From 3fe69e3385bfb9af0af70c334345dc89a63f6ac5 Mon Sep 17 00:00:00 2001 From: awoodhead Date: Fri, 17 Apr 2020 17:08:31 +0100 Subject: [PATCH 01/16] first cut at providing a relocated version of guava --- .../java/org/apache/iceberg/Accessors.java | 2 +- .../java/org/apache/iceberg/Filterable.java | 2 +- .../org/apache/iceberg/PartitionField.java | 2 +- .../org/apache/iceberg/PartitionSpec.java | 14 +-- .../main/java/org/apache/iceberg/Schema.java | 10 +- .../java/org/apache/iceberg/TableScan.java | 2 +- .../main/java/org/apache/iceberg/Tables.java | 2 +- .../org/apache/iceberg/catalog/Namespace.java | 2 +- .../iceberg/catalog/TableIdentifier.java | 6 +- .../iceberg/encryption/EncryptionManager.java | 2 +- .../org/apache/iceberg/events/Listeners.java | 6 +- .../apache/iceberg/expressions/Binder.java | 4 +- .../expressions/BoundLiteralPredicate.java | 2 +- .../expressions/BoundSetPredicate.java | 4 +- .../iceberg/expressions/Expressions.java | 4 +- .../apache/iceberg/expressions/Literals.java | 2 +- .../iceberg/expressions/NamedReference.java | 2 +- .../apache/iceberg/expressions/Predicate.java | 2 +- .../expressions/StrictMetricsEvaluator.java | 2 +- .../iceberg/expressions/UnboundPredicate.java | 10 +- .../org/apache/iceberg/io/CloseableGroup.java | 2 +- .../apache/iceberg/io/CloseableIterable.java | 6 +- .../org/apache/iceberg/transforms/Bucket.java | 10 +- .../apache/iceberg/transforms/Identity.java | 2 +- .../transforms/PartitionSpecVisitor.java | 2 +- .../iceberg/transforms/ProjectionUtil.java | 2 +- .../apache/iceberg/transforms/Transforms.java | 2 +- .../apache/iceberg/transforms/Truncate.java | 2 +- .../apache/iceberg/types/AssignFreshIds.java | 2 +- .../iceberg/types/CheckCompatibility.java | 8 +- .../org/apache/iceberg/types/Comparators.java | 2 +- .../apache/iceberg/types/GetProjectedIds.java | 2 +- .../org/apache/iceberg/types/IndexById.java | 2 +- .../org/apache/iceberg/types/IndexByName.java | 6 +- .../apache/iceberg/types/PruneColumns.java | 2 +- .../org/apache/iceberg/types/ReassignIds.java | 4 +- .../org/apache/iceberg/types/TypeUtil.java | 12 +-- .../java/org/apache/iceberg/types/Types.java | 8 +- .../org/apache/iceberg/util/BinaryUtil.java | 2 +- .../apache/iceberg/util/CharSequenceSet.java | 6 +- .../org/apache/iceberg/util/UnicodeUtil.java | 2 +- .../TestInclusiveManifestEvaluator.java | 2 +- .../TestInclusiveMetricsEvaluator.java | 2 +- .../TestStrictMetricsEvaluator.java | 2 +- .../iceberg/io/TestCloseableIterable.java | 4 +- .../iceberg/transforms/TestBucketing.java | 4 +- .../transforms/TestBucketingProjection.java | 4 +- .../transforms/TestDatesProjection.java | 4 +- .../iceberg/transforms/TestProjection.java | 2 +- .../transforms/TestTimestampsProjection.java | 4 +- .../transforms/TestTruncatesProjection.java | 4 +- build.gradle | 36 ++++++- .../java/org/apache/iceberg/GuavaClasses.java | 96 +++++++++++++++++++ settings.gradle | 2 + versions.lock | 1 - versions.props | 1 - 56 files changed, 230 insertions(+), 106 deletions(-) create mode 100644 relocate-external-dependencies/src/main/java/org/apache/iceberg/GuavaClasses.java diff --git a/api/src/main/java/org/apache/iceberg/Accessors.java b/api/src/main/java/org/apache/iceberg/Accessors.java index 0e0d275c6440..9e391baf37b5 100644 --- a/api/src/main/java/org/apache/iceberg/Accessors.java +++ b/api/src/main/java/org/apache/iceberg/Accessors.java @@ -19,7 +19,7 @@ package org.apache.iceberg; -import com.google.common.collect.Maps; +import org.apache.iceberg.shaded.com.google.common.collect.Maps; import java.util.List; import java.util.Map; import org.apache.iceberg.types.Type; diff --git a/api/src/main/java/org/apache/iceberg/Filterable.java b/api/src/main/java/org/apache/iceberg/Filterable.java index d53a318bccc9..243ed4d66f4f 100644 --- a/api/src/main/java/org/apache/iceberg/Filterable.java +++ b/api/src/main/java/org/apache/iceberg/Filterable.java @@ -19,7 +19,7 @@ package org.apache.iceberg; -import com.google.common.collect.Lists; +import org.apache.iceberg.shaded.com.google.common.collect.Lists; import java.util.Collection; import org.apache.iceberg.expressions.Expression; import org.apache.iceberg.io.CloseableIterable; diff --git a/api/src/main/java/org/apache/iceberg/PartitionField.java b/api/src/main/java/org/apache/iceberg/PartitionField.java index 4bc5ce5d0075..8bece7251fbf 100644 --- a/api/src/main/java/org/apache/iceberg/PartitionField.java +++ b/api/src/main/java/org/apache/iceberg/PartitionField.java @@ -19,7 +19,7 @@ package org.apache.iceberg; -import com.google.common.base.Objects; +import org.apache.iceberg.shaded.com.google.common.base.Objects; import java.io.Serializable; import org.apache.iceberg.transforms.Transform; diff --git a/api/src/main/java/org/apache/iceberg/PartitionSpec.java b/api/src/main/java/org/apache/iceberg/PartitionSpec.java index 9ccce0dadc34..e331171deaee 100644 --- a/api/src/main/java/org/apache/iceberg/PartitionSpec.java +++ b/api/src/main/java/org/apache/iceberg/PartitionSpec.java @@ -19,13 +19,13 @@ package org.apache.iceberg; -import com.google.common.base.Preconditions; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.ListMultimap; -import com.google.common.collect.Lists; -import com.google.common.collect.Maps; -import com.google.common.collect.Multimaps; -import com.google.common.collect.Sets; +import org.apache.iceberg.shaded.com.google.common.base.Preconditions; +import org.apache.iceberg.shaded.com.google.common.collect.ImmutableList; +import org.apache.iceberg.shaded.com.google.common.collect.ListMultimap; +import org.apache.iceberg.shaded.com.google.common.collect.Lists; +import org.apache.iceberg.shaded.com.google.common.collect.Maps; +import org.apache.iceberg.shaded.com.google.common.collect.Multimaps; +import org.apache.iceberg.shaded.com.google.common.collect.Sets; import java.io.Serializable; import java.io.UnsupportedEncodingException; import java.net.URLEncoder; diff --git a/api/src/main/java/org/apache/iceberg/Schema.java b/api/src/main/java/org/apache/iceberg/Schema.java index f08354cc123f..c4cd87767149 100644 --- a/api/src/main/java/org/apache/iceberg/Schema.java +++ b/api/src/main/java/org/apache/iceberg/Schema.java @@ -19,11 +19,11 @@ package org.apache.iceberg; -import com.google.common.base.Joiner; -import com.google.common.base.Preconditions; -import com.google.common.collect.BiMap; -import com.google.common.collect.ImmutableBiMap; -import com.google.common.collect.Sets; +import org.apache.iceberg.shaded.com.google.common.base.Joiner; +import org.apache.iceberg.shaded.com.google.common.base.Preconditions; +import org.apache.iceberg.shaded.com.google.common.collect.BiMap; +import org.apache.iceberg.shaded.com.google.common.collect.ImmutableBiMap; +import org.apache.iceberg.shaded.com.google.common.collect.Sets; import java.io.Serializable; import java.util.Arrays; import java.util.Collection; diff --git a/api/src/main/java/org/apache/iceberg/TableScan.java b/api/src/main/java/org/apache/iceberg/TableScan.java index 65a78069cee0..853136eb54b0 100644 --- a/api/src/main/java/org/apache/iceberg/TableScan.java +++ b/api/src/main/java/org/apache/iceberg/TableScan.java @@ -19,7 +19,7 @@ package org.apache.iceberg; -import com.google.common.collect.Lists; +import org.apache.iceberg.shaded.com.google.common.collect.Lists; import java.util.Collection; import org.apache.iceberg.expressions.Expression; import org.apache.iceberg.io.CloseableIterable; diff --git a/api/src/main/java/org/apache/iceberg/Tables.java b/api/src/main/java/org/apache/iceberg/Tables.java index 4e23a08f6016..101b7614aca8 100644 --- a/api/src/main/java/org/apache/iceberg/Tables.java +++ b/api/src/main/java/org/apache/iceberg/Tables.java @@ -19,7 +19,7 @@ package org.apache.iceberg; -import com.google.common.collect.ImmutableMap; +import org.apache.iceberg.shaded.com.google.common.collect.ImmutableMap; import java.util.Map; /** diff --git a/api/src/main/java/org/apache/iceberg/catalog/Namespace.java b/api/src/main/java/org/apache/iceberg/catalog/Namespace.java index 2202d5f245ed..8cc912b5442d 100644 --- a/api/src/main/java/org/apache/iceberg/catalog/Namespace.java +++ b/api/src/main/java/org/apache/iceberg/catalog/Namespace.java @@ -19,7 +19,7 @@ package org.apache.iceberg.catalog; -import com.google.common.base.Joiner; +import org.apache.iceberg.shaded.com.google.common.base.Joiner; import java.util.Arrays; /** diff --git a/api/src/main/java/org/apache/iceberg/catalog/TableIdentifier.java b/api/src/main/java/org/apache/iceberg/catalog/TableIdentifier.java index 7e30c8f8b15c..f7c96708b691 100644 --- a/api/src/main/java/org/apache/iceberg/catalog/TableIdentifier.java +++ b/api/src/main/java/org/apache/iceberg/catalog/TableIdentifier.java @@ -19,9 +19,9 @@ package org.apache.iceberg.catalog; -import com.google.common.base.Preconditions; -import com.google.common.base.Splitter; -import com.google.common.collect.Iterables; +import org.apache.iceberg.shaded.com.google.common.base.Preconditions; +import org.apache.iceberg.shaded.com.google.common.base.Splitter; +import org.apache.iceberg.shaded.com.google.common.collect.Iterables; import java.util.Arrays; import java.util.Objects; diff --git a/api/src/main/java/org/apache/iceberg/encryption/EncryptionManager.java b/api/src/main/java/org/apache/iceberg/encryption/EncryptionManager.java index ad712fcd45a7..406b3f9b7bde 100644 --- a/api/src/main/java/org/apache/iceberg/encryption/EncryptionManager.java +++ b/api/src/main/java/org/apache/iceberg/encryption/EncryptionManager.java @@ -19,7 +19,7 @@ package org.apache.iceberg.encryption; -import com.google.common.collect.Iterables; +import org.apache.iceberg.shaded.com.google.common.collect.Iterables; import java.io.Serializable; import org.apache.iceberg.io.InputFile; import org.apache.iceberg.io.OutputFile; diff --git a/api/src/main/java/org/apache/iceberg/events/Listeners.java b/api/src/main/java/org/apache/iceberg/events/Listeners.java index 3b279c0f1a04..ae7d1212a293 100644 --- a/api/src/main/java/org/apache/iceberg/events/Listeners.java +++ b/api/src/main/java/org/apache/iceberg/events/Listeners.java @@ -19,9 +19,9 @@ package org.apache.iceberg.events; -import com.google.common.base.Preconditions; -import com.google.common.collect.Lists; -import com.google.common.collect.Maps; +import org.apache.iceberg.shaded.com.google.common.base.Preconditions; +import org.apache.iceberg.shaded.com.google.common.collect.Lists; +import org.apache.iceberg.shaded.com.google.common.collect.Maps; import java.util.Iterator; import java.util.List; import java.util.Map; diff --git a/api/src/main/java/org/apache/iceberg/expressions/Binder.java b/api/src/main/java/org/apache/iceberg/expressions/Binder.java index 1bc6563b0bc4..70ca7333ab74 100644 --- a/api/src/main/java/org/apache/iceberg/expressions/Binder.java +++ b/api/src/main/java/org/apache/iceberg/expressions/Binder.java @@ -19,8 +19,8 @@ package org.apache.iceberg.expressions; -import com.google.common.collect.ImmutableSet; -import com.google.common.collect.Sets; +import org.apache.iceberg.shaded.com.google.common.collect.ImmutableSet; +import org.apache.iceberg.shaded.com.google.common.collect.Sets; import java.util.List; import java.util.Set; import org.apache.iceberg.exceptions.ValidationException; diff --git a/api/src/main/java/org/apache/iceberg/expressions/BoundLiteralPredicate.java b/api/src/main/java/org/apache/iceberg/expressions/BoundLiteralPredicate.java index 65ac03b89008..37dba32c3382 100644 --- a/api/src/main/java/org/apache/iceberg/expressions/BoundLiteralPredicate.java +++ b/api/src/main/java/org/apache/iceberg/expressions/BoundLiteralPredicate.java @@ -19,7 +19,7 @@ package org.apache.iceberg.expressions; -import com.google.common.base.Preconditions; +import org.apache.iceberg.shaded.com.google.common.base.Preconditions; import java.util.Comparator; public class BoundLiteralPredicate extends BoundPredicate { diff --git a/api/src/main/java/org/apache/iceberg/expressions/BoundSetPredicate.java b/api/src/main/java/org/apache/iceberg/expressions/BoundSetPredicate.java index 337cceab4987..db1a3e6fc2b6 100644 --- a/api/src/main/java/org/apache/iceberg/expressions/BoundSetPredicate.java +++ b/api/src/main/java/org/apache/iceberg/expressions/BoundSetPredicate.java @@ -19,8 +19,8 @@ package org.apache.iceberg.expressions; -import com.google.common.base.Joiner; -import com.google.common.base.Preconditions; +import org.apache.iceberg.shaded.com.google.common.base.Joiner; +import org.apache.iceberg.shaded.com.google.common.base.Preconditions; import java.util.Set; public class BoundSetPredicate extends BoundPredicate { diff --git a/api/src/main/java/org/apache/iceberg/expressions/Expressions.java b/api/src/main/java/org/apache/iceberg/expressions/Expressions.java index 0a976558778c..4c143c6147e5 100644 --- a/api/src/main/java/org/apache/iceberg/expressions/Expressions.java +++ b/api/src/main/java/org/apache/iceberg/expressions/Expressions.java @@ -19,8 +19,8 @@ package org.apache.iceberg.expressions; -import com.google.common.base.Preconditions; -import com.google.common.collect.Lists; +import org.apache.iceberg.shaded.com.google.common.base.Preconditions; +import org.apache.iceberg.shaded.com.google.common.collect.Lists; import java.util.stream.Stream; import org.apache.iceberg.expressions.Expression.Operation; import org.apache.iceberg.transforms.Transform; diff --git a/api/src/main/java/org/apache/iceberg/expressions/Literals.java b/api/src/main/java/org/apache/iceberg/expressions/Literals.java index c5fb103fb0e7..5cbe10958017 100644 --- a/api/src/main/java/org/apache/iceberg/expressions/Literals.java +++ b/api/src/main/java/org/apache/iceberg/expressions/Literals.java @@ -19,7 +19,7 @@ package org.apache.iceberg.expressions; -import com.google.common.base.Preconditions; +import org.apache.iceberg.shaded.com.google.common.base.Preconditions; import java.io.ObjectStreamException; import java.math.BigDecimal; import java.math.RoundingMode; diff --git a/api/src/main/java/org/apache/iceberg/expressions/NamedReference.java b/api/src/main/java/org/apache/iceberg/expressions/NamedReference.java index d928b3abfe1d..264065ad8fd0 100644 --- a/api/src/main/java/org/apache/iceberg/expressions/NamedReference.java +++ b/api/src/main/java/org/apache/iceberg/expressions/NamedReference.java @@ -19,7 +19,7 @@ package org.apache.iceberg.expressions; -import com.google.common.base.Preconditions; +import org.apache.iceberg.shaded.com.google.common.base.Preconditions; import org.apache.iceberg.Schema; import org.apache.iceberg.exceptions.ValidationException; import org.apache.iceberg.types.Types; diff --git a/api/src/main/java/org/apache/iceberg/expressions/Predicate.java b/api/src/main/java/org/apache/iceberg/expressions/Predicate.java index 347304857788..12d909235cd8 100644 --- a/api/src/main/java/org/apache/iceberg/expressions/Predicate.java +++ b/api/src/main/java/org/apache/iceberg/expressions/Predicate.java @@ -19,7 +19,7 @@ package org.apache.iceberg.expressions; -import com.google.common.base.Preconditions; +import org.apache.iceberg.shaded.com.google.common.base.Preconditions; public abstract class Predicate implements Expression { private final Operation op; diff --git a/api/src/main/java/org/apache/iceberg/expressions/StrictMetricsEvaluator.java b/api/src/main/java/org/apache/iceberg/expressions/StrictMetricsEvaluator.java index 8cc3e58d8672..c051ac6d4f9e 100644 --- a/api/src/main/java/org/apache/iceberg/expressions/StrictMetricsEvaluator.java +++ b/api/src/main/java/org/apache/iceberg/expressions/StrictMetricsEvaluator.java @@ -19,7 +19,7 @@ package org.apache.iceberg.expressions; -import com.google.common.base.Preconditions; +import org.apache.iceberg.shaded.com.google.common.base.Preconditions; import java.nio.ByteBuffer; import java.util.Collection; import java.util.Map; diff --git a/api/src/main/java/org/apache/iceberg/expressions/UnboundPredicate.java b/api/src/main/java/org/apache/iceberg/expressions/UnboundPredicate.java index fbef5e158934..d64559e63d03 100644 --- a/api/src/main/java/org/apache/iceberg/expressions/UnboundPredicate.java +++ b/api/src/main/java/org/apache/iceberg/expressions/UnboundPredicate.java @@ -19,11 +19,11 @@ package org.apache.iceberg.expressions; -import com.google.common.base.Joiner; -import com.google.common.base.Preconditions; -import com.google.common.collect.Iterables; -import com.google.common.collect.Lists; -import com.google.common.collect.Sets; +import org.apache.iceberg.shaded.com.google.common.base.Joiner; +import org.apache.iceberg.shaded.com.google.common.base.Preconditions; +import org.apache.iceberg.shaded.com.google.common.collect.Iterables; +import org.apache.iceberg.shaded.com.google.common.collect.Lists; +import org.apache.iceberg.shaded.com.google.common.collect.Sets; import java.util.List; import java.util.Set; import org.apache.iceberg.exceptions.ValidationException; diff --git a/api/src/main/java/org/apache/iceberg/io/CloseableGroup.java b/api/src/main/java/org/apache/iceberg/io/CloseableGroup.java index f1cf61f2e24c..32e8da71fa10 100644 --- a/api/src/main/java/org/apache/iceberg/io/CloseableGroup.java +++ b/api/src/main/java/org/apache/iceberg/io/CloseableGroup.java @@ -19,7 +19,7 @@ package org.apache.iceberg.io; -import com.google.common.collect.Lists; +import org.apache.iceberg.shaded.com.google.common.collect.Lists; import java.io.Closeable; import java.io.IOException; import java.util.Deque; diff --git a/api/src/main/java/org/apache/iceberg/io/CloseableIterable.java b/api/src/main/java/org/apache/iceberg/io/CloseableIterable.java index 5e47ab2c4ae8..ee6fed23e2f5 100644 --- a/api/src/main/java/org/apache/iceberg/io/CloseableIterable.java +++ b/api/src/main/java/org/apache/iceberg/io/CloseableIterable.java @@ -19,9 +19,9 @@ package org.apache.iceberg.io; -import com.google.common.base.Preconditions; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.Iterables; +import org.apache.iceberg.shaded.com.google.common.base.Preconditions; +import org.apache.iceberg.shaded.com.google.common.collect.ImmutableList; +import org.apache.iceberg.shaded.com.google.common.collect.Iterables; import java.io.Closeable; import java.io.IOException; import java.util.Collections; diff --git a/api/src/main/java/org/apache/iceberg/transforms/Bucket.java b/api/src/main/java/org/apache/iceberg/transforms/Bucket.java index b5ebb8fe1115..835fceab5bf5 100644 --- a/api/src/main/java/org/apache/iceberg/transforms/Bucket.java +++ b/api/src/main/java/org/apache/iceberg/transforms/Bucket.java @@ -19,11 +19,11 @@ package org.apache.iceberg.transforms; -import com.google.common.annotations.VisibleForTesting; -import com.google.common.base.Objects; -import com.google.common.collect.Sets; -import com.google.common.hash.HashFunction; -import com.google.common.hash.Hashing; +import org.apache.iceberg.shaded.com.google.common.annotations.VisibleForTesting; +import org.apache.iceberg.shaded.com.google.common.base.Objects; +import org.apache.iceberg.shaded.com.google.common.collect.Sets; +import org.apache.iceberg.shaded.com.google.common.hash.HashFunction; +import org.apache.iceberg.shaded.com.google.common.hash.Hashing; import java.math.BigDecimal; import java.nio.ByteBuffer; import java.nio.charset.StandardCharsets; diff --git a/api/src/main/java/org/apache/iceberg/transforms/Identity.java b/api/src/main/java/org/apache/iceberg/transforms/Identity.java index 2e340d8faa7a..bddf60dad14c 100644 --- a/api/src/main/java/org/apache/iceberg/transforms/Identity.java +++ b/api/src/main/java/org/apache/iceberg/transforms/Identity.java @@ -19,7 +19,7 @@ package org.apache.iceberg.transforms; -import com.google.common.base.Objects; +import org.apache.iceberg.shaded.com.google.common.base.Objects; import java.nio.ByteBuffer; import org.apache.iceberg.expressions.BoundPredicate; import org.apache.iceberg.expressions.Expressions; diff --git a/api/src/main/java/org/apache/iceberg/transforms/PartitionSpecVisitor.java b/api/src/main/java/org/apache/iceberg/transforms/PartitionSpecVisitor.java index e521909c893a..998e6bee2315 100644 --- a/api/src/main/java/org/apache/iceberg/transforms/PartitionSpecVisitor.java +++ b/api/src/main/java/org/apache/iceberg/transforms/PartitionSpecVisitor.java @@ -19,7 +19,7 @@ package org.apache.iceberg.transforms; -import com.google.common.collect.Lists; +import org.apache.iceberg.shaded.com.google.common.collect.Lists; import java.util.List; import org.apache.iceberg.PartitionField; import org.apache.iceberg.PartitionSpec; diff --git a/api/src/main/java/org/apache/iceberg/transforms/ProjectionUtil.java b/api/src/main/java/org/apache/iceberg/transforms/ProjectionUtil.java index 9c75aaa514e4..af0dc140faaa 100644 --- a/api/src/main/java/org/apache/iceberg/transforms/ProjectionUtil.java +++ b/api/src/main/java/org/apache/iceberg/transforms/ProjectionUtil.java @@ -19,7 +19,6 @@ package org.apache.iceberg.transforms; -import com.google.common.collect.Iterables; import java.math.BigDecimal; import java.math.BigInteger; import org.apache.iceberg.expressions.BoundLiteralPredicate; @@ -29,6 +28,7 @@ import org.apache.iceberg.expressions.Expression; import org.apache.iceberg.expressions.Expressions; import org.apache.iceberg.expressions.UnboundPredicate; +import org.apache.iceberg.shaded.com.google.common.collect.Iterables; import static org.apache.iceberg.expressions.Expressions.predicate; diff --git a/api/src/main/java/org/apache/iceberg/transforms/Transforms.java b/api/src/main/java/org/apache/iceberg/transforms/Transforms.java index cd370d481b30..72775506e24a 100644 --- a/api/src/main/java/org/apache/iceberg/transforms/Transforms.java +++ b/api/src/main/java/org/apache/iceberg/transforms/Transforms.java @@ -19,7 +19,7 @@ package org.apache.iceberg.transforms; -import com.google.common.base.Preconditions; +import org.apache.iceberg.shaded.com.google.common.base.Preconditions; import java.util.Locale; import java.util.regex.Matcher; import java.util.regex.Pattern; diff --git a/api/src/main/java/org/apache/iceberg/transforms/Truncate.java b/api/src/main/java/org/apache/iceberg/transforms/Truncate.java index 64b64d35c17b..673464ccdd75 100644 --- a/api/src/main/java/org/apache/iceberg/transforms/Truncate.java +++ b/api/src/main/java/org/apache/iceberg/transforms/Truncate.java @@ -19,7 +19,7 @@ package org.apache.iceberg.transforms; -import com.google.common.base.Objects; +import org.apache.iceberg.shaded.com.google.common.base.Objects; import java.math.BigDecimal; import java.math.BigInteger; import java.nio.ByteBuffer; diff --git a/api/src/main/java/org/apache/iceberg/types/AssignFreshIds.java b/api/src/main/java/org/apache/iceberg/types/AssignFreshIds.java index c8006da3710f..f54cdf4dfaa9 100644 --- a/api/src/main/java/org/apache/iceberg/types/AssignFreshIds.java +++ b/api/src/main/java/org/apache/iceberg/types/AssignFreshIds.java @@ -19,7 +19,7 @@ package org.apache.iceberg.types; -import com.google.common.collect.Lists; +import org.apache.iceberg.shaded.com.google.common.collect.Lists; import java.util.Iterator; import java.util.List; import java.util.function.Supplier; 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 b2ae457ed4f6..3d53fb3f8561 100644 --- a/api/src/main/java/org/apache/iceberg/types/CheckCompatibility.java +++ b/api/src/main/java/org/apache/iceberg/types/CheckCompatibility.java @@ -19,10 +19,10 @@ package org.apache.iceberg.types; -import com.google.common.base.Preconditions; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.Lists; -import com.google.common.collect.Maps; +import org.apache.iceberg.shaded.com.google.common.base.Preconditions; +import org.apache.iceberg.shaded.com.google.common.collect.ImmutableList; +import org.apache.iceberg.shaded.com.google.common.collect.Lists; +import org.apache.iceberg.shaded.com.google.common.collect.Maps; import java.util.List; import java.util.Locale; import java.util.Map; diff --git a/api/src/main/java/org/apache/iceberg/types/Comparators.java b/api/src/main/java/org/apache/iceberg/types/Comparators.java index 1b09fe2e766e..b8293ad15317 100644 --- a/api/src/main/java/org/apache/iceberg/types/Comparators.java +++ b/api/src/main/java/org/apache/iceberg/types/Comparators.java @@ -19,7 +19,7 @@ package org.apache.iceberg.types; -import com.google.common.collect.ImmutableMap; +import org.apache.iceberg.shaded.com.google.common.collect.ImmutableMap; import java.nio.ByteBuffer; import java.util.Comparator; import org.apache.iceberg.util.UnicodeUtil; diff --git a/api/src/main/java/org/apache/iceberg/types/GetProjectedIds.java b/api/src/main/java/org/apache/iceberg/types/GetProjectedIds.java index d33b2f9de991..42a3d8aeb622 100644 --- a/api/src/main/java/org/apache/iceberg/types/GetProjectedIds.java +++ b/api/src/main/java/org/apache/iceberg/types/GetProjectedIds.java @@ -19,7 +19,7 @@ package org.apache.iceberg.types; -import com.google.common.collect.Sets; +import org.apache.iceberg.shaded.com.google.common.collect.Sets; import java.util.List; import java.util.Set; import org.apache.iceberg.Schema; diff --git a/api/src/main/java/org/apache/iceberg/types/IndexById.java b/api/src/main/java/org/apache/iceberg/types/IndexById.java index d1bed5df046f..d8e9cbb5ed19 100644 --- a/api/src/main/java/org/apache/iceberg/types/IndexById.java +++ b/api/src/main/java/org/apache/iceberg/types/IndexById.java @@ -19,7 +19,7 @@ package org.apache.iceberg.types; -import com.google.common.collect.Maps; +import org.apache.iceberg.shaded.com.google.common.collect.Maps; import java.util.List; import java.util.Map; import org.apache.iceberg.Schema; diff --git a/api/src/main/java/org/apache/iceberg/types/IndexByName.java b/api/src/main/java/org/apache/iceberg/types/IndexByName.java index a9ad58ef0436..afd555f6aa02 100644 --- a/api/src/main/java/org/apache/iceberg/types/IndexByName.java +++ b/api/src/main/java/org/apache/iceberg/types/IndexByName.java @@ -19,9 +19,9 @@ package org.apache.iceberg.types; -import com.google.common.base.Joiner; -import com.google.common.collect.Lists; -import com.google.common.collect.Maps; +import org.apache.iceberg.shaded.com.google.common.base.Joiner; +import org.apache.iceberg.shaded.com.google.common.collect.Lists; +import org.apache.iceberg.shaded.com.google.common.collect.Maps; import java.util.Deque; import java.util.Map; import java.util.concurrent.Callable; diff --git a/api/src/main/java/org/apache/iceberg/types/PruneColumns.java b/api/src/main/java/org/apache/iceberg/types/PruneColumns.java index a816edf72365..11989bc71f3b 100644 --- a/api/src/main/java/org/apache/iceberg/types/PruneColumns.java +++ b/api/src/main/java/org/apache/iceberg/types/PruneColumns.java @@ -19,7 +19,7 @@ package org.apache.iceberg.types; -import com.google.common.collect.Lists; +import org.apache.iceberg.shaded.com.google.common.collect.Lists; import java.util.List; import java.util.Set; import org.apache.iceberg.Schema; diff --git a/api/src/main/java/org/apache/iceberg/types/ReassignIds.java b/api/src/main/java/org/apache/iceberg/types/ReassignIds.java index 16099493fb96..f1055a8769d9 100644 --- a/api/src/main/java/org/apache/iceberg/types/ReassignIds.java +++ b/api/src/main/java/org/apache/iceberg/types/ReassignIds.java @@ -19,8 +19,8 @@ package org.apache.iceberg.types; -import com.google.common.base.Preconditions; -import com.google.common.collect.Lists; +import org.apache.iceberg.shaded.com.google.common.base.Preconditions; +import org.apache.iceberg.shaded.com.google.common.collect.Lists; import java.util.List; import java.util.function.Supplier; import org.apache.iceberg.Schema; diff --git a/api/src/main/java/org/apache/iceberg/types/TypeUtil.java b/api/src/main/java/org/apache/iceberg/types/TypeUtil.java index 82c23f1e3715..02176fd6b546 100644 --- a/api/src/main/java/org/apache/iceberg/types/TypeUtil.java +++ b/api/src/main/java/org/apache/iceberg/types/TypeUtil.java @@ -19,12 +19,12 @@ package org.apache.iceberg.types; -import com.google.common.base.Preconditions; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableSet; -import com.google.common.collect.Iterables; -import com.google.common.collect.Lists; -import com.google.common.collect.Maps; +import org.apache.iceberg.shaded.com.google.common.base.Preconditions; +import org.apache.iceberg.shaded.com.google.common.collect.ImmutableList; +import org.apache.iceberg.shaded.com.google.common.collect.ImmutableSet; +import org.apache.iceberg.shaded.com.google.common.collect.Iterables; +import org.apache.iceberg.shaded.com.google.common.collect.Lists; +import org.apache.iceberg.shaded.com.google.common.collect.Maps; import java.util.List; import java.util.Locale; import java.util.Map; diff --git a/api/src/main/java/org/apache/iceberg/types/Types.java b/api/src/main/java/org/apache/iceberg/types/Types.java index 48e7c96671ba..76e993bbbe06 100644 --- a/api/src/main/java/org/apache/iceberg/types/Types.java +++ b/api/src/main/java/org/apache/iceberg/types/Types.java @@ -19,10 +19,10 @@ package org.apache.iceberg.types; -import com.google.common.base.Joiner; -import com.google.common.base.Preconditions; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableMap; +import org.apache.iceberg.shaded.com.google.common.base.Joiner; +import org.apache.iceberg.shaded.com.google.common.base.Preconditions; +import org.apache.iceberg.shaded.com.google.common.collect.ImmutableList; +import org.apache.iceberg.shaded.com.google.common.collect.ImmutableMap; import java.io.Serializable; import java.util.Arrays; import java.util.List; diff --git a/api/src/main/java/org/apache/iceberg/util/BinaryUtil.java b/api/src/main/java/org/apache/iceberg/util/BinaryUtil.java index 9b394811b1ad..cb801c2b3d35 100644 --- a/api/src/main/java/org/apache/iceberg/util/BinaryUtil.java +++ b/api/src/main/java/org/apache/iceberg/util/BinaryUtil.java @@ -19,7 +19,7 @@ package org.apache.iceberg.util; -import com.google.common.base.Preconditions; +import org.apache.iceberg.shaded.com.google.common.base.Preconditions; import java.nio.ByteBuffer; import org.apache.iceberg.expressions.Literal; diff --git a/api/src/main/java/org/apache/iceberg/util/CharSequenceSet.java b/api/src/main/java/org/apache/iceberg/util/CharSequenceSet.java index b51ff3448b51..6f36aee46417 100644 --- a/api/src/main/java/org/apache/iceberg/util/CharSequenceSet.java +++ b/api/src/main/java/org/apache/iceberg/util/CharSequenceSet.java @@ -19,9 +19,9 @@ package org.apache.iceberg.util; -import com.google.common.collect.Iterables; -import com.google.common.collect.Iterators; -import com.google.common.collect.Sets; +import org.apache.iceberg.shaded.com.google.common.collect.Iterables; +import org.apache.iceberg.shaded.com.google.common.collect.Iterators; +import org.apache.iceberg.shaded.com.google.common.collect.Sets; import java.io.Serializable; import java.util.Collection; import java.util.Iterator; diff --git a/api/src/main/java/org/apache/iceberg/util/UnicodeUtil.java b/api/src/main/java/org/apache/iceberg/util/UnicodeUtil.java index c371d4a93223..17bb0149fc9b 100644 --- a/api/src/main/java/org/apache/iceberg/util/UnicodeUtil.java +++ b/api/src/main/java/org/apache/iceberg/util/UnicodeUtil.java @@ -19,7 +19,7 @@ package org.apache.iceberg.util; -import com.google.common.base.Preconditions; +import org.apache.iceberg.shaded.com.google.common.base.Preconditions; import org.apache.iceberg.expressions.Literal; public class UnicodeUtil { diff --git a/api/src/test/java/org/apache/iceberg/expressions/TestInclusiveManifestEvaluator.java b/api/src/test/java/org/apache/iceberg/expressions/TestInclusiveManifestEvaluator.java index b9a476ffa5d7..dab63af67712 100644 --- a/api/src/test/java/org/apache/iceberg/expressions/TestInclusiveManifestEvaluator.java +++ b/api/src/test/java/org/apache/iceberg/expressions/TestInclusiveManifestEvaluator.java @@ -19,7 +19,7 @@ package org.apache.iceberg.expressions; -import com.google.common.collect.ImmutableList; +import org.apache.iceberg.shaded.com.google.common.collect.ImmutableList; import java.nio.ByteBuffer; import org.apache.iceberg.AssertHelpers; import org.apache.iceberg.ManifestFile; diff --git a/api/src/test/java/org/apache/iceberg/expressions/TestInclusiveMetricsEvaluator.java b/api/src/test/java/org/apache/iceberg/expressions/TestInclusiveMetricsEvaluator.java index 1f90cf1c1308..756c8bd7a7c4 100644 --- a/api/src/test/java/org/apache/iceberg/expressions/TestInclusiveMetricsEvaluator.java +++ b/api/src/test/java/org/apache/iceberg/expressions/TestInclusiveMetricsEvaluator.java @@ -19,7 +19,7 @@ package org.apache.iceberg.expressions; -import com.google.common.collect.ImmutableMap; +import org.apache.iceberg.shaded.com.google.common.collect.ImmutableMap; import org.apache.iceberg.AssertHelpers; import org.apache.iceberg.DataFile; import org.apache.iceberg.Schema; diff --git a/api/src/test/java/org/apache/iceberg/expressions/TestStrictMetricsEvaluator.java b/api/src/test/java/org/apache/iceberg/expressions/TestStrictMetricsEvaluator.java index 9f0d465e0ee9..9dbe4f027a70 100644 --- a/api/src/test/java/org/apache/iceberg/expressions/TestStrictMetricsEvaluator.java +++ b/api/src/test/java/org/apache/iceberg/expressions/TestStrictMetricsEvaluator.java @@ -19,7 +19,7 @@ package org.apache.iceberg.expressions; -import com.google.common.collect.ImmutableMap; +import org.apache.iceberg.shaded.com.google.common.collect.ImmutableMap; import org.apache.iceberg.AssertHelpers; import org.apache.iceberg.DataFile; import org.apache.iceberg.Schema; diff --git a/api/src/test/java/org/apache/iceberg/io/TestCloseableIterable.java b/api/src/test/java/org/apache/iceberg/io/TestCloseableIterable.java index d45a8cce6f0e..2dfde8a11cdd 100644 --- a/api/src/test/java/org/apache/iceberg/io/TestCloseableIterable.java +++ b/api/src/test/java/org/apache/iceberg/io/TestCloseableIterable.java @@ -19,8 +19,8 @@ package org.apache.iceberg.io; -import com.google.common.collect.Iterables; -import com.google.common.collect.Lists; +import org.apache.iceberg.shaded.com.google.common.collect.Iterables; +import org.apache.iceberg.shaded.com.google.common.collect.Lists; import java.util.NoSuchElementException; import org.apache.iceberg.AssertHelpers; import org.junit.Assert; diff --git a/api/src/test/java/org/apache/iceberg/transforms/TestBucketing.java b/api/src/test/java/org/apache/iceberg/transforms/TestBucketing.java index 868d6be7770c..3910c795215a 100644 --- a/api/src/test/java/org/apache/iceberg/transforms/TestBucketing.java +++ b/api/src/test/java/org/apache/iceberg/transforms/TestBucketing.java @@ -19,8 +19,8 @@ package org.apache.iceberg.transforms; -import com.google.common.hash.HashFunction; -import com.google.common.hash.Hashing; +import org.apache.iceberg.shaded.com.google.common.hash.HashFunction; +import org.apache.iceberg.shaded.com.google.common.hash.Hashing; import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; import java.math.BigDecimal; diff --git a/api/src/test/java/org/apache/iceberg/transforms/TestBucketingProjection.java b/api/src/test/java/org/apache/iceberg/transforms/TestBucketingProjection.java index 54006f5751b2..507855918c92 100644 --- a/api/src/test/java/org/apache/iceberg/transforms/TestBucketingProjection.java +++ b/api/src/test/java/org/apache/iceberg/transforms/TestBucketingProjection.java @@ -19,8 +19,8 @@ package org.apache.iceberg.transforms; -import com.google.common.collect.Iterables; -import com.google.common.collect.Lists; +import org.apache.iceberg.shaded.com.google.common.collect.Iterables; +import org.apache.iceberg.shaded.com.google.common.collect.Lists; import java.math.BigDecimal; import java.nio.ByteBuffer; import java.util.UUID; diff --git a/api/src/test/java/org/apache/iceberg/transforms/TestDatesProjection.java b/api/src/test/java/org/apache/iceberg/transforms/TestDatesProjection.java index abee7e857122..6421a6fc04ee 100644 --- a/api/src/test/java/org/apache/iceberg/transforms/TestDatesProjection.java +++ b/api/src/test/java/org/apache/iceberg/transforms/TestDatesProjection.java @@ -19,8 +19,8 @@ package org.apache.iceberg.transforms; -import com.google.common.collect.Iterables; -import com.google.common.collect.Lists; +import org.apache.iceberg.shaded.com.google.common.collect.Iterables; +import org.apache.iceberg.shaded.com.google.common.collect.Lists; import java.util.stream.Collectors; import org.apache.iceberg.PartitionSpec; import org.apache.iceberg.Schema; diff --git a/api/src/test/java/org/apache/iceberg/transforms/TestProjection.java b/api/src/test/java/org/apache/iceberg/transforms/TestProjection.java index e79cab2003a3..6ff47bc1b04f 100644 --- a/api/src/test/java/org/apache/iceberg/transforms/TestProjection.java +++ b/api/src/test/java/org/apache/iceberg/transforms/TestProjection.java @@ -19,7 +19,7 @@ package org.apache.iceberg.transforms; -import com.google.common.collect.Lists; +import org.apache.iceberg.shaded.com.google.common.collect.Lists; import java.util.List; import org.apache.iceberg.PartitionSpec; import org.apache.iceberg.Schema; diff --git a/api/src/test/java/org/apache/iceberg/transforms/TestTimestampsProjection.java b/api/src/test/java/org/apache/iceberg/transforms/TestTimestampsProjection.java index ad86b8a75024..baa568b18184 100644 --- a/api/src/test/java/org/apache/iceberg/transforms/TestTimestampsProjection.java +++ b/api/src/test/java/org/apache/iceberg/transforms/TestTimestampsProjection.java @@ -19,8 +19,8 @@ package org.apache.iceberg.transforms; -import com.google.common.collect.Iterables; -import com.google.common.collect.Lists; +import org.apache.iceberg.shaded.com.google.common.collect.Iterables; +import org.apache.iceberg.shaded.com.google.common.collect.Lists; import java.util.stream.Collectors; import org.apache.iceberg.PartitionSpec; import org.apache.iceberg.Schema; diff --git a/api/src/test/java/org/apache/iceberg/transforms/TestTruncatesProjection.java b/api/src/test/java/org/apache/iceberg/transforms/TestTruncatesProjection.java index dbb547bad42d..e12262f1e01f 100644 --- a/api/src/test/java/org/apache/iceberg/transforms/TestTruncatesProjection.java +++ b/api/src/test/java/org/apache/iceberg/transforms/TestTruncatesProjection.java @@ -19,8 +19,8 @@ package org.apache.iceberg.transforms; -import com.google.common.collect.Iterables; -import com.google.common.collect.Lists; +import org.apache.iceberg.shaded.com.google.common.collect.Iterables; +import org.apache.iceberg.shaded.com.google.common.collect.Lists; import java.math.BigDecimal; import java.nio.ByteBuffer; import java.util.stream.Collectors; diff --git a/build.gradle b/build.gradle index bbba9160174c..ca982657c8b8 100644 --- a/build.gradle +++ b/build.gradle @@ -84,10 +84,6 @@ subprojects { dependencies { compile 'org.slf4j:slf4j-api' - compile('com.google.guava:guava') { - // may be LGPL - use ALv2 findbugs-annotations instead - exclude group: 'com.google.code.findbugs' - } compile 'com.github.stephenc.findbugs:findbugs-annotations:1.3.9-1' testCompile 'junit:junit' @@ -101,8 +97,40 @@ apply from: 'deploy.gradle' apply from: 'tasks.gradle' apply from: 'jmh.gradle' +project(':iceberg-relocate-external-dependencies') { + apply plugin: 'com.github.johnrengelman.shadow' + + tasks.javadoc.enabled = false + tasks.javadocJar.enabled = false + tasks.assemble.dependsOn tasks.shadowJar + tasks.install.dependsOn tasks.shadowJar + + dependencies { + compile('com.google.guava:guava:28.0-jre') { + // may be LGPL - use ALv2 findbugs-annotations instead + exclude group: 'com.google.code.findbugs' + } + } + + shadowJar { + configurations = [project.configurations.compile] + zip64 true + + // include the LICENSE and NOTICE files for the shaded Jar + from(projectDir) { + include 'LICENSE' + include 'NOTICE' + } + + relocate 'com.google', 'org.apache.iceberg.shaded.com.google' + + minimize() + } +} + project(':iceberg-api') { dependencies { + compile project(path: ':iceberg-relocate-external-dependencies', configuration: 'shadow') testCompile "org.apache.avro:avro" testCompile 'joda-time:joda-time' } diff --git a/relocate-external-dependencies/src/main/java/org/apache/iceberg/GuavaClasses.java b/relocate-external-dependencies/src/main/java/org/apache/iceberg/GuavaClasses.java new file mode 100644 index 000000000000..46662962f03b --- /dev/null +++ b/relocate-external-dependencies/src/main/java/org/apache/iceberg/GuavaClasses.java @@ -0,0 +1,96 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.apache.iceberg; + +import com.google.common.annotations.VisibleForTesting; +import com.google.common.base.Joiner; +import com.google.common.base.MoreObjects; +import com.google.common.base.Objects; +import com.google.common.base.Preconditions; +import com.google.common.base.Splitter; +import com.google.common.base.Throwables; +import com.google.common.collect.BiMap; +import com.google.common.collect.FluentIterable; +import com.google.common.collect.ImmutableBiMap; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableMap; +import com.google.common.collect.ImmutableSet; +import com.google.common.collect.Iterables; +import com.google.common.collect.Iterators; +import com.google.common.collect.ListMultimap; +import com.google.common.collect.Lists; +import com.google.common.collect.MapMaker; +import com.google.common.collect.Maps; +import com.google.common.collect.Multimap; +import com.google.common.collect.Multimaps; +import com.google.common.collect.Ordering; +import com.google.common.collect.Sets; +import com.google.common.collect.Streams; +import com.google.common.hash.HashFunction; +import com.google.common.hash.Hasher; +import com.google.common.hash.Hashing; +import com.google.common.io.Files; +import com.google.common.primitives.Bytes; +import com.google.common.util.concurrent.MoreExecutors; +import com.google.common.util.concurrent.ThreadFactoryBuilder; + +//inspired in part by https://github.com/apache/avro/blob/release-1.8.2/lang/java/guava/src/main/java/org/apache/avro/GuavaClasses.java +class GuavaClasses { + + /* + * Referencing Guava classes here includes them in the minimized and relocated Guava jar + */ + static { + VisibleForTesting.class.getName(); + Joiner.class.getName(); + MoreObjects.class.getName(); + Objects.class.getName(); + Preconditions.class.getName(); + Splitter.class.getName(); + Throwables.class.getName(); + BiMap.class.getName(); + FluentIterable.class.getName(); + ImmutableBiMap.class.getName(); + ImmutableList.class.getName(); + ImmutableMap.class.getName(); + ImmutableSet.class.getName(); + Iterables.class.getName(); + Iterators.class.getName(); + ListMultimap.class.getName(); + Lists.class.getName(); + MapMaker.class.getName(); + Maps.class.getName(); + Multimap.class.getName(); + Multimaps.class.getName(); + Ordering.class.getName(); + Sets.class.getName(); + Streams.class.getName(); + Hasher.class.getName(); + HashFunction.class.getName(); + Hashing.class.getName(); + Files.class.getName(); + Bytes.class.getName(); + MoreExecutors.class.getName(); + ThreadFactoryBuilder.class.getName(); + Iterables.class.getName(); + } + +} + diff --git a/settings.gradle b/settings.gradle index 0c9e59228094..cd0691a130d4 100644 --- a/settings.gradle +++ b/settings.gradle @@ -25,6 +25,7 @@ include 'data' include 'mr' include 'orc' include 'parquet' +include 'relocate-external-dependencies' include 'spark' include 'arrow' include 'spark-runtime' @@ -39,6 +40,7 @@ project(':mr').name = 'iceberg-mr' project(':orc').name = 'iceberg-orc' project(':arrow').name = 'iceberg-arrow' project(':parquet').name = 'iceberg-parquet' +project(':relocate-external-dependencies').name = 'iceberg-relocate-external-dependencies' project(':spark').name = 'iceberg-spark' project(':spark-runtime').name = 'iceberg-spark-runtime' project(':pig').name = 'iceberg-pig' diff --git a/versions.lock b/versions.lock index f94a0ca1d756..19e17e7a87c3 100644 --- a/versions.lock +++ b/versions.lock @@ -20,7 +20,6 @@ com.google.code.gson:gson:2.2.4 (2 constraints: 9518bfd2) com.google.errorprone:error_prone_annotations:2.3.3 (2 constraints: 161a2544) com.google.flatbuffers:flatbuffers-java:1.9.0 (2 constraints: e5199714) com.google.guava:failureaccess:1.0.1 (1 constraints: 140ae1b4) -com.google.guava:guava:28.0-jre (21 constraints: 88453dad) com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava (1 constraints: bd17c918) com.google.inject:guice:3.0 (6 constraints: 6873914c) com.google.inject.extensions:guice-servlet:3.0 (11 constraints: a9d50a2b) diff --git a/versions.props b/versions.props index 0a1f86f530a9..533996a04833 100644 --- a/versions.props +++ b/versions.props @@ -1,5 +1,4 @@ org.slf4j:slf4j-api = 1.7.22 -com.google.guava:guava = 28.0-jre org.apache.avro:avro = 1.9.2 org.apache.hadoop:* = 2.7.3 org.apache.hive:hive-metastore = 2.3.6 From 01ae7ff914d69eb99380c7f3ccb55c87b35ada8e Mon Sep 17 00:00:00 2001 From: awoodhead Date: Mon, 27 Apr 2020 16:21:03 +0100 Subject: [PATCH 02/16] move shade base package from "org.apache.iceberg.shaded" to "com.google.common.shaded" --- .baseline/checkstyle/checkstyle.xml | 3 +- .../java/org/apache/iceberg/Accessors.java | 2 +- .../java/org/apache/iceberg/Filterable.java | 2 +- .../org/apache/iceberg/PartitionField.java | 2 +- .../org/apache/iceberg/PartitionSpec.java | 14 +- .../main/java/org/apache/iceberg/Schema.java | 10 +- .../java/org/apache/iceberg/TableScan.java | 2 +- .../main/java/org/apache/iceberg/Tables.java | 2 +- .../org/apache/iceberg/catalog/Namespace.java | 2 +- .../iceberg/catalog/SupportsNamespaces.java | 2 +- .../iceberg/catalog/TableIdentifier.java | 6 +- .../iceberg/encryption/EncryptionManager.java | 2 +- .../org/apache/iceberg/events/Listeners.java | 6 +- .../apache/iceberg/expressions/Binder.java | 4 +- .../expressions/BoundLiteralPredicate.java | 2 +- .../expressions/BoundSetPredicate.java | 4 +- .../iceberg/expressions/Expressions.java | 4 +- .../apache/iceberg/expressions/Literals.java | 2 +- .../iceberg/expressions/NamedReference.java | 2 +- .../apache/iceberg/expressions/Predicate.java | 2 +- .../expressions/StrictMetricsEvaluator.java | 2 +- .../iceberg/expressions/UnboundPredicate.java | 10 +- .../org/apache/iceberg/io/CloseableGroup.java | 2 +- .../apache/iceberg/io/CloseableIterable.java | 6 +- .../org/apache/iceberg/transforms/Bucket.java | 10 +- .../apache/iceberg/transforms/Identity.java | 2 +- .../transforms/PartitionSpecVisitor.java | 2 +- .../iceberg/transforms/ProjectionUtil.java | 2 +- .../apache/iceberg/transforms/Transforms.java | 2 +- .../apache/iceberg/transforms/Truncate.java | 2 +- .../apache/iceberg/types/AssignFreshIds.java | 2 +- .../iceberg/types/CheckCompatibility.java | 8 +- .../org/apache/iceberg/types/Comparators.java | 2 +- .../apache/iceberg/types/GetProjectedIds.java | 2 +- .../org/apache/iceberg/types/IndexById.java | 2 +- .../org/apache/iceberg/types/IndexByName.java | 6 +- .../apache/iceberg/types/PruneColumns.java | 2 +- .../org/apache/iceberg/types/ReassignIds.java | 4 +- .../org/apache/iceberg/types/TypeUtil.java | 12 +- .../java/org/apache/iceberg/types/Types.java | 8 +- .../org/apache/iceberg/util/BinaryUtil.java | 2 +- .../apache/iceberg/util/CharSequenceSet.java | 6 +- .../org/apache/iceberg/util/UnicodeUtil.java | 2 +- .../TestInclusiveManifestEvaluator.java | 2 +- .../TestInclusiveMetricsEvaluator.java | 2 +- .../TestStrictMetricsEvaluator.java | 2 +- .../iceberg/io/TestCloseableIterable.java | 4 +- .../iceberg/transforms/TestBucketing.java | 4 +- .../transforms/TestBucketingProjection.java | 4 +- .../transforms/TestDatesProjection.java | 4 +- .../iceberg/transforms/TestProjection.java | 2 +- .../transforms/TestTimestampsProjection.java | 4 +- .../transforms/TestTruncatesProjection.java | 4 +- build.gradle | 6 +- deps.log | 1224 +++++++++++++++++ 55 files changed, 1329 insertions(+), 106 deletions(-) create mode 100644 deps.log diff --git a/.baseline/checkstyle/checkstyle.xml b/.baseline/checkstyle/checkstyle.xml index f11542f05776..f8747c1d9947 100644 --- a/.baseline/checkstyle/checkstyle.xml +++ b/.baseline/checkstyle/checkstyle.xml @@ -134,8 +134,7 @@ - - + diff --git a/api/src/main/java/org/apache/iceberg/Accessors.java b/api/src/main/java/org/apache/iceberg/Accessors.java index 9e391baf37b5..66b328c6ab07 100644 --- a/api/src/main/java/org/apache/iceberg/Accessors.java +++ b/api/src/main/java/org/apache/iceberg/Accessors.java @@ -19,7 +19,7 @@ package org.apache.iceberg; -import org.apache.iceberg.shaded.com.google.common.collect.Maps; +import com.google.common.shaded.collect.Maps; import java.util.List; import java.util.Map; import org.apache.iceberg.types.Type; diff --git a/api/src/main/java/org/apache/iceberg/Filterable.java b/api/src/main/java/org/apache/iceberg/Filterable.java index 243ed4d66f4f..dd01e85a1c39 100644 --- a/api/src/main/java/org/apache/iceberg/Filterable.java +++ b/api/src/main/java/org/apache/iceberg/Filterable.java @@ -19,7 +19,7 @@ package org.apache.iceberg; -import org.apache.iceberg.shaded.com.google.common.collect.Lists; +import com.google.common.shaded.collect.Lists; import java.util.Collection; import org.apache.iceberg.expressions.Expression; import org.apache.iceberg.io.CloseableIterable; diff --git a/api/src/main/java/org/apache/iceberg/PartitionField.java b/api/src/main/java/org/apache/iceberg/PartitionField.java index 8bece7251fbf..1b1343f8c16c 100644 --- a/api/src/main/java/org/apache/iceberg/PartitionField.java +++ b/api/src/main/java/org/apache/iceberg/PartitionField.java @@ -19,7 +19,7 @@ package org.apache.iceberg; -import org.apache.iceberg.shaded.com.google.common.base.Objects; +import com.google.common.shaded.base.Objects; import java.io.Serializable; import org.apache.iceberg.transforms.Transform; diff --git a/api/src/main/java/org/apache/iceberg/PartitionSpec.java b/api/src/main/java/org/apache/iceberg/PartitionSpec.java index e331171deaee..9ff11ba2396b 100644 --- a/api/src/main/java/org/apache/iceberg/PartitionSpec.java +++ b/api/src/main/java/org/apache/iceberg/PartitionSpec.java @@ -19,13 +19,13 @@ package org.apache.iceberg; -import org.apache.iceberg.shaded.com.google.common.base.Preconditions; -import org.apache.iceberg.shaded.com.google.common.collect.ImmutableList; -import org.apache.iceberg.shaded.com.google.common.collect.ListMultimap; -import org.apache.iceberg.shaded.com.google.common.collect.Lists; -import org.apache.iceberg.shaded.com.google.common.collect.Maps; -import org.apache.iceberg.shaded.com.google.common.collect.Multimaps; -import org.apache.iceberg.shaded.com.google.common.collect.Sets; +import com.google.common.shaded.base.Preconditions; +import com.google.common.shaded.collect.ImmutableList; +import com.google.common.shaded.collect.ListMultimap; +import com.google.common.shaded.collect.Lists; +import com.google.common.shaded.collect.Maps; +import com.google.common.shaded.collect.Multimaps; +import com.google.common.shaded.collect.Sets; import java.io.Serializable; import java.io.UnsupportedEncodingException; import java.net.URLEncoder; diff --git a/api/src/main/java/org/apache/iceberg/Schema.java b/api/src/main/java/org/apache/iceberg/Schema.java index c4cd87767149..2eafe721f0c4 100644 --- a/api/src/main/java/org/apache/iceberg/Schema.java +++ b/api/src/main/java/org/apache/iceberg/Schema.java @@ -19,11 +19,11 @@ package org.apache.iceberg; -import org.apache.iceberg.shaded.com.google.common.base.Joiner; -import org.apache.iceberg.shaded.com.google.common.base.Preconditions; -import org.apache.iceberg.shaded.com.google.common.collect.BiMap; -import org.apache.iceberg.shaded.com.google.common.collect.ImmutableBiMap; -import org.apache.iceberg.shaded.com.google.common.collect.Sets; +import com.google.common.shaded.base.Joiner; +import com.google.common.shaded.base.Preconditions; +import com.google.common.shaded.collect.BiMap; +import com.google.common.shaded.collect.ImmutableBiMap; +import com.google.common.shaded.collect.Sets; import java.io.Serializable; import java.util.Arrays; import java.util.Collection; diff --git a/api/src/main/java/org/apache/iceberg/TableScan.java b/api/src/main/java/org/apache/iceberg/TableScan.java index 853136eb54b0..5e8460c23bb3 100644 --- a/api/src/main/java/org/apache/iceberg/TableScan.java +++ b/api/src/main/java/org/apache/iceberg/TableScan.java @@ -19,7 +19,7 @@ package org.apache.iceberg; -import org.apache.iceberg.shaded.com.google.common.collect.Lists; +import com.google.common.shaded.collect.Lists; import java.util.Collection; import org.apache.iceberg.expressions.Expression; import org.apache.iceberg.io.CloseableIterable; diff --git a/api/src/main/java/org/apache/iceberg/Tables.java b/api/src/main/java/org/apache/iceberg/Tables.java index 101b7614aca8..290bc818628a 100644 --- a/api/src/main/java/org/apache/iceberg/Tables.java +++ b/api/src/main/java/org/apache/iceberg/Tables.java @@ -19,7 +19,7 @@ package org.apache.iceberg; -import org.apache.iceberg.shaded.com.google.common.collect.ImmutableMap; +import com.google.common.shaded.collect.ImmutableMap; import java.util.Map; /** diff --git a/api/src/main/java/org/apache/iceberg/catalog/Namespace.java b/api/src/main/java/org/apache/iceberg/catalog/Namespace.java index 8cc912b5442d..f3faaa25c946 100644 --- a/api/src/main/java/org/apache/iceberg/catalog/Namespace.java +++ b/api/src/main/java/org/apache/iceberg/catalog/Namespace.java @@ -19,7 +19,7 @@ package org.apache.iceberg.catalog; -import org.apache.iceberg.shaded.com.google.common.base.Joiner; +import com.google.common.shaded.base.Joiner; import java.util.Arrays; /** diff --git a/api/src/main/java/org/apache/iceberg/catalog/SupportsNamespaces.java b/api/src/main/java/org/apache/iceberg/catalog/SupportsNamespaces.java index b147288f3a83..604e27dfa40d 100644 --- a/api/src/main/java/org/apache/iceberg/catalog/SupportsNamespaces.java +++ b/api/src/main/java/org/apache/iceberg/catalog/SupportsNamespaces.java @@ -19,7 +19,7 @@ package org.apache.iceberg.catalog; -import org.apache.iceberg.shaded.com.google.common.collect.ImmutableMap; +import com.google.common.shaded.collect.ImmutableMap; import java.util.List; import java.util.Map; import java.util.Set; diff --git a/api/src/main/java/org/apache/iceberg/catalog/TableIdentifier.java b/api/src/main/java/org/apache/iceberg/catalog/TableIdentifier.java index f7c96708b691..7ca0227c7b99 100644 --- a/api/src/main/java/org/apache/iceberg/catalog/TableIdentifier.java +++ b/api/src/main/java/org/apache/iceberg/catalog/TableIdentifier.java @@ -19,9 +19,9 @@ package org.apache.iceberg.catalog; -import org.apache.iceberg.shaded.com.google.common.base.Preconditions; -import org.apache.iceberg.shaded.com.google.common.base.Splitter; -import org.apache.iceberg.shaded.com.google.common.collect.Iterables; +import com.google.common.shaded.base.Preconditions; +import com.google.common.shaded.base.Splitter; +import com.google.common.shaded.collect.Iterables; import java.util.Arrays; import java.util.Objects; diff --git a/api/src/main/java/org/apache/iceberg/encryption/EncryptionManager.java b/api/src/main/java/org/apache/iceberg/encryption/EncryptionManager.java index 406b3f9b7bde..957540857ff3 100644 --- a/api/src/main/java/org/apache/iceberg/encryption/EncryptionManager.java +++ b/api/src/main/java/org/apache/iceberg/encryption/EncryptionManager.java @@ -19,7 +19,7 @@ package org.apache.iceberg.encryption; -import org.apache.iceberg.shaded.com.google.common.collect.Iterables; +import com.google.common.shaded.collect.Iterables; import java.io.Serializable; import org.apache.iceberg.io.InputFile; import org.apache.iceberg.io.OutputFile; diff --git a/api/src/main/java/org/apache/iceberg/events/Listeners.java b/api/src/main/java/org/apache/iceberg/events/Listeners.java index f85dbfa272d4..1ddd574a17f4 100644 --- a/api/src/main/java/org/apache/iceberg/events/Listeners.java +++ b/api/src/main/java/org/apache/iceberg/events/Listeners.java @@ -19,10 +19,8 @@ package org.apache.iceberg.events; -import org.apache.iceberg.shaded.com.google.common.base.Preconditions; -import org.apache.iceberg.shaded.com.google.common.collect.Maps; -import java.util.Iterator; -import java.util.List; +import com.google.common.shaded.base.Preconditions; +import com.google.common.shaded.collect.Maps; import java.util.Map; import java.util.Queue; import java.util.concurrent.ConcurrentLinkedQueue; diff --git a/api/src/main/java/org/apache/iceberg/expressions/Binder.java b/api/src/main/java/org/apache/iceberg/expressions/Binder.java index 70ca7333ab74..fb078f1117a7 100644 --- a/api/src/main/java/org/apache/iceberg/expressions/Binder.java +++ b/api/src/main/java/org/apache/iceberg/expressions/Binder.java @@ -19,8 +19,8 @@ package org.apache.iceberg.expressions; -import org.apache.iceberg.shaded.com.google.common.collect.ImmutableSet; -import org.apache.iceberg.shaded.com.google.common.collect.Sets; +import com.google.common.shaded.collect.ImmutableSet; +import com.google.common.shaded.collect.Sets; import java.util.List; import java.util.Set; import org.apache.iceberg.exceptions.ValidationException; diff --git a/api/src/main/java/org/apache/iceberg/expressions/BoundLiteralPredicate.java b/api/src/main/java/org/apache/iceberg/expressions/BoundLiteralPredicate.java index 37dba32c3382..f37c5af51f0a 100644 --- a/api/src/main/java/org/apache/iceberg/expressions/BoundLiteralPredicate.java +++ b/api/src/main/java/org/apache/iceberg/expressions/BoundLiteralPredicate.java @@ -19,7 +19,7 @@ package org.apache.iceberg.expressions; -import org.apache.iceberg.shaded.com.google.common.base.Preconditions; +import com.google.common.shaded.base.Preconditions; import java.util.Comparator; public class BoundLiteralPredicate extends BoundPredicate { diff --git a/api/src/main/java/org/apache/iceberg/expressions/BoundSetPredicate.java b/api/src/main/java/org/apache/iceberg/expressions/BoundSetPredicate.java index db1a3e6fc2b6..3971d3914ac1 100644 --- a/api/src/main/java/org/apache/iceberg/expressions/BoundSetPredicate.java +++ b/api/src/main/java/org/apache/iceberg/expressions/BoundSetPredicate.java @@ -19,8 +19,8 @@ package org.apache.iceberg.expressions; -import org.apache.iceberg.shaded.com.google.common.base.Joiner; -import org.apache.iceberg.shaded.com.google.common.base.Preconditions; +import com.google.common.shaded.base.Joiner; +import com.google.common.shaded.base.Preconditions; import java.util.Set; public class BoundSetPredicate extends BoundPredicate { diff --git a/api/src/main/java/org/apache/iceberg/expressions/Expressions.java b/api/src/main/java/org/apache/iceberg/expressions/Expressions.java index 4c143c6147e5..bc0b19af4c31 100644 --- a/api/src/main/java/org/apache/iceberg/expressions/Expressions.java +++ b/api/src/main/java/org/apache/iceberg/expressions/Expressions.java @@ -19,8 +19,8 @@ package org.apache.iceberg.expressions; -import org.apache.iceberg.shaded.com.google.common.base.Preconditions; -import org.apache.iceberg.shaded.com.google.common.collect.Lists; +import com.google.common.shaded.base.Preconditions; +import com.google.common.shaded.collect.Lists; import java.util.stream.Stream; import org.apache.iceberg.expressions.Expression.Operation; import org.apache.iceberg.transforms.Transform; diff --git a/api/src/main/java/org/apache/iceberg/expressions/Literals.java b/api/src/main/java/org/apache/iceberg/expressions/Literals.java index 5cbe10958017..439b3fa869b4 100644 --- a/api/src/main/java/org/apache/iceberg/expressions/Literals.java +++ b/api/src/main/java/org/apache/iceberg/expressions/Literals.java @@ -19,7 +19,7 @@ package org.apache.iceberg.expressions; -import org.apache.iceberg.shaded.com.google.common.base.Preconditions; +import com.google.common.shaded.base.Preconditions; import java.io.ObjectStreamException; import java.math.BigDecimal; import java.math.RoundingMode; diff --git a/api/src/main/java/org/apache/iceberg/expressions/NamedReference.java b/api/src/main/java/org/apache/iceberg/expressions/NamedReference.java index 264065ad8fd0..ae460599768c 100644 --- a/api/src/main/java/org/apache/iceberg/expressions/NamedReference.java +++ b/api/src/main/java/org/apache/iceberg/expressions/NamedReference.java @@ -19,7 +19,7 @@ package org.apache.iceberg.expressions; -import org.apache.iceberg.shaded.com.google.common.base.Preconditions; +import com.google.common.shaded.base.Preconditions; import org.apache.iceberg.Schema; import org.apache.iceberg.exceptions.ValidationException; import org.apache.iceberg.types.Types; diff --git a/api/src/main/java/org/apache/iceberg/expressions/Predicate.java b/api/src/main/java/org/apache/iceberg/expressions/Predicate.java index 12d909235cd8..380e252a2067 100644 --- a/api/src/main/java/org/apache/iceberg/expressions/Predicate.java +++ b/api/src/main/java/org/apache/iceberg/expressions/Predicate.java @@ -19,7 +19,7 @@ package org.apache.iceberg.expressions; -import org.apache.iceberg.shaded.com.google.common.base.Preconditions; +import com.google.common.shaded.base.Preconditions; public abstract class Predicate implements Expression { private final Operation op; diff --git a/api/src/main/java/org/apache/iceberg/expressions/StrictMetricsEvaluator.java b/api/src/main/java/org/apache/iceberg/expressions/StrictMetricsEvaluator.java index c051ac6d4f9e..8f173a161cb3 100644 --- a/api/src/main/java/org/apache/iceberg/expressions/StrictMetricsEvaluator.java +++ b/api/src/main/java/org/apache/iceberg/expressions/StrictMetricsEvaluator.java @@ -19,7 +19,7 @@ package org.apache.iceberg.expressions; -import org.apache.iceberg.shaded.com.google.common.base.Preconditions; +import com.google.common.shaded.base.Preconditions; import java.nio.ByteBuffer; import java.util.Collection; import java.util.Map; diff --git a/api/src/main/java/org/apache/iceberg/expressions/UnboundPredicate.java b/api/src/main/java/org/apache/iceberg/expressions/UnboundPredicate.java index d64559e63d03..690d4c599081 100644 --- a/api/src/main/java/org/apache/iceberg/expressions/UnboundPredicate.java +++ b/api/src/main/java/org/apache/iceberg/expressions/UnboundPredicate.java @@ -19,11 +19,11 @@ package org.apache.iceberg.expressions; -import org.apache.iceberg.shaded.com.google.common.base.Joiner; -import org.apache.iceberg.shaded.com.google.common.base.Preconditions; -import org.apache.iceberg.shaded.com.google.common.collect.Iterables; -import org.apache.iceberg.shaded.com.google.common.collect.Lists; -import org.apache.iceberg.shaded.com.google.common.collect.Sets; +import com.google.common.shaded.base.Joiner; +import com.google.common.shaded.base.Preconditions; +import com.google.common.shaded.collect.Iterables; +import com.google.common.shaded.collect.Lists; +import com.google.common.shaded.collect.Sets; import java.util.List; import java.util.Set; import org.apache.iceberg.exceptions.ValidationException; diff --git a/api/src/main/java/org/apache/iceberg/io/CloseableGroup.java b/api/src/main/java/org/apache/iceberg/io/CloseableGroup.java index 32e8da71fa10..0bf75ce65a5d 100644 --- a/api/src/main/java/org/apache/iceberg/io/CloseableGroup.java +++ b/api/src/main/java/org/apache/iceberg/io/CloseableGroup.java @@ -19,7 +19,7 @@ package org.apache.iceberg.io; -import org.apache.iceberg.shaded.com.google.common.collect.Lists; +import com.google.common.shaded.collect.Lists; import java.io.Closeable; import java.io.IOException; import java.util.Deque; diff --git a/api/src/main/java/org/apache/iceberg/io/CloseableIterable.java b/api/src/main/java/org/apache/iceberg/io/CloseableIterable.java index ee6fed23e2f5..d48c50368bbd 100644 --- a/api/src/main/java/org/apache/iceberg/io/CloseableIterable.java +++ b/api/src/main/java/org/apache/iceberg/io/CloseableIterable.java @@ -19,9 +19,9 @@ package org.apache.iceberg.io; -import org.apache.iceberg.shaded.com.google.common.base.Preconditions; -import org.apache.iceberg.shaded.com.google.common.collect.ImmutableList; -import org.apache.iceberg.shaded.com.google.common.collect.Iterables; +import com.google.common.shaded.base.Preconditions; +import com.google.common.shaded.collect.ImmutableList; +import com.google.common.shaded.collect.Iterables; import java.io.Closeable; import java.io.IOException; import java.util.Collections; diff --git a/api/src/main/java/org/apache/iceberg/transforms/Bucket.java b/api/src/main/java/org/apache/iceberg/transforms/Bucket.java index 835fceab5bf5..d1ad2be3f2b5 100644 --- a/api/src/main/java/org/apache/iceberg/transforms/Bucket.java +++ b/api/src/main/java/org/apache/iceberg/transforms/Bucket.java @@ -19,11 +19,11 @@ package org.apache.iceberg.transforms; -import org.apache.iceberg.shaded.com.google.common.annotations.VisibleForTesting; -import org.apache.iceberg.shaded.com.google.common.base.Objects; -import org.apache.iceberg.shaded.com.google.common.collect.Sets; -import org.apache.iceberg.shaded.com.google.common.hash.HashFunction; -import org.apache.iceberg.shaded.com.google.common.hash.Hashing; +import com.google.common.shaded.annotations.VisibleForTesting; +import com.google.common.shaded.base.Objects; +import com.google.common.shaded.collect.Sets; +import com.google.common.shaded.hash.HashFunction; +import com.google.common.shaded.hash.Hashing; import java.math.BigDecimal; import java.nio.ByteBuffer; import java.nio.charset.StandardCharsets; diff --git a/api/src/main/java/org/apache/iceberg/transforms/Identity.java b/api/src/main/java/org/apache/iceberg/transforms/Identity.java index bddf60dad14c..1feacd8e9ab1 100644 --- a/api/src/main/java/org/apache/iceberg/transforms/Identity.java +++ b/api/src/main/java/org/apache/iceberg/transforms/Identity.java @@ -19,7 +19,7 @@ package org.apache.iceberg.transforms; -import org.apache.iceberg.shaded.com.google.common.base.Objects; +import com.google.common.shaded.base.Objects; import java.nio.ByteBuffer; import org.apache.iceberg.expressions.BoundPredicate; import org.apache.iceberg.expressions.Expressions; diff --git a/api/src/main/java/org/apache/iceberg/transforms/PartitionSpecVisitor.java b/api/src/main/java/org/apache/iceberg/transforms/PartitionSpecVisitor.java index 998e6bee2315..b07ed3e0e701 100644 --- a/api/src/main/java/org/apache/iceberg/transforms/PartitionSpecVisitor.java +++ b/api/src/main/java/org/apache/iceberg/transforms/PartitionSpecVisitor.java @@ -19,7 +19,7 @@ package org.apache.iceberg.transforms; -import org.apache.iceberg.shaded.com.google.common.collect.Lists; +import com.google.common.shaded.collect.Lists; import java.util.List; import org.apache.iceberg.PartitionField; import org.apache.iceberg.PartitionSpec; diff --git a/api/src/main/java/org/apache/iceberg/transforms/ProjectionUtil.java b/api/src/main/java/org/apache/iceberg/transforms/ProjectionUtil.java index af0dc140faaa..fc422a7f164a 100644 --- a/api/src/main/java/org/apache/iceberg/transforms/ProjectionUtil.java +++ b/api/src/main/java/org/apache/iceberg/transforms/ProjectionUtil.java @@ -19,6 +19,7 @@ package org.apache.iceberg.transforms; +import com.google.common.shaded.collect.Iterables; import java.math.BigDecimal; import java.math.BigInteger; import org.apache.iceberg.expressions.BoundLiteralPredicate; @@ -28,7 +29,6 @@ import org.apache.iceberg.expressions.Expression; import org.apache.iceberg.expressions.Expressions; import org.apache.iceberg.expressions.UnboundPredicate; -import org.apache.iceberg.shaded.com.google.common.collect.Iterables; import static org.apache.iceberg.expressions.Expressions.predicate; diff --git a/api/src/main/java/org/apache/iceberg/transforms/Transforms.java b/api/src/main/java/org/apache/iceberg/transforms/Transforms.java index 72775506e24a..21e40e0b3c2f 100644 --- a/api/src/main/java/org/apache/iceberg/transforms/Transforms.java +++ b/api/src/main/java/org/apache/iceberg/transforms/Transforms.java @@ -19,7 +19,7 @@ package org.apache.iceberg.transforms; -import org.apache.iceberg.shaded.com.google.common.base.Preconditions; +import com.google.common.shaded.base.Preconditions; import java.util.Locale; import java.util.regex.Matcher; import java.util.regex.Pattern; diff --git a/api/src/main/java/org/apache/iceberg/transforms/Truncate.java b/api/src/main/java/org/apache/iceberg/transforms/Truncate.java index 673464ccdd75..bfd1ba8cf05e 100644 --- a/api/src/main/java/org/apache/iceberg/transforms/Truncate.java +++ b/api/src/main/java/org/apache/iceberg/transforms/Truncate.java @@ -19,7 +19,7 @@ package org.apache.iceberg.transforms; -import org.apache.iceberg.shaded.com.google.common.base.Objects; +import com.google.common.shaded.base.Objects; import java.math.BigDecimal; import java.math.BigInteger; import java.nio.ByteBuffer; diff --git a/api/src/main/java/org/apache/iceberg/types/AssignFreshIds.java b/api/src/main/java/org/apache/iceberg/types/AssignFreshIds.java index f54cdf4dfaa9..3ec406332586 100644 --- a/api/src/main/java/org/apache/iceberg/types/AssignFreshIds.java +++ b/api/src/main/java/org/apache/iceberg/types/AssignFreshIds.java @@ -19,7 +19,7 @@ package org.apache.iceberg.types; -import org.apache.iceberg.shaded.com.google.common.collect.Lists; +import com.google.common.shaded.collect.Lists; import java.util.Iterator; import java.util.List; import java.util.function.Supplier; 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 3d53fb3f8561..8873b5635a4b 100644 --- a/api/src/main/java/org/apache/iceberg/types/CheckCompatibility.java +++ b/api/src/main/java/org/apache/iceberg/types/CheckCompatibility.java @@ -19,10 +19,10 @@ package org.apache.iceberg.types; -import org.apache.iceberg.shaded.com.google.common.base.Preconditions; -import org.apache.iceberg.shaded.com.google.common.collect.ImmutableList; -import org.apache.iceberg.shaded.com.google.common.collect.Lists; -import org.apache.iceberg.shaded.com.google.common.collect.Maps; +import com.google.common.shaded.base.Preconditions; +import com.google.common.shaded.collect.ImmutableList; +import com.google.common.shaded.collect.Lists; +import com.google.common.shaded.collect.Maps; import java.util.List; import java.util.Locale; import java.util.Map; diff --git a/api/src/main/java/org/apache/iceberg/types/Comparators.java b/api/src/main/java/org/apache/iceberg/types/Comparators.java index b8293ad15317..5ed016ffec85 100644 --- a/api/src/main/java/org/apache/iceberg/types/Comparators.java +++ b/api/src/main/java/org/apache/iceberg/types/Comparators.java @@ -19,7 +19,7 @@ package org.apache.iceberg.types; -import org.apache.iceberg.shaded.com.google.common.collect.ImmutableMap; +import com.google.common.shaded.collect.ImmutableMap; import java.nio.ByteBuffer; import java.util.Comparator; import org.apache.iceberg.util.UnicodeUtil; diff --git a/api/src/main/java/org/apache/iceberg/types/GetProjectedIds.java b/api/src/main/java/org/apache/iceberg/types/GetProjectedIds.java index 42a3d8aeb622..c85b884c63cc 100644 --- a/api/src/main/java/org/apache/iceberg/types/GetProjectedIds.java +++ b/api/src/main/java/org/apache/iceberg/types/GetProjectedIds.java @@ -19,7 +19,7 @@ package org.apache.iceberg.types; -import org.apache.iceberg.shaded.com.google.common.collect.Sets; +import com.google.common.shaded.collect.Sets; import java.util.List; import java.util.Set; import org.apache.iceberg.Schema; diff --git a/api/src/main/java/org/apache/iceberg/types/IndexById.java b/api/src/main/java/org/apache/iceberg/types/IndexById.java index d8e9cbb5ed19..0e4fd3a8eadd 100644 --- a/api/src/main/java/org/apache/iceberg/types/IndexById.java +++ b/api/src/main/java/org/apache/iceberg/types/IndexById.java @@ -19,7 +19,7 @@ package org.apache.iceberg.types; -import org.apache.iceberg.shaded.com.google.common.collect.Maps; +import com.google.common.shaded.collect.Maps; import java.util.List; import java.util.Map; import org.apache.iceberg.Schema; diff --git a/api/src/main/java/org/apache/iceberg/types/IndexByName.java b/api/src/main/java/org/apache/iceberg/types/IndexByName.java index afd555f6aa02..15881e15231c 100644 --- a/api/src/main/java/org/apache/iceberg/types/IndexByName.java +++ b/api/src/main/java/org/apache/iceberg/types/IndexByName.java @@ -19,9 +19,9 @@ package org.apache.iceberg.types; -import org.apache.iceberg.shaded.com.google.common.base.Joiner; -import org.apache.iceberg.shaded.com.google.common.collect.Lists; -import org.apache.iceberg.shaded.com.google.common.collect.Maps; +import com.google.common.shaded.base.Joiner; +import com.google.common.shaded.collect.Lists; +import com.google.common.shaded.collect.Maps; import java.util.Deque; import java.util.Map; import java.util.concurrent.Callable; diff --git a/api/src/main/java/org/apache/iceberg/types/PruneColumns.java b/api/src/main/java/org/apache/iceberg/types/PruneColumns.java index 11989bc71f3b..c5b76df4af71 100644 --- a/api/src/main/java/org/apache/iceberg/types/PruneColumns.java +++ b/api/src/main/java/org/apache/iceberg/types/PruneColumns.java @@ -19,7 +19,7 @@ package org.apache.iceberg.types; -import org.apache.iceberg.shaded.com.google.common.collect.Lists; +import com.google.common.shaded.collect.Lists; import java.util.List; import java.util.Set; import org.apache.iceberg.Schema; diff --git a/api/src/main/java/org/apache/iceberg/types/ReassignIds.java b/api/src/main/java/org/apache/iceberg/types/ReassignIds.java index f1055a8769d9..eed526f156f3 100644 --- a/api/src/main/java/org/apache/iceberg/types/ReassignIds.java +++ b/api/src/main/java/org/apache/iceberg/types/ReassignIds.java @@ -19,8 +19,8 @@ package org.apache.iceberg.types; -import org.apache.iceberg.shaded.com.google.common.base.Preconditions; -import org.apache.iceberg.shaded.com.google.common.collect.Lists; +import com.google.common.shaded.base.Preconditions; +import com.google.common.shaded.collect.Lists; import java.util.List; import java.util.function.Supplier; import org.apache.iceberg.Schema; diff --git a/api/src/main/java/org/apache/iceberg/types/TypeUtil.java b/api/src/main/java/org/apache/iceberg/types/TypeUtil.java index 02176fd6b546..2f99aefd8b53 100644 --- a/api/src/main/java/org/apache/iceberg/types/TypeUtil.java +++ b/api/src/main/java/org/apache/iceberg/types/TypeUtil.java @@ -19,12 +19,12 @@ package org.apache.iceberg.types; -import org.apache.iceberg.shaded.com.google.common.base.Preconditions; -import org.apache.iceberg.shaded.com.google.common.collect.ImmutableList; -import org.apache.iceberg.shaded.com.google.common.collect.ImmutableSet; -import org.apache.iceberg.shaded.com.google.common.collect.Iterables; -import org.apache.iceberg.shaded.com.google.common.collect.Lists; -import org.apache.iceberg.shaded.com.google.common.collect.Maps; +import com.google.common.shaded.base.Preconditions; +import com.google.common.shaded.collect.ImmutableList; +import com.google.common.shaded.collect.ImmutableSet; +import com.google.common.shaded.collect.Iterables; +import com.google.common.shaded.collect.Lists; +import com.google.common.shaded.collect.Maps; import java.util.List; import java.util.Locale; import java.util.Map; diff --git a/api/src/main/java/org/apache/iceberg/types/Types.java b/api/src/main/java/org/apache/iceberg/types/Types.java index 76e993bbbe06..367a0749a1e2 100644 --- a/api/src/main/java/org/apache/iceberg/types/Types.java +++ b/api/src/main/java/org/apache/iceberg/types/Types.java @@ -19,10 +19,10 @@ package org.apache.iceberg.types; -import org.apache.iceberg.shaded.com.google.common.base.Joiner; -import org.apache.iceberg.shaded.com.google.common.base.Preconditions; -import org.apache.iceberg.shaded.com.google.common.collect.ImmutableList; -import org.apache.iceberg.shaded.com.google.common.collect.ImmutableMap; +import com.google.common.shaded.base.Joiner; +import com.google.common.shaded.base.Preconditions; +import com.google.common.shaded.collect.ImmutableList; +import com.google.common.shaded.collect.ImmutableMap; import java.io.Serializable; import java.util.Arrays; import java.util.List; diff --git a/api/src/main/java/org/apache/iceberg/util/BinaryUtil.java b/api/src/main/java/org/apache/iceberg/util/BinaryUtil.java index cb801c2b3d35..af25b121b10c 100644 --- a/api/src/main/java/org/apache/iceberg/util/BinaryUtil.java +++ b/api/src/main/java/org/apache/iceberg/util/BinaryUtil.java @@ -19,7 +19,7 @@ package org.apache.iceberg.util; -import org.apache.iceberg.shaded.com.google.common.base.Preconditions; +import com.google.common.shaded.base.Preconditions; import java.nio.ByteBuffer; import org.apache.iceberg.expressions.Literal; diff --git a/api/src/main/java/org/apache/iceberg/util/CharSequenceSet.java b/api/src/main/java/org/apache/iceberg/util/CharSequenceSet.java index 6f36aee46417..581b780c3841 100644 --- a/api/src/main/java/org/apache/iceberg/util/CharSequenceSet.java +++ b/api/src/main/java/org/apache/iceberg/util/CharSequenceSet.java @@ -19,9 +19,9 @@ package org.apache.iceberg.util; -import org.apache.iceberg.shaded.com.google.common.collect.Iterables; -import org.apache.iceberg.shaded.com.google.common.collect.Iterators; -import org.apache.iceberg.shaded.com.google.common.collect.Sets; +import com.google.common.shaded.collect.Iterables; +import com.google.common.shaded.collect.Iterators; +import com.google.common.shaded.collect.Sets; import java.io.Serializable; import java.util.Collection; import java.util.Iterator; diff --git a/api/src/main/java/org/apache/iceberg/util/UnicodeUtil.java b/api/src/main/java/org/apache/iceberg/util/UnicodeUtil.java index 17bb0149fc9b..cb1cb10da902 100644 --- a/api/src/main/java/org/apache/iceberg/util/UnicodeUtil.java +++ b/api/src/main/java/org/apache/iceberg/util/UnicodeUtil.java @@ -19,7 +19,7 @@ package org.apache.iceberg.util; -import org.apache.iceberg.shaded.com.google.common.base.Preconditions; +import com.google.common.shaded.base.Preconditions; import org.apache.iceberg.expressions.Literal; public class UnicodeUtil { diff --git a/api/src/test/java/org/apache/iceberg/expressions/TestInclusiveManifestEvaluator.java b/api/src/test/java/org/apache/iceberg/expressions/TestInclusiveManifestEvaluator.java index dab63af67712..b994f2f3f63d 100644 --- a/api/src/test/java/org/apache/iceberg/expressions/TestInclusiveManifestEvaluator.java +++ b/api/src/test/java/org/apache/iceberg/expressions/TestInclusiveManifestEvaluator.java @@ -19,7 +19,7 @@ package org.apache.iceberg.expressions; -import org.apache.iceberg.shaded.com.google.common.collect.ImmutableList; +import com.google.common.shaded.collect.ImmutableList; import java.nio.ByteBuffer; import org.apache.iceberg.AssertHelpers; import org.apache.iceberg.ManifestFile; diff --git a/api/src/test/java/org/apache/iceberg/expressions/TestInclusiveMetricsEvaluator.java b/api/src/test/java/org/apache/iceberg/expressions/TestInclusiveMetricsEvaluator.java index 756c8bd7a7c4..d3a0b4d1d812 100644 --- a/api/src/test/java/org/apache/iceberg/expressions/TestInclusiveMetricsEvaluator.java +++ b/api/src/test/java/org/apache/iceberg/expressions/TestInclusiveMetricsEvaluator.java @@ -19,7 +19,7 @@ package org.apache.iceberg.expressions; -import org.apache.iceberg.shaded.com.google.common.collect.ImmutableMap; +import com.google.common.shaded.collect.ImmutableMap; import org.apache.iceberg.AssertHelpers; import org.apache.iceberg.DataFile; import org.apache.iceberg.Schema; diff --git a/api/src/test/java/org/apache/iceberg/expressions/TestStrictMetricsEvaluator.java b/api/src/test/java/org/apache/iceberg/expressions/TestStrictMetricsEvaluator.java index 9dbe4f027a70..7e7921d64664 100644 --- a/api/src/test/java/org/apache/iceberg/expressions/TestStrictMetricsEvaluator.java +++ b/api/src/test/java/org/apache/iceberg/expressions/TestStrictMetricsEvaluator.java @@ -19,7 +19,7 @@ package org.apache.iceberg.expressions; -import org.apache.iceberg.shaded.com.google.common.collect.ImmutableMap; +import com.google.common.shaded.collect.ImmutableMap; import org.apache.iceberg.AssertHelpers; import org.apache.iceberg.DataFile; import org.apache.iceberg.Schema; diff --git a/api/src/test/java/org/apache/iceberg/io/TestCloseableIterable.java b/api/src/test/java/org/apache/iceberg/io/TestCloseableIterable.java index 2dfde8a11cdd..7f53febbaa42 100644 --- a/api/src/test/java/org/apache/iceberg/io/TestCloseableIterable.java +++ b/api/src/test/java/org/apache/iceberg/io/TestCloseableIterable.java @@ -19,8 +19,8 @@ package org.apache.iceberg.io; -import org.apache.iceberg.shaded.com.google.common.collect.Iterables; -import org.apache.iceberg.shaded.com.google.common.collect.Lists; +import com.google.common.shaded.collect.Iterables; +import com.google.common.shaded.collect.Lists; import java.util.NoSuchElementException; import org.apache.iceberg.AssertHelpers; import org.junit.Assert; diff --git a/api/src/test/java/org/apache/iceberg/transforms/TestBucketing.java b/api/src/test/java/org/apache/iceberg/transforms/TestBucketing.java index 3910c795215a..f8859cdc3aab 100644 --- a/api/src/test/java/org/apache/iceberg/transforms/TestBucketing.java +++ b/api/src/test/java/org/apache/iceberg/transforms/TestBucketing.java @@ -19,8 +19,8 @@ package org.apache.iceberg.transforms; -import org.apache.iceberg.shaded.com.google.common.hash.HashFunction; -import org.apache.iceberg.shaded.com.google.common.hash.Hashing; +import com.google.common.shaded.hash.HashFunction; +import com.google.common.shaded.hash.Hashing; import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; import java.math.BigDecimal; diff --git a/api/src/test/java/org/apache/iceberg/transforms/TestBucketingProjection.java b/api/src/test/java/org/apache/iceberg/transforms/TestBucketingProjection.java index 507855918c92..f9b13bc3d4f8 100644 --- a/api/src/test/java/org/apache/iceberg/transforms/TestBucketingProjection.java +++ b/api/src/test/java/org/apache/iceberg/transforms/TestBucketingProjection.java @@ -19,8 +19,8 @@ package org.apache.iceberg.transforms; -import org.apache.iceberg.shaded.com.google.common.collect.Iterables; -import org.apache.iceberg.shaded.com.google.common.collect.Lists; +import com.google.common.shaded.collect.Iterables; +import com.google.common.shaded.collect.Lists; import java.math.BigDecimal; import java.nio.ByteBuffer; import java.util.UUID; diff --git a/api/src/test/java/org/apache/iceberg/transforms/TestDatesProjection.java b/api/src/test/java/org/apache/iceberg/transforms/TestDatesProjection.java index 6421a6fc04ee..8318663137f4 100644 --- a/api/src/test/java/org/apache/iceberg/transforms/TestDatesProjection.java +++ b/api/src/test/java/org/apache/iceberg/transforms/TestDatesProjection.java @@ -19,8 +19,8 @@ package org.apache.iceberg.transforms; -import org.apache.iceberg.shaded.com.google.common.collect.Iterables; -import org.apache.iceberg.shaded.com.google.common.collect.Lists; +import com.google.common.shaded.collect.Iterables; +import com.google.common.shaded.collect.Lists; import java.util.stream.Collectors; import org.apache.iceberg.PartitionSpec; import org.apache.iceberg.Schema; diff --git a/api/src/test/java/org/apache/iceberg/transforms/TestProjection.java b/api/src/test/java/org/apache/iceberg/transforms/TestProjection.java index 6ff47bc1b04f..aaf279b09bcf 100644 --- a/api/src/test/java/org/apache/iceberg/transforms/TestProjection.java +++ b/api/src/test/java/org/apache/iceberg/transforms/TestProjection.java @@ -19,7 +19,7 @@ package org.apache.iceberg.transforms; -import org.apache.iceberg.shaded.com.google.common.collect.Lists; +import com.google.common.shaded.collect.Lists; import java.util.List; import org.apache.iceberg.PartitionSpec; import org.apache.iceberg.Schema; diff --git a/api/src/test/java/org/apache/iceberg/transforms/TestTimestampsProjection.java b/api/src/test/java/org/apache/iceberg/transforms/TestTimestampsProjection.java index baa568b18184..4889ac7bbd18 100644 --- a/api/src/test/java/org/apache/iceberg/transforms/TestTimestampsProjection.java +++ b/api/src/test/java/org/apache/iceberg/transforms/TestTimestampsProjection.java @@ -19,8 +19,8 @@ package org.apache.iceberg.transforms; -import org.apache.iceberg.shaded.com.google.common.collect.Iterables; -import org.apache.iceberg.shaded.com.google.common.collect.Lists; +import com.google.common.shaded.collect.Iterables; +import com.google.common.shaded.collect.Lists; import java.util.stream.Collectors; import org.apache.iceberg.PartitionSpec; import org.apache.iceberg.Schema; diff --git a/api/src/test/java/org/apache/iceberg/transforms/TestTruncatesProjection.java b/api/src/test/java/org/apache/iceberg/transforms/TestTruncatesProjection.java index e12262f1e01f..3bbdcd408aa9 100644 --- a/api/src/test/java/org/apache/iceberg/transforms/TestTruncatesProjection.java +++ b/api/src/test/java/org/apache/iceberg/transforms/TestTruncatesProjection.java @@ -19,8 +19,8 @@ package org.apache.iceberg.transforms; -import org.apache.iceberg.shaded.com.google.common.collect.Iterables; -import org.apache.iceberg.shaded.com.google.common.collect.Lists; +import com.google.common.shaded.collect.Iterables; +import com.google.common.shaded.collect.Lists; import java.math.BigDecimal; import java.nio.ByteBuffer; import java.util.stream.Collectors; diff --git a/build.gradle b/build.gradle index c5b9ee58e5e9..8acf59d10571 100644 --- a/build.gradle +++ b/build.gradle @@ -114,8 +114,10 @@ project(':iceberg-relocate-external-dependencies') { dependencies { compile('com.google.guava:guava:28.0-jre') { - // may be LGPL - use ALv2 findbugs-annotations instead exclude group: 'com.google.code.findbugs' + // may be LGPL - use ALv2 findbugs-annotations instead + exclude group: 'com.google.errorprone' + exclude group: 'com.google.j2objc' } } @@ -129,7 +131,7 @@ project(':iceberg-relocate-external-dependencies') { include 'NOTICE' } - relocate 'com.google', 'org.apache.iceberg.shaded.com.google' + relocate 'com.google.common', 'com.google.common.shaded' minimize() } diff --git a/deps.log b/deps.log new file mode 100644 index 000000000000..c254a3ed46ab --- /dev/null +++ b/deps.log @@ -0,0 +1,1224 @@ + +------------------------------------------------------------ +Root project +------------------------------------------------------------ + +archives - Configuration for archive artifacts. +No dependencies + +baseline +\--- com.palantir.baseline:gradle-baseline-java-config:0.55.0 + +consistentVersionsPlaceholder (n) +No dependencies + +consistentVersionsProduction - Outgoing configuration for production dependencies meant to be used by consistent-versions (n) +No dependencies + +consistentVersionsTest - Outgoing configuration for test dependencies meant to be used by consistent-versions (n) +No dependencies + +default - Configuration for default artifacts. +No dependencies + +lockConstraints (n) +No dependencies + +rootConfiguration +No dependencies + +unifiedClasspath ++--- project : (*) ++--- project : (*) ++--- project :iceberg-api +| +--- project :iceberg-api (*) +| +--- org.slf4j:slf4j-api:1.7.22 -> 1.7.25 (c) +| +--- junit:junit:4.12 (c) +| +--- joda-time:joda-time:2.9.9 (c) +| +--- org.mockito:mockito-core:1.10.19 (c) +| +--- org.apache.avro:avro:1.9.2 (c) +| +--- org.slf4j:slf4j-simple:1.7.5 (c) +| +--- org.apache.arrow:arrow-vector:0.14.1 (c) +| +--- com.github.ben-manes.caffeine:caffeine:2.7.0 (c) +| +--- org.apache.hive:hive-metastore:2.3.6 (c) +| +--- org.apache.hive:hive-exec:2.3.6 (c) +| +--- org.apache.parquet:parquet-avro:1.11.0 (c) +| +--- org.apache.commons:commons-lang3:3.9 (c) +| +--- org.apache.pig:pig:0.14.0 (c) +| +--- org.apache.spark:spark-hive_2.11:2.4.5 (c) +| +--- org.apache.spark:spark-avro_2.11:2.4.5 (c) +| +--- org.slf4j:slf4j-api -> 1.7.25 +| +--- com.github.stephenc.findbugs:findbugs-annotations:1.3.9-1 +| +--- project :iceberg-relocate-external-dependencies +| | +--- project :iceberg-relocate-external-dependencies (*) +| | +--- org.slf4j:slf4j-api:1.7.22 -> 1.7.25 (c) +| | +--- junit:junit:4.12 (c) +| | +--- joda-time:joda-time:2.9.9 (c) +| | +--- org.mockito:mockito-core:1.10.19 (c) +| | +--- org.apache.avro:avro:1.9.2 (c) +| | +--- org.slf4j:slf4j-simple:1.7.5 (c) +| | +--- org.apache.arrow:arrow-vector:0.14.1 (c) +| | +--- com.github.ben-manes.caffeine:caffeine:2.7.0 (c) +| | +--- org.apache.hive:hive-metastore:2.3.6 (c) +| | +--- org.apache.hive:hive-exec:2.3.6 (c) +| | +--- org.apache.parquet:parquet-avro:1.11.0 (c) +| | +--- org.apache.commons:commons-lang3:3.9 (c) +| | +--- org.apache.pig:pig:0.14.0 (c) +| | +--- org.apache.spark:spark-hive_2.11:2.4.5 (c) +| | +--- org.apache.spark:spark-avro_2.11:2.4.5 (c) +| | +--- org.slf4j:slf4j-api -> 1.7.25 +| | +--- com.github.stephenc.findbugs:findbugs-annotations:1.3.9-1 +| | +--- com.google.guava:guava:28.0-jre +| | | +--- com.google.guava:failureaccess:1.0.1 +| | | +--- com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava +| | | +--- com.google.code.findbugs:jsr305:3.0.2 +| | | +--- org.checkerframework:checker-qual:2.8.1 +| | | +--- com.google.errorprone:error_prone_annotations:2.3.2 -> 2.3.3 +| | | +--- com.google.j2objc:j2objc-annotations:1.3 +| | | \--- org.codehaus.mojo:animal-sniffer-annotations:1.17 +| | +--- junit:junit -> 4.12 +| | | \--- org.hamcrest:hamcrest-core:1.3 +| | +--- org.slf4j:slf4j-simple -> 1.7.5 +| | | \--- org.slf4j:slf4j-api:1.7.5 -> 1.7.25 +| | +--- org.mockito:mockito-core -> 1.10.19 +| | | +--- org.hamcrest:hamcrest-core:1.1 -> 1.3 +| | | \--- org.objenesis:objenesis:2.1 -> 2.5.1 +| | +--- org.slf4j:slf4j-api -> 1.7.25 +| | +--- com.github.stephenc.findbugs:findbugs-annotations:1.3.9-1 +| | \--- com.google.guava:guava:28.0-jre (*) +| +--- junit:junit -> 4.12 (*) +| +--- org.slf4j:slf4j-simple -> 1.7.5 (*) +| +--- org.mockito:mockito-core -> 1.10.19 (*) +| +--- org.apache.avro:avro -> 1.9.2 +| | +--- com.fasterxml.jackson.core:jackson-core:2.10.2 +| | +--- com.fasterxml.jackson.core:jackson-databind:2.10.2 +| | | +--- com.fasterxml.jackson.core:jackson-annotations:2.10.2 +| | | \--- com.fasterxml.jackson.core:jackson-core:2.10.2 +| | +--- org.apache.commons:commons-compress:1.19 +| | \--- org.slf4j:slf4j-api:1.7.25 +| +--- joda-time:joda-time -> 2.9.9 +| +--- org.slf4j:slf4j-api -> 1.7.25 +| \--- com.github.stephenc.findbugs:findbugs-annotations:1.3.9-1 ++--- project :iceberg-api (*) ++--- project :iceberg-arrow +| +--- project :iceberg-arrow (*) +| +--- org.slf4j:slf4j-api:1.7.22 -> 1.7.25 (c) +| +--- junit:junit:4.12 (c) +| +--- joda-time:joda-time:2.9.9 (c) +| +--- org.mockito:mockito-core:1.10.19 (c) +| +--- org.apache.avro:avro:1.9.2 (c) +| +--- org.slf4j:slf4j-simple:1.7.5 (c) +| +--- org.apache.arrow:arrow-vector:0.14.1 (c) +| +--- com.github.ben-manes.caffeine:caffeine:2.7.0 (c) +| +--- org.apache.hive:hive-metastore:2.3.6 (c) +| +--- org.apache.hive:hive-exec:2.3.6 (c) +| +--- org.apache.parquet:parquet-avro:1.11.0 (c) +| +--- org.apache.commons:commons-lang3:3.9 (c) +| +--- org.apache.pig:pig:0.14.0 (c) +| +--- org.apache.spark:spark-hive_2.11:2.4.5 (c) +| +--- org.apache.spark:spark-avro_2.11:2.4.5 (c) +| +--- org.slf4j:slf4j-api -> 1.7.25 +| +--- com.github.stephenc.findbugs:findbugs-annotations:1.3.9-1 +| +--- project :iceberg-api (*) +| +--- project :iceberg-parquet +| | +--- project :iceberg-parquet (*) +| | +--- org.slf4j:slf4j-api:1.7.22 -> 1.7.25 (c) +| | +--- junit:junit:4.12 (c) +| | +--- joda-time:joda-time:2.9.9 (c) +| | +--- org.mockito:mockito-core:1.10.19 (c) +| | +--- org.apache.avro:avro:1.9.2 (c) +| | +--- org.slf4j:slf4j-simple:1.7.5 (c) +| | +--- org.apache.arrow:arrow-vector:0.14.1 (c) +| | +--- com.github.ben-manes.caffeine:caffeine:2.7.0 (c) +| | +--- org.apache.hive:hive-metastore:2.3.6 (c) +| | +--- org.apache.hive:hive-exec:2.3.6 (c) +| | +--- org.apache.parquet:parquet-avro:1.11.0 (c) +| | +--- org.apache.commons:commons-lang3:3.9 (c) +| | +--- org.apache.pig:pig:0.14.0 (c) +| | +--- org.apache.spark:spark-hive_2.11:2.4.5 (c) +| | +--- org.apache.spark:spark-avro_2.11:2.4.5 (c) +| | +--- org.apache.avro:avro -> 1.9.2 (*) +| | +--- org.apache.hadoop:hadoop-client:2.7.3 +| | | +--- org.apache.hadoop:hadoop-common:2.7.3 +| | | | +--- org.apache.hadoop:hadoop-annotations:2.7.3 +| | | | +--- com.google.guava:guava:11.0.2 -> 28.0-jre (*) +| | | | +--- commons-cli:commons-cli:1.2 +| | | | +--- org.apache.commons:commons-math3:3.1.1 -> 3.4.1 +| | | | +--- xmlenc:xmlenc:0.52 +| | | | +--- commons-httpclient:commons-httpclient:3.1 +| | | | | +--- commons-logging:commons-logging:1.0.4 -> 1.2 +| | | | | \--- commons-codec:commons-codec:1.2 -> 1.10 +| | | | +--- commons-codec:commons-codec:1.4 -> 1.10 +| | | | +--- commons-io:commons-io:2.4 +| | | | +--- commons-net:commons-net:3.1 +| | | | +--- commons-collections:commons-collections:3.2.2 +| | | | +--- javax.servlet:servlet-api:2.5 +| | | | +--- javax.servlet.jsp:jsp-api:2.1 +| | | | +--- com.sun.jersey:jersey-core:1.9 +| | | | +--- com.sun.jersey:jersey-json:1.9 +| | | | | +--- org.codehaus.jettison:jettison:1.1 +| | | | | +--- com.sun.xml.bind:jaxb-impl:2.2.3-1 +| | | | | | \--- javax.xml.bind:jaxb-api:2.2.2 -> 2.2.11 +| | | | | +--- org.codehaus.jackson:jackson-core-asl:1.8.3 -> 1.9.13 +| | | | | +--- org.codehaus.jackson:jackson-mapper-asl:1.8.3 -> 1.9.13 +| | | | | | \--- org.codehaus.jackson:jackson-core-asl:1.9.13 +| | | | | +--- org.codehaus.jackson:jackson-jaxrs:1.8.3 -> 1.9.13 +| | | | | | +--- org.codehaus.jackson:jackson-core-asl:1.9.13 +| | | | | | \--- org.codehaus.jackson:jackson-mapper-asl:1.9.13 (*) +| | | | | +--- org.codehaus.jackson:jackson-xc:1.8.3 -> 1.9.13 +| | | | | | +--- org.codehaus.jackson:jackson-core-asl:1.9.13 +| | | | | | \--- org.codehaus.jackson:jackson-mapper-asl:1.9.13 (*) +| | | | | \--- com.sun.jersey:jersey-core:1.9 +| | | | +--- com.sun.jersey:jersey-server:1.9 +| | | | | +--- asm:asm:3.1 +| | | | | \--- com.sun.jersey:jersey-core:1.9 +| | | | +--- commons-logging:commons-logging:1.1.3 -> 1.2 +| | | | +--- log4j:log4j:1.2.17 +| | | | +--- net.java.dev.jets3t:jets3t:0.9.0 +| | | | | +--- commons-codec:commons-codec:1.4 -> 1.10 +| | | | | +--- commons-logging:commons-logging:1.1.1 -> 1.2 +| | | | | +--- org.apache.httpcomponents:httpclient:4.1.2 -> 4.5.6 +| | | | | | +--- org.apache.httpcomponents:httpcore:4.4.10 +| | | | | | +--- commons-logging:commons-logging:1.2 +| | | | | | \--- commons-codec:commons-codec:1.10 +| | | | | +--- org.apache.httpcomponents:httpcore:4.1.2 -> 4.4.10 +| | | | | \--- com.jamesmurty.utils:java-xmlbuilder:0.4 +| | | | +--- commons-lang:commons-lang:2.6 +| | | | +--- commons-configuration:commons-configuration:1.6 +| | | | | +--- commons-collections:commons-collections:3.2.1 -> 3.2.2 +| | | | | +--- commons-lang:commons-lang:2.4 -> 2.6 +| | | | | +--- commons-logging:commons-logging:1.1.1 -> 1.2 +| | | | | +--- commons-digester:commons-digester:1.8 +| | | | | | +--- commons-beanutils:commons-beanutils:1.7.0 +| | | | | | | \--- commons-logging:commons-logging:1.0.3 -> 1.2 +| | | | | | \--- commons-logging:commons-logging:1.1 -> 1.2 +| | | | | \--- commons-beanutils:commons-beanutils-core:1.8.0 +| | | | | \--- commons-logging:commons-logging:1.1.1 -> 1.2 +| | | | +--- org.slf4j:slf4j-api:1.7.10 -> 1.7.25 +| | | | +--- org.codehaus.jackson:jackson-core-asl:1.9.13 +| | | | +--- org.codehaus.jackson:jackson-mapper-asl:1.9.13 (*) +| | | | +--- org.apache.avro:avro:1.7.4 -> 1.9.2 (*) +| | | | +--- com.google.protobuf:protobuf-java:2.5.0 +| | | | +--- com.google.code.gson:gson:2.2.4 +| | | | +--- org.apache.hadoop:hadoop-auth:2.7.3 +| | | | | +--- org.slf4j:slf4j-api:1.7.10 -> 1.7.25 +| | | | | +--- commons-codec:commons-codec:1.4 -> 1.10 +| | | | | +--- log4j:log4j:1.2.17 +| | | | | +--- org.apache.httpcomponents:httpclient:4.2.5 -> 4.5.6 (*) +| | | | | +--- org.apache.directory.server:apacheds-kerberos-codec:2.0.0-M15 +| | | | | | +--- org.apache.directory.server:apacheds-i18n:2.0.0-M15 +| | | | | | | \--- org.slf4j:slf4j-api:1.7.5 -> 1.7.25 +| | | | | | +--- org.apache.directory.api:api-asn1-api:1.0.0-M20 +| | | | | | | \--- org.slf4j:slf4j-api:1.7.5 -> 1.7.25 +| | | | | | +--- org.apache.directory.api:api-util:1.0.0-M20 +| | | | | | | \--- org.slf4j:slf4j-api:1.7.5 -> 1.7.25 +| | | | | | \--- org.slf4j:slf4j-api:1.7.5 -> 1.7.25 +| | | | | +--- org.apache.zookeeper:zookeeper:3.4.6 +| | | | | | +--- org.slf4j:slf4j-api:1.6.1 -> 1.7.25 +| | | | | | +--- log4j:log4j:1.2.16 -> 1.2.17 +| | | | | | +--- jline:jline:0.9.94 -> 2.12 +| | | | | | \--- io.netty:netty:3.7.0.Final -> 3.9.9.Final +| | | | | \--- org.apache.curator:curator-framework:2.7.1 +| | | | | +--- org.apache.curator:curator-client:2.7.1 +| | | | | | +--- org.slf4j:slf4j-api:1.7.6 -> 1.7.25 +| | | | | | +--- org.apache.zookeeper:zookeeper:3.4.6 (*) +| | | | | | \--- com.google.guava:guava:16.0.1 -> 28.0-jre (*) +| | | | | +--- org.apache.zookeeper:zookeeper:3.4.6 (*) +| | | | | \--- com.google.guava:guava:16.0.1 -> 28.0-jre (*) +| | | | +--- com.jcraft:jsch:0.1.42 +| | | | +--- org.apache.curator:curator-client:2.7.1 (*) +| | | | +--- org.apache.curator:curator-recipes:2.7.1 +| | | | | +--- org.apache.curator:curator-framework:2.7.1 (*) +| | | | | +--- org.apache.zookeeper:zookeeper:3.4.6 (*) +| | | | | \--- com.google.guava:guava:16.0.1 -> 28.0-jre (*) +| | | | +--- com.google.code.findbugs:jsr305:3.0.0 -> 3.0.2 +| | | | +--- org.apache.htrace:htrace-core:3.1.0-incubating +| | | | +--- org.apache.zookeeper:zookeeper:3.4.6 (*) +| | | | \--- org.apache.commons:commons-compress:1.4.1 -> 1.19 +| | | +--- org.apache.hadoop:hadoop-hdfs:2.7.3 +| | | | +--- com.google.guava:guava:11.0.2 -> 28.0-jre (*) +| | | | +--- com.sun.jersey:jersey-core:1.9 +| | | | +--- com.sun.jersey:jersey-server:1.9 (*) +| | | | +--- commons-cli:commons-cli:1.2 +| | | | +--- commons-codec:commons-codec:1.4 -> 1.10 +| | | | +--- commons-io:commons-io:2.4 +| | | | +--- commons-lang:commons-lang:2.6 +| | | | +--- commons-logging:commons-logging:1.1.3 -> 1.2 +| | | | +--- commons-daemon:commons-daemon:1.0.13 +| | | | +--- log4j:log4j:1.2.17 +| | | | +--- com.google.protobuf:protobuf-java:2.5.0 +| | | | +--- javax.servlet:servlet-api:2.5 +| | | | +--- org.codehaus.jackson:jackson-core-asl:1.9.13 +| | | | +--- org.codehaus.jackson:jackson-mapper-asl:1.9.13 (*) +| | | | +--- xmlenc:xmlenc:0.52 +| | | | +--- io.netty:netty:3.6.2.Final -> 3.9.9.Final +| | | | +--- io.netty:netty-all:4.0.23.Final -> 4.1.42.Final +| | | | +--- xerces:xercesImpl:2.9.1 +| | | | | \--- xml-apis:xml-apis:1.3.04 +| | | | +--- org.apache.htrace:htrace-core:3.1.0-incubating +| | | | \--- org.fusesource.leveldbjni:leveldbjni-all:1.8 +| | | +--- org.apache.hadoop:hadoop-mapreduce-client-app:2.7.3 +| | | | +--- org.apache.hadoop:hadoop-mapreduce-client-common:2.7.3 +| | | | | +--- org.apache.hadoop:hadoop-yarn-common:2.7.3 +| | | | | | +--- org.apache.hadoop:hadoop-yarn-api:2.7.3 +| | | | | | | +--- commons-lang:commons-lang:2.6 +| | | | | | | +--- com.google.guava:guava:11.0.2 -> 28.0-jre (*) +| | | | | | | +--- commons-logging:commons-logging:1.1.3 -> 1.2 +| | | | | | | +--- org.apache.hadoop:hadoop-annotations:2.7.3 +| | | | | | | \--- com.google.protobuf:protobuf-java:2.5.0 +| | | | | | +--- javax.xml.bind:jaxb-api:2.2.2 -> 2.2.11 +| | | | | | +--- org.apache.commons:commons-compress:1.4.1 -> 1.19 +| | | | | | +--- commons-lang:commons-lang:2.6 +| | | | | | +--- javax.servlet:servlet-api:2.5 +| | | | | | +--- commons-codec:commons-codec:1.4 -> 1.10 +| | | | | | +--- com.sun.jersey:jersey-core:1.9 +| | | | | | +--- com.sun.jersey:jersey-client:1.9 +| | | | | | | \--- com.sun.jersey:jersey-core:1.9 +| | | | | | +--- org.codehaus.jackson:jackson-core-asl:1.9.13 +| | | | | | +--- org.codehaus.jackson:jackson-mapper-asl:1.9.13 (*) +| | | | | | +--- org.codehaus.jackson:jackson-jaxrs:1.9.13 (*) +| | | | | | +--- org.codehaus.jackson:jackson-xc:1.9.13 (*) +| | | | | | +--- com.google.guava:guava:11.0.2 -> 28.0-jre (*) +| | | | | | +--- commons-logging:commons-logging:1.1.3 -> 1.2 +| | | | | | +--- commons-cli:commons-cli:1.2 +| | | | | | +--- org.slf4j:slf4j-api:1.7.10 -> 1.7.25 +| | | | | | +--- org.apache.hadoop:hadoop-annotations:2.7.3 +| | | | | | +--- com.google.inject.extensions:guice-servlet:3.0 +| | | | | | | \--- com.google.inject:guice:3.0 +| | | | | | | +--- javax.inject:javax.inject:1 +| | | | | | | +--- aopalliance:aopalliance:1.0 +| | | | | | | \--- org.sonatype.sisu.inject:cglib:2.2.1-v20090111 +| | | | | | | \--- asm:asm:3.1 +| | | | | | +--- com.google.protobuf:protobuf-java:2.5.0 +| | | | | | +--- commons-io:commons-io:2.4 +| | | | | | +--- com.google.inject:guice:3.0 (*) +| | | | | | +--- com.sun.jersey:jersey-server:1.9 (*) +| | | | | | +--- com.sun.jersey:jersey-json:1.9 (*) +| | | | | | +--- com.sun.jersey.contribs:jersey-guice:1.9 +| | | | | | | +--- javax.inject:javax.inject:1 +| | | | | | | +--- com.google.inject:guice:3.0 (*) +| | | | | | | +--- com.google.inject.extensions:guice-servlet:3.0 (*) +| | | | | | | \--- com.sun.jersey:jersey-server:1.9 (*) +| | | | | | \--- log4j:log4j:1.2.17 +| | | | | +--- org.apache.hadoop:hadoop-yarn-client:2.7.3 +| | | | | | +--- com.google.guava:guava:11.0.2 -> 28.0-jre (*) +| | | | | | +--- commons-logging:commons-logging:1.1.3 -> 1.2 +| | | | | | +--- commons-lang:commons-lang:2.6 +| | | | | | +--- commons-cli:commons-cli:1.2 +| | | | | | +--- log4j:log4j:1.2.17 +| | | | | | +--- org.apache.hadoop:hadoop-annotations:2.7.3 +| | | | | | +--- org.apache.hadoop:hadoop-yarn-api:2.7.3 (*) +| | | | | | \--- org.apache.hadoop:hadoop-yarn-common:2.7.3 (*) +| | | | | +--- org.apache.hadoop:hadoop-mapreduce-client-core:2.7.3 +| | | | | | +--- org.apache.hadoop:hadoop-yarn-common:2.7.3 (*) +| | | | | | +--- com.google.protobuf:protobuf-java:2.5.0 +| | | | | | +--- org.apache.avro:avro:1.7.4 -> 1.9.2 (*) +| | | | | | +--- org.slf4j:slf4j-api:1.7.10 -> 1.7.25 +| | | | | | +--- org.apache.hadoop:hadoop-annotations:2.7.3 +| | | | | | +--- com.google.inject.extensions:guice-servlet:3.0 (*) +| | | | | | \--- io.netty:netty:3.6.2.Final -> 3.9.9.Final +| | | | | +--- org.apache.hadoop:hadoop-yarn-server-common:2.7.3 +| | | | | | +--- org.apache.hadoop:hadoop-yarn-api:2.7.3 (*) +| | | | | | +--- org.apache.hadoop:hadoop-yarn-common:2.7.3 (*) +| | | | | | +--- com.google.guava:guava:11.0.2 -> 28.0-jre (*) +| | | | | | +--- commons-logging:commons-logging:1.1.3 -> 1.2 +| | | | | | +--- org.apache.hadoop:hadoop-annotations:2.7.3 +| | | | | | +--- com.google.protobuf:protobuf-java:2.5.0 +| | | | | | +--- org.apache.zookeeper:zookeeper:3.4.6 (*) +| | | | | | \--- org.fusesource.leveldbjni:leveldbjni-all:1.8 +| | | | | +--- com.google.protobuf:protobuf-java:2.5.0 +| | | | | +--- org.slf4j:slf4j-api:1.7.10 -> 1.7.25 +| | | | | +--- org.apache.hadoop:hadoop-annotations:2.7.3 +| | | | | +--- com.google.inject.extensions:guice-servlet:3.0 (*) +| | | | | \--- io.netty:netty:3.6.2.Final -> 3.9.9.Final +| | | | +--- org.apache.hadoop:hadoop-yarn-server-web-proxy:2.7.3 +| | | | | +--- javax.servlet:servlet-api:2.5 +| | | | | +--- org.apache.hadoop:hadoop-yarn-server-common:2.7.3 (*) +| | | | | +--- org.apache.hadoop:hadoop-yarn-common:2.7.3 (*) +| | | | | +--- org.apache.hadoop:hadoop-yarn-api:2.7.3 (*) +| | | | | +--- com.google.guava:guava:11.0.2 -> 28.0-jre (*) +| | | | | \--- commons-logging:commons-logging:1.1.3 -> 1.2 +| | | | +--- org.apache.hadoop:hadoop-mapreduce-client-shuffle:2.7.3 +| | | | | +--- org.apache.hadoop:hadoop-yarn-server-common:2.7.3 (*) +| | | | | +--- org.apache.hadoop:hadoop-yarn-server-nodemanager:2.7.3 +| | | | | | +--- org.apache.hadoop:hadoop-yarn-common:2.7.3 (*) +| | | | | | +--- org.apache.hadoop:hadoop-yarn-api:2.7.3 (*) +| | | | | | +--- javax.xml.bind:jaxb-api:2.2.2 -> 2.2.11 +| | | | | | +--- org.codehaus.jettison:jettison:1.1 +| | | | | | +--- commons-lang:commons-lang:2.6 +| | | | | | +--- javax.servlet:servlet-api:2.5 +| | | | | | +--- commons-codec:commons-codec:1.4 -> 1.10 +| | | | | | +--- com.sun.jersey:jersey-core:1.9 +| | | | | | +--- com.sun.jersey:jersey-client:1.9 (*) +| | | | | | +--- com.google.guava:guava:11.0.2 -> 28.0-jre (*) +| | | | | | +--- commons-logging:commons-logging:1.1.3 -> 1.2 +| | | | | | +--- org.slf4j:slf4j-api:1.7.10 -> 1.7.25 +| | | | | | +--- org.apache.hadoop:hadoop-annotations:2.7.3 +| | | | | | +--- com.google.inject.extensions:guice-servlet:3.0 (*) +| | | | | | +--- com.google.protobuf:protobuf-java:2.5.0 +| | | | | | +--- com.google.inject:guice:3.0 (*) +| | | | | | +--- com.sun.jersey:jersey-json:1.9 (*) +| | | | | | +--- com.sun.jersey.contribs:jersey-guice:1.9 (*) +| | | | | | +--- org.apache.hadoop:hadoop-yarn-server-common:2.7.3 (*) +| | | | | | \--- org.fusesource.leveldbjni:leveldbjni-all:1.8 +| | | | | +--- org.apache.hadoop:hadoop-mapreduce-client-common:2.7.3 (*) +| | | | | +--- org.fusesource.leveldbjni:leveldbjni-all:1.8 +| | | | | +--- com.google.protobuf:protobuf-java:2.5.0 +| | | | | +--- org.slf4j:slf4j-api:1.7.10 -> 1.7.25 +| | | | | +--- org.apache.hadoop:hadoop-annotations:2.7.3 +| | | | | +--- com.google.inject.extensions:guice-servlet:3.0 (*) +| | | | | \--- io.netty:netty:3.6.2.Final -> 3.9.9.Final +| | | | +--- com.google.protobuf:protobuf-java:2.5.0 +| | | | +--- org.slf4j:slf4j-api:1.7.10 -> 1.7.25 +| | | | +--- org.apache.hadoop:hadoop-annotations:2.7.3 +| | | | +--- com.google.inject.extensions:guice-servlet:3.0 (*) +| | | | \--- io.netty:netty:3.6.2.Final -> 3.9.9.Final +| | | +--- org.apache.hadoop:hadoop-yarn-api:2.7.3 (*) +| | | +--- org.apache.hadoop:hadoop-mapreduce-client-core:2.7.3 (*) +| | | +--- org.apache.hadoop:hadoop-mapreduce-client-jobclient:2.7.3 +| | | | +--- org.apache.hadoop:hadoop-mapreduce-client-common:2.7.3 (*) +| | | | +--- org.apache.hadoop:hadoop-mapreduce-client-shuffle:2.7.3 (*) +| | | | +--- com.google.protobuf:protobuf-java:2.5.0 +| | | | +--- org.slf4j:slf4j-api:1.7.10 -> 1.7.25 +| | | | +--- org.apache.hadoop:hadoop-annotations:2.7.3 +| | | | +--- com.google.inject.extensions:guice-servlet:3.0 (*) +| | | | \--- io.netty:netty:3.6.2.Final -> 3.9.9.Final +| | | \--- org.apache.hadoop:hadoop-annotations:2.7.3 +| | +--- org.slf4j:slf4j-api -> 1.7.25 +| | +--- com.github.stephenc.findbugs:findbugs-annotations:1.3.9-1 +| | +--- project :iceberg-api (*) +| | +--- project :iceberg-core +| | | +--- project :iceberg-core (*) +| | | +--- org.slf4j:slf4j-api:1.7.22 -> 1.7.25 (c) +| | | +--- junit:junit:4.12 (c) +| | | +--- joda-time:joda-time:2.9.9 (c) +| | | +--- org.mockito:mockito-core:1.10.19 (c) +| | | +--- org.apache.avro:avro:1.9.2 (c) +| | | +--- org.slf4j:slf4j-simple:1.7.5 (c) +| | | +--- org.apache.arrow:arrow-vector:0.14.1 (c) +| | | +--- com.github.ben-manes.caffeine:caffeine:2.7.0 (c) +| | | +--- org.apache.hive:hive-metastore:2.3.6 (c) +| | | +--- org.apache.hive:hive-exec:2.3.6 (c) +| | | +--- org.apache.parquet:parquet-avro:1.11.0 (c) +| | | +--- org.apache.commons:commons-lang3:3.9 (c) +| | | +--- org.apache.pig:pig:0.14.0 (c) +| | | +--- org.apache.spark:spark-hive_2.11:2.4.5 (c) +| | | +--- org.apache.spark:spark-avro_2.11:2.4.5 (c) +| | | +--- org.apache.hadoop:hadoop-client:2.7.3 (*) +| | | +--- org.slf4j:slf4j-api -> 1.7.25 +| | | +--- com.github.stephenc.findbugs:findbugs-annotations:1.3.9-1 +| | | +--- project :iceberg-api (*) +| | | +--- project :iceberg-common +| | | | +--- project :iceberg-common (*) +| | | | +--- org.slf4j:slf4j-api:1.7.22 -> 1.7.25 (c) +| | | | +--- junit:junit:4.12 (c) +| | | | +--- joda-time:joda-time:2.9.9 (c) +| | | | +--- org.mockito:mockito-core:1.10.19 (c) +| | | | +--- org.apache.avro:avro:1.9.2 (c) +| | | | +--- org.slf4j:slf4j-simple:1.7.5 (c) +| | | | +--- org.apache.arrow:arrow-vector:0.14.1 (c) +| | | | +--- com.github.ben-manes.caffeine:caffeine:2.7.0 (c) +| | | | +--- org.apache.hive:hive-metastore:2.3.6 (c) +| | | | +--- org.apache.hive:hive-exec:2.3.6 (c) +| | | | +--- org.apache.parquet:parquet-avro:1.11.0 (c) +| | | | +--- org.apache.commons:commons-lang3:3.9 (c) +| | | | +--- org.apache.pig:pig:0.14.0 (c) +| | | | +--- org.apache.spark:spark-hive_2.11:2.4.5 (c) +| | | | +--- org.apache.spark:spark-avro_2.11:2.4.5 (c) +| | | | +--- org.slf4j:slf4j-api -> 1.7.25 +| | | | +--- com.github.stephenc.findbugs:findbugs-annotations:1.3.9-1 +| | | | +--- junit:junit -> 4.12 (*) +| | | | +--- org.slf4j:slf4j-simple -> 1.7.5 (*) +| | | | +--- org.mockito:mockito-core -> 1.10.19 (*) +| | | | +--- org.slf4j:slf4j-api -> 1.7.25 +| | | | \--- com.github.stephenc.findbugs:findbugs-annotations:1.3.9-1 +| | | +--- org.apache.avro:avro -> 1.9.2 (*) +| | | +--- com.fasterxml.jackson.core:jackson-databind:2.10.0 -> 2.10.2 (*) +| | | +--- com.fasterxml.jackson.core:jackson-core:2.10.0 -> 2.10.2 +| | | +--- com.github.ben-manes.caffeine:caffeine -> 2.7.0 +| | | | +--- org.checkerframework:checker-qual:2.6.0 -> 2.8.1 +| | | | \--- com.google.errorprone:error_prone_annotations:2.3.3 +| | | +--- junit:junit -> 4.12 (*) +| | | +--- org.slf4j:slf4j-simple -> 1.7.5 (*) +| | | +--- org.mockito:mockito-core -> 1.10.19 (*) +| | | +--- org.slf4j:slf4j-api -> 1.7.25 +| | | +--- com.github.stephenc.findbugs:findbugs-annotations:1.3.9-1 +| | | +--- org.apache.avro:avro -> 1.9.2 (*) +| | | +--- com.fasterxml.jackson.core:jackson-databind:2.10.0 -> 2.10.2 (*) +| | | +--- com.fasterxml.jackson.core:jackson-core:2.10.0 -> 2.10.2 +| | | +--- com.github.ben-manes.caffeine:caffeine -> 2.7.0 (*) +| | | \--- org.apache.hadoop:hadoop-client:2.7.3 (*) +| | +--- org.apache.parquet:parquet-avro -> 1.11.0 +| | | +--- org.apache.parquet:parquet-column:1.11.0 +| | | | +--- org.apache.parquet:parquet-common:1.11.0 +| | | | | +--- org.apache.parquet:parquet-format-structures:1.11.0 +| | | | | | +--- org.slf4j:slf4j-api:1.7.22 -> 1.7.25 +| | | | | | \--- javax.annotation:javax.annotation-api:1.3.2 +| | | | | +--- org.slf4j:slf4j-api:1.7.22 -> 1.7.25 +| | | | | \--- org.apache.yetus:audience-annotations:0.11.0 +| | | | \--- org.apache.parquet:parquet-encoding:1.11.0 +| | | | \--- org.apache.parquet:parquet-common:1.11.0 (*) +| | | +--- org.apache.parquet:parquet-hadoop:1.11.0 +| | | | +--- org.apache.parquet:parquet-column:1.11.0 (*) +| | | | +--- org.apache.parquet:parquet-format-structures:1.11.0 (*) +| | | | +--- org.apache.parquet:parquet-jackson:1.11.0 +| | | | +--- org.xerial.snappy:snappy-java:1.1.7.3 +| | | | \--- commons-pool:commons-pool:1.6 +| | | \--- org.apache.parquet:parquet-format-structures:1.11.0 (*) +| | +--- junit:junit -> 4.12 (*) +| | +--- org.slf4j:slf4j-simple -> 1.7.5 (*) +| | +--- org.mockito:mockito-core -> 1.10.19 (*) +| | +--- org.slf4j:slf4j-api -> 1.7.25 +| | +--- com.github.stephenc.findbugs:findbugs-annotations:1.3.9-1 +| | +--- org.apache.parquet:parquet-avro -> 1.11.0 (*) +| | +--- org.apache.avro:avro -> 1.9.2 (*) +| | \--- org.apache.hadoop:hadoop-client:2.7.3 (*) +| +--- org.apache.arrow:arrow-vector -> 0.14.1 +| | +--- org.apache.arrow:arrow-format:0.14.1 +| | | \--- com.google.flatbuffers:flatbuffers-java:1.9.0 +| | +--- org.apache.arrow:arrow-memory:0.14.1 +| | | +--- com.google.code.findbugs:jsr305:3.0.2 +| | | +--- io.netty:netty-buffer:4.1.27.Final +| | | \--- org.slf4j:slf4j-api:1.7.25 +| | +--- com.fasterxml.jackson.core:jackson-core:2.9.8 -> 2.10.2 +| | +--- com.fasterxml.jackson.core:jackson-annotations:2.9.8 -> 2.10.2 +| | +--- com.fasterxml.jackson.core:jackson-databind:2.9.8 -> 2.10.2 (*) +| | +--- com.carrotsearch:hppc:0.7.2 +| | +--- commons-codec:commons-codec:1.10 +| | +--- com.google.flatbuffers:flatbuffers-java:1.9.0 +| | \--- org.slf4j:slf4j-api:1.7.25 +| +--- org.apache.arrow:arrow-memory -> 0.14.1 (*) +| +--- junit:junit -> 4.12 (*) +| +--- org.slf4j:slf4j-simple -> 1.7.5 (*) +| +--- org.mockito:mockito-core -> 1.10.19 (*) +| +--- org.slf4j:slf4j-api -> 1.7.25 +| +--- com.github.stephenc.findbugs:findbugs-annotations:1.3.9-1 +| +--- org.apache.arrow:arrow-vector -> 0.14.1 (*) +| \--- org.apache.arrow:arrow-memory -> 0.14.1 (*) ++--- project :iceberg-arrow (*) ++--- project :iceberg-common (*) ++--- project :iceberg-common (*) ++--- project :iceberg-core (*) ++--- project :iceberg-core (*) ++--- project :iceberg-data +| +--- project :iceberg-data (*) +| +--- org.slf4j:slf4j-api:1.7.22 -> 1.7.25 (c) +| +--- junit:junit:4.12 (c) +| +--- joda-time:joda-time:2.9.9 (c) +| +--- org.mockito:mockito-core:1.10.19 (c) +| +--- org.apache.avro:avro:1.9.2 (c) +| +--- org.slf4j:slf4j-simple:1.7.5 (c) +| +--- org.apache.arrow:arrow-vector:0.14.1 (c) +| +--- com.github.ben-manes.caffeine:caffeine:2.7.0 (c) +| +--- org.apache.hive:hive-metastore:2.3.6 (c) +| +--- org.apache.hive:hive-exec:2.3.6 (c) +| +--- org.apache.parquet:parquet-avro:1.11.0 (c) +| +--- org.apache.commons:commons-lang3:3.9 (c) +| +--- org.apache.pig:pig:0.14.0 (c) +| +--- org.apache.spark:spark-hive_2.11:2.4.5 (c) +| +--- org.apache.spark:spark-avro_2.11:2.4.5 (c) +| +--- project :iceberg-parquet (*) +| +--- project :iceberg-orc +| | +--- project :iceberg-orc (*) +| | +--- org.slf4j:slf4j-api:1.7.22 -> 1.7.25 (c) +| | +--- junit:junit:4.12 (c) +| | +--- joda-time:joda-time:2.9.9 (c) +| | +--- org.mockito:mockito-core:1.10.19 (c) +| | +--- org.apache.avro:avro:1.9.2 (c) +| | +--- org.slf4j:slf4j-simple:1.7.5 (c) +| | +--- org.apache.arrow:arrow-vector:0.14.1 (c) +| | +--- com.github.ben-manes.caffeine:caffeine:2.7.0 (c) +| | +--- org.apache.hive:hive-metastore:2.3.6 (c) +| | +--- org.apache.hive:hive-exec:2.3.6 (c) +| | +--- org.apache.parquet:parquet-avro:1.11.0 (c) +| | +--- org.apache.commons:commons-lang3:3.9 (c) +| | +--- org.apache.pig:pig:0.14.0 (c) +| | +--- org.apache.spark:spark-hive_2.11:2.4.5 (c) +| | +--- org.apache.spark:spark-avro_2.11:2.4.5 (c) +| | +--- org.apache.hadoop:hadoop-common:2.7.3 (*) +| | +--- org.apache.hadoop:hadoop-client:2.7.3 (*) +| | +--- org.slf4j:slf4j-api -> 1.7.25 +| | +--- com.github.stephenc.findbugs:findbugs-annotations:1.3.9-1 +| | +--- project :iceberg-api (*) +| | +--- project :iceberg-core (*) +| | +--- org.apache.orc:orc-core:1.6.2 +| | | +--- org.apache.orc:orc-shims:1.6.2 +| | | | \--- org.slf4j:slf4j-api:1.7.5 -> 1.7.25 +| | | +--- com.google.protobuf:protobuf-java:2.5.0 +| | | +--- commons-lang:commons-lang:2.6 +| | | +--- io.airlift:aircompressor:0.15 +| | | +--- javax.xml.bind:jaxb-api:2.2.11 +| | | +--- org.jetbrains:annotations:17.0.0 +| | | \--- org.slf4j:slf4j-api:1.7.5 -> 1.7.25 +| | +--- junit:junit -> 4.12 (*) +| | +--- org.slf4j:slf4j-simple -> 1.7.5 (*) +| | +--- org.mockito:mockito-core -> 1.10.19 (*) +| | +--- org.slf4j:slf4j-api -> 1.7.25 +| | +--- com.github.stephenc.findbugs:findbugs-annotations:1.3.9-1 +| | +--- org.apache.orc:orc-core:1.6.2 (*) +| | +--- org.apache.hadoop:hadoop-common:2.7.3 (*) +| | \--- org.apache.hadoop:hadoop-client:2.7.3 (*) +| +--- org.apache.hadoop:hadoop-common:2.7.3 (*) +| +--- org.slf4j:slf4j-api -> 1.7.25 +| +--- com.github.stephenc.findbugs:findbugs-annotations:1.3.9-1 +| +--- project :iceberg-api (*) +| +--- project :iceberg-core (*) +| +--- junit:junit -> 4.12 (*) +| +--- org.slf4j:slf4j-simple -> 1.7.5 (*) +| +--- org.mockito:mockito-core -> 1.10.19 (*) +| +--- org.apache.hadoop:hadoop-client:2.7.3 (*) +| +--- org.slf4j:slf4j-api -> 1.7.25 +| +--- com.github.stephenc.findbugs:findbugs-annotations:1.3.9-1 +| \--- org.apache.hadoop:hadoop-common:2.7.3 (*) ++--- project :iceberg-data (*) ++--- project :iceberg-hive +| +--- project :iceberg-hive (*) +| +--- org.slf4j:slf4j-api:1.7.22 -> 1.7.25 (c) +| +--- junit:junit:4.12 (c) +| +--- joda-time:joda-time:2.9.9 (c) +| +--- org.mockito:mockito-core:1.10.19 (c) +| +--- org.apache.avro:avro:1.9.2 (c) +| +--- org.slf4j:slf4j-simple:1.7.5 (c) +| +--- org.apache.arrow:arrow-vector:0.14.1 (c) +| +--- com.github.ben-manes.caffeine:caffeine:2.7.0 (c) +| +--- org.apache.hive:hive-metastore:2.3.6 (c) +| +--- org.apache.hive:hive-exec:2.3.6 (c) +| +--- org.apache.parquet:parquet-avro:1.11.0 (c) +| +--- org.apache.commons:commons-lang3:3.9 (c) +| +--- org.apache.pig:pig:0.14.0 (c) +| +--- org.apache.spark:spark-hive_2.11:2.4.5 (c) +| +--- org.apache.spark:spark-avro_2.11:2.4.5 (c) +| +--- org.apache.avro:avro -> 1.9.2 (*) +| +--- org.apache.hive:hive-metastore -> 2.3.6 +| | +--- org.apache.hive:hive-serde:2.3.6 +| | | +--- org.apache.hive:hive-common:2.3.6 +| | | | +--- org.apache.hive:hive-shims:2.3.6 +| | | | | +--- org.apache.hive.shims:hive-shims-common:2.3.6 +| | | | | | +--- com.google.guava:guava:14.0.1 -> 28.0-jre (*) +| | | | | | +--- commons-lang:commons-lang:2.6 +| | | | | | +--- org.apache.thrift:libthrift:0.9.3 +| | | | | | | +--- org.slf4j:slf4j-api:1.7.12 -> 1.7.25 +| | | | | | | +--- org.apache.httpcomponents:httpclient:4.4.1 -> 4.5.6 (*) +| | | | | | | \--- org.apache.httpcomponents:httpcore:4.4.1 -> 4.4.10 +| | | | | | +--- org.apache.curator:curator-framework:2.7.1 (*) +| | | | | | +--- org.apache.zookeeper:zookeeper:3.4.6 (*) +| | | | | | \--- org.slf4j:slf4j-api:1.7.10 -> 1.7.25 +| | | | | +--- org.apache.hive.shims:hive-shims-0.23:2.3.6 +| | | | | | +--- org.apache.hive.shims:hive-shims-common:2.3.6 (*) +| | | | | | +--- commons-lang:commons-lang:2.6 +| | | | | | +--- org.apache.hadoop:hadoop-yarn-server-resourcemanager:2.7.2 -> 2.7.3 +| | | | | | | +--- javax.servlet:servlet-api:2.5 +| | | | | | | +--- org.slf4j:slf4j-api:1.7.10 -> 1.7.25 +| | | | | | | +--- org.apache.hadoop:hadoop-annotations:2.7.3 +| | | | | | | +--- com.google.inject.extensions:guice-servlet:3.0 (*) +| | | | | | | +--- com.google.protobuf:protobuf-java:2.5.0 +| | | | | | | +--- commons-io:commons-io:2.4 +| | | | | | | +--- com.google.inject:guice:3.0 (*) +| | | | | | | +--- com.sun.jersey:jersey-json:1.9 (*) +| | | | | | | +--- com.sun.jersey.contribs:jersey-guice:1.9 (*) +| | | | | | | +--- org.apache.hadoop:hadoop-yarn-common:2.7.3 (*) +| | | | | | | +--- org.apache.hadoop:hadoop-yarn-api:2.7.3 (*) +| | | | | | | +--- javax.xml.bind:jaxb-api:2.2.2 -> 2.2.11 +| | | | | | | +--- org.codehaus.jettison:jettison:1.1 +| | | | | | | +--- commons-lang:commons-lang:2.6 +| | | | | | | +--- com.sun.jersey:jersey-core:1.9 +| | | | | | | +--- com.sun.jersey:jersey-client:1.9 (*) +| | | | | | | +--- com.google.guava:guava:11.0.2 -> 28.0-jre (*) +| | | | | | | +--- commons-logging:commons-logging:1.1.3 -> 1.2 +| | | | | | | +--- log4j:log4j:1.2.17 +| | | | | | | +--- org.apache.hadoop:hadoop-yarn-server-common:2.7.3 (*) +| | | | | | | +--- org.apache.hadoop:hadoop-yarn-server-applicationhistoryservice:2.7.3 +| | | | | | | | +--- javax.servlet:servlet-api:2.5 +| | | | | | | | +--- org.apache.hadoop:hadoop-annotations:2.7.3 +| | | | | | | | +--- com.google.inject.extensions:guice-servlet:3.0 (*) +| | | | | | | | +--- com.google.protobuf:protobuf-java:2.5.0 +| | | | | | | | +--- com.google.inject:guice:3.0 (*) +| | | | | | | | +--- com.sun.jersey:jersey-json:1.9 (*) +| | | | | | | | +--- com.sun.jersey.contribs:jersey-guice:1.9 (*) +| | | | | | | | +--- org.apache.hadoop:hadoop-yarn-common:2.7.3 (*) +| | | | | | | | +--- org.apache.hadoop:hadoop-yarn-api:2.7.3 (*) +| | | | | | | | +--- javax.xml.bind:jaxb-api:2.2.2 -> 2.2.11 +| | | | | | | | +--- org.codehaus.jettison:jettison:1.1 +| | | | | | | | +--- com.sun.jersey:jersey-core:1.9 +| | | | | | | | +--- com.sun.jersey:jersey-client:1.9 (*) +| | | | | | | | +--- com.google.guava:guava:11.0.2 -> 28.0-jre (*) +| | | | | | | | +--- commons-logging:commons-logging:1.1.3 -> 1.2 +| | | | | | | | +--- org.apache.hadoop:hadoop-yarn-server-common:2.7.3 (*) +| | | | | | | | +--- commons-collections:commons-collections:3.2.2 +| | | | | | | | \--- org.fusesource.leveldbjni:leveldbjni-all:1.8 +| | | | | | | +--- org.apache.hadoop:hadoop-yarn-server-web-proxy:2.7.3 (*) +| | | | | | | +--- org.apache.zookeeper:zookeeper:3.4.6 (*) +| | | | | | | \--- org.fusesource.leveldbjni:leveldbjni-all:1.8 +| | | | | | \--- org.slf4j:slf4j-api:1.7.10 -> 1.7.25 +| | | | | +--- org.apache.hive.shims:hive-shims-scheduler:2.3.6 +| | | | | | +--- org.apache.hive.shims:hive-shims-common:2.3.6 (*) +| | | | | | \--- org.slf4j:slf4j-api:1.7.10 -> 1.7.25 +| | | | | \--- org.slf4j:slf4j-api:1.7.10 -> 1.7.25 +| | | | +--- org.apache.hive:hive-storage-api:2.4.0 +| | | | | +--- commons-lang:commons-lang:2.6 +| | | | | \--- org.slf4j:slf4j-api:1.7.10 -> 1.7.25 +| | | | +--- commons-cli:commons-cli:1.2 +| | | | +--- commons-lang:commons-lang:2.6 +| | | | +--- org.apache.commons:commons-lang3:3.1 -> 3.9 +| | | | +--- org.apache.orc:orc-core:1.3.4 -> 1.6.2 (*) +| | | | +--- jline:jline:2.12 +| | | | +--- joda-time:joda-time:2.8.1 -> 2.9.9 +| | | | +--- org.apache.commons:commons-compress:1.9 -> 1.19 +| | | | +--- org.apache.ant:ant:1.9.1 +| | | | | \--- org.apache.ant:ant-launcher:1.9.1 +| | | | +--- io.dropwizard.metrics:metrics-core:3.1.0 -> 3.1.5 +| | | | | \--- org.slf4j:slf4j-api:1.7.7 -> 1.7.25 +| | | | +--- io.dropwizard.metrics:metrics-jvm:3.1.0 -> 3.1.5 +| | | | | +--- io.dropwizard.metrics:metrics-core:3.1.5 (*) +| | | | | \--- org.slf4j:slf4j-api:1.7.7 -> 1.7.25 +| | | | +--- io.dropwizard.metrics:metrics-json:3.1.0 -> 3.1.5 +| | | | | +--- io.dropwizard.metrics:metrics-core:3.1.5 (*) +| | | | | +--- com.fasterxml.jackson.core:jackson-databind:2.4.2 -> 2.10.2 (*) +| | | | | \--- org.slf4j:slf4j-api:1.7.7 -> 1.7.25 +| | | | +--- com.fasterxml.jackson.core:jackson-databind:2.6.5 -> 2.10.2 (*) +| | | | +--- com.github.joshelser:dropwizard-metrics-hadoop-metrics2-reporter:0.1.2 +| | | | | +--- io.dropwizard.metrics:metrics-core:3.1.2 -> 3.1.5 (*) +| | | | | +--- org.apache.hadoop:hadoop-common:2.6.0 -> 2.7.3 (*) +| | | | | \--- org.slf4j:slf4j-api:1.7.14 -> 1.7.25 +| | | | \--- org.slf4j:slf4j-api:1.7.10 -> 1.7.25 +| | | +--- org.apache.hive:hive-service-rpc:2.3.6 +| | | | +--- commons-codec:commons-codec:1.4 -> 1.10 +| | | | +--- commons-cli:commons-cli:1.2 +| | | | +--- tomcat:jasper-compiler:5.5.23 +| | | | | +--- javax.servlet:jsp-api:2.0 +| | | | | | \--- javax.servlet:servlet-api:2.4 -> 2.5 +| | | | | \--- ant:ant:1.6.5 +| | | | +--- tomcat:jasper-runtime:5.5.23 +| | | | | +--- javax.servlet:servlet-api:2.4 -> 2.5 +| | | | | \--- commons-el:commons-el:1.0 +| | | | | \--- commons-logging:commons-logging:1.0.3 -> 1.2 +| | | | +--- org.apache.thrift:libfb303:0.9.3 +| | | | | \--- org.apache.thrift:libthrift:0.9.3 (*) +| | | | +--- org.apache.thrift:libthrift:0.9.3 (*) +| | | | \--- org.slf4j:slf4j-api:1.7.10 -> 1.7.25 +| | | +--- org.apache.hive:hive-shims:2.3.6 (*) +| | | +--- commons-codec:commons-codec:1.4 -> 1.10 +| | | +--- commons-lang:commons-lang:2.6 +| | | +--- org.apache.thrift:libthrift:0.9.3 (*) +| | | +--- net.sf.opencsv:opencsv:2.3 +| | | \--- org.slf4j:slf4j-api:1.7.10 -> 1.7.25 +| | +--- org.apache.hive:hive-shims:2.3.6 (*) +| | +--- javolution:javolution:5.5.1 +| | +--- com.google.guava:guava:14.0.1 -> 28.0-jre (*) +| | +--- com.google.protobuf:protobuf-java:2.5.0 +| | +--- com.jolbox:bonecp:0.8.0.RELEASE +| | | +--- com.google.guava:guava:15.0 -> 28.0-jre (*) +| | | \--- org.slf4j:slf4j-api:1.7.2 -> 1.7.25 +| | +--- commons-cli:commons-cli:1.2 +| | +--- commons-lang:commons-lang:2.6 +| | +--- org.apache.derby:derby:10.10.2.0 -> 10.12.1.1 +| | +--- org.datanucleus:datanucleus-api-jdo:4.2.4 +| | +--- org.datanucleus:datanucleus-core:4.1.17 +| | +--- org.datanucleus:datanucleus-rdbms:4.1.19 +| | +--- commons-pool:commons-pool:1.5.4 -> 1.6 +| | +--- commons-dbcp:commons-dbcp:1.4 +| | | \--- commons-pool:commons-pool:1.5.4 -> 1.6 +| | +--- javax.jdo:jdo-api:3.0.1 +| | | \--- javax.transaction:jta:1.1 +| | +--- org.datanucleus:javax.jdo:3.2.0-m3 +| | +--- org.antlr:antlr-runtime:3.5.2 +| | +--- org.apache.thrift:libfb303:0.9.3 (*) +| | +--- org.apache.thrift:libthrift:0.9.3 (*) +| | \--- org.slf4j:slf4j-api:1.7.10 -> 1.7.25 +| +--- org.apache.hadoop:hadoop-client:2.7.3 (*) +| +--- org.slf4j:slf4j-api -> 1.7.25 +| +--- com.github.stephenc.findbugs:findbugs-annotations:1.3.9-1 +| +--- project :iceberg-core (*) +| +--- junit:junit -> 4.12 (*) +| +--- org.slf4j:slf4j-simple -> 1.7.5 (*) +| +--- org.mockito:mockito-core -> 1.10.19 (*) +| +--- org.apache.hive:hive-exec -> 2.3.6 +| | +--- org.apache.hive:hive-vector-code-gen:2.3.6 +| | | +--- commons-lang:commons-lang:2.6 +| | | +--- com.google.guava:guava:14.0.1 -> 28.0-jre (*) +| | | +--- org.apache.ant:ant:1.9.1 (*) +| | | +--- org.apache.velocity:velocity:1.5 +| | | | +--- commons-lang:commons-lang:2.1 -> 2.6 +| | | | \--- oro:oro:2.0.8 +| | | \--- org.slf4j:slf4j-api:1.7.10 -> 1.7.25 +| | +--- org.apache.hive:hive-shims:2.3.6 (*) +| | +--- commons-codec:commons-codec:1.4 -> 1.10 +| | +--- commons-httpclient:commons-httpclient:3.0.1 -> 3.1 (*) +| | +--- commons-io:commons-io:2.4 +| | +--- org.antlr:antlr-runtime:3.5.2 +| | +--- org.antlr:ST4:4.0.4 +| | | \--- org.antlr:antlr-runtime:3.3 -> 3.5.2 +| | +--- org.apache.ant:ant:1.9.1 (*) +| | +--- org.apache.commons:commons-compress:1.9 -> 1.19 +| | +--- org.apache.ivy:ivy:2.4.0 +| | +--- org.apache.zookeeper:zookeeper:3.4.6 (*) +| | +--- org.apache.curator:curator-framework:2.7.1 (*) +| | +--- org.apache.curator:apache-curator:2.7.1 +| | | +--- org.apache.zookeeper:zookeeper:3.4.6 (*) +| | | \--- com.google.guava:guava:16.0.1 -> 28.0-jre (*) +| | +--- org.codehaus.groovy:groovy-all:2.4.4 +| | +--- org.datanucleus:datanucleus-core:4.1.17 +| | +--- com.google.code.gson:gson:2.2.4 +| | +--- stax:stax-api:1.0.1 +| | \--- org.slf4j:slf4j-api:1.7.10 -> 1.7.25 +| +--- org.apache.hive:hive-metastore -> 2.3.6 (*) +| +--- project :iceberg-api (*) +| +--- org.slf4j:slf4j-api -> 1.7.25 +| +--- com.github.stephenc.findbugs:findbugs-annotations:1.3.9-1 +| +--- org.apache.avro:avro -> 1.9.2 (*) +| \--- org.apache.hadoop:hadoop-client:2.7.3 (*) ++--- project :iceberg-hive (*) ++--- project :iceberg-mr +| +--- project :iceberg-mr (*) +| +--- org.slf4j:slf4j-api:1.7.22 -> 1.7.25 (c) +| +--- junit:junit:4.12 (c) +| +--- joda-time:joda-time:2.9.9 (c) +| +--- org.mockito:mockito-core:1.10.19 (c) +| +--- org.apache.avro:avro:1.9.2 (c) +| +--- org.slf4j:slf4j-simple:1.7.5 (c) +| +--- org.apache.arrow:arrow-vector:0.14.1 (c) +| +--- com.github.ben-manes.caffeine:caffeine:2.7.0 (c) +| +--- org.apache.hive:hive-metastore:2.3.6 (c) +| +--- org.apache.hive:hive-exec:2.3.6 (c) +| +--- org.apache.parquet:parquet-avro:1.11.0 (c) +| +--- org.apache.commons:commons-lang3:3.9 (c) +| +--- org.apache.pig:pig:0.14.0 (c) +| +--- org.apache.spark:spark-hive_2.11:2.4.5 (c) +| +--- org.apache.spark:spark-avro_2.11:2.4.5 (c) +| +--- org.apache.hadoop:hadoop-client:2.7.3 (*) +| +--- org.slf4j:slf4j-api -> 1.7.25 +| +--- com.github.stephenc.findbugs:findbugs-annotations:1.3.9-1 +| +--- project :iceberg-api (*) +| +--- project :iceberg-core (*) +| +--- project :iceberg-orc (*) +| +--- project :iceberg-parquet (*) +| +--- project :iceberg-data (*) +| +--- junit:junit -> 4.12 (*) +| +--- org.slf4j:slf4j-simple -> 1.7.5 (*) +| +--- org.mockito:mockito-core -> 1.10.19 (*) +| +--- org.slf4j:slf4j-api -> 1.7.25 +| +--- com.github.stephenc.findbugs:findbugs-annotations:1.3.9-1 +| \--- org.apache.hadoop:hadoop-client:2.7.3 (*) ++--- project :iceberg-mr (*) ++--- project :iceberg-orc (*) ++--- project :iceberg-orc (*) ++--- project :iceberg-parquet (*) ++--- project :iceberg-parquet (*) ++--- project :iceberg-pig +| +--- project :iceberg-pig (*) +| +--- org.slf4j:slf4j-api:1.7.22 -> 1.7.25 (c) +| +--- junit:junit:4.12 (c) +| +--- joda-time:joda-time:2.9.9 (c) +| +--- org.mockito:mockito-core:1.10.19 (c) +| +--- org.apache.avro:avro:1.9.2 (c) +| +--- org.slf4j:slf4j-simple:1.7.5 (c) +| +--- org.apache.arrow:arrow-vector:0.14.1 (c) +| +--- com.github.ben-manes.caffeine:caffeine:2.7.0 (c) +| +--- org.apache.hive:hive-metastore:2.3.6 (c) +| +--- org.apache.hive:hive-exec:2.3.6 (c) +| +--- org.apache.parquet:parquet-avro:1.11.0 (c) +| +--- org.apache.commons:commons-lang3:3.9 (c) +| +--- org.apache.pig:pig:0.14.0 (c) +| +--- org.apache.spark:spark-hive_2.11:2.4.5 (c) +| +--- org.apache.spark:spark-avro_2.11:2.4.5 (c) +| +--- org.apache.pig:pig -> 0.14.0 +| | +--- commons-cli:commons-cli:1.2 +| | +--- xmlenc:xmlenc:0.52 +| | +--- commons-httpclient:commons-httpclient:3.1 (*) +| | +--- commons-codec:commons-codec:1.4 -> 1.10 +| | +--- commons-net:commons-net:1.4.1 -> 3.1 +| | +--- tomcat:jasper-runtime:5.5.12 -> 5.5.23 (*) +| | +--- tomcat:jasper-compiler:5.5.12 -> 5.5.23 (*) +| | +--- commons-el:commons-el:1.0 (*) +| | +--- net.java.dev.jets3t:jets3t:0.7.1 -> 0.9.0 (*) +| | +--- net.sf.kosmosfs:kfs:0.3 +| | +--- hsqldb:hsqldb:1.8.0.10 +| | +--- oro:oro:2.0.8 +| | +--- jline:jline:1.0 -> 2.12 +| | +--- org.antlr:ST4:4.0.4 (*) +| | +--- org.antlr:antlr-runtime:3.4 -> 3.5.2 +| | +--- dk.brics.automaton:automaton:1.11-8 +| | +--- com.google.guava:guava:11.0 -> 28.0-jre (*) +| | +--- org.codehaus.jackson:jackson-mapper-asl:1.8.8 -> 1.9.13 (*) +| | +--- org.codehaus.jackson:jackson-core-asl:1.8.8 -> 1.9.13 +| | +--- joda-time:joda-time:2.1 -> 2.9.9 +| | \--- org.apache.avro:avro:1.7.4 -> 1.9.2 (*) +| +--- org.apache.hadoop:hadoop-mapreduce-client-core:2.7.3 (*) +| +--- org.apache.hadoop:hadoop-client:2.7.3 (*) +| +--- org.slf4j:slf4j-api -> 1.7.25 +| +--- com.github.stephenc.findbugs:findbugs-annotations:1.3.9-1 +| +--- project :iceberg-api (*) +| +--- project :iceberg-common (*) +| +--- project :iceberg-core (*) +| +--- project :iceberg-parquet (*) +| +--- org.apache.commons:commons-lang3 -> 3.9 +| +--- junit:junit -> 4.12 (*) +| +--- org.slf4j:slf4j-simple -> 1.7.5 (*) +| +--- org.mockito:mockito-core -> 1.10.19 (*) +| +--- org.apache.hadoop:hadoop-hdfs:2.7.3 (*) +| +--- org.apache.hadoop:hadoop-common:2.7.3 (*) +| +--- org.apache.hadoop:hadoop-minicluster:2.7.3 +| | +--- org.apache.hadoop:hadoop-common:2.7.3 (*) +| | +--- org.apache.hadoop:hadoop-hdfs:2.7.3 (*) +| | +--- org.apache.hadoop:hadoop-yarn-server-tests:2.7.3 +| | | +--- org.apache.hadoop:hadoop-annotations:2.7.3 +| | | +--- org.apache.hadoop:hadoop-yarn-server-common:2.7.3 (*) +| | | +--- org.apache.hadoop:hadoop-yarn-server-nodemanager:2.7.3 (*) +| | | +--- org.apache.hadoop:hadoop-yarn-server-resourcemanager:2.7.3 (*) +| | | +--- org.apache.hadoop:hadoop-yarn-common:2.7.3 (*) +| | | +--- org.apache.hadoop:hadoop-yarn-api:2.7.3 (*) +| | | +--- com.google.guava:guava:11.0.2 -> 28.0-jre (*) +| | | \--- commons-logging:commons-logging:1.1.3 -> 1.2 +| | +--- org.apache.hadoop:hadoop-mapreduce-client-jobclient:2.7.3 (*) +| | +--- org.apache.hadoop:hadoop-mapreduce-client-app:2.7.3 (*) +| | +--- org.apache.hadoop:hadoop-yarn-api:2.7.3 (*) +| | +--- org.apache.hadoop:hadoop-mapreduce-client-core:2.7.3 (*) +| | \--- org.apache.hadoop:hadoop-mapreduce-client-hs:2.7.3 +| | +--- org.apache.hadoop:hadoop-hdfs:2.7.3 (*) +| | +--- org.apache.hadoop:hadoop-mapreduce-client-common:2.7.3 (*) +| | +--- org.apache.hadoop:hadoop-mapreduce-client-app:2.7.3 (*) +| | +--- org.fusesource.leveldbjni:leveldbjni-all:1.8 +| | +--- com.google.protobuf:protobuf-java:2.5.0 +| | +--- org.slf4j:slf4j-api:1.7.10 -> 1.7.25 +| | +--- org.apache.hadoop:hadoop-annotations:2.7.3 +| | +--- com.google.inject.extensions:guice-servlet:3.0 (*) +| | \--- io.netty:netty:3.6.2.Final -> 3.9.9.Final +| +--- org.slf4j:slf4j-api -> 1.7.25 +| +--- com.github.stephenc.findbugs:findbugs-annotations:1.3.9-1 +| +--- org.apache.commons:commons-lang3 -> 3.9 +| +--- org.apache.pig:pig -> 0.14.0 (*) +| +--- org.apache.hadoop:hadoop-mapreduce-client-core:2.7.3 (*) +| \--- org.apache.hadoop:hadoop-client:2.7.3 (*) ++--- project :iceberg-pig (*) ++--- project :iceberg-relocate-external-dependencies (*) ++--- project :iceberg-relocate-external-dependencies (*) ++--- project :iceberg-spark +| +--- project :iceberg-spark (*) +| +--- org.slf4j:slf4j-api:1.7.22 -> 1.7.25 (c) +| +--- junit:junit:4.12 (c) +| +--- joda-time:joda-time:2.9.9 (c) +| +--- org.mockito:mockito-core:1.10.19 (c) +| +--- org.apache.avro:avro:1.9.2 (c) +| +--- org.slf4j:slf4j-simple:1.7.5 (c) +| +--- org.apache.arrow:arrow-vector:0.14.1 (c) +| +--- com.github.ben-manes.caffeine:caffeine:2.7.0 (c) +| +--- org.apache.hive:hive-metastore:2.3.6 (c) +| +--- org.apache.hive:hive-exec:2.3.6 (c) +| +--- org.apache.parquet:parquet-avro:1.11.0 (c) +| +--- org.apache.commons:commons-lang3:3.9 (c) +| +--- org.apache.pig:pig:0.14.0 (c) +| +--- org.apache.spark:spark-hive_2.11:2.4.5 (c) +| +--- org.apache.spark:spark-avro_2.11:2.4.5 (c) +| +--- org.apache.avro:avro -> 1.9.2 (*) +| +--- org.apache.spark:spark-hive_2.11 -> 2.4.5 +| | +--- com.twitter:parquet-hadoop-bundle:1.6.0 +| | +--- org.apache.spark:spark-core_2.11:2.4.5 +| | | +--- com.thoughtworks.paranamer:paranamer:2.8 +| | | +--- org.apache.avro:avro-mapred:1.8.2 +| | | | +--- org.apache.avro:avro-ipc:1.8.2 +| | | | | +--- org.codehaus.jackson:jackson-core-asl:1.9.13 +| | | | | +--- org.codehaus.jackson:jackson-mapper-asl:1.9.13 (*) +| | | | | \--- org.slf4j:slf4j-api:1.7.7 -> 1.7.25 +| | | | +--- org.codehaus.jackson:jackson-core-asl:1.9.13 +| | | | +--- org.codehaus.jackson:jackson-mapper-asl:1.9.13 (*) +| | | | +--- commons-codec:commons-codec:1.9 -> 1.10 +| | | | \--- org.slf4j:slf4j-api:1.7.7 -> 1.7.25 +| | | +--- com.twitter:chill_2.11:0.9.3 +| | | | +--- org.scala-lang:scala-library:2.11.12 +| | | | +--- com.twitter:chill-java:0.9.3 +| | | | | \--- com.esotericsoftware:kryo-shaded:4.0.2 +| | | | | +--- com.esotericsoftware:minlog:1.3.0 +| | | | | \--- org.objenesis:objenesis:2.5.1 +| | | | \--- com.esotericsoftware:kryo-shaded:4.0.2 (*) +| | | +--- com.twitter:chill-java:0.9.3 (*) +| | | +--- org.apache.xbean:xbean-asm6-shaded:4.8 +| | | +--- org.apache.hadoop:hadoop-client:2.6.5 -> 2.7.3 (*) +| | | +--- org.apache.spark:spark-launcher_2.11:2.4.5 +| | | | +--- org.apache.spark:spark-tags_2.11:2.4.5 +| | | | | +--- org.scala-lang:scala-library:2.11.12 +| | | | | \--- org.spark-project.spark:unused:1.0.0 +| | | | \--- org.spark-project.spark:unused:1.0.0 +| | | +--- org.apache.spark:spark-kvstore_2.11:2.4.5 +| | | | +--- org.apache.spark:spark-tags_2.11:2.4.5 (*) +| | | | +--- org.fusesource.leveldbjni:leveldbjni-all:1.8 +| | | | +--- com.fasterxml.jackson.core:jackson-core:2.6.7 -> 2.10.2 +| | | | +--- com.fasterxml.jackson.core:jackson-databind:2.6.7.3 -> 2.10.2 (*) +| | | | +--- com.fasterxml.jackson.core:jackson-annotations:2.6.7 -> 2.10.2 +| | | | \--- org.spark-project.spark:unused:1.0.0 +| | | +--- org.apache.spark:spark-network-common_2.11:2.4.5 +| | | | +--- io.netty:netty-all:4.1.42.Final +| | | | +--- org.apache.commons:commons-lang3:3.5 -> 3.9 +| | | | +--- org.fusesource.leveldbjni:leveldbjni-all:1.8 +| | | | +--- com.fasterxml.jackson.core:jackson-databind:2.6.7.3 -> 2.10.2 (*) +| | | | +--- com.fasterxml.jackson.core:jackson-annotations:2.6.7 -> 2.10.2 +| | | | +--- io.dropwizard.metrics:metrics-core:3.1.5 (*) +| | | | +--- com.google.code.findbugs:jsr305:1.3.9 -> 3.0.2 +| | | | +--- org.apache.commons:commons-crypto:1.0.0 +| | | | \--- org.spark-project.spark:unused:1.0.0 +| | | +--- org.apache.spark:spark-network-shuffle_2.11:2.4.5 +| | | | +--- org.apache.spark:spark-network-common_2.11:2.4.5 (*) +| | | | +--- io.dropwizard.metrics:metrics-core:3.1.5 (*) +| | | | \--- org.spark-project.spark:unused:1.0.0 +| | | +--- org.apache.spark:spark-unsafe_2.11:2.4.5 +| | | | +--- org.apache.spark:spark-tags_2.11:2.4.5 (*) +| | | | +--- com.twitter:chill_2.11:0.9.3 (*) +| | | | +--- com.google.code.findbugs:jsr305:1.3.9 -> 3.0.2 +| | | | \--- org.spark-project.spark:unused:1.0.0 +| | | +--- javax.activation:activation:1.1.1 +| | | +--- org.apache.curator:curator-recipes:2.6.0 -> 2.7.1 (*) +| | | +--- org.apache.zookeeper:zookeeper:3.4.6 (*) +| | | +--- javax.servlet:javax.servlet-api:3.1.0 +| | | +--- org.apache.commons:commons-lang3:3.5 -> 3.9 +| | | +--- org.apache.commons:commons-math3:3.4.1 +| | | +--- com.google.code.findbugs:jsr305:1.3.9 -> 3.0.2 +| | | +--- org.slf4j:slf4j-api:1.7.16 -> 1.7.25 +| | | +--- org.slf4j:jul-to-slf4j:1.7.16 +| | | | \--- org.slf4j:slf4j-api:1.7.16 -> 1.7.25 +| | | +--- org.slf4j:jcl-over-slf4j:1.7.16 +| | | | \--- org.slf4j:slf4j-api:1.7.16 -> 1.7.25 +| | | +--- log4j:log4j:1.2.17 +| | | +--- com.ning:compress-lzf:1.0.3 +| | | +--- org.xerial.snappy:snappy-java:1.1.7.3 +| | | +--- org.lz4:lz4-java:1.4.0 +| | | +--- com.github.luben:zstd-jni:1.3.2-2 +| | | +--- org.roaringbitmap:RoaringBitmap:0.7.45 +| | | | \--- org.roaringbitmap:shims:0.7.45 +| | | +--- commons-net:commons-net:3.1 +| | | +--- org.scala-lang:scala-library:2.11.12 +| | | +--- org.json4s:json4s-jackson_2.11:3.5.3 +| | | | +--- org.scala-lang:scala-library:2.11.11 -> 2.11.12 +| | | | \--- org.json4s:json4s-core_2.11:3.5.3 +| | | | +--- org.scala-lang:scala-library:2.11.11 -> 2.11.12 +| | | | +--- org.json4s:json4s-ast_2.11:3.5.3 +| | | | | \--- org.scala-lang:scala-library:2.11.11 -> 2.11.12 +| | | | +--- org.json4s:json4s-scalap_2.11:3.5.3 +| | | | | \--- org.scala-lang:scala-library:2.11.11 -> 2.11.12 +| | | | +--- com.thoughtworks.paranamer:paranamer:2.8 +| | | | \--- org.scala-lang.modules:scala-xml_2.11:1.0.6 +| | | | \--- org.scala-lang:scala-library:2.11.8 -> 2.11.12 +| | | +--- org.glassfish.jersey.core:jersey-client:2.22.2 +| | | | +--- javax.ws.rs:javax.ws.rs-api:2.0.1 +| | | | +--- org.glassfish.jersey.core:jersey-common:2.22.2 +| | | | | +--- javax.ws.rs:javax.ws.rs-api:2.0.1 +| | | | | +--- javax.annotation:javax.annotation-api:1.2 -> 1.3.2 +| | | | | +--- org.glassfish.jersey.bundles.repackaged:jersey-guava:2.22.2 +| | | | | +--- org.glassfish.hk2:hk2-api:2.4.0-b34 +| | | | | | +--- javax.inject:javax.inject:1 +| | | | | | +--- org.glassfish.hk2:hk2-utils:2.4.0-b34 +| | | | | | | \--- javax.inject:javax.inject:1 +| | | | | | \--- org.glassfish.hk2.external:aopalliance-repackaged:2.4.0-b34 +| | | | | +--- org.glassfish.hk2.external:javax.inject:2.4.0-b34 +| | | | | +--- org.glassfish.hk2:hk2-locator:2.4.0-b34 +| | | | | | +--- org.glassfish.hk2.external:javax.inject:2.4.0-b34 +| | | | | | +--- org.glassfish.hk2.external:aopalliance-repackaged:2.4.0-b34 +| | | | | | +--- org.glassfish.hk2:hk2-api:2.4.0-b34 (*) +| | | | | | +--- org.glassfish.hk2:hk2-utils:2.4.0-b34 (*) +| | | | | | \--- org.javassist:javassist:3.18.1-GA +| | | | | \--- org.glassfish.hk2:osgi-resource-locator:1.0.1 +| | | | +--- org.glassfish.hk2:hk2-api:2.4.0-b34 (*) +| | | | +--- org.glassfish.hk2.external:javax.inject:2.4.0-b34 +| | | | \--- org.glassfish.hk2:hk2-locator:2.4.0-b34 (*) +| | | +--- org.glassfish.jersey.core:jersey-common:2.22.2 (*) +| | | +--- org.glassfish.jersey.core:jersey-server:2.22.2 +| | | | +--- org.glassfish.jersey.core:jersey-common:2.22.2 (*) +| | | | +--- org.glassfish.jersey.core:jersey-client:2.22.2 (*) +| | | | +--- javax.ws.rs:javax.ws.rs-api:2.0.1 +| | | | +--- org.glassfish.jersey.media:jersey-media-jaxb:2.22.2 +| | | | | +--- org.glassfish.jersey.core:jersey-common:2.22.2 (*) +| | | | | +--- org.glassfish.hk2:hk2-api:2.4.0-b34 (*) +| | | | | +--- org.glassfish.hk2.external:javax.inject:2.4.0-b34 +| | | | | +--- org.glassfish.hk2:hk2-locator:2.4.0-b34 (*) +| | | | | \--- org.glassfish.hk2:osgi-resource-locator:1.0.1 +| | | | +--- javax.annotation:javax.annotation-api:1.2 -> 1.3.2 +| | | | +--- org.glassfish.hk2:hk2-api:2.4.0-b34 (*) +| | | | +--- org.glassfish.hk2.external:javax.inject:2.4.0-b34 +| | | | +--- org.glassfish.hk2:hk2-locator:2.4.0-b34 (*) +| | | | \--- javax.validation:validation-api:1.1.0.Final +| | | +--- org.glassfish.jersey.containers:jersey-container-servlet:2.22.2 +| | | | +--- org.glassfish.jersey.containers:jersey-container-servlet-core:2.22.2 +| | | | | +--- org.glassfish.hk2.external:javax.inject:2.4.0-b34 +| | | | | +--- org.glassfish.jersey.core:jersey-common:2.22.2 (*) +| | | | | +--- org.glassfish.jersey.core:jersey-server:2.22.2 (*) +| | | | | \--- javax.ws.rs:javax.ws.rs-api:2.0.1 +| | | | +--- org.glassfish.jersey.core:jersey-common:2.22.2 (*) +| | | | +--- org.glassfish.jersey.core:jersey-server:2.22.2 (*) +| | | | \--- javax.ws.rs:javax.ws.rs-api:2.0.1 +| | | +--- org.glassfish.jersey.containers:jersey-container-servlet-core:2.22.2 (*) +| | | +--- io.netty:netty-all:4.1.42.Final +| | | +--- io.netty:netty:3.9.9.Final +| | | +--- com.clearspring.analytics:stream:2.7.0 +| | | +--- io.dropwizard.metrics:metrics-core:3.1.5 (*) +| | | +--- io.dropwizard.metrics:metrics-jvm:3.1.5 (*) +| | | +--- io.dropwizard.metrics:metrics-json:3.1.5 (*) +| | | +--- io.dropwizard.metrics:metrics-graphite:3.1.5 +| | | | +--- io.dropwizard.metrics:metrics-core:3.1.5 (*) +| | | | \--- org.slf4j:slf4j-api:1.7.7 -> 1.7.25 +| | | +--- com.fasterxml.jackson.core:jackson-databind:2.6.7.3 -> 2.10.2 (*) +| | | +--- com.fasterxml.jackson.module:jackson-module-scala_2.11:2.6.7.1 -> 2.10.2 +| | | | +--- org.scala-lang:scala-library:2.11.12 +| | | | +--- com.fasterxml.jackson.core:jackson-core:2.10.2 +| | | | +--- com.fasterxml.jackson.core:jackson-annotations:2.10.2 +| | | | +--- com.fasterxml.jackson.core:jackson-databind:2.10.2 (*) +| | | | \--- com.fasterxml.jackson.module:jackson-module-paranamer:2.10.2 +| | | | +--- com.fasterxml.jackson.core:jackson-databind:2.10.2 (*) +| | | | \--- com.thoughtworks.paranamer:paranamer:2.8 +| | | +--- org.apache.ivy:ivy:2.4.0 +| | | +--- oro:oro:2.0.8 +| | | +--- net.razorvine:pyrolite:4.13 +| | | +--- net.sf.py4j:py4j:0.10.7 +| | | +--- org.apache.spark:spark-tags_2.11:2.4.5 (*) +| | | +--- org.apache.commons:commons-crypto:1.0.0 +| | | \--- org.spark-project.spark:unused:1.0.0 +| | +--- org.apache.spark:spark-sql_2.11:2.4.5 +| | | +--- com.univocity:univocity-parsers:2.7.3 +| | | +--- org.apache.spark:spark-sketch_2.11:2.4.5 +| | | | +--- org.apache.spark:spark-tags_2.11:2.4.5 (*) +| | | | \--- org.spark-project.spark:unused:1.0.0 +| | | +--- org.apache.spark:spark-core_2.11:2.4.5 (*) +| | | +--- org.apache.spark:spark-catalyst_2.11:2.4.5 +| | | | +--- org.scala-lang:scala-reflect:2.11.12 +| | | | | \--- org.scala-lang:scala-library:2.11.12 +| | | | +--- org.scala-lang.modules:scala-parser-combinators_2.11:1.1.0 +| | | | | \--- org.scala-lang:scala-library:2.11.12 +| | | | +--- org.apache.spark:spark-core_2.11:2.4.5 (*) +| | | | +--- org.apache.spark:spark-tags_2.11:2.4.5 (*) +| | | | +--- org.apache.spark:spark-unsafe_2.11:2.4.5 (*) +| | | | +--- org.apache.spark:spark-sketch_2.11:2.4.5 (*) +| | | | +--- org.codehaus.janino:janino:3.0.9 +| | | | | \--- org.codehaus.janino:commons-compiler:3.0.9 +| | | | +--- org.codehaus.janino:commons-compiler:3.0.9 +| | | | +--- org.antlr:antlr4-runtime:4.7 +| | | | +--- commons-codec:commons-codec:1.10 +| | | | \--- org.spark-project.spark:unused:1.0.0 +| | | +--- org.apache.spark:spark-tags_2.11:2.4.5 (*) +| | | +--- org.apache.orc:orc-core:1.5.5 -> 1.6.2 (*) +| | | +--- org.apache.orc:orc-mapreduce:1.5.5 -> 1.6.2 +| | | | +--- commons-codec:commons-codec:1.4 -> 1.10 +| | | | \--- commons-lang:commons-lang:2.6 +| | | +--- org.apache.parquet:parquet-column:1.10.1 -> 1.11.0 (*) +| | | +--- org.apache.parquet:parquet-hadoop:1.10.1 -> 1.11.0 (*) +| | | +--- com.fasterxml.jackson.core:jackson-databind:2.6.7.3 -> 2.10.2 (*) +| | | +--- org.apache.arrow:arrow-vector:0.10.0 -> 0.14.1 (*) +| | | +--- org.apache.xbean:xbean-asm6-shaded:4.8 +| | | \--- org.spark-project.spark:unused:1.0.0 +| | +--- org.spark-project.hive:hive-exec:1.2.1.spark2 +| | | +--- com.twitter:parquet-hadoop-bundle:1.6.0 +| | | +--- commons-io:commons-io:2.4 +| | | +--- org.apache.commons:commons-lang3:3.1 -> 3.9 +| | | +--- commons-lang:commons-lang:2.6 +| | | +--- javolution:javolution:5.5.1 +| | | +--- log4j:apache-log4j-extras:1.2.17 +| | | +--- org.antlr:antlr-runtime:3.4 -> 3.5.2 +| | | +--- org.antlr:ST4:4.0.4 (*) +| | | +--- org.apache.commons:commons-compress:1.4.1 -> 1.19 +| | | +--- org.apache.ivy:ivy:2.4.0 +| | | +--- org.codehaus.jackson:jackson-core-asl:1.9.2 -> 1.9.13 +| | | +--- org.jodd:jodd-core:3.5.2 +| | | +--- org.codehaus.jackson:jackson-mapper-asl:1.9.2 -> 1.9.13 (*) +| | | +--- org.datanucleus:datanucleus-core:3.2.10 -> 4.1.17 +| | | +--- org.apache.calcite:calcite-avatica:1.2.0-incubating +| | | +--- com.googlecode.javaewah:JavaEWAH:0.3.2 +| | | +--- org.iq80.snappy:snappy:0.2 +| | | +--- stax:stax-api:1.0.1 +| | | \--- net.sf.opencsv:opencsv:2.3 +| | +--- org.spark-project.hive:hive-metastore:1.2.1.spark2 +| | | +--- com.jolbox:bonecp:0.8.0.RELEASE (*) +| | | +--- commons-cli:commons-cli:1.2 +| | | +--- commons-lang:commons-lang:2.6 +| | | +--- commons-logging:commons-logging:1.1.3 -> 1.2 +| | | +--- org.apache.derby:derby:10.10.2.0 -> 10.12.1.1 +| | | +--- org.datanucleus:datanucleus-api-jdo:3.2.6 -> 4.2.4 +| | | +--- org.datanucleus:datanucleus-core:3.2.10 -> 4.1.17 +| | | +--- org.datanucleus:datanucleus-rdbms:3.2.9 -> 4.1.19 +| | | +--- commons-pool:commons-pool:1.5.4 -> 1.6 +| | | +--- commons-dbcp:commons-dbcp:1.4 (*) +| | | +--- javax.jdo:jdo-api:3.0.1 (*) +| | | \--- org.antlr:antlr-runtime:3.4 -> 3.5.2 +| | +--- org.apache.avro:avro-mapred:1.8.2 (*) +| | +--- commons-httpclient:commons-httpclient:3.1 (*) +| | +--- org.apache.calcite:calcite-avatica:1.2.0-incubating +| | +--- org.apache.calcite:calcite-core:1.2.0-incubating +| | | +--- org.apache.calcite:calcite-avatica:1.2.0-incubating +| | | +--- org.apache.calcite:calcite-linq4j:1.2.0-incubating +| | | +--- commons-dbcp:commons-dbcp:1.4 (*) +| | | \--- net.hydromatic:eigenbase-properties:1.1.5 +| | +--- org.apache.httpcomponents:httpclient:4.5.6 (*) +| | +--- org.codehaus.jackson:jackson-mapper-asl:1.9.13 (*) +| | +--- commons-codec:commons-codec:1.10 +| | +--- joda-time:joda-time:2.9.3 -> 2.9.9 +| | +--- org.jodd:jodd-core:3.5.2 +| | +--- com.google.code.findbugs:jsr305:1.3.9 -> 3.0.2 +| | +--- org.datanucleus:datanucleus-core:3.2.10 -> 4.1.17 +| | +--- org.apache.thrift:libthrift:0.9.3 (*) +| | +--- org.apache.thrift:libfb303:0.9.3 (*) +| | +--- org.apache.derby:derby:10.12.1.1 +| | \--- org.spark-project.spark:unused:1.0.0 +| +--- org.apache.spark:spark-avro_2.11 -> 2.4.5 +| | +--- org.apache.spark:spark-tags_2.11:2.4.5 (*) +| | \--- org.spark-project.spark:unused:1.0.0 +| +--- org.slf4j:slf4j-api -> 1.7.25 +| +--- com.github.stephenc.findbugs:findbugs-annotations:1.3.9-1 +| +--- project :iceberg-api (*) +| +--- project :iceberg-common (*) +| +--- project :iceberg-core (*) +| +--- project :iceberg-data (*) +| +--- project :iceberg-orc (*) +| +--- project :iceberg-parquet (*) +| +--- project :iceberg-arrow (*) +| +--- project :iceberg-hive (*) +| +--- junit:junit -> 4.12 (*) +| +--- org.slf4j:slf4j-simple -> 1.7.5 (*) +| +--- org.mockito:mockito-core -> 1.10.19 (*) +| +--- org.apache.hadoop:hadoop-hdfs:2.7.3 (*) +| +--- org.apache.hadoop:hadoop-common:2.7.3 (*) +| +--- org.apache.hadoop:hadoop-minicluster:2.7.3 (*) +| +--- org.slf4j:slf4j-api -> 1.7.25 +| +--- com.github.stephenc.findbugs:findbugs-annotations:1.3.9-1 +| +--- org.apache.avro:avro -> 1.9.2 (*) +| +--- org.apache.spark:spark-hive_2.11 -> 2.4.5 (*) +| \--- org.apache.spark:spark-avro_2.11 -> 2.4.5 (*) ++--- project :iceberg-spark (*) ++--- project :iceberg-spark-runtime +| +--- project :iceberg-spark-runtime (*) +| +--- org.slf4j:slf4j-api:1.7.22 -> 1.7.25 (c) +| +--- junit:junit:4.12 (c) +| +--- joda-time:joda-time:2.9.9 (c) +| +--- org.mockito:mockito-core:1.10.19 (c) +| +--- org.apache.avro:avro:1.9.2 (c) +| +--- org.slf4j:slf4j-simple:1.7.5 (c) +| +--- org.apache.arrow:arrow-vector:0.14.1 (c) +| +--- com.github.ben-manes.caffeine:caffeine:2.7.0 (c) +| +--- org.apache.hive:hive-metastore:2.3.6 (c) +| +--- org.apache.hive:hive-exec:2.3.6 (c) +| +--- org.apache.parquet:parquet-avro:1.11.0 (c) +| +--- org.apache.commons:commons-lang3:3.9 (c) +| +--- org.apache.pig:pig:0.14.0 (c) +| +--- org.apache.spark:spark-hive_2.11:2.4.5 (c) +| +--- org.apache.spark:spark-avro_2.11:2.4.5 (c) +| +--- project :iceberg-spark (*) +| +--- com.github.stephenc.findbugs:findbugs-annotations:1.3.9-1 +| +--- org.slf4j:slf4j-api -> 1.7.25 +| +--- junit:junit -> 4.12 (*) +| +--- org.mockito:mockito-core -> 1.10.19 (*) +| \--- com.github.stephenc.findbugs:findbugs-annotations:1.3.9-1 ++--- project :iceberg-spark-runtime (*) ++--- org.slf4j:slf4j-api:1.7.22 -> 1.7.25 (c) ++--- junit:junit:4.12 (c) ++--- joda-time:joda-time:2.9.9 (c) ++--- org.mockito:mockito-core:1.10.19 (c) ++--- org.apache.avro:avro:1.9.2 (c) ++--- org.slf4j:slf4j-simple:1.7.5 (c) ++--- org.apache.arrow:arrow-vector:0.14.1 (c) ++--- com.github.ben-manes.caffeine:caffeine:2.7.0 (c) ++--- org.apache.hive:hive-metastore:2.3.6 (c) ++--- org.apache.hive:hive-exec:2.3.6 (c) ++--- org.apache.parquet:parquet-avro:1.11.0 (c) ++--- org.apache.commons:commons-lang3:3.9 (c) ++--- org.apache.pig:pig:0.14.0 (c) ++--- org.apache.spark:spark-hive_2.11:2.4.5 (c) +\--- org.apache.spark:spark-avro_2.11:2.4.5 (c) + +(c) - dependency constraint +(*) - dependencies omitted (listed previously) + +A web-based, searchable dependency report is available by adding the --scan option. From 2a29f57a7da41be87e6acc92f70b9084d1c7b1dc Mon Sep 17 00:00:00 2001 From: awoodhead Date: Mon, 27 Apr 2020 16:21:58 +0100 Subject: [PATCH 03/16] remove dependency log --- deps.log | 1224 ------------------------------------------------------ 1 file changed, 1224 deletions(-) delete mode 100644 deps.log diff --git a/deps.log b/deps.log deleted file mode 100644 index c254a3ed46ab..000000000000 --- a/deps.log +++ /dev/null @@ -1,1224 +0,0 @@ - ------------------------------------------------------------- -Root project ------------------------------------------------------------- - -archives - Configuration for archive artifacts. -No dependencies - -baseline -\--- com.palantir.baseline:gradle-baseline-java-config:0.55.0 - -consistentVersionsPlaceholder (n) -No dependencies - -consistentVersionsProduction - Outgoing configuration for production dependencies meant to be used by consistent-versions (n) -No dependencies - -consistentVersionsTest - Outgoing configuration for test dependencies meant to be used by consistent-versions (n) -No dependencies - -default - Configuration for default artifacts. -No dependencies - -lockConstraints (n) -No dependencies - -rootConfiguration -No dependencies - -unifiedClasspath -+--- project : (*) -+--- project : (*) -+--- project :iceberg-api -| +--- project :iceberg-api (*) -| +--- org.slf4j:slf4j-api:1.7.22 -> 1.7.25 (c) -| +--- junit:junit:4.12 (c) -| +--- joda-time:joda-time:2.9.9 (c) -| +--- org.mockito:mockito-core:1.10.19 (c) -| +--- org.apache.avro:avro:1.9.2 (c) -| +--- org.slf4j:slf4j-simple:1.7.5 (c) -| +--- org.apache.arrow:arrow-vector:0.14.1 (c) -| +--- com.github.ben-manes.caffeine:caffeine:2.7.0 (c) -| +--- org.apache.hive:hive-metastore:2.3.6 (c) -| +--- org.apache.hive:hive-exec:2.3.6 (c) -| +--- org.apache.parquet:parquet-avro:1.11.0 (c) -| +--- org.apache.commons:commons-lang3:3.9 (c) -| +--- org.apache.pig:pig:0.14.0 (c) -| +--- org.apache.spark:spark-hive_2.11:2.4.5 (c) -| +--- org.apache.spark:spark-avro_2.11:2.4.5 (c) -| +--- org.slf4j:slf4j-api -> 1.7.25 -| +--- com.github.stephenc.findbugs:findbugs-annotations:1.3.9-1 -| +--- project :iceberg-relocate-external-dependencies -| | +--- project :iceberg-relocate-external-dependencies (*) -| | +--- org.slf4j:slf4j-api:1.7.22 -> 1.7.25 (c) -| | +--- junit:junit:4.12 (c) -| | +--- joda-time:joda-time:2.9.9 (c) -| | +--- org.mockito:mockito-core:1.10.19 (c) -| | +--- org.apache.avro:avro:1.9.2 (c) -| | +--- org.slf4j:slf4j-simple:1.7.5 (c) -| | +--- org.apache.arrow:arrow-vector:0.14.1 (c) -| | +--- com.github.ben-manes.caffeine:caffeine:2.7.0 (c) -| | +--- org.apache.hive:hive-metastore:2.3.6 (c) -| | +--- org.apache.hive:hive-exec:2.3.6 (c) -| | +--- org.apache.parquet:parquet-avro:1.11.0 (c) -| | +--- org.apache.commons:commons-lang3:3.9 (c) -| | +--- org.apache.pig:pig:0.14.0 (c) -| | +--- org.apache.spark:spark-hive_2.11:2.4.5 (c) -| | +--- org.apache.spark:spark-avro_2.11:2.4.5 (c) -| | +--- org.slf4j:slf4j-api -> 1.7.25 -| | +--- com.github.stephenc.findbugs:findbugs-annotations:1.3.9-1 -| | +--- com.google.guava:guava:28.0-jre -| | | +--- com.google.guava:failureaccess:1.0.1 -| | | +--- com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava -| | | +--- com.google.code.findbugs:jsr305:3.0.2 -| | | +--- org.checkerframework:checker-qual:2.8.1 -| | | +--- com.google.errorprone:error_prone_annotations:2.3.2 -> 2.3.3 -| | | +--- com.google.j2objc:j2objc-annotations:1.3 -| | | \--- org.codehaus.mojo:animal-sniffer-annotations:1.17 -| | +--- junit:junit -> 4.12 -| | | \--- org.hamcrest:hamcrest-core:1.3 -| | +--- org.slf4j:slf4j-simple -> 1.7.5 -| | | \--- org.slf4j:slf4j-api:1.7.5 -> 1.7.25 -| | +--- org.mockito:mockito-core -> 1.10.19 -| | | +--- org.hamcrest:hamcrest-core:1.1 -> 1.3 -| | | \--- org.objenesis:objenesis:2.1 -> 2.5.1 -| | +--- org.slf4j:slf4j-api -> 1.7.25 -| | +--- com.github.stephenc.findbugs:findbugs-annotations:1.3.9-1 -| | \--- com.google.guava:guava:28.0-jre (*) -| +--- junit:junit -> 4.12 (*) -| +--- org.slf4j:slf4j-simple -> 1.7.5 (*) -| +--- org.mockito:mockito-core -> 1.10.19 (*) -| +--- org.apache.avro:avro -> 1.9.2 -| | +--- com.fasterxml.jackson.core:jackson-core:2.10.2 -| | +--- com.fasterxml.jackson.core:jackson-databind:2.10.2 -| | | +--- com.fasterxml.jackson.core:jackson-annotations:2.10.2 -| | | \--- com.fasterxml.jackson.core:jackson-core:2.10.2 -| | +--- org.apache.commons:commons-compress:1.19 -| | \--- org.slf4j:slf4j-api:1.7.25 -| +--- joda-time:joda-time -> 2.9.9 -| +--- org.slf4j:slf4j-api -> 1.7.25 -| \--- com.github.stephenc.findbugs:findbugs-annotations:1.3.9-1 -+--- project :iceberg-api (*) -+--- project :iceberg-arrow -| +--- project :iceberg-arrow (*) -| +--- org.slf4j:slf4j-api:1.7.22 -> 1.7.25 (c) -| +--- junit:junit:4.12 (c) -| +--- joda-time:joda-time:2.9.9 (c) -| +--- org.mockito:mockito-core:1.10.19 (c) -| +--- org.apache.avro:avro:1.9.2 (c) -| +--- org.slf4j:slf4j-simple:1.7.5 (c) -| +--- org.apache.arrow:arrow-vector:0.14.1 (c) -| +--- com.github.ben-manes.caffeine:caffeine:2.7.0 (c) -| +--- org.apache.hive:hive-metastore:2.3.6 (c) -| +--- org.apache.hive:hive-exec:2.3.6 (c) -| +--- org.apache.parquet:parquet-avro:1.11.0 (c) -| +--- org.apache.commons:commons-lang3:3.9 (c) -| +--- org.apache.pig:pig:0.14.0 (c) -| +--- org.apache.spark:spark-hive_2.11:2.4.5 (c) -| +--- org.apache.spark:spark-avro_2.11:2.4.5 (c) -| +--- org.slf4j:slf4j-api -> 1.7.25 -| +--- com.github.stephenc.findbugs:findbugs-annotations:1.3.9-1 -| +--- project :iceberg-api (*) -| +--- project :iceberg-parquet -| | +--- project :iceberg-parquet (*) -| | +--- org.slf4j:slf4j-api:1.7.22 -> 1.7.25 (c) -| | +--- junit:junit:4.12 (c) -| | +--- joda-time:joda-time:2.9.9 (c) -| | +--- org.mockito:mockito-core:1.10.19 (c) -| | +--- org.apache.avro:avro:1.9.2 (c) -| | +--- org.slf4j:slf4j-simple:1.7.5 (c) -| | +--- org.apache.arrow:arrow-vector:0.14.1 (c) -| | +--- com.github.ben-manes.caffeine:caffeine:2.7.0 (c) -| | +--- org.apache.hive:hive-metastore:2.3.6 (c) -| | +--- org.apache.hive:hive-exec:2.3.6 (c) -| | +--- org.apache.parquet:parquet-avro:1.11.0 (c) -| | +--- org.apache.commons:commons-lang3:3.9 (c) -| | +--- org.apache.pig:pig:0.14.0 (c) -| | +--- org.apache.spark:spark-hive_2.11:2.4.5 (c) -| | +--- org.apache.spark:spark-avro_2.11:2.4.5 (c) -| | +--- org.apache.avro:avro -> 1.9.2 (*) -| | +--- org.apache.hadoop:hadoop-client:2.7.3 -| | | +--- org.apache.hadoop:hadoop-common:2.7.3 -| | | | +--- org.apache.hadoop:hadoop-annotations:2.7.3 -| | | | +--- com.google.guava:guava:11.0.2 -> 28.0-jre (*) -| | | | +--- commons-cli:commons-cli:1.2 -| | | | +--- org.apache.commons:commons-math3:3.1.1 -> 3.4.1 -| | | | +--- xmlenc:xmlenc:0.52 -| | | | +--- commons-httpclient:commons-httpclient:3.1 -| | | | | +--- commons-logging:commons-logging:1.0.4 -> 1.2 -| | | | | \--- commons-codec:commons-codec:1.2 -> 1.10 -| | | | +--- commons-codec:commons-codec:1.4 -> 1.10 -| | | | +--- commons-io:commons-io:2.4 -| | | | +--- commons-net:commons-net:3.1 -| | | | +--- commons-collections:commons-collections:3.2.2 -| | | | +--- javax.servlet:servlet-api:2.5 -| | | | +--- javax.servlet.jsp:jsp-api:2.1 -| | | | +--- com.sun.jersey:jersey-core:1.9 -| | | | +--- com.sun.jersey:jersey-json:1.9 -| | | | | +--- org.codehaus.jettison:jettison:1.1 -| | | | | +--- com.sun.xml.bind:jaxb-impl:2.2.3-1 -| | | | | | \--- javax.xml.bind:jaxb-api:2.2.2 -> 2.2.11 -| | | | | +--- org.codehaus.jackson:jackson-core-asl:1.8.3 -> 1.9.13 -| | | | | +--- org.codehaus.jackson:jackson-mapper-asl:1.8.3 -> 1.9.13 -| | | | | | \--- org.codehaus.jackson:jackson-core-asl:1.9.13 -| | | | | +--- org.codehaus.jackson:jackson-jaxrs:1.8.3 -> 1.9.13 -| | | | | | +--- org.codehaus.jackson:jackson-core-asl:1.9.13 -| | | | | | \--- org.codehaus.jackson:jackson-mapper-asl:1.9.13 (*) -| | | | | +--- org.codehaus.jackson:jackson-xc:1.8.3 -> 1.9.13 -| | | | | | +--- org.codehaus.jackson:jackson-core-asl:1.9.13 -| | | | | | \--- org.codehaus.jackson:jackson-mapper-asl:1.9.13 (*) -| | | | | \--- com.sun.jersey:jersey-core:1.9 -| | | | +--- com.sun.jersey:jersey-server:1.9 -| | | | | +--- asm:asm:3.1 -| | | | | \--- com.sun.jersey:jersey-core:1.9 -| | | | +--- commons-logging:commons-logging:1.1.3 -> 1.2 -| | | | +--- log4j:log4j:1.2.17 -| | | | +--- net.java.dev.jets3t:jets3t:0.9.0 -| | | | | +--- commons-codec:commons-codec:1.4 -> 1.10 -| | | | | +--- commons-logging:commons-logging:1.1.1 -> 1.2 -| | | | | +--- org.apache.httpcomponents:httpclient:4.1.2 -> 4.5.6 -| | | | | | +--- org.apache.httpcomponents:httpcore:4.4.10 -| | | | | | +--- commons-logging:commons-logging:1.2 -| | | | | | \--- commons-codec:commons-codec:1.10 -| | | | | +--- org.apache.httpcomponents:httpcore:4.1.2 -> 4.4.10 -| | | | | \--- com.jamesmurty.utils:java-xmlbuilder:0.4 -| | | | +--- commons-lang:commons-lang:2.6 -| | | | +--- commons-configuration:commons-configuration:1.6 -| | | | | +--- commons-collections:commons-collections:3.2.1 -> 3.2.2 -| | | | | +--- commons-lang:commons-lang:2.4 -> 2.6 -| | | | | +--- commons-logging:commons-logging:1.1.1 -> 1.2 -| | | | | +--- commons-digester:commons-digester:1.8 -| | | | | | +--- commons-beanutils:commons-beanutils:1.7.0 -| | | | | | | \--- commons-logging:commons-logging:1.0.3 -> 1.2 -| | | | | | \--- commons-logging:commons-logging:1.1 -> 1.2 -| | | | | \--- commons-beanutils:commons-beanutils-core:1.8.0 -| | | | | \--- commons-logging:commons-logging:1.1.1 -> 1.2 -| | | | +--- org.slf4j:slf4j-api:1.7.10 -> 1.7.25 -| | | | +--- org.codehaus.jackson:jackson-core-asl:1.9.13 -| | | | +--- org.codehaus.jackson:jackson-mapper-asl:1.9.13 (*) -| | | | +--- org.apache.avro:avro:1.7.4 -> 1.9.2 (*) -| | | | +--- com.google.protobuf:protobuf-java:2.5.0 -| | | | +--- com.google.code.gson:gson:2.2.4 -| | | | +--- org.apache.hadoop:hadoop-auth:2.7.3 -| | | | | +--- org.slf4j:slf4j-api:1.7.10 -> 1.7.25 -| | | | | +--- commons-codec:commons-codec:1.4 -> 1.10 -| | | | | +--- log4j:log4j:1.2.17 -| | | | | +--- org.apache.httpcomponents:httpclient:4.2.5 -> 4.5.6 (*) -| | | | | +--- org.apache.directory.server:apacheds-kerberos-codec:2.0.0-M15 -| | | | | | +--- org.apache.directory.server:apacheds-i18n:2.0.0-M15 -| | | | | | | \--- org.slf4j:slf4j-api:1.7.5 -> 1.7.25 -| | | | | | +--- org.apache.directory.api:api-asn1-api:1.0.0-M20 -| | | | | | | \--- org.slf4j:slf4j-api:1.7.5 -> 1.7.25 -| | | | | | +--- org.apache.directory.api:api-util:1.0.0-M20 -| | | | | | | \--- org.slf4j:slf4j-api:1.7.5 -> 1.7.25 -| | | | | | \--- org.slf4j:slf4j-api:1.7.5 -> 1.7.25 -| | | | | +--- org.apache.zookeeper:zookeeper:3.4.6 -| | | | | | +--- org.slf4j:slf4j-api:1.6.1 -> 1.7.25 -| | | | | | +--- log4j:log4j:1.2.16 -> 1.2.17 -| | | | | | +--- jline:jline:0.9.94 -> 2.12 -| | | | | | \--- io.netty:netty:3.7.0.Final -> 3.9.9.Final -| | | | | \--- org.apache.curator:curator-framework:2.7.1 -| | | | | +--- org.apache.curator:curator-client:2.7.1 -| | | | | | +--- org.slf4j:slf4j-api:1.7.6 -> 1.7.25 -| | | | | | +--- org.apache.zookeeper:zookeeper:3.4.6 (*) -| | | | | | \--- com.google.guava:guava:16.0.1 -> 28.0-jre (*) -| | | | | +--- org.apache.zookeeper:zookeeper:3.4.6 (*) -| | | | | \--- com.google.guava:guava:16.0.1 -> 28.0-jre (*) -| | | | +--- com.jcraft:jsch:0.1.42 -| | | | +--- org.apache.curator:curator-client:2.7.1 (*) -| | | | +--- org.apache.curator:curator-recipes:2.7.1 -| | | | | +--- org.apache.curator:curator-framework:2.7.1 (*) -| | | | | +--- org.apache.zookeeper:zookeeper:3.4.6 (*) -| | | | | \--- com.google.guava:guava:16.0.1 -> 28.0-jre (*) -| | | | +--- com.google.code.findbugs:jsr305:3.0.0 -> 3.0.2 -| | | | +--- org.apache.htrace:htrace-core:3.1.0-incubating -| | | | +--- org.apache.zookeeper:zookeeper:3.4.6 (*) -| | | | \--- org.apache.commons:commons-compress:1.4.1 -> 1.19 -| | | +--- org.apache.hadoop:hadoop-hdfs:2.7.3 -| | | | +--- com.google.guava:guava:11.0.2 -> 28.0-jre (*) -| | | | +--- com.sun.jersey:jersey-core:1.9 -| | | | +--- com.sun.jersey:jersey-server:1.9 (*) -| | | | +--- commons-cli:commons-cli:1.2 -| | | | +--- commons-codec:commons-codec:1.4 -> 1.10 -| | | | +--- commons-io:commons-io:2.4 -| | | | +--- commons-lang:commons-lang:2.6 -| | | | +--- commons-logging:commons-logging:1.1.3 -> 1.2 -| | | | +--- commons-daemon:commons-daemon:1.0.13 -| | | | +--- log4j:log4j:1.2.17 -| | | | +--- com.google.protobuf:protobuf-java:2.5.0 -| | | | +--- javax.servlet:servlet-api:2.5 -| | | | +--- org.codehaus.jackson:jackson-core-asl:1.9.13 -| | | | +--- org.codehaus.jackson:jackson-mapper-asl:1.9.13 (*) -| | | | +--- xmlenc:xmlenc:0.52 -| | | | +--- io.netty:netty:3.6.2.Final -> 3.9.9.Final -| | | | +--- io.netty:netty-all:4.0.23.Final -> 4.1.42.Final -| | | | +--- xerces:xercesImpl:2.9.1 -| | | | | \--- xml-apis:xml-apis:1.3.04 -| | | | +--- org.apache.htrace:htrace-core:3.1.0-incubating -| | | | \--- org.fusesource.leveldbjni:leveldbjni-all:1.8 -| | | +--- org.apache.hadoop:hadoop-mapreduce-client-app:2.7.3 -| | | | +--- org.apache.hadoop:hadoop-mapreduce-client-common:2.7.3 -| | | | | +--- org.apache.hadoop:hadoop-yarn-common:2.7.3 -| | | | | | +--- org.apache.hadoop:hadoop-yarn-api:2.7.3 -| | | | | | | +--- commons-lang:commons-lang:2.6 -| | | | | | | +--- com.google.guava:guava:11.0.2 -> 28.0-jre (*) -| | | | | | | +--- commons-logging:commons-logging:1.1.3 -> 1.2 -| | | | | | | +--- org.apache.hadoop:hadoop-annotations:2.7.3 -| | | | | | | \--- com.google.protobuf:protobuf-java:2.5.0 -| | | | | | +--- javax.xml.bind:jaxb-api:2.2.2 -> 2.2.11 -| | | | | | +--- org.apache.commons:commons-compress:1.4.1 -> 1.19 -| | | | | | +--- commons-lang:commons-lang:2.6 -| | | | | | +--- javax.servlet:servlet-api:2.5 -| | | | | | +--- commons-codec:commons-codec:1.4 -> 1.10 -| | | | | | +--- com.sun.jersey:jersey-core:1.9 -| | | | | | +--- com.sun.jersey:jersey-client:1.9 -| | | | | | | \--- com.sun.jersey:jersey-core:1.9 -| | | | | | +--- org.codehaus.jackson:jackson-core-asl:1.9.13 -| | | | | | +--- org.codehaus.jackson:jackson-mapper-asl:1.9.13 (*) -| | | | | | +--- org.codehaus.jackson:jackson-jaxrs:1.9.13 (*) -| | | | | | +--- org.codehaus.jackson:jackson-xc:1.9.13 (*) -| | | | | | +--- com.google.guava:guava:11.0.2 -> 28.0-jre (*) -| | | | | | +--- commons-logging:commons-logging:1.1.3 -> 1.2 -| | | | | | +--- commons-cli:commons-cli:1.2 -| | | | | | +--- org.slf4j:slf4j-api:1.7.10 -> 1.7.25 -| | | | | | +--- org.apache.hadoop:hadoop-annotations:2.7.3 -| | | | | | +--- com.google.inject.extensions:guice-servlet:3.0 -| | | | | | | \--- com.google.inject:guice:3.0 -| | | | | | | +--- javax.inject:javax.inject:1 -| | | | | | | +--- aopalliance:aopalliance:1.0 -| | | | | | | \--- org.sonatype.sisu.inject:cglib:2.2.1-v20090111 -| | | | | | | \--- asm:asm:3.1 -| | | | | | +--- com.google.protobuf:protobuf-java:2.5.0 -| | | | | | +--- commons-io:commons-io:2.4 -| | | | | | +--- com.google.inject:guice:3.0 (*) -| | | | | | +--- com.sun.jersey:jersey-server:1.9 (*) -| | | | | | +--- com.sun.jersey:jersey-json:1.9 (*) -| | | | | | +--- com.sun.jersey.contribs:jersey-guice:1.9 -| | | | | | | +--- javax.inject:javax.inject:1 -| | | | | | | +--- com.google.inject:guice:3.0 (*) -| | | | | | | +--- com.google.inject.extensions:guice-servlet:3.0 (*) -| | | | | | | \--- com.sun.jersey:jersey-server:1.9 (*) -| | | | | | \--- log4j:log4j:1.2.17 -| | | | | +--- org.apache.hadoop:hadoop-yarn-client:2.7.3 -| | | | | | +--- com.google.guava:guava:11.0.2 -> 28.0-jre (*) -| | | | | | +--- commons-logging:commons-logging:1.1.3 -> 1.2 -| | | | | | +--- commons-lang:commons-lang:2.6 -| | | | | | +--- commons-cli:commons-cli:1.2 -| | | | | | +--- log4j:log4j:1.2.17 -| | | | | | +--- org.apache.hadoop:hadoop-annotations:2.7.3 -| | | | | | +--- org.apache.hadoop:hadoop-yarn-api:2.7.3 (*) -| | | | | | \--- org.apache.hadoop:hadoop-yarn-common:2.7.3 (*) -| | | | | +--- org.apache.hadoop:hadoop-mapreduce-client-core:2.7.3 -| | | | | | +--- org.apache.hadoop:hadoop-yarn-common:2.7.3 (*) -| | | | | | +--- com.google.protobuf:protobuf-java:2.5.0 -| | | | | | +--- org.apache.avro:avro:1.7.4 -> 1.9.2 (*) -| | | | | | +--- org.slf4j:slf4j-api:1.7.10 -> 1.7.25 -| | | | | | +--- org.apache.hadoop:hadoop-annotations:2.7.3 -| | | | | | +--- com.google.inject.extensions:guice-servlet:3.0 (*) -| | | | | | \--- io.netty:netty:3.6.2.Final -> 3.9.9.Final -| | | | | +--- org.apache.hadoop:hadoop-yarn-server-common:2.7.3 -| | | | | | +--- org.apache.hadoop:hadoop-yarn-api:2.7.3 (*) -| | | | | | +--- org.apache.hadoop:hadoop-yarn-common:2.7.3 (*) -| | | | | | +--- com.google.guava:guava:11.0.2 -> 28.0-jre (*) -| | | | | | +--- commons-logging:commons-logging:1.1.3 -> 1.2 -| | | | | | +--- org.apache.hadoop:hadoop-annotations:2.7.3 -| | | | | | +--- com.google.protobuf:protobuf-java:2.5.0 -| | | | | | +--- org.apache.zookeeper:zookeeper:3.4.6 (*) -| | | | | | \--- org.fusesource.leveldbjni:leveldbjni-all:1.8 -| | | | | +--- com.google.protobuf:protobuf-java:2.5.0 -| | | | | +--- org.slf4j:slf4j-api:1.7.10 -> 1.7.25 -| | | | | +--- org.apache.hadoop:hadoop-annotations:2.7.3 -| | | | | +--- com.google.inject.extensions:guice-servlet:3.0 (*) -| | | | | \--- io.netty:netty:3.6.2.Final -> 3.9.9.Final -| | | | +--- org.apache.hadoop:hadoop-yarn-server-web-proxy:2.7.3 -| | | | | +--- javax.servlet:servlet-api:2.5 -| | | | | +--- org.apache.hadoop:hadoop-yarn-server-common:2.7.3 (*) -| | | | | +--- org.apache.hadoop:hadoop-yarn-common:2.7.3 (*) -| | | | | +--- org.apache.hadoop:hadoop-yarn-api:2.7.3 (*) -| | | | | +--- com.google.guava:guava:11.0.2 -> 28.0-jre (*) -| | | | | \--- commons-logging:commons-logging:1.1.3 -> 1.2 -| | | | +--- org.apache.hadoop:hadoop-mapreduce-client-shuffle:2.7.3 -| | | | | +--- org.apache.hadoop:hadoop-yarn-server-common:2.7.3 (*) -| | | | | +--- org.apache.hadoop:hadoop-yarn-server-nodemanager:2.7.3 -| | | | | | +--- org.apache.hadoop:hadoop-yarn-common:2.7.3 (*) -| | | | | | +--- org.apache.hadoop:hadoop-yarn-api:2.7.3 (*) -| | | | | | +--- javax.xml.bind:jaxb-api:2.2.2 -> 2.2.11 -| | | | | | +--- org.codehaus.jettison:jettison:1.1 -| | | | | | +--- commons-lang:commons-lang:2.6 -| | | | | | +--- javax.servlet:servlet-api:2.5 -| | | | | | +--- commons-codec:commons-codec:1.4 -> 1.10 -| | | | | | +--- com.sun.jersey:jersey-core:1.9 -| | | | | | +--- com.sun.jersey:jersey-client:1.9 (*) -| | | | | | +--- com.google.guava:guava:11.0.2 -> 28.0-jre (*) -| | | | | | +--- commons-logging:commons-logging:1.1.3 -> 1.2 -| | | | | | +--- org.slf4j:slf4j-api:1.7.10 -> 1.7.25 -| | | | | | +--- org.apache.hadoop:hadoop-annotations:2.7.3 -| | | | | | +--- com.google.inject.extensions:guice-servlet:3.0 (*) -| | | | | | +--- com.google.protobuf:protobuf-java:2.5.0 -| | | | | | +--- com.google.inject:guice:3.0 (*) -| | | | | | +--- com.sun.jersey:jersey-json:1.9 (*) -| | | | | | +--- com.sun.jersey.contribs:jersey-guice:1.9 (*) -| | | | | | +--- org.apache.hadoop:hadoop-yarn-server-common:2.7.3 (*) -| | | | | | \--- org.fusesource.leveldbjni:leveldbjni-all:1.8 -| | | | | +--- org.apache.hadoop:hadoop-mapreduce-client-common:2.7.3 (*) -| | | | | +--- org.fusesource.leveldbjni:leveldbjni-all:1.8 -| | | | | +--- com.google.protobuf:protobuf-java:2.5.0 -| | | | | +--- org.slf4j:slf4j-api:1.7.10 -> 1.7.25 -| | | | | +--- org.apache.hadoop:hadoop-annotations:2.7.3 -| | | | | +--- com.google.inject.extensions:guice-servlet:3.0 (*) -| | | | | \--- io.netty:netty:3.6.2.Final -> 3.9.9.Final -| | | | +--- com.google.protobuf:protobuf-java:2.5.0 -| | | | +--- org.slf4j:slf4j-api:1.7.10 -> 1.7.25 -| | | | +--- org.apache.hadoop:hadoop-annotations:2.7.3 -| | | | +--- com.google.inject.extensions:guice-servlet:3.0 (*) -| | | | \--- io.netty:netty:3.6.2.Final -> 3.9.9.Final -| | | +--- org.apache.hadoop:hadoop-yarn-api:2.7.3 (*) -| | | +--- org.apache.hadoop:hadoop-mapreduce-client-core:2.7.3 (*) -| | | +--- org.apache.hadoop:hadoop-mapreduce-client-jobclient:2.7.3 -| | | | +--- org.apache.hadoop:hadoop-mapreduce-client-common:2.7.3 (*) -| | | | +--- org.apache.hadoop:hadoop-mapreduce-client-shuffle:2.7.3 (*) -| | | | +--- com.google.protobuf:protobuf-java:2.5.0 -| | | | +--- org.slf4j:slf4j-api:1.7.10 -> 1.7.25 -| | | | +--- org.apache.hadoop:hadoop-annotations:2.7.3 -| | | | +--- com.google.inject.extensions:guice-servlet:3.0 (*) -| | | | \--- io.netty:netty:3.6.2.Final -> 3.9.9.Final -| | | \--- org.apache.hadoop:hadoop-annotations:2.7.3 -| | +--- org.slf4j:slf4j-api -> 1.7.25 -| | +--- com.github.stephenc.findbugs:findbugs-annotations:1.3.9-1 -| | +--- project :iceberg-api (*) -| | +--- project :iceberg-core -| | | +--- project :iceberg-core (*) -| | | +--- org.slf4j:slf4j-api:1.7.22 -> 1.7.25 (c) -| | | +--- junit:junit:4.12 (c) -| | | +--- joda-time:joda-time:2.9.9 (c) -| | | +--- org.mockito:mockito-core:1.10.19 (c) -| | | +--- org.apache.avro:avro:1.9.2 (c) -| | | +--- org.slf4j:slf4j-simple:1.7.5 (c) -| | | +--- org.apache.arrow:arrow-vector:0.14.1 (c) -| | | +--- com.github.ben-manes.caffeine:caffeine:2.7.0 (c) -| | | +--- org.apache.hive:hive-metastore:2.3.6 (c) -| | | +--- org.apache.hive:hive-exec:2.3.6 (c) -| | | +--- org.apache.parquet:parquet-avro:1.11.0 (c) -| | | +--- org.apache.commons:commons-lang3:3.9 (c) -| | | +--- org.apache.pig:pig:0.14.0 (c) -| | | +--- org.apache.spark:spark-hive_2.11:2.4.5 (c) -| | | +--- org.apache.spark:spark-avro_2.11:2.4.5 (c) -| | | +--- org.apache.hadoop:hadoop-client:2.7.3 (*) -| | | +--- org.slf4j:slf4j-api -> 1.7.25 -| | | +--- com.github.stephenc.findbugs:findbugs-annotations:1.3.9-1 -| | | +--- project :iceberg-api (*) -| | | +--- project :iceberg-common -| | | | +--- project :iceberg-common (*) -| | | | +--- org.slf4j:slf4j-api:1.7.22 -> 1.7.25 (c) -| | | | +--- junit:junit:4.12 (c) -| | | | +--- joda-time:joda-time:2.9.9 (c) -| | | | +--- org.mockito:mockito-core:1.10.19 (c) -| | | | +--- org.apache.avro:avro:1.9.2 (c) -| | | | +--- org.slf4j:slf4j-simple:1.7.5 (c) -| | | | +--- org.apache.arrow:arrow-vector:0.14.1 (c) -| | | | +--- com.github.ben-manes.caffeine:caffeine:2.7.0 (c) -| | | | +--- org.apache.hive:hive-metastore:2.3.6 (c) -| | | | +--- org.apache.hive:hive-exec:2.3.6 (c) -| | | | +--- org.apache.parquet:parquet-avro:1.11.0 (c) -| | | | +--- org.apache.commons:commons-lang3:3.9 (c) -| | | | +--- org.apache.pig:pig:0.14.0 (c) -| | | | +--- org.apache.spark:spark-hive_2.11:2.4.5 (c) -| | | | +--- org.apache.spark:spark-avro_2.11:2.4.5 (c) -| | | | +--- org.slf4j:slf4j-api -> 1.7.25 -| | | | +--- com.github.stephenc.findbugs:findbugs-annotations:1.3.9-1 -| | | | +--- junit:junit -> 4.12 (*) -| | | | +--- org.slf4j:slf4j-simple -> 1.7.5 (*) -| | | | +--- org.mockito:mockito-core -> 1.10.19 (*) -| | | | +--- org.slf4j:slf4j-api -> 1.7.25 -| | | | \--- com.github.stephenc.findbugs:findbugs-annotations:1.3.9-1 -| | | +--- org.apache.avro:avro -> 1.9.2 (*) -| | | +--- com.fasterxml.jackson.core:jackson-databind:2.10.0 -> 2.10.2 (*) -| | | +--- com.fasterxml.jackson.core:jackson-core:2.10.0 -> 2.10.2 -| | | +--- com.github.ben-manes.caffeine:caffeine -> 2.7.0 -| | | | +--- org.checkerframework:checker-qual:2.6.0 -> 2.8.1 -| | | | \--- com.google.errorprone:error_prone_annotations:2.3.3 -| | | +--- junit:junit -> 4.12 (*) -| | | +--- org.slf4j:slf4j-simple -> 1.7.5 (*) -| | | +--- org.mockito:mockito-core -> 1.10.19 (*) -| | | +--- org.slf4j:slf4j-api -> 1.7.25 -| | | +--- com.github.stephenc.findbugs:findbugs-annotations:1.3.9-1 -| | | +--- org.apache.avro:avro -> 1.9.2 (*) -| | | +--- com.fasterxml.jackson.core:jackson-databind:2.10.0 -> 2.10.2 (*) -| | | +--- com.fasterxml.jackson.core:jackson-core:2.10.0 -> 2.10.2 -| | | +--- com.github.ben-manes.caffeine:caffeine -> 2.7.0 (*) -| | | \--- org.apache.hadoop:hadoop-client:2.7.3 (*) -| | +--- org.apache.parquet:parquet-avro -> 1.11.0 -| | | +--- org.apache.parquet:parquet-column:1.11.0 -| | | | +--- org.apache.parquet:parquet-common:1.11.0 -| | | | | +--- org.apache.parquet:parquet-format-structures:1.11.0 -| | | | | | +--- org.slf4j:slf4j-api:1.7.22 -> 1.7.25 -| | | | | | \--- javax.annotation:javax.annotation-api:1.3.2 -| | | | | +--- org.slf4j:slf4j-api:1.7.22 -> 1.7.25 -| | | | | \--- org.apache.yetus:audience-annotations:0.11.0 -| | | | \--- org.apache.parquet:parquet-encoding:1.11.0 -| | | | \--- org.apache.parquet:parquet-common:1.11.0 (*) -| | | +--- org.apache.parquet:parquet-hadoop:1.11.0 -| | | | +--- org.apache.parquet:parquet-column:1.11.0 (*) -| | | | +--- org.apache.parquet:parquet-format-structures:1.11.0 (*) -| | | | +--- org.apache.parquet:parquet-jackson:1.11.0 -| | | | +--- org.xerial.snappy:snappy-java:1.1.7.3 -| | | | \--- commons-pool:commons-pool:1.6 -| | | \--- org.apache.parquet:parquet-format-structures:1.11.0 (*) -| | +--- junit:junit -> 4.12 (*) -| | +--- org.slf4j:slf4j-simple -> 1.7.5 (*) -| | +--- org.mockito:mockito-core -> 1.10.19 (*) -| | +--- org.slf4j:slf4j-api -> 1.7.25 -| | +--- com.github.stephenc.findbugs:findbugs-annotations:1.3.9-1 -| | +--- org.apache.parquet:parquet-avro -> 1.11.0 (*) -| | +--- org.apache.avro:avro -> 1.9.2 (*) -| | \--- org.apache.hadoop:hadoop-client:2.7.3 (*) -| +--- org.apache.arrow:arrow-vector -> 0.14.1 -| | +--- org.apache.arrow:arrow-format:0.14.1 -| | | \--- com.google.flatbuffers:flatbuffers-java:1.9.0 -| | +--- org.apache.arrow:arrow-memory:0.14.1 -| | | +--- com.google.code.findbugs:jsr305:3.0.2 -| | | +--- io.netty:netty-buffer:4.1.27.Final -| | | \--- org.slf4j:slf4j-api:1.7.25 -| | +--- com.fasterxml.jackson.core:jackson-core:2.9.8 -> 2.10.2 -| | +--- com.fasterxml.jackson.core:jackson-annotations:2.9.8 -> 2.10.2 -| | +--- com.fasterxml.jackson.core:jackson-databind:2.9.8 -> 2.10.2 (*) -| | +--- com.carrotsearch:hppc:0.7.2 -| | +--- commons-codec:commons-codec:1.10 -| | +--- com.google.flatbuffers:flatbuffers-java:1.9.0 -| | \--- org.slf4j:slf4j-api:1.7.25 -| +--- org.apache.arrow:arrow-memory -> 0.14.1 (*) -| +--- junit:junit -> 4.12 (*) -| +--- org.slf4j:slf4j-simple -> 1.7.5 (*) -| +--- org.mockito:mockito-core -> 1.10.19 (*) -| +--- org.slf4j:slf4j-api -> 1.7.25 -| +--- com.github.stephenc.findbugs:findbugs-annotations:1.3.9-1 -| +--- org.apache.arrow:arrow-vector -> 0.14.1 (*) -| \--- org.apache.arrow:arrow-memory -> 0.14.1 (*) -+--- project :iceberg-arrow (*) -+--- project :iceberg-common (*) -+--- project :iceberg-common (*) -+--- project :iceberg-core (*) -+--- project :iceberg-core (*) -+--- project :iceberg-data -| +--- project :iceberg-data (*) -| +--- org.slf4j:slf4j-api:1.7.22 -> 1.7.25 (c) -| +--- junit:junit:4.12 (c) -| +--- joda-time:joda-time:2.9.9 (c) -| +--- org.mockito:mockito-core:1.10.19 (c) -| +--- org.apache.avro:avro:1.9.2 (c) -| +--- org.slf4j:slf4j-simple:1.7.5 (c) -| +--- org.apache.arrow:arrow-vector:0.14.1 (c) -| +--- com.github.ben-manes.caffeine:caffeine:2.7.0 (c) -| +--- org.apache.hive:hive-metastore:2.3.6 (c) -| +--- org.apache.hive:hive-exec:2.3.6 (c) -| +--- org.apache.parquet:parquet-avro:1.11.0 (c) -| +--- org.apache.commons:commons-lang3:3.9 (c) -| +--- org.apache.pig:pig:0.14.0 (c) -| +--- org.apache.spark:spark-hive_2.11:2.4.5 (c) -| +--- org.apache.spark:spark-avro_2.11:2.4.5 (c) -| +--- project :iceberg-parquet (*) -| +--- project :iceberg-orc -| | +--- project :iceberg-orc (*) -| | +--- org.slf4j:slf4j-api:1.7.22 -> 1.7.25 (c) -| | +--- junit:junit:4.12 (c) -| | +--- joda-time:joda-time:2.9.9 (c) -| | +--- org.mockito:mockito-core:1.10.19 (c) -| | +--- org.apache.avro:avro:1.9.2 (c) -| | +--- org.slf4j:slf4j-simple:1.7.5 (c) -| | +--- org.apache.arrow:arrow-vector:0.14.1 (c) -| | +--- com.github.ben-manes.caffeine:caffeine:2.7.0 (c) -| | +--- org.apache.hive:hive-metastore:2.3.6 (c) -| | +--- org.apache.hive:hive-exec:2.3.6 (c) -| | +--- org.apache.parquet:parquet-avro:1.11.0 (c) -| | +--- org.apache.commons:commons-lang3:3.9 (c) -| | +--- org.apache.pig:pig:0.14.0 (c) -| | +--- org.apache.spark:spark-hive_2.11:2.4.5 (c) -| | +--- org.apache.spark:spark-avro_2.11:2.4.5 (c) -| | +--- org.apache.hadoop:hadoop-common:2.7.3 (*) -| | +--- org.apache.hadoop:hadoop-client:2.7.3 (*) -| | +--- org.slf4j:slf4j-api -> 1.7.25 -| | +--- com.github.stephenc.findbugs:findbugs-annotations:1.3.9-1 -| | +--- project :iceberg-api (*) -| | +--- project :iceberg-core (*) -| | +--- org.apache.orc:orc-core:1.6.2 -| | | +--- org.apache.orc:orc-shims:1.6.2 -| | | | \--- org.slf4j:slf4j-api:1.7.5 -> 1.7.25 -| | | +--- com.google.protobuf:protobuf-java:2.5.0 -| | | +--- commons-lang:commons-lang:2.6 -| | | +--- io.airlift:aircompressor:0.15 -| | | +--- javax.xml.bind:jaxb-api:2.2.11 -| | | +--- org.jetbrains:annotations:17.0.0 -| | | \--- org.slf4j:slf4j-api:1.7.5 -> 1.7.25 -| | +--- junit:junit -> 4.12 (*) -| | +--- org.slf4j:slf4j-simple -> 1.7.5 (*) -| | +--- org.mockito:mockito-core -> 1.10.19 (*) -| | +--- org.slf4j:slf4j-api -> 1.7.25 -| | +--- com.github.stephenc.findbugs:findbugs-annotations:1.3.9-1 -| | +--- org.apache.orc:orc-core:1.6.2 (*) -| | +--- org.apache.hadoop:hadoop-common:2.7.3 (*) -| | \--- org.apache.hadoop:hadoop-client:2.7.3 (*) -| +--- org.apache.hadoop:hadoop-common:2.7.3 (*) -| +--- org.slf4j:slf4j-api -> 1.7.25 -| +--- com.github.stephenc.findbugs:findbugs-annotations:1.3.9-1 -| +--- project :iceberg-api (*) -| +--- project :iceberg-core (*) -| +--- junit:junit -> 4.12 (*) -| +--- org.slf4j:slf4j-simple -> 1.7.5 (*) -| +--- org.mockito:mockito-core -> 1.10.19 (*) -| +--- org.apache.hadoop:hadoop-client:2.7.3 (*) -| +--- org.slf4j:slf4j-api -> 1.7.25 -| +--- com.github.stephenc.findbugs:findbugs-annotations:1.3.9-1 -| \--- org.apache.hadoop:hadoop-common:2.7.3 (*) -+--- project :iceberg-data (*) -+--- project :iceberg-hive -| +--- project :iceberg-hive (*) -| +--- org.slf4j:slf4j-api:1.7.22 -> 1.7.25 (c) -| +--- junit:junit:4.12 (c) -| +--- joda-time:joda-time:2.9.9 (c) -| +--- org.mockito:mockito-core:1.10.19 (c) -| +--- org.apache.avro:avro:1.9.2 (c) -| +--- org.slf4j:slf4j-simple:1.7.5 (c) -| +--- org.apache.arrow:arrow-vector:0.14.1 (c) -| +--- com.github.ben-manes.caffeine:caffeine:2.7.0 (c) -| +--- org.apache.hive:hive-metastore:2.3.6 (c) -| +--- org.apache.hive:hive-exec:2.3.6 (c) -| +--- org.apache.parquet:parquet-avro:1.11.0 (c) -| +--- org.apache.commons:commons-lang3:3.9 (c) -| +--- org.apache.pig:pig:0.14.0 (c) -| +--- org.apache.spark:spark-hive_2.11:2.4.5 (c) -| +--- org.apache.spark:spark-avro_2.11:2.4.5 (c) -| +--- org.apache.avro:avro -> 1.9.2 (*) -| +--- org.apache.hive:hive-metastore -> 2.3.6 -| | +--- org.apache.hive:hive-serde:2.3.6 -| | | +--- org.apache.hive:hive-common:2.3.6 -| | | | +--- org.apache.hive:hive-shims:2.3.6 -| | | | | +--- org.apache.hive.shims:hive-shims-common:2.3.6 -| | | | | | +--- com.google.guava:guava:14.0.1 -> 28.0-jre (*) -| | | | | | +--- commons-lang:commons-lang:2.6 -| | | | | | +--- org.apache.thrift:libthrift:0.9.3 -| | | | | | | +--- org.slf4j:slf4j-api:1.7.12 -> 1.7.25 -| | | | | | | +--- org.apache.httpcomponents:httpclient:4.4.1 -> 4.5.6 (*) -| | | | | | | \--- org.apache.httpcomponents:httpcore:4.4.1 -> 4.4.10 -| | | | | | +--- org.apache.curator:curator-framework:2.7.1 (*) -| | | | | | +--- org.apache.zookeeper:zookeeper:3.4.6 (*) -| | | | | | \--- org.slf4j:slf4j-api:1.7.10 -> 1.7.25 -| | | | | +--- org.apache.hive.shims:hive-shims-0.23:2.3.6 -| | | | | | +--- org.apache.hive.shims:hive-shims-common:2.3.6 (*) -| | | | | | +--- commons-lang:commons-lang:2.6 -| | | | | | +--- org.apache.hadoop:hadoop-yarn-server-resourcemanager:2.7.2 -> 2.7.3 -| | | | | | | +--- javax.servlet:servlet-api:2.5 -| | | | | | | +--- org.slf4j:slf4j-api:1.7.10 -> 1.7.25 -| | | | | | | +--- org.apache.hadoop:hadoop-annotations:2.7.3 -| | | | | | | +--- com.google.inject.extensions:guice-servlet:3.0 (*) -| | | | | | | +--- com.google.protobuf:protobuf-java:2.5.0 -| | | | | | | +--- commons-io:commons-io:2.4 -| | | | | | | +--- com.google.inject:guice:3.0 (*) -| | | | | | | +--- com.sun.jersey:jersey-json:1.9 (*) -| | | | | | | +--- com.sun.jersey.contribs:jersey-guice:1.9 (*) -| | | | | | | +--- org.apache.hadoop:hadoop-yarn-common:2.7.3 (*) -| | | | | | | +--- org.apache.hadoop:hadoop-yarn-api:2.7.3 (*) -| | | | | | | +--- javax.xml.bind:jaxb-api:2.2.2 -> 2.2.11 -| | | | | | | +--- org.codehaus.jettison:jettison:1.1 -| | | | | | | +--- commons-lang:commons-lang:2.6 -| | | | | | | +--- com.sun.jersey:jersey-core:1.9 -| | | | | | | +--- com.sun.jersey:jersey-client:1.9 (*) -| | | | | | | +--- com.google.guava:guava:11.0.2 -> 28.0-jre (*) -| | | | | | | +--- commons-logging:commons-logging:1.1.3 -> 1.2 -| | | | | | | +--- log4j:log4j:1.2.17 -| | | | | | | +--- org.apache.hadoop:hadoop-yarn-server-common:2.7.3 (*) -| | | | | | | +--- org.apache.hadoop:hadoop-yarn-server-applicationhistoryservice:2.7.3 -| | | | | | | | +--- javax.servlet:servlet-api:2.5 -| | | | | | | | +--- org.apache.hadoop:hadoop-annotations:2.7.3 -| | | | | | | | +--- com.google.inject.extensions:guice-servlet:3.0 (*) -| | | | | | | | +--- com.google.protobuf:protobuf-java:2.5.0 -| | | | | | | | +--- com.google.inject:guice:3.0 (*) -| | | | | | | | +--- com.sun.jersey:jersey-json:1.9 (*) -| | | | | | | | +--- com.sun.jersey.contribs:jersey-guice:1.9 (*) -| | | | | | | | +--- org.apache.hadoop:hadoop-yarn-common:2.7.3 (*) -| | | | | | | | +--- org.apache.hadoop:hadoop-yarn-api:2.7.3 (*) -| | | | | | | | +--- javax.xml.bind:jaxb-api:2.2.2 -> 2.2.11 -| | | | | | | | +--- org.codehaus.jettison:jettison:1.1 -| | | | | | | | +--- com.sun.jersey:jersey-core:1.9 -| | | | | | | | +--- com.sun.jersey:jersey-client:1.9 (*) -| | | | | | | | +--- com.google.guava:guava:11.0.2 -> 28.0-jre (*) -| | | | | | | | +--- commons-logging:commons-logging:1.1.3 -> 1.2 -| | | | | | | | +--- org.apache.hadoop:hadoop-yarn-server-common:2.7.3 (*) -| | | | | | | | +--- commons-collections:commons-collections:3.2.2 -| | | | | | | | \--- org.fusesource.leveldbjni:leveldbjni-all:1.8 -| | | | | | | +--- org.apache.hadoop:hadoop-yarn-server-web-proxy:2.7.3 (*) -| | | | | | | +--- org.apache.zookeeper:zookeeper:3.4.6 (*) -| | | | | | | \--- org.fusesource.leveldbjni:leveldbjni-all:1.8 -| | | | | | \--- org.slf4j:slf4j-api:1.7.10 -> 1.7.25 -| | | | | +--- org.apache.hive.shims:hive-shims-scheduler:2.3.6 -| | | | | | +--- org.apache.hive.shims:hive-shims-common:2.3.6 (*) -| | | | | | \--- org.slf4j:slf4j-api:1.7.10 -> 1.7.25 -| | | | | \--- org.slf4j:slf4j-api:1.7.10 -> 1.7.25 -| | | | +--- org.apache.hive:hive-storage-api:2.4.0 -| | | | | +--- commons-lang:commons-lang:2.6 -| | | | | \--- org.slf4j:slf4j-api:1.7.10 -> 1.7.25 -| | | | +--- commons-cli:commons-cli:1.2 -| | | | +--- commons-lang:commons-lang:2.6 -| | | | +--- org.apache.commons:commons-lang3:3.1 -> 3.9 -| | | | +--- org.apache.orc:orc-core:1.3.4 -> 1.6.2 (*) -| | | | +--- jline:jline:2.12 -| | | | +--- joda-time:joda-time:2.8.1 -> 2.9.9 -| | | | +--- org.apache.commons:commons-compress:1.9 -> 1.19 -| | | | +--- org.apache.ant:ant:1.9.1 -| | | | | \--- org.apache.ant:ant-launcher:1.9.1 -| | | | +--- io.dropwizard.metrics:metrics-core:3.1.0 -> 3.1.5 -| | | | | \--- org.slf4j:slf4j-api:1.7.7 -> 1.7.25 -| | | | +--- io.dropwizard.metrics:metrics-jvm:3.1.0 -> 3.1.5 -| | | | | +--- io.dropwizard.metrics:metrics-core:3.1.5 (*) -| | | | | \--- org.slf4j:slf4j-api:1.7.7 -> 1.7.25 -| | | | +--- io.dropwizard.metrics:metrics-json:3.1.0 -> 3.1.5 -| | | | | +--- io.dropwizard.metrics:metrics-core:3.1.5 (*) -| | | | | +--- com.fasterxml.jackson.core:jackson-databind:2.4.2 -> 2.10.2 (*) -| | | | | \--- org.slf4j:slf4j-api:1.7.7 -> 1.7.25 -| | | | +--- com.fasterxml.jackson.core:jackson-databind:2.6.5 -> 2.10.2 (*) -| | | | +--- com.github.joshelser:dropwizard-metrics-hadoop-metrics2-reporter:0.1.2 -| | | | | +--- io.dropwizard.metrics:metrics-core:3.1.2 -> 3.1.5 (*) -| | | | | +--- org.apache.hadoop:hadoop-common:2.6.0 -> 2.7.3 (*) -| | | | | \--- org.slf4j:slf4j-api:1.7.14 -> 1.7.25 -| | | | \--- org.slf4j:slf4j-api:1.7.10 -> 1.7.25 -| | | +--- org.apache.hive:hive-service-rpc:2.3.6 -| | | | +--- commons-codec:commons-codec:1.4 -> 1.10 -| | | | +--- commons-cli:commons-cli:1.2 -| | | | +--- tomcat:jasper-compiler:5.5.23 -| | | | | +--- javax.servlet:jsp-api:2.0 -| | | | | | \--- javax.servlet:servlet-api:2.4 -> 2.5 -| | | | | \--- ant:ant:1.6.5 -| | | | +--- tomcat:jasper-runtime:5.5.23 -| | | | | +--- javax.servlet:servlet-api:2.4 -> 2.5 -| | | | | \--- commons-el:commons-el:1.0 -| | | | | \--- commons-logging:commons-logging:1.0.3 -> 1.2 -| | | | +--- org.apache.thrift:libfb303:0.9.3 -| | | | | \--- org.apache.thrift:libthrift:0.9.3 (*) -| | | | +--- org.apache.thrift:libthrift:0.9.3 (*) -| | | | \--- org.slf4j:slf4j-api:1.7.10 -> 1.7.25 -| | | +--- org.apache.hive:hive-shims:2.3.6 (*) -| | | +--- commons-codec:commons-codec:1.4 -> 1.10 -| | | +--- commons-lang:commons-lang:2.6 -| | | +--- org.apache.thrift:libthrift:0.9.3 (*) -| | | +--- net.sf.opencsv:opencsv:2.3 -| | | \--- org.slf4j:slf4j-api:1.7.10 -> 1.7.25 -| | +--- org.apache.hive:hive-shims:2.3.6 (*) -| | +--- javolution:javolution:5.5.1 -| | +--- com.google.guava:guava:14.0.1 -> 28.0-jre (*) -| | +--- com.google.protobuf:protobuf-java:2.5.0 -| | +--- com.jolbox:bonecp:0.8.0.RELEASE -| | | +--- com.google.guava:guava:15.0 -> 28.0-jre (*) -| | | \--- org.slf4j:slf4j-api:1.7.2 -> 1.7.25 -| | +--- commons-cli:commons-cli:1.2 -| | +--- commons-lang:commons-lang:2.6 -| | +--- org.apache.derby:derby:10.10.2.0 -> 10.12.1.1 -| | +--- org.datanucleus:datanucleus-api-jdo:4.2.4 -| | +--- org.datanucleus:datanucleus-core:4.1.17 -| | +--- org.datanucleus:datanucleus-rdbms:4.1.19 -| | +--- commons-pool:commons-pool:1.5.4 -> 1.6 -| | +--- commons-dbcp:commons-dbcp:1.4 -| | | \--- commons-pool:commons-pool:1.5.4 -> 1.6 -| | +--- javax.jdo:jdo-api:3.0.1 -| | | \--- javax.transaction:jta:1.1 -| | +--- org.datanucleus:javax.jdo:3.2.0-m3 -| | +--- org.antlr:antlr-runtime:3.5.2 -| | +--- org.apache.thrift:libfb303:0.9.3 (*) -| | +--- org.apache.thrift:libthrift:0.9.3 (*) -| | \--- org.slf4j:slf4j-api:1.7.10 -> 1.7.25 -| +--- org.apache.hadoop:hadoop-client:2.7.3 (*) -| +--- org.slf4j:slf4j-api -> 1.7.25 -| +--- com.github.stephenc.findbugs:findbugs-annotations:1.3.9-1 -| +--- project :iceberg-core (*) -| +--- junit:junit -> 4.12 (*) -| +--- org.slf4j:slf4j-simple -> 1.7.5 (*) -| +--- org.mockito:mockito-core -> 1.10.19 (*) -| +--- org.apache.hive:hive-exec -> 2.3.6 -| | +--- org.apache.hive:hive-vector-code-gen:2.3.6 -| | | +--- commons-lang:commons-lang:2.6 -| | | +--- com.google.guava:guava:14.0.1 -> 28.0-jre (*) -| | | +--- org.apache.ant:ant:1.9.1 (*) -| | | +--- org.apache.velocity:velocity:1.5 -| | | | +--- commons-lang:commons-lang:2.1 -> 2.6 -| | | | \--- oro:oro:2.0.8 -| | | \--- org.slf4j:slf4j-api:1.7.10 -> 1.7.25 -| | +--- org.apache.hive:hive-shims:2.3.6 (*) -| | +--- commons-codec:commons-codec:1.4 -> 1.10 -| | +--- commons-httpclient:commons-httpclient:3.0.1 -> 3.1 (*) -| | +--- commons-io:commons-io:2.4 -| | +--- org.antlr:antlr-runtime:3.5.2 -| | +--- org.antlr:ST4:4.0.4 -| | | \--- org.antlr:antlr-runtime:3.3 -> 3.5.2 -| | +--- org.apache.ant:ant:1.9.1 (*) -| | +--- org.apache.commons:commons-compress:1.9 -> 1.19 -| | +--- org.apache.ivy:ivy:2.4.0 -| | +--- org.apache.zookeeper:zookeeper:3.4.6 (*) -| | +--- org.apache.curator:curator-framework:2.7.1 (*) -| | +--- org.apache.curator:apache-curator:2.7.1 -| | | +--- org.apache.zookeeper:zookeeper:3.4.6 (*) -| | | \--- com.google.guava:guava:16.0.1 -> 28.0-jre (*) -| | +--- org.codehaus.groovy:groovy-all:2.4.4 -| | +--- org.datanucleus:datanucleus-core:4.1.17 -| | +--- com.google.code.gson:gson:2.2.4 -| | +--- stax:stax-api:1.0.1 -| | \--- org.slf4j:slf4j-api:1.7.10 -> 1.7.25 -| +--- org.apache.hive:hive-metastore -> 2.3.6 (*) -| +--- project :iceberg-api (*) -| +--- org.slf4j:slf4j-api -> 1.7.25 -| +--- com.github.stephenc.findbugs:findbugs-annotations:1.3.9-1 -| +--- org.apache.avro:avro -> 1.9.2 (*) -| \--- org.apache.hadoop:hadoop-client:2.7.3 (*) -+--- project :iceberg-hive (*) -+--- project :iceberg-mr -| +--- project :iceberg-mr (*) -| +--- org.slf4j:slf4j-api:1.7.22 -> 1.7.25 (c) -| +--- junit:junit:4.12 (c) -| +--- joda-time:joda-time:2.9.9 (c) -| +--- org.mockito:mockito-core:1.10.19 (c) -| +--- org.apache.avro:avro:1.9.2 (c) -| +--- org.slf4j:slf4j-simple:1.7.5 (c) -| +--- org.apache.arrow:arrow-vector:0.14.1 (c) -| +--- com.github.ben-manes.caffeine:caffeine:2.7.0 (c) -| +--- org.apache.hive:hive-metastore:2.3.6 (c) -| +--- org.apache.hive:hive-exec:2.3.6 (c) -| +--- org.apache.parquet:parquet-avro:1.11.0 (c) -| +--- org.apache.commons:commons-lang3:3.9 (c) -| +--- org.apache.pig:pig:0.14.0 (c) -| +--- org.apache.spark:spark-hive_2.11:2.4.5 (c) -| +--- org.apache.spark:spark-avro_2.11:2.4.5 (c) -| +--- org.apache.hadoop:hadoop-client:2.7.3 (*) -| +--- org.slf4j:slf4j-api -> 1.7.25 -| +--- com.github.stephenc.findbugs:findbugs-annotations:1.3.9-1 -| +--- project :iceberg-api (*) -| +--- project :iceberg-core (*) -| +--- project :iceberg-orc (*) -| +--- project :iceberg-parquet (*) -| +--- project :iceberg-data (*) -| +--- junit:junit -> 4.12 (*) -| +--- org.slf4j:slf4j-simple -> 1.7.5 (*) -| +--- org.mockito:mockito-core -> 1.10.19 (*) -| +--- org.slf4j:slf4j-api -> 1.7.25 -| +--- com.github.stephenc.findbugs:findbugs-annotations:1.3.9-1 -| \--- org.apache.hadoop:hadoop-client:2.7.3 (*) -+--- project :iceberg-mr (*) -+--- project :iceberg-orc (*) -+--- project :iceberg-orc (*) -+--- project :iceberg-parquet (*) -+--- project :iceberg-parquet (*) -+--- project :iceberg-pig -| +--- project :iceberg-pig (*) -| +--- org.slf4j:slf4j-api:1.7.22 -> 1.7.25 (c) -| +--- junit:junit:4.12 (c) -| +--- joda-time:joda-time:2.9.9 (c) -| +--- org.mockito:mockito-core:1.10.19 (c) -| +--- org.apache.avro:avro:1.9.2 (c) -| +--- org.slf4j:slf4j-simple:1.7.5 (c) -| +--- org.apache.arrow:arrow-vector:0.14.1 (c) -| +--- com.github.ben-manes.caffeine:caffeine:2.7.0 (c) -| +--- org.apache.hive:hive-metastore:2.3.6 (c) -| +--- org.apache.hive:hive-exec:2.3.6 (c) -| +--- org.apache.parquet:parquet-avro:1.11.0 (c) -| +--- org.apache.commons:commons-lang3:3.9 (c) -| +--- org.apache.pig:pig:0.14.0 (c) -| +--- org.apache.spark:spark-hive_2.11:2.4.5 (c) -| +--- org.apache.spark:spark-avro_2.11:2.4.5 (c) -| +--- org.apache.pig:pig -> 0.14.0 -| | +--- commons-cli:commons-cli:1.2 -| | +--- xmlenc:xmlenc:0.52 -| | +--- commons-httpclient:commons-httpclient:3.1 (*) -| | +--- commons-codec:commons-codec:1.4 -> 1.10 -| | +--- commons-net:commons-net:1.4.1 -> 3.1 -| | +--- tomcat:jasper-runtime:5.5.12 -> 5.5.23 (*) -| | +--- tomcat:jasper-compiler:5.5.12 -> 5.5.23 (*) -| | +--- commons-el:commons-el:1.0 (*) -| | +--- net.java.dev.jets3t:jets3t:0.7.1 -> 0.9.0 (*) -| | +--- net.sf.kosmosfs:kfs:0.3 -| | +--- hsqldb:hsqldb:1.8.0.10 -| | +--- oro:oro:2.0.8 -| | +--- jline:jline:1.0 -> 2.12 -| | +--- org.antlr:ST4:4.0.4 (*) -| | +--- org.antlr:antlr-runtime:3.4 -> 3.5.2 -| | +--- dk.brics.automaton:automaton:1.11-8 -| | +--- com.google.guava:guava:11.0 -> 28.0-jre (*) -| | +--- org.codehaus.jackson:jackson-mapper-asl:1.8.8 -> 1.9.13 (*) -| | +--- org.codehaus.jackson:jackson-core-asl:1.8.8 -> 1.9.13 -| | +--- joda-time:joda-time:2.1 -> 2.9.9 -| | \--- org.apache.avro:avro:1.7.4 -> 1.9.2 (*) -| +--- org.apache.hadoop:hadoop-mapreduce-client-core:2.7.3 (*) -| +--- org.apache.hadoop:hadoop-client:2.7.3 (*) -| +--- org.slf4j:slf4j-api -> 1.7.25 -| +--- com.github.stephenc.findbugs:findbugs-annotations:1.3.9-1 -| +--- project :iceberg-api (*) -| +--- project :iceberg-common (*) -| +--- project :iceberg-core (*) -| +--- project :iceberg-parquet (*) -| +--- org.apache.commons:commons-lang3 -> 3.9 -| +--- junit:junit -> 4.12 (*) -| +--- org.slf4j:slf4j-simple -> 1.7.5 (*) -| +--- org.mockito:mockito-core -> 1.10.19 (*) -| +--- org.apache.hadoop:hadoop-hdfs:2.7.3 (*) -| +--- org.apache.hadoop:hadoop-common:2.7.3 (*) -| +--- org.apache.hadoop:hadoop-minicluster:2.7.3 -| | +--- org.apache.hadoop:hadoop-common:2.7.3 (*) -| | +--- org.apache.hadoop:hadoop-hdfs:2.7.3 (*) -| | +--- org.apache.hadoop:hadoop-yarn-server-tests:2.7.3 -| | | +--- org.apache.hadoop:hadoop-annotations:2.7.3 -| | | +--- org.apache.hadoop:hadoop-yarn-server-common:2.7.3 (*) -| | | +--- org.apache.hadoop:hadoop-yarn-server-nodemanager:2.7.3 (*) -| | | +--- org.apache.hadoop:hadoop-yarn-server-resourcemanager:2.7.3 (*) -| | | +--- org.apache.hadoop:hadoop-yarn-common:2.7.3 (*) -| | | +--- org.apache.hadoop:hadoop-yarn-api:2.7.3 (*) -| | | +--- com.google.guava:guava:11.0.2 -> 28.0-jre (*) -| | | \--- commons-logging:commons-logging:1.1.3 -> 1.2 -| | +--- org.apache.hadoop:hadoop-mapreduce-client-jobclient:2.7.3 (*) -| | +--- org.apache.hadoop:hadoop-mapreduce-client-app:2.7.3 (*) -| | +--- org.apache.hadoop:hadoop-yarn-api:2.7.3 (*) -| | +--- org.apache.hadoop:hadoop-mapreduce-client-core:2.7.3 (*) -| | \--- org.apache.hadoop:hadoop-mapreduce-client-hs:2.7.3 -| | +--- org.apache.hadoop:hadoop-hdfs:2.7.3 (*) -| | +--- org.apache.hadoop:hadoop-mapreduce-client-common:2.7.3 (*) -| | +--- org.apache.hadoop:hadoop-mapreduce-client-app:2.7.3 (*) -| | +--- org.fusesource.leveldbjni:leveldbjni-all:1.8 -| | +--- com.google.protobuf:protobuf-java:2.5.0 -| | +--- org.slf4j:slf4j-api:1.7.10 -> 1.7.25 -| | +--- org.apache.hadoop:hadoop-annotations:2.7.3 -| | +--- com.google.inject.extensions:guice-servlet:3.0 (*) -| | \--- io.netty:netty:3.6.2.Final -> 3.9.9.Final -| +--- org.slf4j:slf4j-api -> 1.7.25 -| +--- com.github.stephenc.findbugs:findbugs-annotations:1.3.9-1 -| +--- org.apache.commons:commons-lang3 -> 3.9 -| +--- org.apache.pig:pig -> 0.14.0 (*) -| +--- org.apache.hadoop:hadoop-mapreduce-client-core:2.7.3 (*) -| \--- org.apache.hadoop:hadoop-client:2.7.3 (*) -+--- project :iceberg-pig (*) -+--- project :iceberg-relocate-external-dependencies (*) -+--- project :iceberg-relocate-external-dependencies (*) -+--- project :iceberg-spark -| +--- project :iceberg-spark (*) -| +--- org.slf4j:slf4j-api:1.7.22 -> 1.7.25 (c) -| +--- junit:junit:4.12 (c) -| +--- joda-time:joda-time:2.9.9 (c) -| +--- org.mockito:mockito-core:1.10.19 (c) -| +--- org.apache.avro:avro:1.9.2 (c) -| +--- org.slf4j:slf4j-simple:1.7.5 (c) -| +--- org.apache.arrow:arrow-vector:0.14.1 (c) -| +--- com.github.ben-manes.caffeine:caffeine:2.7.0 (c) -| +--- org.apache.hive:hive-metastore:2.3.6 (c) -| +--- org.apache.hive:hive-exec:2.3.6 (c) -| +--- org.apache.parquet:parquet-avro:1.11.0 (c) -| +--- org.apache.commons:commons-lang3:3.9 (c) -| +--- org.apache.pig:pig:0.14.0 (c) -| +--- org.apache.spark:spark-hive_2.11:2.4.5 (c) -| +--- org.apache.spark:spark-avro_2.11:2.4.5 (c) -| +--- org.apache.avro:avro -> 1.9.2 (*) -| +--- org.apache.spark:spark-hive_2.11 -> 2.4.5 -| | +--- com.twitter:parquet-hadoop-bundle:1.6.0 -| | +--- org.apache.spark:spark-core_2.11:2.4.5 -| | | +--- com.thoughtworks.paranamer:paranamer:2.8 -| | | +--- org.apache.avro:avro-mapred:1.8.2 -| | | | +--- org.apache.avro:avro-ipc:1.8.2 -| | | | | +--- org.codehaus.jackson:jackson-core-asl:1.9.13 -| | | | | +--- org.codehaus.jackson:jackson-mapper-asl:1.9.13 (*) -| | | | | \--- org.slf4j:slf4j-api:1.7.7 -> 1.7.25 -| | | | +--- org.codehaus.jackson:jackson-core-asl:1.9.13 -| | | | +--- org.codehaus.jackson:jackson-mapper-asl:1.9.13 (*) -| | | | +--- commons-codec:commons-codec:1.9 -> 1.10 -| | | | \--- org.slf4j:slf4j-api:1.7.7 -> 1.7.25 -| | | +--- com.twitter:chill_2.11:0.9.3 -| | | | +--- org.scala-lang:scala-library:2.11.12 -| | | | +--- com.twitter:chill-java:0.9.3 -| | | | | \--- com.esotericsoftware:kryo-shaded:4.0.2 -| | | | | +--- com.esotericsoftware:minlog:1.3.0 -| | | | | \--- org.objenesis:objenesis:2.5.1 -| | | | \--- com.esotericsoftware:kryo-shaded:4.0.2 (*) -| | | +--- com.twitter:chill-java:0.9.3 (*) -| | | +--- org.apache.xbean:xbean-asm6-shaded:4.8 -| | | +--- org.apache.hadoop:hadoop-client:2.6.5 -> 2.7.3 (*) -| | | +--- org.apache.spark:spark-launcher_2.11:2.4.5 -| | | | +--- org.apache.spark:spark-tags_2.11:2.4.5 -| | | | | +--- org.scala-lang:scala-library:2.11.12 -| | | | | \--- org.spark-project.spark:unused:1.0.0 -| | | | \--- org.spark-project.spark:unused:1.0.0 -| | | +--- org.apache.spark:spark-kvstore_2.11:2.4.5 -| | | | +--- org.apache.spark:spark-tags_2.11:2.4.5 (*) -| | | | +--- org.fusesource.leveldbjni:leveldbjni-all:1.8 -| | | | +--- com.fasterxml.jackson.core:jackson-core:2.6.7 -> 2.10.2 -| | | | +--- com.fasterxml.jackson.core:jackson-databind:2.6.7.3 -> 2.10.2 (*) -| | | | +--- com.fasterxml.jackson.core:jackson-annotations:2.6.7 -> 2.10.2 -| | | | \--- org.spark-project.spark:unused:1.0.0 -| | | +--- org.apache.spark:spark-network-common_2.11:2.4.5 -| | | | +--- io.netty:netty-all:4.1.42.Final -| | | | +--- org.apache.commons:commons-lang3:3.5 -> 3.9 -| | | | +--- org.fusesource.leveldbjni:leveldbjni-all:1.8 -| | | | +--- com.fasterxml.jackson.core:jackson-databind:2.6.7.3 -> 2.10.2 (*) -| | | | +--- com.fasterxml.jackson.core:jackson-annotations:2.6.7 -> 2.10.2 -| | | | +--- io.dropwizard.metrics:metrics-core:3.1.5 (*) -| | | | +--- com.google.code.findbugs:jsr305:1.3.9 -> 3.0.2 -| | | | +--- org.apache.commons:commons-crypto:1.0.0 -| | | | \--- org.spark-project.spark:unused:1.0.0 -| | | +--- org.apache.spark:spark-network-shuffle_2.11:2.4.5 -| | | | +--- org.apache.spark:spark-network-common_2.11:2.4.5 (*) -| | | | +--- io.dropwizard.metrics:metrics-core:3.1.5 (*) -| | | | \--- org.spark-project.spark:unused:1.0.0 -| | | +--- org.apache.spark:spark-unsafe_2.11:2.4.5 -| | | | +--- org.apache.spark:spark-tags_2.11:2.4.5 (*) -| | | | +--- com.twitter:chill_2.11:0.9.3 (*) -| | | | +--- com.google.code.findbugs:jsr305:1.3.9 -> 3.0.2 -| | | | \--- org.spark-project.spark:unused:1.0.0 -| | | +--- javax.activation:activation:1.1.1 -| | | +--- org.apache.curator:curator-recipes:2.6.0 -> 2.7.1 (*) -| | | +--- org.apache.zookeeper:zookeeper:3.4.6 (*) -| | | +--- javax.servlet:javax.servlet-api:3.1.0 -| | | +--- org.apache.commons:commons-lang3:3.5 -> 3.9 -| | | +--- org.apache.commons:commons-math3:3.4.1 -| | | +--- com.google.code.findbugs:jsr305:1.3.9 -> 3.0.2 -| | | +--- org.slf4j:slf4j-api:1.7.16 -> 1.7.25 -| | | +--- org.slf4j:jul-to-slf4j:1.7.16 -| | | | \--- org.slf4j:slf4j-api:1.7.16 -> 1.7.25 -| | | +--- org.slf4j:jcl-over-slf4j:1.7.16 -| | | | \--- org.slf4j:slf4j-api:1.7.16 -> 1.7.25 -| | | +--- log4j:log4j:1.2.17 -| | | +--- com.ning:compress-lzf:1.0.3 -| | | +--- org.xerial.snappy:snappy-java:1.1.7.3 -| | | +--- org.lz4:lz4-java:1.4.0 -| | | +--- com.github.luben:zstd-jni:1.3.2-2 -| | | +--- org.roaringbitmap:RoaringBitmap:0.7.45 -| | | | \--- org.roaringbitmap:shims:0.7.45 -| | | +--- commons-net:commons-net:3.1 -| | | +--- org.scala-lang:scala-library:2.11.12 -| | | +--- org.json4s:json4s-jackson_2.11:3.5.3 -| | | | +--- org.scala-lang:scala-library:2.11.11 -> 2.11.12 -| | | | \--- org.json4s:json4s-core_2.11:3.5.3 -| | | | +--- org.scala-lang:scala-library:2.11.11 -> 2.11.12 -| | | | +--- org.json4s:json4s-ast_2.11:3.5.3 -| | | | | \--- org.scala-lang:scala-library:2.11.11 -> 2.11.12 -| | | | +--- org.json4s:json4s-scalap_2.11:3.5.3 -| | | | | \--- org.scala-lang:scala-library:2.11.11 -> 2.11.12 -| | | | +--- com.thoughtworks.paranamer:paranamer:2.8 -| | | | \--- org.scala-lang.modules:scala-xml_2.11:1.0.6 -| | | | \--- org.scala-lang:scala-library:2.11.8 -> 2.11.12 -| | | +--- org.glassfish.jersey.core:jersey-client:2.22.2 -| | | | +--- javax.ws.rs:javax.ws.rs-api:2.0.1 -| | | | +--- org.glassfish.jersey.core:jersey-common:2.22.2 -| | | | | +--- javax.ws.rs:javax.ws.rs-api:2.0.1 -| | | | | +--- javax.annotation:javax.annotation-api:1.2 -> 1.3.2 -| | | | | +--- org.glassfish.jersey.bundles.repackaged:jersey-guava:2.22.2 -| | | | | +--- org.glassfish.hk2:hk2-api:2.4.0-b34 -| | | | | | +--- javax.inject:javax.inject:1 -| | | | | | +--- org.glassfish.hk2:hk2-utils:2.4.0-b34 -| | | | | | | \--- javax.inject:javax.inject:1 -| | | | | | \--- org.glassfish.hk2.external:aopalliance-repackaged:2.4.0-b34 -| | | | | +--- org.glassfish.hk2.external:javax.inject:2.4.0-b34 -| | | | | +--- org.glassfish.hk2:hk2-locator:2.4.0-b34 -| | | | | | +--- org.glassfish.hk2.external:javax.inject:2.4.0-b34 -| | | | | | +--- org.glassfish.hk2.external:aopalliance-repackaged:2.4.0-b34 -| | | | | | +--- org.glassfish.hk2:hk2-api:2.4.0-b34 (*) -| | | | | | +--- org.glassfish.hk2:hk2-utils:2.4.0-b34 (*) -| | | | | | \--- org.javassist:javassist:3.18.1-GA -| | | | | \--- org.glassfish.hk2:osgi-resource-locator:1.0.1 -| | | | +--- org.glassfish.hk2:hk2-api:2.4.0-b34 (*) -| | | | +--- org.glassfish.hk2.external:javax.inject:2.4.0-b34 -| | | | \--- org.glassfish.hk2:hk2-locator:2.4.0-b34 (*) -| | | +--- org.glassfish.jersey.core:jersey-common:2.22.2 (*) -| | | +--- org.glassfish.jersey.core:jersey-server:2.22.2 -| | | | +--- org.glassfish.jersey.core:jersey-common:2.22.2 (*) -| | | | +--- org.glassfish.jersey.core:jersey-client:2.22.2 (*) -| | | | +--- javax.ws.rs:javax.ws.rs-api:2.0.1 -| | | | +--- org.glassfish.jersey.media:jersey-media-jaxb:2.22.2 -| | | | | +--- org.glassfish.jersey.core:jersey-common:2.22.2 (*) -| | | | | +--- org.glassfish.hk2:hk2-api:2.4.0-b34 (*) -| | | | | +--- org.glassfish.hk2.external:javax.inject:2.4.0-b34 -| | | | | +--- org.glassfish.hk2:hk2-locator:2.4.0-b34 (*) -| | | | | \--- org.glassfish.hk2:osgi-resource-locator:1.0.1 -| | | | +--- javax.annotation:javax.annotation-api:1.2 -> 1.3.2 -| | | | +--- org.glassfish.hk2:hk2-api:2.4.0-b34 (*) -| | | | +--- org.glassfish.hk2.external:javax.inject:2.4.0-b34 -| | | | +--- org.glassfish.hk2:hk2-locator:2.4.0-b34 (*) -| | | | \--- javax.validation:validation-api:1.1.0.Final -| | | +--- org.glassfish.jersey.containers:jersey-container-servlet:2.22.2 -| | | | +--- org.glassfish.jersey.containers:jersey-container-servlet-core:2.22.2 -| | | | | +--- org.glassfish.hk2.external:javax.inject:2.4.0-b34 -| | | | | +--- org.glassfish.jersey.core:jersey-common:2.22.2 (*) -| | | | | +--- org.glassfish.jersey.core:jersey-server:2.22.2 (*) -| | | | | \--- javax.ws.rs:javax.ws.rs-api:2.0.1 -| | | | +--- org.glassfish.jersey.core:jersey-common:2.22.2 (*) -| | | | +--- org.glassfish.jersey.core:jersey-server:2.22.2 (*) -| | | | \--- javax.ws.rs:javax.ws.rs-api:2.0.1 -| | | +--- org.glassfish.jersey.containers:jersey-container-servlet-core:2.22.2 (*) -| | | +--- io.netty:netty-all:4.1.42.Final -| | | +--- io.netty:netty:3.9.9.Final -| | | +--- com.clearspring.analytics:stream:2.7.0 -| | | +--- io.dropwizard.metrics:metrics-core:3.1.5 (*) -| | | +--- io.dropwizard.metrics:metrics-jvm:3.1.5 (*) -| | | +--- io.dropwizard.metrics:metrics-json:3.1.5 (*) -| | | +--- io.dropwizard.metrics:metrics-graphite:3.1.5 -| | | | +--- io.dropwizard.metrics:metrics-core:3.1.5 (*) -| | | | \--- org.slf4j:slf4j-api:1.7.7 -> 1.7.25 -| | | +--- com.fasterxml.jackson.core:jackson-databind:2.6.7.3 -> 2.10.2 (*) -| | | +--- com.fasterxml.jackson.module:jackson-module-scala_2.11:2.6.7.1 -> 2.10.2 -| | | | +--- org.scala-lang:scala-library:2.11.12 -| | | | +--- com.fasterxml.jackson.core:jackson-core:2.10.2 -| | | | +--- com.fasterxml.jackson.core:jackson-annotations:2.10.2 -| | | | +--- com.fasterxml.jackson.core:jackson-databind:2.10.2 (*) -| | | | \--- com.fasterxml.jackson.module:jackson-module-paranamer:2.10.2 -| | | | +--- com.fasterxml.jackson.core:jackson-databind:2.10.2 (*) -| | | | \--- com.thoughtworks.paranamer:paranamer:2.8 -| | | +--- org.apache.ivy:ivy:2.4.0 -| | | +--- oro:oro:2.0.8 -| | | +--- net.razorvine:pyrolite:4.13 -| | | +--- net.sf.py4j:py4j:0.10.7 -| | | +--- org.apache.spark:spark-tags_2.11:2.4.5 (*) -| | | +--- org.apache.commons:commons-crypto:1.0.0 -| | | \--- org.spark-project.spark:unused:1.0.0 -| | +--- org.apache.spark:spark-sql_2.11:2.4.5 -| | | +--- com.univocity:univocity-parsers:2.7.3 -| | | +--- org.apache.spark:spark-sketch_2.11:2.4.5 -| | | | +--- org.apache.spark:spark-tags_2.11:2.4.5 (*) -| | | | \--- org.spark-project.spark:unused:1.0.0 -| | | +--- org.apache.spark:spark-core_2.11:2.4.5 (*) -| | | +--- org.apache.spark:spark-catalyst_2.11:2.4.5 -| | | | +--- org.scala-lang:scala-reflect:2.11.12 -| | | | | \--- org.scala-lang:scala-library:2.11.12 -| | | | +--- org.scala-lang.modules:scala-parser-combinators_2.11:1.1.0 -| | | | | \--- org.scala-lang:scala-library:2.11.12 -| | | | +--- org.apache.spark:spark-core_2.11:2.4.5 (*) -| | | | +--- org.apache.spark:spark-tags_2.11:2.4.5 (*) -| | | | +--- org.apache.spark:spark-unsafe_2.11:2.4.5 (*) -| | | | +--- org.apache.spark:spark-sketch_2.11:2.4.5 (*) -| | | | +--- org.codehaus.janino:janino:3.0.9 -| | | | | \--- org.codehaus.janino:commons-compiler:3.0.9 -| | | | +--- org.codehaus.janino:commons-compiler:3.0.9 -| | | | +--- org.antlr:antlr4-runtime:4.7 -| | | | +--- commons-codec:commons-codec:1.10 -| | | | \--- org.spark-project.spark:unused:1.0.0 -| | | +--- org.apache.spark:spark-tags_2.11:2.4.5 (*) -| | | +--- org.apache.orc:orc-core:1.5.5 -> 1.6.2 (*) -| | | +--- org.apache.orc:orc-mapreduce:1.5.5 -> 1.6.2 -| | | | +--- commons-codec:commons-codec:1.4 -> 1.10 -| | | | \--- commons-lang:commons-lang:2.6 -| | | +--- org.apache.parquet:parquet-column:1.10.1 -> 1.11.0 (*) -| | | +--- org.apache.parquet:parquet-hadoop:1.10.1 -> 1.11.0 (*) -| | | +--- com.fasterxml.jackson.core:jackson-databind:2.6.7.3 -> 2.10.2 (*) -| | | +--- org.apache.arrow:arrow-vector:0.10.0 -> 0.14.1 (*) -| | | +--- org.apache.xbean:xbean-asm6-shaded:4.8 -| | | \--- org.spark-project.spark:unused:1.0.0 -| | +--- org.spark-project.hive:hive-exec:1.2.1.spark2 -| | | +--- com.twitter:parquet-hadoop-bundle:1.6.0 -| | | +--- commons-io:commons-io:2.4 -| | | +--- org.apache.commons:commons-lang3:3.1 -> 3.9 -| | | +--- commons-lang:commons-lang:2.6 -| | | +--- javolution:javolution:5.5.1 -| | | +--- log4j:apache-log4j-extras:1.2.17 -| | | +--- org.antlr:antlr-runtime:3.4 -> 3.5.2 -| | | +--- org.antlr:ST4:4.0.4 (*) -| | | +--- org.apache.commons:commons-compress:1.4.1 -> 1.19 -| | | +--- org.apache.ivy:ivy:2.4.0 -| | | +--- org.codehaus.jackson:jackson-core-asl:1.9.2 -> 1.9.13 -| | | +--- org.jodd:jodd-core:3.5.2 -| | | +--- org.codehaus.jackson:jackson-mapper-asl:1.9.2 -> 1.9.13 (*) -| | | +--- org.datanucleus:datanucleus-core:3.2.10 -> 4.1.17 -| | | +--- org.apache.calcite:calcite-avatica:1.2.0-incubating -| | | +--- com.googlecode.javaewah:JavaEWAH:0.3.2 -| | | +--- org.iq80.snappy:snappy:0.2 -| | | +--- stax:stax-api:1.0.1 -| | | \--- net.sf.opencsv:opencsv:2.3 -| | +--- org.spark-project.hive:hive-metastore:1.2.1.spark2 -| | | +--- com.jolbox:bonecp:0.8.0.RELEASE (*) -| | | +--- commons-cli:commons-cli:1.2 -| | | +--- commons-lang:commons-lang:2.6 -| | | +--- commons-logging:commons-logging:1.1.3 -> 1.2 -| | | +--- org.apache.derby:derby:10.10.2.0 -> 10.12.1.1 -| | | +--- org.datanucleus:datanucleus-api-jdo:3.2.6 -> 4.2.4 -| | | +--- org.datanucleus:datanucleus-core:3.2.10 -> 4.1.17 -| | | +--- org.datanucleus:datanucleus-rdbms:3.2.9 -> 4.1.19 -| | | +--- commons-pool:commons-pool:1.5.4 -> 1.6 -| | | +--- commons-dbcp:commons-dbcp:1.4 (*) -| | | +--- javax.jdo:jdo-api:3.0.1 (*) -| | | \--- org.antlr:antlr-runtime:3.4 -> 3.5.2 -| | +--- org.apache.avro:avro-mapred:1.8.2 (*) -| | +--- commons-httpclient:commons-httpclient:3.1 (*) -| | +--- org.apache.calcite:calcite-avatica:1.2.0-incubating -| | +--- org.apache.calcite:calcite-core:1.2.0-incubating -| | | +--- org.apache.calcite:calcite-avatica:1.2.0-incubating -| | | +--- org.apache.calcite:calcite-linq4j:1.2.0-incubating -| | | +--- commons-dbcp:commons-dbcp:1.4 (*) -| | | \--- net.hydromatic:eigenbase-properties:1.1.5 -| | +--- org.apache.httpcomponents:httpclient:4.5.6 (*) -| | +--- org.codehaus.jackson:jackson-mapper-asl:1.9.13 (*) -| | +--- commons-codec:commons-codec:1.10 -| | +--- joda-time:joda-time:2.9.3 -> 2.9.9 -| | +--- org.jodd:jodd-core:3.5.2 -| | +--- com.google.code.findbugs:jsr305:1.3.9 -> 3.0.2 -| | +--- org.datanucleus:datanucleus-core:3.2.10 -> 4.1.17 -| | +--- org.apache.thrift:libthrift:0.9.3 (*) -| | +--- org.apache.thrift:libfb303:0.9.3 (*) -| | +--- org.apache.derby:derby:10.12.1.1 -| | \--- org.spark-project.spark:unused:1.0.0 -| +--- org.apache.spark:spark-avro_2.11 -> 2.4.5 -| | +--- org.apache.spark:spark-tags_2.11:2.4.5 (*) -| | \--- org.spark-project.spark:unused:1.0.0 -| +--- org.slf4j:slf4j-api -> 1.7.25 -| +--- com.github.stephenc.findbugs:findbugs-annotations:1.3.9-1 -| +--- project :iceberg-api (*) -| +--- project :iceberg-common (*) -| +--- project :iceberg-core (*) -| +--- project :iceberg-data (*) -| +--- project :iceberg-orc (*) -| +--- project :iceberg-parquet (*) -| +--- project :iceberg-arrow (*) -| +--- project :iceberg-hive (*) -| +--- junit:junit -> 4.12 (*) -| +--- org.slf4j:slf4j-simple -> 1.7.5 (*) -| +--- org.mockito:mockito-core -> 1.10.19 (*) -| +--- org.apache.hadoop:hadoop-hdfs:2.7.3 (*) -| +--- org.apache.hadoop:hadoop-common:2.7.3 (*) -| +--- org.apache.hadoop:hadoop-minicluster:2.7.3 (*) -| +--- org.slf4j:slf4j-api -> 1.7.25 -| +--- com.github.stephenc.findbugs:findbugs-annotations:1.3.9-1 -| +--- org.apache.avro:avro -> 1.9.2 (*) -| +--- org.apache.spark:spark-hive_2.11 -> 2.4.5 (*) -| \--- org.apache.spark:spark-avro_2.11 -> 2.4.5 (*) -+--- project :iceberg-spark (*) -+--- project :iceberg-spark-runtime -| +--- project :iceberg-spark-runtime (*) -| +--- org.slf4j:slf4j-api:1.7.22 -> 1.7.25 (c) -| +--- junit:junit:4.12 (c) -| +--- joda-time:joda-time:2.9.9 (c) -| +--- org.mockito:mockito-core:1.10.19 (c) -| +--- org.apache.avro:avro:1.9.2 (c) -| +--- org.slf4j:slf4j-simple:1.7.5 (c) -| +--- org.apache.arrow:arrow-vector:0.14.1 (c) -| +--- com.github.ben-manes.caffeine:caffeine:2.7.0 (c) -| +--- org.apache.hive:hive-metastore:2.3.6 (c) -| +--- org.apache.hive:hive-exec:2.3.6 (c) -| +--- org.apache.parquet:parquet-avro:1.11.0 (c) -| +--- org.apache.commons:commons-lang3:3.9 (c) -| +--- org.apache.pig:pig:0.14.0 (c) -| +--- org.apache.spark:spark-hive_2.11:2.4.5 (c) -| +--- org.apache.spark:spark-avro_2.11:2.4.5 (c) -| +--- project :iceberg-spark (*) -| +--- com.github.stephenc.findbugs:findbugs-annotations:1.3.9-1 -| +--- org.slf4j:slf4j-api -> 1.7.25 -| +--- junit:junit -> 4.12 (*) -| +--- org.mockito:mockito-core -> 1.10.19 (*) -| \--- com.github.stephenc.findbugs:findbugs-annotations:1.3.9-1 -+--- project :iceberg-spark-runtime (*) -+--- org.slf4j:slf4j-api:1.7.22 -> 1.7.25 (c) -+--- junit:junit:4.12 (c) -+--- joda-time:joda-time:2.9.9 (c) -+--- org.mockito:mockito-core:1.10.19 (c) -+--- org.apache.avro:avro:1.9.2 (c) -+--- org.slf4j:slf4j-simple:1.7.5 (c) -+--- org.apache.arrow:arrow-vector:0.14.1 (c) -+--- com.github.ben-manes.caffeine:caffeine:2.7.0 (c) -+--- org.apache.hive:hive-metastore:2.3.6 (c) -+--- org.apache.hive:hive-exec:2.3.6 (c) -+--- org.apache.parquet:parquet-avro:1.11.0 (c) -+--- org.apache.commons:commons-lang3:3.9 (c) -+--- org.apache.pig:pig:0.14.0 (c) -+--- org.apache.spark:spark-hive_2.11:2.4.5 (c) -\--- org.apache.spark:spark-avro_2.11:2.4.5 (c) - -(c) - dependency constraint -(*) - dependencies omitted (listed previously) - -A web-based, searchable dependency report is available by adding the --scan option. From 2e3d2db40b06c186438643cbc95b06e89f5a7308 Mon Sep 17 00:00:00 2001 From: cmathiesen Date: Wed, 29 Apr 2020 17:35:32 +0100 Subject: [PATCH 04/16] Swap to shaded guava in common and core modules (#8) * Swap to shaded guava in common and core modules * Shade in arrow module --- .../apache/iceberg/arrow/ArrowSchemaUtil.java | 6 +++--- .../vectorized/VectorizedArrowReader.java | 2 +- .../BaseVectorizedParquetValuesReader.java | 2 +- .../parquet/VectorizedColumnIterator.java | 2 +- build.gradle | 14 ++++++++++++-- .../org/apache/iceberg/common/DynClasses.java | 2 +- .../apache/iceberg/common/DynConstructors.java | 4 ++-- .../org/apache/iceberg/common/DynFields.java | 11 ++++++----- .../org/apache/iceberg/common/DynMethods.java | 4 ++-- .../org/apache/iceberg/AllDataFilesTable.java | 6 +++--- .../org/apache/iceberg/AllEntriesTable.java | 4 ++-- .../org/apache/iceberg/AllManifestsTable.java | 6 +++--- .../iceberg/BaseAllMetadataTableScan.java | 2 +- .../apache/iceberg/BaseCombinedScanTask.java | 6 +++--- .../org/apache/iceberg/BaseFileScanTask.java | 6 +++--- .../org/apache/iceberg/BaseMetadataTable.java | 2 +- .../java/org/apache/iceberg/BaseSnapshot.java | 10 +++++----- .../java/org/apache/iceberg/BaseTableScan.java | 10 +++++----- .../org/apache/iceberg/DataFilesTable.java | 6 +++--- .../java/org/apache/iceberg/DataTableScan.java | 6 +++--- .../org/apache/iceberg/GenericDataFile.java | 8 ++++---- .../apache/iceberg/GenericManifestEntry.java | 2 +- .../apache/iceberg/GenericManifestFile.java | 6 +++--- .../iceberg/GenericPartitionFieldSummary.java | 2 +- .../iceberg/IncrementalDataTableScan.java | 12 ++++++------ .../apache/iceberg/ManifestEntriesTable.java | 6 +++--- .../org/apache/iceberg/StaticTableScan.java | 2 +- .../java/org/apache/iceberg/TableMetadata.java | 18 +++++++++--------- .../org/apache/iceberg/TestWapWorkflow.java | 4 ++-- 29 files changed, 91 insertions(+), 80 deletions(-) diff --git a/arrow/src/main/java/org/apache/iceberg/arrow/ArrowSchemaUtil.java b/arrow/src/main/java/org/apache/iceberg/arrow/ArrowSchemaUtil.java index b0ada19e23bd..74121e4ce476 100644 --- a/arrow/src/main/java/org/apache/iceberg/arrow/ArrowSchemaUtil.java +++ b/arrow/src/main/java/org/apache/iceberg/arrow/ArrowSchemaUtil.java @@ -19,9 +19,9 @@ package org.apache.iceberg.arrow; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableMap; -import com.google.common.collect.Lists; +import com.google.common.shaded.collect.ImmutableList; +import com.google.common.shaded.collect.ImmutableMap; +import com.google.common.shaded.collect.Lists; import java.util.List; import java.util.Map; import org.apache.arrow.vector.types.DateUnit; diff --git a/arrow/src/main/java/org/apache/iceberg/arrow/vectorized/VectorizedArrowReader.java b/arrow/src/main/java/org/apache/iceberg/arrow/vectorized/VectorizedArrowReader.java index c8d956addfc0..2501e8f16756 100644 --- a/arrow/src/main/java/org/apache/iceberg/arrow/vectorized/VectorizedArrowReader.java +++ b/arrow/src/main/java/org/apache/iceberg/arrow/vectorized/VectorizedArrowReader.java @@ -19,7 +19,7 @@ package org.apache.iceberg.arrow.vectorized; -import com.google.common.base.Preconditions; +import com.google.common.shaded.base.Preconditions; import java.util.Map; import org.apache.arrow.memory.BufferAllocator; import org.apache.arrow.vector.BigIntVector; diff --git a/arrow/src/main/java/org/apache/iceberg/arrow/vectorized/parquet/BaseVectorizedParquetValuesReader.java b/arrow/src/main/java/org/apache/iceberg/arrow/vectorized/parquet/BaseVectorizedParquetValuesReader.java index e2292b20b36f..a4e4751e94ce 100644 --- a/arrow/src/main/java/org/apache/iceberg/arrow/vectorized/parquet/BaseVectorizedParquetValuesReader.java +++ b/arrow/src/main/java/org/apache/iceberg/arrow/vectorized/parquet/BaseVectorizedParquetValuesReader.java @@ -19,7 +19,7 @@ package org.apache.iceberg.arrow.vectorized.parquet; -import com.google.common.base.Preconditions; +import com.google.common.shaded.base.Preconditions; import java.io.IOException; import java.nio.ByteBuffer; import org.apache.parquet.bytes.ByteBufferInputStream; diff --git a/arrow/src/main/java/org/apache/iceberg/arrow/vectorized/parquet/VectorizedColumnIterator.java b/arrow/src/main/java/org/apache/iceberg/arrow/vectorized/parquet/VectorizedColumnIterator.java index d0d05836b544..11a9483bf032 100644 --- a/arrow/src/main/java/org/apache/iceberg/arrow/vectorized/parquet/VectorizedColumnIterator.java +++ b/arrow/src/main/java/org/apache/iceberg/arrow/vectorized/parquet/VectorizedColumnIterator.java @@ -19,7 +19,7 @@ package org.apache.iceberg.arrow.vectorized.parquet; -import com.google.common.base.Preconditions; +import com.google.common.shaded.base.Preconditions; import org.apache.arrow.vector.FieldVector; import org.apache.arrow.vector.IntVector; import org.apache.iceberg.arrow.vectorized.NullabilityHolder; diff --git a/build.gradle b/build.gradle index 8acf59d10571..ee060eae242e 100644 --- a/build.gradle +++ b/build.gradle @@ -131,8 +131,14 @@ project(':iceberg-relocate-external-dependencies') { include 'NOTICE' } + dependencies { + exclude(dependency('com.github.stephenc.findbugs:findbugs-annotations')) + exclude(dependency('org.slf4j:slf4j-api')) + exclude(dependency('org.checkerframework:checker-qual')) + } + relocate 'com.google.common', 'com.google.common.shaded' - + minimize() } } @@ -145,7 +151,11 @@ project(':iceberg-api') { } } -project(':iceberg-common') {} +project(':iceberg-common') { + dependencies { + compile project(path: ':iceberg-relocate-external-dependencies', configuration: 'shadow') + } +} project(':iceberg-core') { dependencies { diff --git a/common/src/main/java/org/apache/iceberg/common/DynClasses.java b/common/src/main/java/org/apache/iceberg/common/DynClasses.java index d6fca621bc1b..ea6cf6f9d881 100644 --- a/common/src/main/java/org/apache/iceberg/common/DynClasses.java +++ b/common/src/main/java/org/apache/iceberg/common/DynClasses.java @@ -19,7 +19,7 @@ package org.apache.iceberg.common; -import com.google.common.base.Joiner; +import com.google.common.shaded.base.Joiner; import java.util.LinkedHashSet; import java.util.Set; diff --git a/common/src/main/java/org/apache/iceberg/common/DynConstructors.java b/common/src/main/java/org/apache/iceberg/common/DynConstructors.java index d564249bf013..fa1c13b2b0d5 100644 --- a/common/src/main/java/org/apache/iceberg/common/DynConstructors.java +++ b/common/src/main/java/org/apache/iceberg/common/DynConstructors.java @@ -19,8 +19,8 @@ package org.apache.iceberg.common; -import com.google.common.base.Preconditions; -import com.google.common.base.Throwables; +import com.google.common.shaded.base.Preconditions; +import com.google.common.shaded.base.Throwables; import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; import java.security.AccessController; diff --git a/common/src/main/java/org/apache/iceberg/common/DynFields.java b/common/src/main/java/org/apache/iceberg/common/DynFields.java index 196399aa7494..f05d64bbc64e 100644 --- a/common/src/main/java/org/apache/iceberg/common/DynFields.java +++ b/common/src/main/java/org/apache/iceberg/common/DynFields.java @@ -19,11 +19,12 @@ package org.apache.iceberg.common; -import com.google.common.base.Joiner; -import com.google.common.base.MoreObjects; -import com.google.common.base.Preconditions; -import com.google.common.base.Throwables; -import com.google.common.collect.Sets; + +import com.google.common.shaded.base.Joiner; +import com.google.common.shaded.base.MoreObjects; +import com.google.common.shaded.base.Preconditions; +import com.google.common.shaded.base.Throwables; +import com.google.common.shaded.collect.Sets; import java.lang.reflect.Field; import java.lang.reflect.Modifier; import java.security.AccessController; diff --git a/common/src/main/java/org/apache/iceberg/common/DynMethods.java b/common/src/main/java/org/apache/iceberg/common/DynMethods.java index f9ece6415342..b8a294af060e 100644 --- a/common/src/main/java/org/apache/iceberg/common/DynMethods.java +++ b/common/src/main/java/org/apache/iceberg/common/DynMethods.java @@ -19,8 +19,8 @@ package org.apache.iceberg.common; -import com.google.common.base.Preconditions; -import com.google.common.base.Throwables; +import com.google.common.shaded.base.Preconditions; +import com.google.common.shaded.base.Throwables; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.lang.reflect.Modifier; diff --git a/core/src/main/java/org/apache/iceberg/AllDataFilesTable.java b/core/src/main/java/org/apache/iceberg/AllDataFilesTable.java index 2ecf3b6ee2b2..654a31ad53fc 100644 --- a/core/src/main/java/org/apache/iceberg/AllDataFilesTable.java +++ b/core/src/main/java/org/apache/iceberg/AllDataFilesTable.java @@ -19,9 +19,9 @@ package org.apache.iceberg; -import com.google.common.collect.ImmutableMap; -import com.google.common.collect.Iterables; -import com.google.common.collect.Sets; +import com.google.common.shaded.collect.ImmutableMap; +import com.google.common.shaded.collect.Iterables; +import com.google.common.shaded.collect.Sets; import java.io.IOException; import java.util.Collection; import java.util.List; diff --git a/core/src/main/java/org/apache/iceberg/AllEntriesTable.java b/core/src/main/java/org/apache/iceberg/AllEntriesTable.java index 9c6aa8561178..436f363f13a3 100644 --- a/core/src/main/java/org/apache/iceberg/AllEntriesTable.java +++ b/core/src/main/java/org/apache/iceberg/AllEntriesTable.java @@ -19,8 +19,8 @@ package org.apache.iceberg; -import com.google.common.collect.ImmutableMap; -import com.google.common.collect.Sets; +import com.google.common.shaded.collect.ImmutableMap; +import com.google.common.shaded.collect.Sets; import java.util.Collection; import org.apache.iceberg.expressions.Expression; import org.apache.iceberg.expressions.ResidualEvaluator; diff --git a/core/src/main/java/org/apache/iceberg/AllManifestsTable.java b/core/src/main/java/org/apache/iceberg/AllManifestsTable.java index eb81b786448f..58c95b817dc3 100644 --- a/core/src/main/java/org/apache/iceberg/AllManifestsTable.java +++ b/core/src/main/java/org/apache/iceberg/AllManifestsTable.java @@ -19,9 +19,9 @@ package org.apache.iceberg; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableMap; -import com.google.common.collect.Iterables; +import com.google.common.shaded.collect.ImmutableList; +import com.google.common.shaded.collect.ImmutableMap; +import com.google.common.shaded.collect.Iterables; import java.io.IOException; import java.util.Collection; import org.apache.iceberg.avro.Avro; diff --git a/core/src/main/java/org/apache/iceberg/BaseAllMetadataTableScan.java b/core/src/main/java/org/apache/iceberg/BaseAllMetadataTableScan.java index 3cda654007a3..f7f6ca2fe68e 100644 --- a/core/src/main/java/org/apache/iceberg/BaseAllMetadataTableScan.java +++ b/core/src/main/java/org/apache/iceberg/BaseAllMetadataTableScan.java @@ -19,7 +19,7 @@ package org.apache.iceberg; -import com.google.common.collect.ImmutableMap; +import com.google.common.shaded.collect.ImmutableMap; import java.util.Collection; import org.apache.iceberg.events.Listeners; import org.apache.iceberg.events.ScanEvent; diff --git a/core/src/main/java/org/apache/iceberg/BaseCombinedScanTask.java b/core/src/main/java/org/apache/iceberg/BaseCombinedScanTask.java index 00f493f80ae3..8212123987a1 100644 --- a/core/src/main/java/org/apache/iceberg/BaseCombinedScanTask.java +++ b/core/src/main/java/org/apache/iceberg/BaseCombinedScanTask.java @@ -19,9 +19,9 @@ package org.apache.iceberg; -import com.google.common.base.Joiner; -import com.google.common.base.MoreObjects; -import com.google.common.collect.ImmutableList; +import com.google.common.shaded.base.Joiner; +import com.google.common.shaded.base.MoreObjects; +import com.google.common.shaded.collect.ImmutableList; import java.util.Collection; import java.util.List; diff --git a/core/src/main/java/org/apache/iceberg/BaseFileScanTask.java b/core/src/main/java/org/apache/iceberg/BaseFileScanTask.java index 988b07eb0596..86ec6a483b07 100644 --- a/core/src/main/java/org/apache/iceberg/BaseFileScanTask.java +++ b/core/src/main/java/org/apache/iceberg/BaseFileScanTask.java @@ -19,9 +19,9 @@ package org.apache.iceberg; -import com.google.common.annotations.VisibleForTesting; -import com.google.common.base.MoreObjects; -import com.google.common.collect.ImmutableList; +import com.google.common.shaded.annotations.VisibleForTesting; +import com.google.common.shaded.base.MoreObjects; +import com.google.common.shaded.collect.ImmutableList; import java.util.ArrayList; import java.util.Iterator; import java.util.List; diff --git a/core/src/main/java/org/apache/iceberg/BaseMetadataTable.java b/core/src/main/java/org/apache/iceberg/BaseMetadataTable.java index 44ba38047306..da60aea4866f 100644 --- a/core/src/main/java/org/apache/iceberg/BaseMetadataTable.java +++ b/core/src/main/java/org/apache/iceberg/BaseMetadataTable.java @@ -19,7 +19,7 @@ package org.apache.iceberg; -import com.google.common.collect.ImmutableMap; +import com.google.common.shaded.collect.ImmutableMap; import java.util.List; import java.util.Map; import org.apache.iceberg.encryption.EncryptionManager; diff --git a/core/src/main/java/org/apache/iceberg/BaseSnapshot.java b/core/src/main/java/org/apache/iceberg/BaseSnapshot.java index 22ab7fe84524..78e75b0ccaa8 100644 --- a/core/src/main/java/org/apache/iceberg/BaseSnapshot.java +++ b/core/src/main/java/org/apache/iceberg/BaseSnapshot.java @@ -19,11 +19,11 @@ package org.apache.iceberg; -import com.google.common.base.MoreObjects; -import com.google.common.base.Objects; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.Iterables; -import com.google.common.collect.Lists; +import com.google.common.shaded.base.MoreObjects; +import com.google.common.shaded.base.Objects; +import com.google.common.shaded.collect.ImmutableList; +import com.google.common.shaded.collect.Iterables; +import com.google.common.shaded.collect.Lists; import java.io.IOException; import java.util.Arrays; import java.util.List; diff --git a/core/src/main/java/org/apache/iceberg/BaseTableScan.java b/core/src/main/java/org/apache/iceberg/BaseTableScan.java index fb0e5f7dc0ab..a61e474bcb82 100644 --- a/core/src/main/java/org/apache/iceberg/BaseTableScan.java +++ b/core/src/main/java/org/apache/iceberg/BaseTableScan.java @@ -19,11 +19,11 @@ package org.apache.iceberg; -import com.google.common.base.MoreObjects; -import com.google.common.base.Preconditions; -import com.google.common.collect.FluentIterable; -import com.google.common.collect.ImmutableMap; -import com.google.common.collect.Sets; +import com.google.common.shaded.base.MoreObjects; +import com.google.common.shaded.base.Preconditions; +import com.google.common.shaded.collect.FluentIterable; +import com.google.common.shaded.collect.ImmutableMap; +import com.google.common.shaded.collect.Sets; import java.time.Instant; import java.time.LocalDateTime; import java.time.ZoneId; diff --git a/core/src/main/java/org/apache/iceberg/DataFilesTable.java b/core/src/main/java/org/apache/iceberg/DataFilesTable.java index 53b6a97dd1c2..fa627bb3e8fb 100644 --- a/core/src/main/java/org/apache/iceberg/DataFilesTable.java +++ b/core/src/main/java/org/apache/iceberg/DataFilesTable.java @@ -19,9 +19,9 @@ package org.apache.iceberg; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableMap; -import com.google.common.collect.Sets; +import com.google.common.shaded.collect.ImmutableList; +import com.google.common.shaded.collect.ImmutableMap; +import com.google.common.shaded.collect.Sets; import java.util.Collection; import org.apache.iceberg.expressions.Expression; import org.apache.iceberg.expressions.ResidualEvaluator; diff --git a/core/src/main/java/org/apache/iceberg/DataTableScan.java b/core/src/main/java/org/apache/iceberg/DataTableScan.java index f3a5d923594e..29a703c7877a 100644 --- a/core/src/main/java/org/apache/iceberg/DataTableScan.java +++ b/core/src/main/java/org/apache/iceberg/DataTableScan.java @@ -19,9 +19,9 @@ package org.apache.iceberg; -import com.google.common.base.Preconditions; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableMap; +import com.google.common.shaded.base.Preconditions; +import com.google.common.shaded.collect.ImmutableList; +import com.google.common.shaded.collect.ImmutableMap; import java.util.Collection; import org.apache.iceberg.expressions.Expression; import org.apache.iceberg.io.CloseableIterable; diff --git a/core/src/main/java/org/apache/iceberg/GenericDataFile.java b/core/src/main/java/org/apache/iceberg/GenericDataFile.java index aa427cbc5e16..1685298b9b93 100644 --- a/core/src/main/java/org/apache/iceberg/GenericDataFile.java +++ b/core/src/main/java/org/apache/iceberg/GenericDataFile.java @@ -19,10 +19,10 @@ package org.apache.iceberg; -import com.google.common.base.MoreObjects; -import com.google.common.collect.ImmutableMap; -import com.google.common.collect.Lists; -import com.google.common.collect.Maps; +import com.google.common.shaded.base.MoreObjects; +import com.google.common.shaded.collect.ImmutableMap; +import com.google.common.shaded.collect.Lists; +import com.google.common.shaded.collect.Maps; import java.io.Serializable; import java.nio.ByteBuffer; import java.util.Arrays; diff --git a/core/src/main/java/org/apache/iceberg/GenericManifestEntry.java b/core/src/main/java/org/apache/iceberg/GenericManifestEntry.java index 9fc29a62bbff..3f5444d56e00 100644 --- a/core/src/main/java/org/apache/iceberg/GenericManifestEntry.java +++ b/core/src/main/java/org/apache/iceberg/GenericManifestEntry.java @@ -19,7 +19,7 @@ package org.apache.iceberg; -import com.google.common.base.MoreObjects; +import com.google.common.shaded.base.MoreObjects; import org.apache.avro.generic.IndexedRecord; import org.apache.avro.specific.SpecificData; import org.apache.iceberg.avro.AvroSchemaUtil; diff --git a/core/src/main/java/org/apache/iceberg/GenericManifestFile.java b/core/src/main/java/org/apache/iceberg/GenericManifestFile.java index 26f7153f81af..5b00400776ec 100644 --- a/core/src/main/java/org/apache/iceberg/GenericManifestFile.java +++ b/core/src/main/java/org/apache/iceberg/GenericManifestFile.java @@ -19,9 +19,9 @@ package org.apache.iceberg; -import com.google.common.base.MoreObjects; -import com.google.common.base.Objects; -import com.google.common.collect.Lists; +import com.google.common.shaded.base.MoreObjects; +import com.google.common.shaded.base.Objects; +import com.google.common.shaded.collect.Lists; import java.io.Serializable; import java.util.Collections; import java.util.List; diff --git a/core/src/main/java/org/apache/iceberg/GenericPartitionFieldSummary.java b/core/src/main/java/org/apache/iceberg/GenericPartitionFieldSummary.java index ae1d5a53e33d..9a6ebbcd1765 100644 --- a/core/src/main/java/org/apache/iceberg/GenericPartitionFieldSummary.java +++ b/core/src/main/java/org/apache/iceberg/GenericPartitionFieldSummary.java @@ -19,7 +19,7 @@ package org.apache.iceberg; -import com.google.common.base.MoreObjects; +import com.google.common.shaded.base.MoreObjects; import java.io.Serializable; import java.nio.ByteBuffer; import java.util.Arrays; diff --git a/core/src/main/java/org/apache/iceberg/IncrementalDataTableScan.java b/core/src/main/java/org/apache/iceberg/IncrementalDataTableScan.java index a2c3d9858d3a..b3206bca0681 100644 --- a/core/src/main/java/org/apache/iceberg/IncrementalDataTableScan.java +++ b/core/src/main/java/org/apache/iceberg/IncrementalDataTableScan.java @@ -19,12 +19,12 @@ package org.apache.iceberg; -import com.google.common.base.Preconditions; -import com.google.common.collect.FluentIterable; -import com.google.common.collect.ImmutableMap; -import com.google.common.collect.Iterables; -import com.google.common.collect.Lists; -import com.google.common.collect.Sets; +import com.google.common.shaded.base.Preconditions; +import com.google.common.shaded.collect.FluentIterable; +import com.google.common.shaded.collect.ImmutableMap; +import com.google.common.shaded.collect.Iterables; +import com.google.common.shaded.collect.Lists; +import com.google.common.shaded.collect.Sets; import java.util.Collection; import java.util.List; import java.util.Set; diff --git a/core/src/main/java/org/apache/iceberg/ManifestEntriesTable.java b/core/src/main/java/org/apache/iceberg/ManifestEntriesTable.java index d2458f80a93c..bb5a392514d1 100644 --- a/core/src/main/java/org/apache/iceberg/ManifestEntriesTable.java +++ b/core/src/main/java/org/apache/iceberg/ManifestEntriesTable.java @@ -19,9 +19,9 @@ package org.apache.iceberg; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableMap; -import com.google.common.collect.Sets; +import com.google.common.shaded.collect.ImmutableList; +import com.google.common.shaded.collect.ImmutableMap; +import com.google.common.shaded.collect.Sets; import java.util.Collection; import org.apache.iceberg.expressions.Expression; import org.apache.iceberg.expressions.ResidualEvaluator; diff --git a/core/src/main/java/org/apache/iceberg/StaticTableScan.java b/core/src/main/java/org/apache/iceberg/StaticTableScan.java index ed63eaad7fbb..fbc7bbc8f33f 100644 --- a/core/src/main/java/org/apache/iceberg/StaticTableScan.java +++ b/core/src/main/java/org/apache/iceberg/StaticTableScan.java @@ -19,7 +19,7 @@ package org.apache.iceberg; -import com.google.common.collect.ImmutableMap; +import com.google.common.shaded.collect.ImmutableMap; import java.util.Collection; import java.util.function.Function; import org.apache.iceberg.expressions.Expression; diff --git a/core/src/main/java/org/apache/iceberg/TableMetadata.java b/core/src/main/java/org/apache/iceberg/TableMetadata.java index 1b1021f6b854..1c11d1096716 100644 --- a/core/src/main/java/org/apache/iceberg/TableMetadata.java +++ b/core/src/main/java/org/apache/iceberg/TableMetadata.java @@ -19,15 +19,15 @@ package org.apache.iceberg; -import com.google.common.base.MoreObjects; -import com.google.common.base.Objects; -import com.google.common.base.Preconditions; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableMap; -import com.google.common.collect.Iterables; -import com.google.common.collect.Lists; -import com.google.common.collect.Maps; -import com.google.common.collect.Sets; +import com.google.common.shaded.base.MoreObjects; +import com.google.common.shaded.base.Objects; +import com.google.common.shaded.base.Preconditions; +import com.google.common.shaded.collect.ImmutableList; +import com.google.common.shaded.collect.ImmutableMap; +import com.google.common.shaded.collect.Iterables; +import com.google.common.shaded.collect.Lists; +import com.google.common.shaded.collect.Maps; +import com.google.common.shaded.collect.Sets; import java.util.List; import java.util.Map; import java.util.Set; diff --git a/core/src/test/java/org/apache/iceberg/TestWapWorkflow.java b/core/src/test/java/org/apache/iceberg/TestWapWorkflow.java index b6c75f32dfb3..b062ab3477a2 100644 --- a/core/src/test/java/org/apache/iceberg/TestWapWorkflow.java +++ b/core/src/test/java/org/apache/iceberg/TestWapWorkflow.java @@ -19,8 +19,8 @@ package org.apache.iceberg; -import com.google.common.collect.Iterables; -import com.google.common.collect.Streams; +import com.google.common.shaded.collect.Iterables; +import com.google.common.shaded.collect.Streams; import org.apache.iceberg.exceptions.CherrypickAncestorCommitException; import org.apache.iceberg.exceptions.DuplicateWAPCommitException; import org.apache.iceberg.exceptions.ValidationException; From b24ea89fd5eec7beead72aa1bd2bb39cb2b77ec4 Mon Sep 17 00:00:00 2001 From: Christine Mathiesen Date: Mon, 11 May 2020 15:15:33 +0100 Subject: [PATCH 05/16] Address PR comments --- .baseline/checkstyle/checkstyle.xml | 3 +- .../java/org/apache/iceberg/Accessors.java | 2 +- .../java/org/apache/iceberg/Filterable.java | 2 +- .../org/apache/iceberg/PartitionField.java | 2 +- .../org/apache/iceberg/PartitionSpec.java | 14 +- .../main/java/org/apache/iceberg/Schema.java | 10 +- .../java/org/apache/iceberg/TableScan.java | 2 +- .../main/java/org/apache/iceberg/Tables.java | 2 +- .../org/apache/iceberg/catalog/Namespace.java | 2 +- .../iceberg/catalog/SupportsNamespaces.java | 2 +- .../iceberg/catalog/TableIdentifier.java | 6 +- .../iceberg/encryption/EncryptionManager.java | 2 +- .../org/apache/iceberg/events/Listeners.java | 4 +- .../apache/iceberg/expressions/Binder.java | 4 +- .../expressions/BoundLiteralPredicate.java | 2 +- .../expressions/BoundSetPredicate.java | 4 +- .../iceberg/expressions/Expressions.java | 4 +- .../apache/iceberg/expressions/Literals.java | 2 +- .../iceberg/expressions/NamedReference.java | 2 +- .../apache/iceberg/expressions/Predicate.java | 3 +- .../expressions/StrictMetricsEvaluator.java | 2 +- .../iceberg/expressions/UnboundPredicate.java | 10 +- .../org/apache/iceberg/io/CloseableGroup.java | 2 +- .../apache/iceberg/io/CloseableIterable.java | 6 +- .../org/apache/iceberg/transforms/Bucket.java | 10 +- .../apache/iceberg/transforms/Identity.java | 2 +- .../transforms/PartitionSpecVisitor.java | 2 +- .../iceberg/transforms/ProjectionUtil.java | 2 +- .../apache/iceberg/transforms/Transforms.java | 2 +- .../apache/iceberg/transforms/Truncate.java | 2 +- .../apache/iceberg/types/AssignFreshIds.java | 2 +- .../iceberg/types/CheckCompatibility.java | 8 +- .../org/apache/iceberg/types/Comparators.java | 2 +- .../apache/iceberg/types/GetProjectedIds.java | 2 +- .../org/apache/iceberg/types/IndexById.java | 2 +- .../org/apache/iceberg/types/IndexByName.java | 6 +- .../apache/iceberg/types/PruneColumns.java | 2 +- .../org/apache/iceberg/types/ReassignIds.java | 4 +- .../org/apache/iceberg/types/TypeUtil.java | 12 +- .../java/org/apache/iceberg/types/Types.java | 8 +- .../org/apache/iceberg/util/BinaryUtil.java | 2 +- .../apache/iceberg/util/CharSequenceSet.java | 6 +- .../org/apache/iceberg/util/UnicodeUtil.java | 2 +- .../TestInclusiveManifestEvaluator.java | 2 +- .../TestInclusiveMetricsEvaluator.java | 2 +- .../TestStrictMetricsEvaluator.java | 2 +- .../iceberg/io/TestCloseableIterable.java | 4 +- .../iceberg/transforms/TestBucketing.java | 4 +- .../transforms/TestBucketingProjection.java | 4 +- .../transforms/TestDatesProjection.java | 4 +- .../iceberg/transforms/TestProjection.java | 2 +- .../transforms/TestTimestampsProjection.java | 4 +- .../transforms/TestTruncatesProjection.java | 4 +- .../apache/iceberg/arrow/ArrowSchemaUtil.java | 6 +- .../vectorized/VectorizedArrowReader.java | 2 +- .../BaseVectorizedParquetValuesReader.java | 2 +- .../parquet/VectorizedColumnIterator.java | 2 +- build.gradle | 5 +- .../org/apache/iceberg/common/DynClasses.java | 2 +- .../iceberg/common/DynConstructors.java | 4 +- .../org/apache/iceberg/common/DynFields.java | 10 +- .../org/apache/iceberg/common/DynMethods.java | 4 +- .../org/apache/iceberg/AllDataFilesTable.java | 6 +- .../org/apache/iceberg/AllEntriesTable.java | 4 +- .../org/apache/iceberg/AllManifestsTable.java | 6 +- .../iceberg/BaseAllMetadataTableScan.java | 2 +- .../apache/iceberg/BaseCombinedScanTask.java | 6 +- .../org/apache/iceberg/BaseFileScanTask.java | 6 +- .../org/apache/iceberg/BaseMetadataTable.java | 2 +- .../java/org/apache/iceberg/BaseSnapshot.java | 10 +- .../org/apache/iceberg/BaseTableScan.java | 10 +- .../org/apache/iceberg/DataFilesTable.java | 6 +- .../org/apache/iceberg/DataTableScan.java | 6 +- .../org/apache/iceberg/GenericDataFile.java | 8 +- .../apache/iceberg/GenericManifestEntry.java | 2 +- .../apache/iceberg/GenericManifestFile.java | 6 +- .../iceberg/GenericPartitionFieldSummary.java | 2 +- .../iceberg/IncrementalDataTableScan.java | 12 +- .../apache/iceberg/ManifestEntriesTable.java | 6 +- .../org/apache/iceberg/StaticTableScan.java | 2 +- .../org/apache/iceberg/TableMetadata.java | 18 +- .../org/apache/iceberg/TestWapWorkflow.java | 4 +- relocate-external-dependencies/LICENSE | 212 ++++++++++++++++++ versions.lock | 1 + versions.props | 1 + 85 files changed, 397 insertions(+), 182 deletions(-) create mode 100644 relocate-external-dependencies/LICENSE diff --git a/.baseline/checkstyle/checkstyle.xml b/.baseline/checkstyle/checkstyle.xml index f8747c1d9947..f11542f05776 100644 --- a/.baseline/checkstyle/checkstyle.xml +++ b/.baseline/checkstyle/checkstyle.xml @@ -134,7 +134,8 @@ - + + diff --git a/api/src/main/java/org/apache/iceberg/Accessors.java b/api/src/main/java/org/apache/iceberg/Accessors.java index 66b328c6ab07..e00a1ad48d79 100644 --- a/api/src/main/java/org/apache/iceberg/Accessors.java +++ b/api/src/main/java/org/apache/iceberg/Accessors.java @@ -19,9 +19,9 @@ package org.apache.iceberg; -import com.google.common.shaded.collect.Maps; import java.util.List; import java.util.Map; +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/api/src/main/java/org/apache/iceberg/Filterable.java b/api/src/main/java/org/apache/iceberg/Filterable.java index dd01e85a1c39..9f2db2e07203 100644 --- a/api/src/main/java/org/apache/iceberg/Filterable.java +++ b/api/src/main/java/org/apache/iceberg/Filterable.java @@ -19,10 +19,10 @@ package org.apache.iceberg; -import com.google.common.shaded.collect.Lists; import java.util.Collection; import org.apache.iceberg.expressions.Expression; import org.apache.iceberg.io.CloseableIterable; +import org.apache.iceberg.relocated.com.google.common.collect.Lists; /** * Methods to filter files in a snapshot or manifest when reading. diff --git a/api/src/main/java/org/apache/iceberg/PartitionField.java b/api/src/main/java/org/apache/iceberg/PartitionField.java index 1b1343f8c16c..de8cfcb3c863 100644 --- a/api/src/main/java/org/apache/iceberg/PartitionField.java +++ b/api/src/main/java/org/apache/iceberg/PartitionField.java @@ -19,8 +19,8 @@ package org.apache.iceberg; -import com.google.common.shaded.base.Objects; import java.io.Serializable; +import org.apache.iceberg.relocated.com.google.common.base.Objects; import org.apache.iceberg.transforms.Transform; /** diff --git a/api/src/main/java/org/apache/iceberg/PartitionSpec.java b/api/src/main/java/org/apache/iceberg/PartitionSpec.java index 9ff11ba2396b..6d402d3d6474 100644 --- a/api/src/main/java/org/apache/iceberg/PartitionSpec.java +++ b/api/src/main/java/org/apache/iceberg/PartitionSpec.java @@ -19,13 +19,6 @@ package org.apache.iceberg; -import com.google.common.shaded.base.Preconditions; -import com.google.common.shaded.collect.ImmutableList; -import com.google.common.shaded.collect.ListMultimap; -import com.google.common.shaded.collect.Lists; -import com.google.common.shaded.collect.Maps; -import com.google.common.shaded.collect.Multimaps; -import com.google.common.shaded.collect.Sets; import java.io.Serializable; import java.io.UnsupportedEncodingException; import java.net.URLEncoder; @@ -35,6 +28,13 @@ import java.util.Set; import java.util.concurrent.atomic.AtomicInteger; import org.apache.iceberg.exceptions.ValidationException; +import org.apache.iceberg.relocated.com.google.common.base.Preconditions; +import org.apache.iceberg.relocated.com.google.common.collect.ImmutableList; +import org.apache.iceberg.relocated.com.google.common.collect.ListMultimap; +import org.apache.iceberg.relocated.com.google.common.collect.Lists; +import org.apache.iceberg.relocated.com.google.common.collect.Maps; +import org.apache.iceberg.relocated.com.google.common.collect.Multimaps; +import org.apache.iceberg.relocated.com.google.common.collect.Sets; import org.apache.iceberg.transforms.Transforms; import org.apache.iceberg.transforms.UnknownTransform; import org.apache.iceberg.types.Type; diff --git a/api/src/main/java/org/apache/iceberg/Schema.java b/api/src/main/java/org/apache/iceberg/Schema.java index 2eafe721f0c4..86a89c0e77d4 100644 --- a/api/src/main/java/org/apache/iceberg/Schema.java +++ b/api/src/main/java/org/apache/iceberg/Schema.java @@ -19,11 +19,6 @@ package org.apache.iceberg; -import com.google.common.shaded.base.Joiner; -import com.google.common.shaded.base.Preconditions; -import com.google.common.shaded.collect.BiMap; -import com.google.common.shaded.collect.ImmutableBiMap; -import com.google.common.shaded.collect.Sets; import java.io.Serializable; import java.util.Arrays; import java.util.Collection; @@ -32,6 +27,11 @@ import java.util.Map; import java.util.Set; import java.util.stream.Collectors; +import org.apache.iceberg.relocated.com.google.common.base.Joiner; +import org.apache.iceberg.relocated.com.google.common.base.Preconditions; +import org.apache.iceberg.relocated.com.google.common.collect.BiMap; +import org.apache.iceberg.relocated.com.google.common.collect.ImmutableBiMap; +import org.apache.iceberg.relocated.com.google.common.collect.Sets; import org.apache.iceberg.types.Type; import org.apache.iceberg.types.TypeUtil; import org.apache.iceberg.types.Types.NestedField; diff --git a/api/src/main/java/org/apache/iceberg/TableScan.java b/api/src/main/java/org/apache/iceberg/TableScan.java index 5e8460c23bb3..3377bc1841e6 100644 --- a/api/src/main/java/org/apache/iceberg/TableScan.java +++ b/api/src/main/java/org/apache/iceberg/TableScan.java @@ -19,10 +19,10 @@ package org.apache.iceberg; -import com.google.common.shaded.collect.Lists; import java.util.Collection; import org.apache.iceberg.expressions.Expression; import org.apache.iceberg.io.CloseableIterable; +import org.apache.iceberg.relocated.com.google.common.collect.Lists; /** * API for configuring a table scan. diff --git a/api/src/main/java/org/apache/iceberg/Tables.java b/api/src/main/java/org/apache/iceberg/Tables.java index 290bc818628a..3681ea6770d7 100644 --- a/api/src/main/java/org/apache/iceberg/Tables.java +++ b/api/src/main/java/org/apache/iceberg/Tables.java @@ -19,8 +19,8 @@ package org.apache.iceberg; -import com.google.common.shaded.collect.ImmutableMap; import java.util.Map; +import org.apache.iceberg.relocated.com.google.common.collect.ImmutableMap; /** * Generic interface for creating and loading a table implementation. diff --git a/api/src/main/java/org/apache/iceberg/catalog/Namespace.java b/api/src/main/java/org/apache/iceberg/catalog/Namespace.java index f3faaa25c946..e08dd6ffe537 100644 --- a/api/src/main/java/org/apache/iceberg/catalog/Namespace.java +++ b/api/src/main/java/org/apache/iceberg/catalog/Namespace.java @@ -19,8 +19,8 @@ package org.apache.iceberg.catalog; -import com.google.common.shaded.base.Joiner; import java.util.Arrays; +import org.apache.iceberg.relocated.com.google.common.base.Joiner; /** * A namespace in a {@link Catalog}. diff --git a/api/src/main/java/org/apache/iceberg/catalog/SupportsNamespaces.java b/api/src/main/java/org/apache/iceberg/catalog/SupportsNamespaces.java index 604e27dfa40d..115e28f65712 100644 --- a/api/src/main/java/org/apache/iceberg/catalog/SupportsNamespaces.java +++ b/api/src/main/java/org/apache/iceberg/catalog/SupportsNamespaces.java @@ -19,13 +19,13 @@ package org.apache.iceberg.catalog; -import com.google.common.shaded.collect.ImmutableMap; import java.util.List; import java.util.Map; import java.util.Set; import org.apache.iceberg.exceptions.AlreadyExistsException; import org.apache.iceberg.exceptions.NamespaceNotEmptyException; import org.apache.iceberg.exceptions.NoSuchNamespaceException; +import org.apache.iceberg.relocated.com.google.common.collect.ImmutableMap; /** * Catalog methods for working with namespaces. diff --git a/api/src/main/java/org/apache/iceberg/catalog/TableIdentifier.java b/api/src/main/java/org/apache/iceberg/catalog/TableIdentifier.java index 7ca0227c7b99..5db74479edc4 100644 --- a/api/src/main/java/org/apache/iceberg/catalog/TableIdentifier.java +++ b/api/src/main/java/org/apache/iceberg/catalog/TableIdentifier.java @@ -19,11 +19,11 @@ package org.apache.iceberg.catalog; -import com.google.common.shaded.base.Preconditions; -import com.google.common.shaded.base.Splitter; -import com.google.common.shaded.collect.Iterables; import java.util.Arrays; import java.util.Objects; +import org.apache.iceberg.relocated.com.google.common.base.Preconditions; +import org.apache.iceberg.relocated.com.google.common.base.Splitter; +import org.apache.iceberg.relocated.com.google.common.collect.Iterables; /** * Identifies a table in iceberg catalog. diff --git a/api/src/main/java/org/apache/iceberg/encryption/EncryptionManager.java b/api/src/main/java/org/apache/iceberg/encryption/EncryptionManager.java index 957540857ff3..97f6f639311b 100644 --- a/api/src/main/java/org/apache/iceberg/encryption/EncryptionManager.java +++ b/api/src/main/java/org/apache/iceberg/encryption/EncryptionManager.java @@ -19,10 +19,10 @@ package org.apache.iceberg.encryption; -import com.google.common.shaded.collect.Iterables; import java.io.Serializable; import org.apache.iceberg.io.InputFile; import org.apache.iceberg.io.OutputFile; +import org.apache.iceberg.relocated.com.google.common.collect.Iterables; /** * Module for encrypting and decrypting table data files. diff --git a/api/src/main/java/org/apache/iceberg/events/Listeners.java b/api/src/main/java/org/apache/iceberg/events/Listeners.java index 1ddd574a17f4..23ecd1e26dba 100644 --- a/api/src/main/java/org/apache/iceberg/events/Listeners.java +++ b/api/src/main/java/org/apache/iceberg/events/Listeners.java @@ -19,11 +19,11 @@ package org.apache.iceberg.events; -import com.google.common.shaded.base.Preconditions; -import com.google.common.shaded.collect.Maps; import java.util.Map; import java.util.Queue; import java.util.concurrent.ConcurrentLinkedQueue; +import org.apache.iceberg.relocated.com.google.common.base.Preconditions; +import org.apache.iceberg.relocated.com.google.common.collect.Maps; /** * Static registration and notification for listeners. diff --git a/api/src/main/java/org/apache/iceberg/expressions/Binder.java b/api/src/main/java/org/apache/iceberg/expressions/Binder.java index fb078f1117a7..ff1d70d328be 100644 --- a/api/src/main/java/org/apache/iceberg/expressions/Binder.java +++ b/api/src/main/java/org/apache/iceberg/expressions/Binder.java @@ -19,12 +19,12 @@ package org.apache.iceberg.expressions; -import com.google.common.shaded.collect.ImmutableSet; -import com.google.common.shaded.collect.Sets; import java.util.List; import java.util.Set; import org.apache.iceberg.exceptions.ValidationException; import org.apache.iceberg.expressions.ExpressionVisitors.ExpressionVisitor; +import org.apache.iceberg.relocated.com.google.common.collect.ImmutableSet; +import org.apache.iceberg.relocated.com.google.common.collect.Sets; import org.apache.iceberg.types.Type; import org.apache.iceberg.types.Types.StructType; diff --git a/api/src/main/java/org/apache/iceberg/expressions/BoundLiteralPredicate.java b/api/src/main/java/org/apache/iceberg/expressions/BoundLiteralPredicate.java index f37c5af51f0a..698b8392bd6b 100644 --- a/api/src/main/java/org/apache/iceberg/expressions/BoundLiteralPredicate.java +++ b/api/src/main/java/org/apache/iceberg/expressions/BoundLiteralPredicate.java @@ -19,8 +19,8 @@ package org.apache.iceberg.expressions; -import com.google.common.shaded.base.Preconditions; import java.util.Comparator; +import org.apache.iceberg.relocated.com.google.common.base.Preconditions; public class BoundLiteralPredicate extends BoundPredicate { private final Literal literal; diff --git a/api/src/main/java/org/apache/iceberg/expressions/BoundSetPredicate.java b/api/src/main/java/org/apache/iceberg/expressions/BoundSetPredicate.java index 3971d3914ac1..aa2ae268bc29 100644 --- a/api/src/main/java/org/apache/iceberg/expressions/BoundSetPredicate.java +++ b/api/src/main/java/org/apache/iceberg/expressions/BoundSetPredicate.java @@ -19,9 +19,9 @@ package org.apache.iceberg.expressions; -import com.google.common.shaded.base.Joiner; -import com.google.common.shaded.base.Preconditions; import java.util.Set; +import org.apache.iceberg.relocated.com.google.common.base.Joiner; +import org.apache.iceberg.relocated.com.google.common.base.Preconditions; public class BoundSetPredicate extends BoundPredicate { private static final Joiner COMMA = Joiner.on(", "); diff --git a/api/src/main/java/org/apache/iceberg/expressions/Expressions.java b/api/src/main/java/org/apache/iceberg/expressions/Expressions.java index bc0b19af4c31..9be27104d3b1 100644 --- a/api/src/main/java/org/apache/iceberg/expressions/Expressions.java +++ b/api/src/main/java/org/apache/iceberg/expressions/Expressions.java @@ -19,10 +19,10 @@ package org.apache.iceberg.expressions; -import com.google.common.shaded.base.Preconditions; -import com.google.common.shaded.collect.Lists; import java.util.stream.Stream; import org.apache.iceberg.expressions.Expression.Operation; +import org.apache.iceberg.relocated.com.google.common.base.Preconditions; +import org.apache.iceberg.relocated.com.google.common.collect.Lists; import org.apache.iceberg.transforms.Transform; import org.apache.iceberg.transforms.Transforms; import org.apache.iceberg.types.Types; diff --git a/api/src/main/java/org/apache/iceberg/expressions/Literals.java b/api/src/main/java/org/apache/iceberg/expressions/Literals.java index 439b3fa869b4..00404a14f12b 100644 --- a/api/src/main/java/org/apache/iceberg/expressions/Literals.java +++ b/api/src/main/java/org/apache/iceberg/expressions/Literals.java @@ -19,7 +19,6 @@ package org.apache.iceberg.expressions; -import com.google.common.shaded.base.Preconditions; import java.io.ObjectStreamException; import java.math.BigDecimal; import java.math.RoundingMode; @@ -35,6 +34,7 @@ import java.util.Comparator; import java.util.Objects; import java.util.UUID; +import org.apache.iceberg.relocated.com.google.common.base.Preconditions; import org.apache.iceberg.types.Comparators; import org.apache.iceberg.types.Conversions; import org.apache.iceberg.types.Type; diff --git a/api/src/main/java/org/apache/iceberg/expressions/NamedReference.java b/api/src/main/java/org/apache/iceberg/expressions/NamedReference.java index ae460599768c..6f599f514305 100644 --- a/api/src/main/java/org/apache/iceberg/expressions/NamedReference.java +++ b/api/src/main/java/org/apache/iceberg/expressions/NamedReference.java @@ -19,9 +19,9 @@ package org.apache.iceberg.expressions; -import com.google.common.shaded.base.Preconditions; import org.apache.iceberg.Schema; import org.apache.iceberg.exceptions.ValidationException; +import org.apache.iceberg.relocated.com.google.common.base.Preconditions; import org.apache.iceberg.types.Types; public class NamedReference implements UnboundTerm, Reference { diff --git a/api/src/main/java/org/apache/iceberg/expressions/Predicate.java b/api/src/main/java/org/apache/iceberg/expressions/Predicate.java index 380e252a2067..9642468ad409 100644 --- a/api/src/main/java/org/apache/iceberg/expressions/Predicate.java +++ b/api/src/main/java/org/apache/iceberg/expressions/Predicate.java @@ -19,7 +19,8 @@ package org.apache.iceberg.expressions; -import com.google.common.shaded.base.Preconditions; + +import org.apache.iceberg.relocated.com.google.common.base.Preconditions; public abstract class Predicate implements Expression { private final Operation op; diff --git a/api/src/main/java/org/apache/iceberg/expressions/StrictMetricsEvaluator.java b/api/src/main/java/org/apache/iceberg/expressions/StrictMetricsEvaluator.java index 8f173a161cb3..4a5598e8d453 100644 --- a/api/src/main/java/org/apache/iceberg/expressions/StrictMetricsEvaluator.java +++ b/api/src/main/java/org/apache/iceberg/expressions/StrictMetricsEvaluator.java @@ -19,7 +19,6 @@ package org.apache.iceberg.expressions; -import com.google.common.shaded.base.Preconditions; import java.nio.ByteBuffer; import java.util.Collection; import java.util.Map; @@ -28,6 +27,7 @@ import org.apache.iceberg.DataFile; import org.apache.iceberg.Schema; import org.apache.iceberg.expressions.ExpressionVisitors.BoundExpressionVisitor; +import org.apache.iceberg.relocated.com.google.common.base.Preconditions; import org.apache.iceberg.types.Conversions; import org.apache.iceberg.types.Types; import org.apache.iceberg.types.Types.StructType; diff --git a/api/src/main/java/org/apache/iceberg/expressions/UnboundPredicate.java b/api/src/main/java/org/apache/iceberg/expressions/UnboundPredicate.java index 690d4c599081..74bab00ab4af 100644 --- a/api/src/main/java/org/apache/iceberg/expressions/UnboundPredicate.java +++ b/api/src/main/java/org/apache/iceberg/expressions/UnboundPredicate.java @@ -19,14 +19,14 @@ package org.apache.iceberg.expressions; -import com.google.common.shaded.base.Joiner; -import com.google.common.shaded.base.Preconditions; -import com.google.common.shaded.collect.Iterables; -import com.google.common.shaded.collect.Lists; -import com.google.common.shaded.collect.Sets; import java.util.List; import java.util.Set; import org.apache.iceberg.exceptions.ValidationException; +import org.apache.iceberg.relocated.com.google.common.base.Joiner; +import org.apache.iceberg.relocated.com.google.common.base.Preconditions; +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.Sets; import org.apache.iceberg.types.Types.StructType; import org.apache.iceberg.util.CharSequenceSet; diff --git a/api/src/main/java/org/apache/iceberg/io/CloseableGroup.java b/api/src/main/java/org/apache/iceberg/io/CloseableGroup.java index 0bf75ce65a5d..c7a20ca01733 100644 --- a/api/src/main/java/org/apache/iceberg/io/CloseableGroup.java +++ b/api/src/main/java/org/apache/iceberg/io/CloseableGroup.java @@ -19,10 +19,10 @@ package org.apache.iceberg.io; -import com.google.common.shaded.collect.Lists; import java.io.Closeable; import java.io.IOException; import java.util.Deque; +import org.apache.iceberg.relocated.com.google.common.collect.Lists; public abstract class CloseableGroup implements Closeable { private final Deque closeables = Lists.newLinkedList(); diff --git a/api/src/main/java/org/apache/iceberg/io/CloseableIterable.java b/api/src/main/java/org/apache/iceberg/io/CloseableIterable.java index d48c50368bbd..4c03c5cc2d45 100644 --- a/api/src/main/java/org/apache/iceberg/io/CloseableIterable.java +++ b/api/src/main/java/org/apache/iceberg/io/CloseableIterable.java @@ -19,9 +19,6 @@ package org.apache.iceberg.io; -import com.google.common.shaded.base.Preconditions; -import com.google.common.shaded.collect.ImmutableList; -import com.google.common.shaded.collect.Iterables; import java.io.Closeable; import java.io.IOException; import java.util.Collections; @@ -30,6 +27,9 @@ import java.util.function.Function; import java.util.function.Predicate; import org.apache.iceberg.exceptions.RuntimeIOException; +import org.apache.iceberg.relocated.com.google.common.base.Preconditions; +import org.apache.iceberg.relocated.com.google.common.collect.ImmutableList; +import org.apache.iceberg.relocated.com.google.common.collect.Iterables; public interface CloseableIterable extends Iterable, Closeable { static CloseableIterable withNoopClose(E entry) { diff --git a/api/src/main/java/org/apache/iceberg/transforms/Bucket.java b/api/src/main/java/org/apache/iceberg/transforms/Bucket.java index d1ad2be3f2b5..9ab1fd44a5c9 100644 --- a/api/src/main/java/org/apache/iceberg/transforms/Bucket.java +++ b/api/src/main/java/org/apache/iceberg/transforms/Bucket.java @@ -19,11 +19,6 @@ package org.apache.iceberg.transforms; -import com.google.common.shaded.annotations.VisibleForTesting; -import com.google.common.shaded.base.Objects; -import com.google.common.shaded.collect.Sets; -import com.google.common.shaded.hash.HashFunction; -import com.google.common.shaded.hash.Hashing; import java.math.BigDecimal; import java.nio.ByteBuffer; import java.nio.charset.StandardCharsets; @@ -34,6 +29,11 @@ import org.apache.iceberg.expressions.Expression; import org.apache.iceberg.expressions.Expressions; import org.apache.iceberg.expressions.UnboundPredicate; +import org.apache.iceberg.relocated.com.google.common.annotations.VisibleForTesting; +import org.apache.iceberg.relocated.com.google.common.base.Objects; +import org.apache.iceberg.relocated.com.google.common.collect.Sets; +import org.apache.iceberg.relocated.com.google.common.hash.HashFunction; +import org.apache.iceberg.relocated.com.google.common.hash.Hashing; import org.apache.iceberg.types.Type; import org.apache.iceberg.types.Types; diff --git a/api/src/main/java/org/apache/iceberg/transforms/Identity.java b/api/src/main/java/org/apache/iceberg/transforms/Identity.java index 1feacd8e9ab1..e53a8f115f9c 100644 --- a/api/src/main/java/org/apache/iceberg/transforms/Identity.java +++ b/api/src/main/java/org/apache/iceberg/transforms/Identity.java @@ -19,11 +19,11 @@ package org.apache.iceberg.transforms; -import com.google.common.shaded.base.Objects; import java.nio.ByteBuffer; import org.apache.iceberg.expressions.BoundPredicate; import org.apache.iceberg.expressions.Expressions; import org.apache.iceberg.expressions.UnboundPredicate; +import org.apache.iceberg.relocated.com.google.common.base.Objects; import org.apache.iceberg.types.Type; import org.apache.iceberg.types.Types; diff --git a/api/src/main/java/org/apache/iceberg/transforms/PartitionSpecVisitor.java b/api/src/main/java/org/apache/iceberg/transforms/PartitionSpecVisitor.java index b07ed3e0e701..13ae759ea085 100644 --- a/api/src/main/java/org/apache/iceberg/transforms/PartitionSpecVisitor.java +++ b/api/src/main/java/org/apache/iceberg/transforms/PartitionSpecVisitor.java @@ -19,11 +19,11 @@ package org.apache.iceberg.transforms; -import com.google.common.shaded.collect.Lists; import java.util.List; import org.apache.iceberg.PartitionField; import org.apache.iceberg.PartitionSpec; import org.apache.iceberg.Schema; +import org.apache.iceberg.relocated.com.google.common.collect.Lists; public interface PartitionSpecVisitor { T identity(String sourceName, int sourceId); diff --git a/api/src/main/java/org/apache/iceberg/transforms/ProjectionUtil.java b/api/src/main/java/org/apache/iceberg/transforms/ProjectionUtil.java index fc422a7f164a..683d6c03b948 100644 --- a/api/src/main/java/org/apache/iceberg/transforms/ProjectionUtil.java +++ b/api/src/main/java/org/apache/iceberg/transforms/ProjectionUtil.java @@ -19,7 +19,6 @@ package org.apache.iceberg.transforms; -import com.google.common.shaded.collect.Iterables; import java.math.BigDecimal; import java.math.BigInteger; import org.apache.iceberg.expressions.BoundLiteralPredicate; @@ -29,6 +28,7 @@ import org.apache.iceberg.expressions.Expression; import org.apache.iceberg.expressions.Expressions; import org.apache.iceberg.expressions.UnboundPredicate; +import org.apache.iceberg.relocated.com.google.common.collect.Iterables; import static org.apache.iceberg.expressions.Expressions.predicate; diff --git a/api/src/main/java/org/apache/iceberg/transforms/Transforms.java b/api/src/main/java/org/apache/iceberg/transforms/Transforms.java index 21e40e0b3c2f..15c6bf55ccf0 100644 --- a/api/src/main/java/org/apache/iceberg/transforms/Transforms.java +++ b/api/src/main/java/org/apache/iceberg/transforms/Transforms.java @@ -19,12 +19,12 @@ package org.apache.iceberg.transforms; -import com.google.common.shaded.base.Preconditions; import java.util.Locale; import java.util.regex.Matcher; import java.util.regex.Pattern; import org.apache.iceberg.PartitionSpec; import org.apache.iceberg.Schema; +import org.apache.iceberg.relocated.com.google.common.base.Preconditions; import org.apache.iceberg.types.Type; /** diff --git a/api/src/main/java/org/apache/iceberg/transforms/Truncate.java b/api/src/main/java/org/apache/iceberg/transforms/Truncate.java index bfd1ba8cf05e..39120b372ccc 100644 --- a/api/src/main/java/org/apache/iceberg/transforms/Truncate.java +++ b/api/src/main/java/org/apache/iceberg/transforms/Truncate.java @@ -19,7 +19,6 @@ package org.apache.iceberg.transforms; -import com.google.common.shaded.base.Objects; import java.math.BigDecimal; import java.math.BigInteger; import java.nio.ByteBuffer; @@ -30,6 +29,7 @@ import org.apache.iceberg.expressions.Expression; import org.apache.iceberg.expressions.Expressions; import org.apache.iceberg.expressions.UnboundPredicate; +import org.apache.iceberg.relocated.com.google.common.base.Objects; import org.apache.iceberg.types.Type; import org.apache.iceberg.util.UnicodeUtil; diff --git a/api/src/main/java/org/apache/iceberg/types/AssignFreshIds.java b/api/src/main/java/org/apache/iceberg/types/AssignFreshIds.java index 3ec406332586..34c2355d1647 100644 --- a/api/src/main/java/org/apache/iceberg/types/AssignFreshIds.java +++ b/api/src/main/java/org/apache/iceberg/types/AssignFreshIds.java @@ -19,11 +19,11 @@ package org.apache.iceberg.types; -import com.google.common.shaded.collect.Lists; import java.util.Iterator; import java.util.List; import java.util.function.Supplier; import org.apache.iceberg.Schema; +import org.apache.iceberg.relocated.com.google.common.collect.Lists; class AssignFreshIds extends TypeUtil.CustomOrderSchemaVisitor { private final TypeUtil.NextID nextId; 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 8873b5635a4b..7b462a33e7f4 100644 --- a/api/src/main/java/org/apache/iceberg/types/CheckCompatibility.java +++ b/api/src/main/java/org/apache/iceberg/types/CheckCompatibility.java @@ -19,15 +19,15 @@ package org.apache.iceberg.types; -import com.google.common.shaded.base.Preconditions; -import com.google.common.shaded.collect.ImmutableList; -import com.google.common.shaded.collect.Lists; -import com.google.common.shaded.collect.Maps; import java.util.List; import java.util.Locale; import java.util.Map; import java.util.function.Supplier; import org.apache.iceberg.Schema; +import org.apache.iceberg.relocated.com.google.common.base.Preconditions; +import org.apache.iceberg.relocated.com.google.common.collect.ImmutableList; +import org.apache.iceberg.relocated.com.google.common.collect.Lists; +import org.apache.iceberg.relocated.com.google.common.collect.Maps; public class CheckCompatibility extends TypeUtil.CustomOrderSchemaVisitor> { /** diff --git a/api/src/main/java/org/apache/iceberg/types/Comparators.java b/api/src/main/java/org/apache/iceberg/types/Comparators.java index 5ed016ffec85..57ad1d476126 100644 --- a/api/src/main/java/org/apache/iceberg/types/Comparators.java +++ b/api/src/main/java/org/apache/iceberg/types/Comparators.java @@ -19,9 +19,9 @@ package org.apache.iceberg.types; -import com.google.common.shaded.collect.ImmutableMap; import java.nio.ByteBuffer; import java.util.Comparator; +import org.apache.iceberg.relocated.com.google.common.collect.ImmutableMap; import org.apache.iceberg.util.UnicodeUtil; public class Comparators { diff --git a/api/src/main/java/org/apache/iceberg/types/GetProjectedIds.java b/api/src/main/java/org/apache/iceberg/types/GetProjectedIds.java index c85b884c63cc..d50c45e22e6b 100644 --- a/api/src/main/java/org/apache/iceberg/types/GetProjectedIds.java +++ b/api/src/main/java/org/apache/iceberg/types/GetProjectedIds.java @@ -19,10 +19,10 @@ package org.apache.iceberg.types; -import com.google.common.shaded.collect.Sets; import java.util.List; import java.util.Set; import org.apache.iceberg.Schema; +import org.apache.iceberg.relocated.com.google.common.collect.Sets; class GetProjectedIds extends TypeUtil.SchemaVisitor> { private final Set fieldIds = Sets.newHashSet(); diff --git a/api/src/main/java/org/apache/iceberg/types/IndexById.java b/api/src/main/java/org/apache/iceberg/types/IndexById.java index 0e4fd3a8eadd..4670ce96a3ca 100644 --- a/api/src/main/java/org/apache/iceberg/types/IndexById.java +++ b/api/src/main/java/org/apache/iceberg/types/IndexById.java @@ -19,10 +19,10 @@ package org.apache.iceberg.types; -import com.google.common.shaded.collect.Maps; import java.util.List; import java.util.Map; import org.apache.iceberg.Schema; +import org.apache.iceberg.relocated.com.google.common.collect.Maps; class IndexById extends TypeUtil.SchemaVisitor> { private final Map index = Maps.newHashMap(); diff --git a/api/src/main/java/org/apache/iceberg/types/IndexByName.java b/api/src/main/java/org/apache/iceberg/types/IndexByName.java index 15881e15231c..a7fc06c35402 100644 --- a/api/src/main/java/org/apache/iceberg/types/IndexByName.java +++ b/api/src/main/java/org/apache/iceberg/types/IndexByName.java @@ -19,15 +19,15 @@ package org.apache.iceberg.types; -import com.google.common.shaded.base.Joiner; -import com.google.common.shaded.collect.Lists; -import com.google.common.shaded.collect.Maps; import java.util.Deque; import java.util.Map; import java.util.concurrent.Callable; import java.util.function.Supplier; import org.apache.iceberg.Schema; import org.apache.iceberg.exceptions.ValidationException; +import org.apache.iceberg.relocated.com.google.common.base.Joiner; +import org.apache.iceberg.relocated.com.google.common.collect.Lists; +import org.apache.iceberg.relocated.com.google.common.collect.Maps; public class IndexByName extends TypeUtil.CustomOrderSchemaVisitor> { private static final Joiner DOT = Joiner.on("."); diff --git a/api/src/main/java/org/apache/iceberg/types/PruneColumns.java b/api/src/main/java/org/apache/iceberg/types/PruneColumns.java index c5b76df4af71..2ef9bfd8b947 100644 --- a/api/src/main/java/org/apache/iceberg/types/PruneColumns.java +++ b/api/src/main/java/org/apache/iceberg/types/PruneColumns.java @@ -19,10 +19,10 @@ package org.apache.iceberg.types; -import com.google.common.shaded.collect.Lists; import java.util.List; import java.util.Set; import org.apache.iceberg.Schema; +import org.apache.iceberg.relocated.com.google.common.collect.Lists; class PruneColumns extends TypeUtil.SchemaVisitor { private final Set selected; diff --git a/api/src/main/java/org/apache/iceberg/types/ReassignIds.java b/api/src/main/java/org/apache/iceberg/types/ReassignIds.java index eed526f156f3..c4006b1b88c8 100644 --- a/api/src/main/java/org/apache/iceberg/types/ReassignIds.java +++ b/api/src/main/java/org/apache/iceberg/types/ReassignIds.java @@ -19,11 +19,11 @@ package org.apache.iceberg.types; -import com.google.common.shaded.base.Preconditions; -import com.google.common.shaded.collect.Lists; import java.util.List; import java.util.function.Supplier; import org.apache.iceberg.Schema; +import org.apache.iceberg.relocated.com.google.common.base.Preconditions; +import org.apache.iceberg.relocated.com.google.common.collect.Lists; class ReassignIds extends TypeUtil.CustomOrderSchemaVisitor { private final Schema sourceSchema; diff --git a/api/src/main/java/org/apache/iceberg/types/TypeUtil.java b/api/src/main/java/org/apache/iceberg/types/TypeUtil.java index 2f99aefd8b53..3719f0aba4c4 100644 --- a/api/src/main/java/org/apache/iceberg/types/TypeUtil.java +++ b/api/src/main/java/org/apache/iceberg/types/TypeUtil.java @@ -19,12 +19,6 @@ package org.apache.iceberg.types; -import com.google.common.shaded.base.Preconditions; -import com.google.common.shaded.collect.ImmutableList; -import com.google.common.shaded.collect.ImmutableSet; -import com.google.common.shaded.collect.Iterables; -import com.google.common.shaded.collect.Lists; -import com.google.common.shaded.collect.Maps; import java.util.List; import java.util.Locale; import java.util.Map; @@ -33,6 +27,12 @@ import java.util.function.Predicate; import java.util.function.Supplier; import org.apache.iceberg.Schema; +import org.apache.iceberg.relocated.com.google.common.base.Preconditions; +import org.apache.iceberg.relocated.com.google.common.collect.ImmutableList; +import org.apache.iceberg.relocated.com.google.common.collect.ImmutableSet; +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; public class TypeUtil { diff --git a/api/src/main/java/org/apache/iceberg/types/Types.java b/api/src/main/java/org/apache/iceberg/types/Types.java index 367a0749a1e2..41d9a040df94 100644 --- a/api/src/main/java/org/apache/iceberg/types/Types.java +++ b/api/src/main/java/org/apache/iceberg/types/Types.java @@ -19,10 +19,6 @@ package org.apache.iceberg.types; -import com.google.common.shaded.base.Joiner; -import com.google.common.shaded.base.Preconditions; -import com.google.common.shaded.collect.ImmutableList; -import com.google.common.shaded.collect.ImmutableMap; import java.io.Serializable; import java.util.Arrays; import java.util.List; @@ -31,6 +27,10 @@ import java.util.Objects; import java.util.regex.Matcher; import java.util.regex.Pattern; +import org.apache.iceberg.relocated.com.google.common.base.Joiner; +import org.apache.iceberg.relocated.com.google.common.base.Preconditions; +import org.apache.iceberg.relocated.com.google.common.collect.ImmutableList; +import org.apache.iceberg.relocated.com.google.common.collect.ImmutableMap; import org.apache.iceberg.types.Type.NestedType; import org.apache.iceberg.types.Type.PrimitiveType; diff --git a/api/src/main/java/org/apache/iceberg/util/BinaryUtil.java b/api/src/main/java/org/apache/iceberg/util/BinaryUtil.java index af25b121b10c..812085f07199 100644 --- a/api/src/main/java/org/apache/iceberg/util/BinaryUtil.java +++ b/api/src/main/java/org/apache/iceberg/util/BinaryUtil.java @@ -19,9 +19,9 @@ package org.apache.iceberg.util; -import com.google.common.shaded.base.Preconditions; import java.nio.ByteBuffer; import org.apache.iceberg.expressions.Literal; +import org.apache.iceberg.relocated.com.google.common.base.Preconditions; public class BinaryUtil { // not meant to be instantiated diff --git a/api/src/main/java/org/apache/iceberg/util/CharSequenceSet.java b/api/src/main/java/org/apache/iceberg/util/CharSequenceSet.java index 581b780c3841..a72468272f65 100644 --- a/api/src/main/java/org/apache/iceberg/util/CharSequenceSet.java +++ b/api/src/main/java/org/apache/iceberg/util/CharSequenceSet.java @@ -19,13 +19,13 @@ package org.apache.iceberg.util; -import com.google.common.shaded.collect.Iterables; -import com.google.common.shaded.collect.Iterators; -import com.google.common.shaded.collect.Sets; import java.io.Serializable; import java.util.Collection; import java.util.Iterator; import java.util.Set; +import org.apache.iceberg.relocated.com.google.common.collect.Iterables; +import org.apache.iceberg.relocated.com.google.common.collect.Iterators; +import org.apache.iceberg.relocated.com.google.common.collect.Sets; public class CharSequenceSet implements Set, Serializable { public static Set of(Iterable charSequences) { diff --git a/api/src/main/java/org/apache/iceberg/util/UnicodeUtil.java b/api/src/main/java/org/apache/iceberg/util/UnicodeUtil.java index cb1cb10da902..40f475ad163d 100644 --- a/api/src/main/java/org/apache/iceberg/util/UnicodeUtil.java +++ b/api/src/main/java/org/apache/iceberg/util/UnicodeUtil.java @@ -19,8 +19,8 @@ package org.apache.iceberg.util; -import com.google.common.shaded.base.Preconditions; import org.apache.iceberg.expressions.Literal; +import org.apache.iceberg.relocated.com.google.common.base.Preconditions; public class UnicodeUtil { // not meant to be instantiated diff --git a/api/src/test/java/org/apache/iceberg/expressions/TestInclusiveManifestEvaluator.java b/api/src/test/java/org/apache/iceberg/expressions/TestInclusiveManifestEvaluator.java index b994f2f3f63d..a35d97988f77 100644 --- a/api/src/test/java/org/apache/iceberg/expressions/TestInclusiveManifestEvaluator.java +++ b/api/src/test/java/org/apache/iceberg/expressions/TestInclusiveManifestEvaluator.java @@ -19,7 +19,6 @@ package org.apache.iceberg.expressions; -import com.google.common.shaded.collect.ImmutableList; import java.nio.ByteBuffer; import org.apache.iceberg.AssertHelpers; import org.apache.iceberg.ManifestFile; @@ -27,6 +26,7 @@ import org.apache.iceberg.Schema; import org.apache.iceberg.TestHelpers; import org.apache.iceberg.exceptions.ValidationException; +import org.apache.iceberg.relocated.com.google.common.collect.ImmutableList; import org.apache.iceberg.types.Types; import org.junit.Assert; import org.junit.Test; diff --git a/api/src/test/java/org/apache/iceberg/expressions/TestInclusiveMetricsEvaluator.java b/api/src/test/java/org/apache/iceberg/expressions/TestInclusiveMetricsEvaluator.java index d3a0b4d1d812..57f5255ba1e6 100644 --- a/api/src/test/java/org/apache/iceberg/expressions/TestInclusiveMetricsEvaluator.java +++ b/api/src/test/java/org/apache/iceberg/expressions/TestInclusiveMetricsEvaluator.java @@ -19,13 +19,13 @@ package org.apache.iceberg.expressions; -import com.google.common.shaded.collect.ImmutableMap; import org.apache.iceberg.AssertHelpers; import org.apache.iceberg.DataFile; import org.apache.iceberg.Schema; import org.apache.iceberg.TestHelpers.Row; import org.apache.iceberg.TestHelpers.TestDataFile; import org.apache.iceberg.exceptions.ValidationException; +import org.apache.iceberg.relocated.com.google.common.collect.ImmutableMap; import org.apache.iceberg.types.Types; import org.apache.iceberg.types.Types.IntegerType; import org.apache.iceberg.types.Types.StringType; diff --git a/api/src/test/java/org/apache/iceberg/expressions/TestStrictMetricsEvaluator.java b/api/src/test/java/org/apache/iceberg/expressions/TestStrictMetricsEvaluator.java index 7e7921d64664..6116fca2aa05 100644 --- a/api/src/test/java/org/apache/iceberg/expressions/TestStrictMetricsEvaluator.java +++ b/api/src/test/java/org/apache/iceberg/expressions/TestStrictMetricsEvaluator.java @@ -19,13 +19,13 @@ package org.apache.iceberg.expressions; -import com.google.common.shaded.collect.ImmutableMap; import org.apache.iceberg.AssertHelpers; import org.apache.iceberg.DataFile; import org.apache.iceberg.Schema; import org.apache.iceberg.TestHelpers.Row; import org.apache.iceberg.TestHelpers.TestDataFile; import org.apache.iceberg.exceptions.ValidationException; +import org.apache.iceberg.relocated.com.google.common.collect.ImmutableMap; import org.apache.iceberg.types.Types.IntegerType; import org.apache.iceberg.types.Types.StringType; import org.junit.Assert; diff --git a/api/src/test/java/org/apache/iceberg/io/TestCloseableIterable.java b/api/src/test/java/org/apache/iceberg/io/TestCloseableIterable.java index 7f53febbaa42..fdeba3746c41 100644 --- a/api/src/test/java/org/apache/iceberg/io/TestCloseableIterable.java +++ b/api/src/test/java/org/apache/iceberg/io/TestCloseableIterable.java @@ -19,10 +19,10 @@ package org.apache.iceberg.io; -import com.google.common.shaded.collect.Iterables; -import com.google.common.shaded.collect.Lists; import java.util.NoSuchElementException; import org.apache.iceberg.AssertHelpers; +import org.apache.iceberg.relocated.com.google.common.collect.Iterables; +import org.apache.iceberg.relocated.com.google.common.collect.Lists; import org.junit.Assert; import org.junit.Test; diff --git a/api/src/test/java/org/apache/iceberg/transforms/TestBucketing.java b/api/src/test/java/org/apache/iceberg/transforms/TestBucketing.java index f8859cdc3aab..517932896e70 100644 --- a/api/src/test/java/org/apache/iceberg/transforms/TestBucketing.java +++ b/api/src/test/java/org/apache/iceberg/transforms/TestBucketing.java @@ -19,8 +19,6 @@ package org.apache.iceberg.transforms; -import com.google.common.shaded.hash.HashFunction; -import com.google.common.shaded.hash.Hashing; import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; import java.math.BigDecimal; @@ -31,6 +29,8 @@ import java.util.UUID; import org.apache.avro.util.Utf8; import org.apache.iceberg.expressions.Literal; +import org.apache.iceberg.relocated.com.google.common.hash.HashFunction; +import org.apache.iceberg.relocated.com.google.common.hash.Hashing; import org.apache.iceberg.types.Types; import org.junit.Assert; import org.junit.Before; diff --git a/api/src/test/java/org/apache/iceberg/transforms/TestBucketingProjection.java b/api/src/test/java/org/apache/iceberg/transforms/TestBucketingProjection.java index f9b13bc3d4f8..af487ffdb288 100644 --- a/api/src/test/java/org/apache/iceberg/transforms/TestBucketingProjection.java +++ b/api/src/test/java/org/apache/iceberg/transforms/TestBucketingProjection.java @@ -19,8 +19,6 @@ package org.apache.iceberg.transforms; -import com.google.common.shaded.collect.Iterables; -import com.google.common.shaded.collect.Lists; import java.math.BigDecimal; import java.nio.ByteBuffer; import java.util.UUID; @@ -31,6 +29,8 @@ import org.apache.iceberg.expressions.Literal; import org.apache.iceberg.expressions.Projections; import org.apache.iceberg.expressions.UnboundPredicate; +import org.apache.iceberg.relocated.com.google.common.collect.Iterables; +import org.apache.iceberg.relocated.com.google.common.collect.Lists; import org.apache.iceberg.types.Types; import org.junit.Assert; import org.junit.Test; diff --git a/api/src/test/java/org/apache/iceberg/transforms/TestDatesProjection.java b/api/src/test/java/org/apache/iceberg/transforms/TestDatesProjection.java index 8318663137f4..475ec7f1afcd 100644 --- a/api/src/test/java/org/apache/iceberg/transforms/TestDatesProjection.java +++ b/api/src/test/java/org/apache/iceberg/transforms/TestDatesProjection.java @@ -19,8 +19,6 @@ package org.apache.iceberg.transforms; -import com.google.common.shaded.collect.Iterables; -import com.google.common.shaded.collect.Lists; import java.util.stream.Collectors; import org.apache.iceberg.PartitionSpec; import org.apache.iceberg.Schema; @@ -28,6 +26,8 @@ import org.apache.iceberg.expressions.Literal; import org.apache.iceberg.expressions.Projections; import org.apache.iceberg.expressions.UnboundPredicate; +import org.apache.iceberg.relocated.com.google.common.collect.Iterables; +import org.apache.iceberg.relocated.com.google.common.collect.Lists; import org.apache.iceberg.types.Types; import org.junit.Assert; import org.junit.Test; diff --git a/api/src/test/java/org/apache/iceberg/transforms/TestProjection.java b/api/src/test/java/org/apache/iceberg/transforms/TestProjection.java index aaf279b09bcf..445bf42ed47a 100644 --- a/api/src/test/java/org/apache/iceberg/transforms/TestProjection.java +++ b/api/src/test/java/org/apache/iceberg/transforms/TestProjection.java @@ -19,7 +19,6 @@ package org.apache.iceberg.transforms; -import com.google.common.shaded.collect.Lists; import java.util.List; import org.apache.iceberg.PartitionSpec; import org.apache.iceberg.Schema; @@ -30,6 +29,7 @@ import org.apache.iceberg.expressions.Or; import org.apache.iceberg.expressions.Projections; import org.apache.iceberg.expressions.UnboundPredicate; +import org.apache.iceberg.relocated.com.google.common.collect.Lists; import org.apache.iceberg.types.Types; import org.junit.Assert; import org.junit.Test; diff --git a/api/src/test/java/org/apache/iceberg/transforms/TestTimestampsProjection.java b/api/src/test/java/org/apache/iceberg/transforms/TestTimestampsProjection.java index 4889ac7bbd18..3af41473d467 100644 --- a/api/src/test/java/org/apache/iceberg/transforms/TestTimestampsProjection.java +++ b/api/src/test/java/org/apache/iceberg/transforms/TestTimestampsProjection.java @@ -19,8 +19,6 @@ package org.apache.iceberg.transforms; -import com.google.common.shaded.collect.Iterables; -import com.google.common.shaded.collect.Lists; import java.util.stream.Collectors; import org.apache.iceberg.PartitionSpec; import org.apache.iceberg.Schema; @@ -28,6 +26,8 @@ import org.apache.iceberg.expressions.Literal; import org.apache.iceberg.expressions.Projections; import org.apache.iceberg.expressions.UnboundPredicate; +import org.apache.iceberg.relocated.com.google.common.collect.Iterables; +import org.apache.iceberg.relocated.com.google.common.collect.Lists; import org.apache.iceberg.types.Types; import org.junit.Assert; import org.junit.Test; diff --git a/api/src/test/java/org/apache/iceberg/transforms/TestTruncatesProjection.java b/api/src/test/java/org/apache/iceberg/transforms/TestTruncatesProjection.java index 3bbdcd408aa9..298aee34d6f2 100644 --- a/api/src/test/java/org/apache/iceberg/transforms/TestTruncatesProjection.java +++ b/api/src/test/java/org/apache/iceberg/transforms/TestTruncatesProjection.java @@ -19,8 +19,6 @@ package org.apache.iceberg.transforms; -import com.google.common.shaded.collect.Iterables; -import com.google.common.shaded.collect.Lists; import java.math.BigDecimal; import java.nio.ByteBuffer; import java.util.stream.Collectors; @@ -30,6 +28,8 @@ import org.apache.iceberg.expressions.Literal; import org.apache.iceberg.expressions.Projections; import org.apache.iceberg.expressions.UnboundPredicate; +import org.apache.iceberg.relocated.com.google.common.collect.Iterables; +import org.apache.iceberg.relocated.com.google.common.collect.Lists; import org.apache.iceberg.types.Types; import org.junit.Assert; import org.junit.Test; diff --git a/arrow/src/main/java/org/apache/iceberg/arrow/ArrowSchemaUtil.java b/arrow/src/main/java/org/apache/iceberg/arrow/ArrowSchemaUtil.java index 74121e4ce476..4d51803a5b90 100644 --- a/arrow/src/main/java/org/apache/iceberg/arrow/ArrowSchemaUtil.java +++ b/arrow/src/main/java/org/apache/iceberg/arrow/ArrowSchemaUtil.java @@ -19,9 +19,6 @@ package org.apache.iceberg.arrow; -import com.google.common.shaded.collect.ImmutableList; -import com.google.common.shaded.collect.ImmutableMap; -import com.google.common.shaded.collect.Lists; import java.util.List; import java.util.Map; import org.apache.arrow.vector.types.DateUnit; @@ -31,6 +28,9 @@ import org.apache.arrow.vector.types.pojo.Field; import org.apache.arrow.vector.types.pojo.FieldType; import org.apache.arrow.vector.types.pojo.Schema; +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.Lists; import org.apache.iceberg.types.Types; import org.apache.iceberg.types.Types.ListType; import org.apache.iceberg.types.Types.MapType; diff --git a/arrow/src/main/java/org/apache/iceberg/arrow/vectorized/VectorizedArrowReader.java b/arrow/src/main/java/org/apache/iceberg/arrow/vectorized/VectorizedArrowReader.java index 2501e8f16756..cbe3eacc9139 100644 --- a/arrow/src/main/java/org/apache/iceberg/arrow/vectorized/VectorizedArrowReader.java +++ b/arrow/src/main/java/org/apache/iceberg/arrow/vectorized/VectorizedArrowReader.java @@ -19,7 +19,6 @@ package org.apache.iceberg.arrow.vectorized; -import com.google.common.shaded.base.Preconditions; import java.util.Map; import org.apache.arrow.memory.BufferAllocator; import org.apache.arrow.vector.BigIntVector; @@ -38,6 +37,7 @@ import org.apache.iceberg.arrow.vectorized.parquet.VectorizedColumnIterator; import org.apache.iceberg.parquet.ParquetUtil; import org.apache.iceberg.parquet.VectorizedReader; +import org.apache.iceberg.relocated.com.google.common.base.Preconditions; import org.apache.iceberg.types.Types; import org.apache.parquet.column.ColumnDescriptor; import org.apache.parquet.column.Dictionary; diff --git a/arrow/src/main/java/org/apache/iceberg/arrow/vectorized/parquet/BaseVectorizedParquetValuesReader.java b/arrow/src/main/java/org/apache/iceberg/arrow/vectorized/parquet/BaseVectorizedParquetValuesReader.java index a4e4751e94ce..60799d017ccc 100644 --- a/arrow/src/main/java/org/apache/iceberg/arrow/vectorized/parquet/BaseVectorizedParquetValuesReader.java +++ b/arrow/src/main/java/org/apache/iceberg/arrow/vectorized/parquet/BaseVectorizedParquetValuesReader.java @@ -19,9 +19,9 @@ package org.apache.iceberg.arrow.vectorized.parquet; -import com.google.common.shaded.base.Preconditions; import java.io.IOException; import java.nio.ByteBuffer; +import org.apache.iceberg.relocated.com.google.common.base.Preconditions; import org.apache.parquet.bytes.ByteBufferInputStream; import org.apache.parquet.bytes.BytesUtils; import org.apache.parquet.column.values.ValuesReader; diff --git a/arrow/src/main/java/org/apache/iceberg/arrow/vectorized/parquet/VectorizedColumnIterator.java b/arrow/src/main/java/org/apache/iceberg/arrow/vectorized/parquet/VectorizedColumnIterator.java index 11a9483bf032..2692cfc59747 100644 --- a/arrow/src/main/java/org/apache/iceberg/arrow/vectorized/parquet/VectorizedColumnIterator.java +++ b/arrow/src/main/java/org/apache/iceberg/arrow/vectorized/parquet/VectorizedColumnIterator.java @@ -19,12 +19,12 @@ package org.apache.iceberg.arrow.vectorized.parquet; -import com.google.common.shaded.base.Preconditions; import org.apache.arrow.vector.FieldVector; import org.apache.arrow.vector.IntVector; import org.apache.iceberg.arrow.vectorized.NullabilityHolder; import org.apache.iceberg.parquet.BaseColumnIterator; import org.apache.iceberg.parquet.BasePageIterator; +import org.apache.iceberg.relocated.com.google.common.base.Preconditions; import org.apache.parquet.column.ColumnDescriptor; import org.apache.parquet.column.Dictionary; import org.apache.parquet.column.page.PageReader; diff --git a/build.gradle b/build.gradle index ee060eae242e..17c8eb9c5512 100644 --- a/build.gradle +++ b/build.gradle @@ -113,7 +113,7 @@ project(':iceberg-relocate-external-dependencies') { tasks.install.dependsOn tasks.shadowJar dependencies { - compile('com.google.guava:guava:28.0-jre') { + compile('com.google.guava:guava') { exclude group: 'com.google.code.findbugs' // may be LGPL - use ALv2 findbugs-annotations instead exclude group: 'com.google.errorprone' @@ -128,7 +128,6 @@ project(':iceberg-relocate-external-dependencies') { // include the LICENSE and NOTICE files for the shaded Jar from(projectDir) { include 'LICENSE' - include 'NOTICE' } dependencies { @@ -137,7 +136,7 @@ project(':iceberg-relocate-external-dependencies') { exclude(dependency('org.checkerframework:checker-qual')) } - relocate 'com.google.common', 'com.google.common.shaded' + relocate 'com.google.common', 'org.apache.iceberg.relocated.com.google.common' minimize() } diff --git a/common/src/main/java/org/apache/iceberg/common/DynClasses.java b/common/src/main/java/org/apache/iceberg/common/DynClasses.java index ea6cf6f9d881..ec7867d1093b 100644 --- a/common/src/main/java/org/apache/iceberg/common/DynClasses.java +++ b/common/src/main/java/org/apache/iceberg/common/DynClasses.java @@ -19,9 +19,9 @@ package org.apache.iceberg.common; -import com.google.common.shaded.base.Joiner; import java.util.LinkedHashSet; import java.util.Set; +import org.apache.iceberg.relocated.com.google.common.base.Joiner; public class DynClasses { diff --git a/common/src/main/java/org/apache/iceberg/common/DynConstructors.java b/common/src/main/java/org/apache/iceberg/common/DynConstructors.java index fa1c13b2b0d5..ccc280706513 100644 --- a/common/src/main/java/org/apache/iceberg/common/DynConstructors.java +++ b/common/src/main/java/org/apache/iceberg/common/DynConstructors.java @@ -19,8 +19,6 @@ package org.apache.iceberg.common; -import com.google.common.shaded.base.Preconditions; -import com.google.common.shaded.base.Throwables; import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; import java.security.AccessController; @@ -28,6 +26,8 @@ import java.util.Arrays; import java.util.HashMap; import java.util.Map; +import org.apache.iceberg.relocated.com.google.common.base.Preconditions; +import org.apache.iceberg.relocated.com.google.common.base.Throwables; /** diff --git a/common/src/main/java/org/apache/iceberg/common/DynFields.java b/common/src/main/java/org/apache/iceberg/common/DynFields.java index f05d64bbc64e..2a11eea2dd4f 100644 --- a/common/src/main/java/org/apache/iceberg/common/DynFields.java +++ b/common/src/main/java/org/apache/iceberg/common/DynFields.java @@ -20,16 +20,16 @@ package org.apache.iceberg.common; -import com.google.common.shaded.base.Joiner; -import com.google.common.shaded.base.MoreObjects; -import com.google.common.shaded.base.Preconditions; -import com.google.common.shaded.base.Throwables; -import com.google.common.shaded.collect.Sets; import java.lang.reflect.Field; import java.lang.reflect.Modifier; import java.security.AccessController; import java.security.PrivilegedAction; import java.util.Set; +import org.apache.iceberg.relocated.com.google.common.base.Joiner; +import org.apache.iceberg.relocated.com.google.common.base.MoreObjects; +import org.apache.iceberg.relocated.com.google.common.base.Preconditions; +import org.apache.iceberg.relocated.com.google.common.base.Throwables; +import org.apache.iceberg.relocated.com.google.common.collect.Sets; public class DynFields { diff --git a/common/src/main/java/org/apache/iceberg/common/DynMethods.java b/common/src/main/java/org/apache/iceberg/common/DynMethods.java index b8a294af060e..66522fed67c5 100644 --- a/common/src/main/java/org/apache/iceberg/common/DynMethods.java +++ b/common/src/main/java/org/apache/iceberg/common/DynMethods.java @@ -19,14 +19,14 @@ package org.apache.iceberg.common; -import com.google.common.shaded.base.Preconditions; -import com.google.common.shaded.base.Throwables; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.lang.reflect.Modifier; import java.security.AccessController; import java.security.PrivilegedAction; import java.util.Arrays; +import org.apache.iceberg.relocated.com.google.common.base.Preconditions; +import org.apache.iceberg.relocated.com.google.common.base.Throwables; /** diff --git a/core/src/main/java/org/apache/iceberg/AllDataFilesTable.java b/core/src/main/java/org/apache/iceberg/AllDataFilesTable.java index 654a31ad53fc..9e41a57a2584 100644 --- a/core/src/main/java/org/apache/iceberg/AllDataFilesTable.java +++ b/core/src/main/java/org/apache/iceberg/AllDataFilesTable.java @@ -19,9 +19,6 @@ package org.apache.iceberg; -import com.google.common.shaded.collect.ImmutableMap; -import com.google.common.shaded.collect.Iterables; -import com.google.common.shaded.collect.Sets; import java.io.IOException; import java.util.Collection; import java.util.List; @@ -29,6 +26,9 @@ import org.apache.iceberg.expressions.Expression; import org.apache.iceberg.expressions.ResidualEvaluator; import org.apache.iceberg.io.CloseableIterable; +import org.apache.iceberg.relocated.com.google.common.collect.ImmutableMap; +import org.apache.iceberg.relocated.com.google.common.collect.Iterables; +import org.apache.iceberg.relocated.com.google.common.collect.Sets; import org.apache.iceberg.types.TypeUtil; import org.apache.iceberg.util.ParallelIterable; import org.apache.iceberg.util.ThreadPools; diff --git a/core/src/main/java/org/apache/iceberg/AllEntriesTable.java b/core/src/main/java/org/apache/iceberg/AllEntriesTable.java index 436f363f13a3..20b1bf5f0cfd 100644 --- a/core/src/main/java/org/apache/iceberg/AllEntriesTable.java +++ b/core/src/main/java/org/apache/iceberg/AllEntriesTable.java @@ -19,12 +19,12 @@ package org.apache.iceberg; -import com.google.common.shaded.collect.ImmutableMap; -import com.google.common.shaded.collect.Sets; import java.util.Collection; import org.apache.iceberg.expressions.Expression; import org.apache.iceberg.expressions.ResidualEvaluator; import org.apache.iceberg.io.CloseableIterable; +import org.apache.iceberg.relocated.com.google.common.collect.ImmutableMap; +import org.apache.iceberg.relocated.com.google.common.collect.Sets; import org.apache.iceberg.types.TypeUtil; /** diff --git a/core/src/main/java/org/apache/iceberg/AllManifestsTable.java b/core/src/main/java/org/apache/iceberg/AllManifestsTable.java index 58c95b817dc3..88929a293931 100644 --- a/core/src/main/java/org/apache/iceberg/AllManifestsTable.java +++ b/core/src/main/java/org/apache/iceberg/AllManifestsTable.java @@ -19,9 +19,6 @@ package org.apache.iceberg; -import com.google.common.shaded.collect.ImmutableList; -import com.google.common.shaded.collect.ImmutableMap; -import com.google.common.shaded.collect.Iterables; import java.io.IOException; import java.util.Collection; import org.apache.iceberg.avro.Avro; @@ -30,6 +27,9 @@ import org.apache.iceberg.expressions.ResidualEvaluator; import org.apache.iceberg.io.CloseableIterable; import org.apache.iceberg.io.FileIO; +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.Iterables; import org.apache.iceberg.types.Types; /** diff --git a/core/src/main/java/org/apache/iceberg/BaseAllMetadataTableScan.java b/core/src/main/java/org/apache/iceberg/BaseAllMetadataTableScan.java index f7f6ca2fe68e..3f7139d0be56 100644 --- a/core/src/main/java/org/apache/iceberg/BaseAllMetadataTableScan.java +++ b/core/src/main/java/org/apache/iceberg/BaseAllMetadataTableScan.java @@ -19,12 +19,12 @@ package org.apache.iceberg; -import com.google.common.shaded.collect.ImmutableMap; import java.util.Collection; import org.apache.iceberg.events.Listeners; import org.apache.iceberg.events.ScanEvent; import org.apache.iceberg.expressions.Expression; import org.apache.iceberg.io.CloseableIterable; +import org.apache.iceberg.relocated.com.google.common.collect.ImmutableMap; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/org/apache/iceberg/BaseCombinedScanTask.java b/core/src/main/java/org/apache/iceberg/BaseCombinedScanTask.java index 8212123987a1..98c69437b947 100644 --- a/core/src/main/java/org/apache/iceberg/BaseCombinedScanTask.java +++ b/core/src/main/java/org/apache/iceberg/BaseCombinedScanTask.java @@ -19,11 +19,11 @@ package org.apache.iceberg; -import com.google.common.shaded.base.Joiner; -import com.google.common.shaded.base.MoreObjects; -import com.google.common.shaded.collect.ImmutableList; import java.util.Collection; import java.util.List; +import org.apache.iceberg.relocated.com.google.common.base.Joiner; +import org.apache.iceberg.relocated.com.google.common.base.MoreObjects; +import org.apache.iceberg.relocated.com.google.common.collect.ImmutableList; public class BaseCombinedScanTask implements CombinedScanTask { private final List tasks; diff --git a/core/src/main/java/org/apache/iceberg/BaseFileScanTask.java b/core/src/main/java/org/apache/iceberg/BaseFileScanTask.java index 86ec6a483b07..e093fb340d0e 100644 --- a/core/src/main/java/org/apache/iceberg/BaseFileScanTask.java +++ b/core/src/main/java/org/apache/iceberg/BaseFileScanTask.java @@ -19,15 +19,15 @@ package org.apache.iceberg; -import com.google.common.shaded.annotations.VisibleForTesting; -import com.google.common.shaded.base.MoreObjects; -import com.google.common.shaded.collect.ImmutableList; import java.util.ArrayList; import java.util.Iterator; import java.util.List; import java.util.NoSuchElementException; import org.apache.iceberg.expressions.Expression; import org.apache.iceberg.expressions.ResidualEvaluator; +import org.apache.iceberg.relocated.com.google.common.annotations.VisibleForTesting; +import org.apache.iceberg.relocated.com.google.common.base.MoreObjects; +import org.apache.iceberg.relocated.com.google.common.collect.ImmutableList; class BaseFileScanTask implements FileScanTask { private final DataFile file; diff --git a/core/src/main/java/org/apache/iceberg/BaseMetadataTable.java b/core/src/main/java/org/apache/iceberg/BaseMetadataTable.java index da60aea4866f..9dbd0fa898e4 100644 --- a/core/src/main/java/org/apache/iceberg/BaseMetadataTable.java +++ b/core/src/main/java/org/apache/iceberg/BaseMetadataTable.java @@ -19,12 +19,12 @@ package org.apache.iceberg; -import com.google.common.shaded.collect.ImmutableMap; import java.util.List; import java.util.Map; import org.apache.iceberg.encryption.EncryptionManager; import org.apache.iceberg.io.FileIO; import org.apache.iceberg.io.LocationProvider; +import org.apache.iceberg.relocated.com.google.common.collect.ImmutableMap; abstract class BaseMetadataTable implements Table { private PartitionSpec spec = PartitionSpec.unpartitioned(); diff --git a/core/src/main/java/org/apache/iceberg/BaseSnapshot.java b/core/src/main/java/org/apache/iceberg/BaseSnapshot.java index 78e75b0ccaa8..fab23b5f7db5 100644 --- a/core/src/main/java/org/apache/iceberg/BaseSnapshot.java +++ b/core/src/main/java/org/apache/iceberg/BaseSnapshot.java @@ -19,11 +19,6 @@ package org.apache.iceberg; -import com.google.common.shaded.base.MoreObjects; -import com.google.common.shaded.base.Objects; -import com.google.common.shaded.collect.ImmutableList; -import com.google.common.shaded.collect.Iterables; -import com.google.common.shaded.collect.Lists; import java.io.IOException; import java.util.Arrays; import java.util.List; @@ -32,6 +27,11 @@ import org.apache.iceberg.io.CloseableIterable; import org.apache.iceberg.io.FileIO; import org.apache.iceberg.io.InputFile; +import org.apache.iceberg.relocated.com.google.common.base.MoreObjects; +import org.apache.iceberg.relocated.com.google.common.base.Objects; +import org.apache.iceberg.relocated.com.google.common.collect.ImmutableList; +import org.apache.iceberg.relocated.com.google.common.collect.Iterables; +import org.apache.iceberg.relocated.com.google.common.collect.Lists; class BaseSnapshot implements Snapshot { private static final long INITIAL_SEQUENCE_NUMBER = 0; diff --git a/core/src/main/java/org/apache/iceberg/BaseTableScan.java b/core/src/main/java/org/apache/iceberg/BaseTableScan.java index a61e474bcb82..9e55e0ee2981 100644 --- a/core/src/main/java/org/apache/iceberg/BaseTableScan.java +++ b/core/src/main/java/org/apache/iceberg/BaseTableScan.java @@ -19,11 +19,6 @@ package org.apache.iceberg; -import com.google.common.shaded.base.MoreObjects; -import com.google.common.shaded.base.Preconditions; -import com.google.common.shaded.collect.FluentIterable; -import com.google.common.shaded.collect.ImmutableMap; -import com.google.common.shaded.collect.Sets; import java.time.Instant; import java.time.LocalDateTime; import java.time.ZoneId; @@ -38,6 +33,11 @@ import org.apache.iceberg.expressions.Expression; import org.apache.iceberg.expressions.Expressions; import org.apache.iceberg.io.CloseableIterable; +import org.apache.iceberg.relocated.com.google.common.base.MoreObjects; +import org.apache.iceberg.relocated.com.google.common.base.Preconditions; +import org.apache.iceberg.relocated.com.google.common.collect.FluentIterable; +import org.apache.iceberg.relocated.com.google.common.collect.ImmutableMap; +import org.apache.iceberg.relocated.com.google.common.collect.Sets; import org.apache.iceberg.types.TypeUtil; import org.apache.iceberg.util.BinPacking; import org.slf4j.Logger; diff --git a/core/src/main/java/org/apache/iceberg/DataFilesTable.java b/core/src/main/java/org/apache/iceberg/DataFilesTable.java index fa627bb3e8fb..0c010cf175af 100644 --- a/core/src/main/java/org/apache/iceberg/DataFilesTable.java +++ b/core/src/main/java/org/apache/iceberg/DataFilesTable.java @@ -19,14 +19,14 @@ package org.apache.iceberg; -import com.google.common.shaded.collect.ImmutableList; -import com.google.common.shaded.collect.ImmutableMap; -import com.google.common.shaded.collect.Sets; import java.util.Collection; import org.apache.iceberg.expressions.Expression; import org.apache.iceberg.expressions.ResidualEvaluator; import org.apache.iceberg.io.CloseableIterable; import org.apache.iceberg.io.FileIO; +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.Sets; import org.apache.iceberg.types.TypeUtil; /** diff --git a/core/src/main/java/org/apache/iceberg/DataTableScan.java b/core/src/main/java/org/apache/iceberg/DataTableScan.java index 29a703c7877a..ce78104a010f 100644 --- a/core/src/main/java/org/apache/iceberg/DataTableScan.java +++ b/core/src/main/java/org/apache/iceberg/DataTableScan.java @@ -19,12 +19,12 @@ package org.apache.iceberg; -import com.google.common.shaded.base.Preconditions; -import com.google.common.shaded.collect.ImmutableList; -import com.google.common.shaded.collect.ImmutableMap; import java.util.Collection; import org.apache.iceberg.expressions.Expression; import org.apache.iceberg.io.CloseableIterable; +import org.apache.iceberg.relocated.com.google.common.base.Preconditions; +import org.apache.iceberg.relocated.com.google.common.collect.ImmutableList; +import org.apache.iceberg.relocated.com.google.common.collect.ImmutableMap; import org.apache.iceberg.util.ThreadPools; public class DataTableScan extends BaseTableScan { diff --git a/core/src/main/java/org/apache/iceberg/GenericDataFile.java b/core/src/main/java/org/apache/iceberg/GenericDataFile.java index 1685298b9b93..ebe96c1e1d52 100644 --- a/core/src/main/java/org/apache/iceberg/GenericDataFile.java +++ b/core/src/main/java/org/apache/iceberg/GenericDataFile.java @@ -19,10 +19,6 @@ package org.apache.iceberg; -import com.google.common.shaded.base.MoreObjects; -import com.google.common.shaded.collect.ImmutableMap; -import com.google.common.shaded.collect.Lists; -import com.google.common.shaded.collect.Maps; import java.io.Serializable; import java.nio.ByteBuffer; import java.util.Arrays; @@ -32,6 +28,10 @@ import org.apache.avro.generic.IndexedRecord; import org.apache.avro.specific.SpecificData; import org.apache.iceberg.avro.AvroSchemaUtil; +import org.apache.iceberg.relocated.com.google.common.base.MoreObjects; +import org.apache.iceberg.relocated.com.google.common.collect.ImmutableMap; +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.Types; import org.apache.iceberg.util.ByteBuffers; diff --git a/core/src/main/java/org/apache/iceberg/GenericManifestEntry.java b/core/src/main/java/org/apache/iceberg/GenericManifestEntry.java index 3f5444d56e00..cc2781801b49 100644 --- a/core/src/main/java/org/apache/iceberg/GenericManifestEntry.java +++ b/core/src/main/java/org/apache/iceberg/GenericManifestEntry.java @@ -19,10 +19,10 @@ package org.apache.iceberg; -import com.google.common.shaded.base.MoreObjects; import org.apache.avro.generic.IndexedRecord; import org.apache.avro.specific.SpecificData; import org.apache.iceberg.avro.AvroSchemaUtil; +import org.apache.iceberg.relocated.com.google.common.base.MoreObjects; import org.apache.iceberg.types.Types; class GenericManifestEntry implements ManifestEntry, IndexedRecord, SpecificData.SchemaConstructable, StructLike { diff --git a/core/src/main/java/org/apache/iceberg/GenericManifestFile.java b/core/src/main/java/org/apache/iceberg/GenericManifestFile.java index 5b00400776ec..e03e25596fcf 100644 --- a/core/src/main/java/org/apache/iceberg/GenericManifestFile.java +++ b/core/src/main/java/org/apache/iceberg/GenericManifestFile.java @@ -19,9 +19,6 @@ package org.apache.iceberg; -import com.google.common.shaded.base.MoreObjects; -import com.google.common.shaded.base.Objects; -import com.google.common.shaded.collect.Lists; import java.io.Serializable; import java.util.Collections; import java.util.List; @@ -31,6 +28,9 @@ import org.apache.avro.specific.SpecificData.SchemaConstructable; import org.apache.iceberg.avro.AvroSchemaUtil; import org.apache.iceberg.io.InputFile; +import org.apache.iceberg.relocated.com.google.common.base.MoreObjects; +import org.apache.iceberg.relocated.com.google.common.base.Objects; +import org.apache.iceberg.relocated.com.google.common.collect.Lists; import org.apache.iceberg.types.Types; public class GenericManifestFile diff --git a/core/src/main/java/org/apache/iceberg/GenericPartitionFieldSummary.java b/core/src/main/java/org/apache/iceberg/GenericPartitionFieldSummary.java index 9a6ebbcd1765..fb1051cff517 100644 --- a/core/src/main/java/org/apache/iceberg/GenericPartitionFieldSummary.java +++ b/core/src/main/java/org/apache/iceberg/GenericPartitionFieldSummary.java @@ -19,7 +19,6 @@ package org.apache.iceberg; -import com.google.common.shaded.base.MoreObjects; import java.io.Serializable; import java.nio.ByteBuffer; import java.util.Arrays; @@ -29,6 +28,7 @@ import org.apache.avro.specific.SpecificData.SchemaConstructable; import org.apache.iceberg.ManifestFile.PartitionFieldSummary; import org.apache.iceberg.avro.AvroSchemaUtil; +import org.apache.iceberg.relocated.com.google.common.base.MoreObjects; import org.apache.iceberg.types.Types; import org.apache.iceberg.util.ByteBuffers; diff --git a/core/src/main/java/org/apache/iceberg/IncrementalDataTableScan.java b/core/src/main/java/org/apache/iceberg/IncrementalDataTableScan.java index b3206bca0681..98be40627dfd 100644 --- a/core/src/main/java/org/apache/iceberg/IncrementalDataTableScan.java +++ b/core/src/main/java/org/apache/iceberg/IncrementalDataTableScan.java @@ -19,17 +19,17 @@ package org.apache.iceberg; -import com.google.common.shaded.base.Preconditions; -import com.google.common.shaded.collect.FluentIterable; -import com.google.common.shaded.collect.ImmutableMap; -import com.google.common.shaded.collect.Iterables; -import com.google.common.shaded.collect.Lists; -import com.google.common.shaded.collect.Sets; import java.util.Collection; import java.util.List; import java.util.Set; import org.apache.iceberg.expressions.Expression; import org.apache.iceberg.io.CloseableIterable; +import org.apache.iceberg.relocated.com.google.common.base.Preconditions; +import org.apache.iceberg.relocated.com.google.common.collect.FluentIterable; +import org.apache.iceberg.relocated.com.google.common.collect.ImmutableMap; +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.Sets; import org.apache.iceberg.util.SnapshotUtil; import org.apache.iceberg.util.ThreadPools; diff --git a/core/src/main/java/org/apache/iceberg/ManifestEntriesTable.java b/core/src/main/java/org/apache/iceberg/ManifestEntriesTable.java index bb5a392514d1..f5710f88f6c6 100644 --- a/core/src/main/java/org/apache/iceberg/ManifestEntriesTable.java +++ b/core/src/main/java/org/apache/iceberg/ManifestEntriesTable.java @@ -19,14 +19,14 @@ package org.apache.iceberg; -import com.google.common.shaded.collect.ImmutableList; -import com.google.common.shaded.collect.ImmutableMap; -import com.google.common.shaded.collect.Sets; import java.util.Collection; import org.apache.iceberg.expressions.Expression; import org.apache.iceberg.expressions.ResidualEvaluator; import org.apache.iceberg.io.CloseableIterable; import org.apache.iceberg.io.FileIO; +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.Sets; import org.apache.iceberg.types.TypeUtil; /** diff --git a/core/src/main/java/org/apache/iceberg/StaticTableScan.java b/core/src/main/java/org/apache/iceberg/StaticTableScan.java index fbc7bbc8f33f..88c751cf3995 100644 --- a/core/src/main/java/org/apache/iceberg/StaticTableScan.java +++ b/core/src/main/java/org/apache/iceberg/StaticTableScan.java @@ -19,11 +19,11 @@ package org.apache.iceberg; -import com.google.common.shaded.collect.ImmutableMap; import java.util.Collection; import java.util.function.Function; import org.apache.iceberg.expressions.Expression; import org.apache.iceberg.io.CloseableIterable; +import org.apache.iceberg.relocated.com.google.common.collect.ImmutableMap; class StaticTableScan extends BaseTableScan { private final Function buildTask; diff --git a/core/src/main/java/org/apache/iceberg/TableMetadata.java b/core/src/main/java/org/apache/iceberg/TableMetadata.java index 1c11d1096716..01e525378732 100644 --- a/core/src/main/java/org/apache/iceberg/TableMetadata.java +++ b/core/src/main/java/org/apache/iceberg/TableMetadata.java @@ -19,15 +19,6 @@ package org.apache.iceberg; -import com.google.common.shaded.base.MoreObjects; -import com.google.common.shaded.base.Objects; -import com.google.common.shaded.base.Preconditions; -import com.google.common.shaded.collect.ImmutableList; -import com.google.common.shaded.collect.ImmutableMap; -import com.google.common.shaded.collect.Iterables; -import com.google.common.shaded.collect.Lists; -import com.google.common.shaded.collect.Maps; -import com.google.common.shaded.collect.Sets; import java.util.List; import java.util.Map; import java.util.Set; @@ -36,6 +27,15 @@ import java.util.function.Predicate; import org.apache.iceberg.exceptions.ValidationException; import org.apache.iceberg.io.InputFile; +import org.apache.iceberg.relocated.com.google.common.base.MoreObjects; +import org.apache.iceberg.relocated.com.google.common.base.Objects; +import org.apache.iceberg.relocated.com.google.common.base.Preconditions; +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.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.relocated.com.google.common.collect.Sets; import org.apache.iceberg.types.TypeUtil; import org.apache.iceberg.util.PropertyUtil; diff --git a/core/src/test/java/org/apache/iceberg/TestWapWorkflow.java b/core/src/test/java/org/apache/iceberg/TestWapWorkflow.java index b062ab3477a2..5a6eb137061b 100644 --- a/core/src/test/java/org/apache/iceberg/TestWapWorkflow.java +++ b/core/src/test/java/org/apache/iceberg/TestWapWorkflow.java @@ -19,11 +19,11 @@ package org.apache.iceberg; -import com.google.common.shaded.collect.Iterables; -import com.google.common.shaded.collect.Streams; import org.apache.iceberg.exceptions.CherrypickAncestorCommitException; import org.apache.iceberg.exceptions.DuplicateWAPCommitException; import org.apache.iceberg.exceptions.ValidationException; +import org.apache.iceberg.relocated.com.google.common.collect.Iterables; +import org.apache.iceberg.relocated.com.google.common.collect.Streams; import org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/relocate-external-dependencies/LICENSE b/relocate-external-dependencies/LICENSE new file mode 100644 index 000000000000..13464a315a90 --- /dev/null +++ b/relocate-external-dependencies/LICENSE @@ -0,0 +1,212 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + +-------------------------------------------------------------------------------- + +This binary artifact contains Google Guava. + +Copyright: 2006-2019 The Guava Authors +Home page: https://github.com/google/guava +License: http://www.apache.org/licenses/LICENSE-2.0 + +-------------------------------------------------------------------------------- diff --git a/versions.lock b/versions.lock index 19e17e7a87c3..f94a0ca1d756 100644 --- a/versions.lock +++ b/versions.lock @@ -20,6 +20,7 @@ com.google.code.gson:gson:2.2.4 (2 constraints: 9518bfd2) com.google.errorprone:error_prone_annotations:2.3.3 (2 constraints: 161a2544) com.google.flatbuffers:flatbuffers-java:1.9.0 (2 constraints: e5199714) com.google.guava:failureaccess:1.0.1 (1 constraints: 140ae1b4) +com.google.guava:guava:28.0-jre (21 constraints: 88453dad) com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava (1 constraints: bd17c918) com.google.inject:guice:3.0 (6 constraints: 6873914c) com.google.inject.extensions:guice-servlet:3.0 (11 constraints: a9d50a2b) diff --git a/versions.props b/versions.props index 533996a04833..9b4d9fd31eb9 100644 --- a/versions.props +++ b/versions.props @@ -9,6 +9,7 @@ org.apache.spark:spark-avro_2.11 = 2.4.5 org.apache.pig:pig = 0.14.0 org.apache.commons:commons-lang3 = 3.9 com.fasterxml.jackson.*:* = 2.10.0 +com.google.guava:guava = 28.0-jre com.github.ben-manes.caffeine:caffeine = 2.7.0 org.apache.arrow:arrow-vector = 0.14.1 From 10ac5828865318ba0c926505ded4106e1de91c1d Mon Sep 17 00:00:00 2001 From: Christine Mathiesen Date: Mon, 11 May 2020 15:30:06 +0100 Subject: [PATCH 06/16] Rename module to bundled-guava --- build.gradle | 6 +++--- {relocate-external-dependencies => bundled-guava}/LICENSE | 0 .../src/main/java/org/apache/iceberg/GuavaClasses.java | 0 settings.gradle | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) rename {relocate-external-dependencies => bundled-guava}/LICENSE (100%) rename {relocate-external-dependencies => bundled-guava}/src/main/java/org/apache/iceberg/GuavaClasses.java (100%) diff --git a/build.gradle b/build.gradle index 17c8eb9c5512..94024a9f4701 100644 --- a/build.gradle +++ b/build.gradle @@ -104,7 +104,7 @@ apply from: 'deploy.gradle' apply from: 'tasks.gradle' apply from: 'jmh.gradle' -project(':iceberg-relocate-external-dependencies') { +project(':iceberg-bundled-guava') { apply plugin: 'com.github.johnrengelman.shadow' tasks.javadoc.enabled = false @@ -144,7 +144,7 @@ project(':iceberg-relocate-external-dependencies') { project(':iceberg-api') { dependencies { - compile project(path: ':iceberg-relocate-external-dependencies', configuration: 'shadow') + compile project(path: ':iceberg-bundled-guava', configuration: 'shadow') testCompile "org.apache.avro:avro" testCompile 'joda-time:joda-time' } @@ -152,7 +152,7 @@ project(':iceberg-api') { project(':iceberg-common') { dependencies { - compile project(path: ':iceberg-relocate-external-dependencies', configuration: 'shadow') + compile project(path: ':iceberg-bundled-guava', configuration: 'shadow') } } diff --git a/relocate-external-dependencies/LICENSE b/bundled-guava/LICENSE similarity index 100% rename from relocate-external-dependencies/LICENSE rename to bundled-guava/LICENSE diff --git a/relocate-external-dependencies/src/main/java/org/apache/iceberg/GuavaClasses.java b/bundled-guava/src/main/java/org/apache/iceberg/GuavaClasses.java similarity index 100% rename from relocate-external-dependencies/src/main/java/org/apache/iceberg/GuavaClasses.java rename to bundled-guava/src/main/java/org/apache/iceberg/GuavaClasses.java diff --git a/settings.gradle b/settings.gradle index cd0691a130d4..706ca326a0af 100644 --- a/settings.gradle +++ b/settings.gradle @@ -25,7 +25,7 @@ include 'data' include 'mr' include 'orc' include 'parquet' -include 'relocate-external-dependencies' +include 'bundled-guava' include 'spark' include 'arrow' include 'spark-runtime' @@ -40,7 +40,7 @@ project(':mr').name = 'iceberg-mr' project(':orc').name = 'iceberg-orc' project(':arrow').name = 'iceberg-arrow' project(':parquet').name = 'iceberg-parquet' -project(':relocate-external-dependencies').name = 'iceberg-relocate-external-dependencies' +project(':bundled-guava').name = 'iceberg-bundled-guava' project(':spark').name = 'iceberg-spark' project(':spark-runtime').name = 'iceberg-spark-runtime' project(':pig').name = 'iceberg-pig' From 69e2b376b469c4f21a235572f6722b5556a9b0b7 Mon Sep 17 00:00:00 2001 From: cmathiesen Date: Fri, 15 May 2020 12:34:55 +0100 Subject: [PATCH 07/16] relocate more classes --- .../org/apache/iceberg/BaseMetastoreCatalog.java | 12 ++++++------ .../main/java/org/apache/iceberg/ManifestLists.java | 4 ++-- .../main/java/org/apache/iceberg/ManifestReader.java | 8 ++++---- .../main/java/org/apache/iceberg/PartitionData.java | 6 +++--- .../java/org/apache/iceberg/PartitionSpecParser.java | 2 +- .../main/java/org/apache/iceberg/SchemaParser.java | 4 ++-- .../main/java/org/apache/iceberg/SnapshotParser.java | 6 +++--- .../java/org/apache/iceberg/TableMetadataParser.java | 8 ++++---- core/src/main/java/org/apache/iceberg/avro/Avro.java | 4 ++-- .../iceberg/avro/AvroCustomOrderSchemaVisitor.java | 6 +++--- .../java/org/apache/iceberg/avro/AvroSchemaUtil.java | 8 ++++---- .../org/apache/iceberg/avro/AvroSchemaVisitor.java | 4 ++-- .../iceberg/avro/AvroSchemaWithTypeVisitor.java | 4 ++-- .../org/apache/iceberg/avro/BuildAvroProjection.java | 6 +++--- .../org/apache/iceberg/avro/GenericAvroWriter.java | 2 +- .../java/org/apache/iceberg/avro/LogicalMap.java | 2 +- .../java/org/apache/iceberg/avro/PruneColumns.java | 6 +++--- .../java/org/apache/iceberg/avro/SchemaToType.java | 4 ++-- .../apache/iceberg/hadoop/HadoopTableOperations.java | 4 ++-- .../java/org/apache/iceberg/util/BinPacking.java | 8 ++++---- .../main/java/org/apache/iceberg/util/JsonUtil.java | 6 +++--- .../java/org/apache/iceberg/data/GenericRecord.java | 6 +++--- .../org/apache/iceberg/data/IcebergGenerics.java | 2 +- .../org/apache/iceberg/data/TableScanIterable.java | 6 +++--- .../org/apache/iceberg/data/avro/DataReader.java | 4 ++-- .../org/apache/iceberg/data/avro/DataWriter.java | 2 +- .../org/apache/iceberg/data/avro/IcebergDecoder.java | 4 ++-- .../org/apache/iceberg/data/avro/IcebergEncoder.java | 2 +- .../apache/iceberg/data/orc/GenericOrcReader.java | 6 +++--- .../apache/iceberg/data/orc/GenericOrcWriter.java | 2 +- .../iceberg/data/parquet/GenericParquetReaders.java | 8 ++++---- .../iceberg/data/parquet/GenericParquetWriter.java | 2 +- .../test/java/org/apache/iceberg/TestSplitScan.java | 2 +- .../org/apache/iceberg/data/RandomGenericData.java | 6 +++--- .../java/org/apache/iceberg/data/TestLocalScan.java | 10 +++++----- .../org/apache/iceberg/data/TestReadProjection.java | 8 ++++---- .../apache/iceberg/data/avro/TestGenericData.java | 2 +- .../iceberg/data/avro/TestGenericReadProjection.java | 2 +- .../iceberg/data/avro/TestSingleMessageEncoding.java | 8 ++++---- .../org/apache/iceberg/data/orc/TestGenericData.java | 2 +- .../iceberg/data/orc/TestGenericReadProjection.java | 2 +- .../apache/iceberg/data/parquet/TestGenericData.java | 2 +- .../data/parquet/TestGenericReadProjection.java | 2 +- .../iceberg/mr/mapreduce/IcebergInputFormat.java | 10 +++++----- .../iceberg/mr/mapreduce/TestIcebergInputFormat.java | 10 +++++----- .../java/org/apache/iceberg/orc/ORCSchemaUtil.java | 8 ++++---- .../java/org/apache/iceberg/parquet/Parquet.java | 6 +++--- 47 files changed, 119 insertions(+), 119 deletions(-) diff --git a/core/src/main/java/org/apache/iceberg/BaseMetastoreCatalog.java b/core/src/main/java/org/apache/iceberg/BaseMetastoreCatalog.java index f56cc074c5e5..63bf85ed66a5 100644 --- a/core/src/main/java/org/apache/iceberg/BaseMetastoreCatalog.java +++ b/core/src/main/java/org/apache/iceberg/BaseMetastoreCatalog.java @@ -19,12 +19,6 @@ package org.apache.iceberg; -import com.google.common.base.Joiner; -import com.google.common.base.Preconditions; -import com.google.common.collect.Iterables; -import com.google.common.collect.MapMaker; -import com.google.common.collect.Maps; -import com.google.common.collect.Sets; import java.io.IOException; import java.util.Map; import java.util.Set; @@ -35,6 +29,12 @@ import org.apache.iceberg.exceptions.NoSuchTableException; import org.apache.iceberg.exceptions.RuntimeIOException; import org.apache.iceberg.io.FileIO; +import org.apache.iceberg.relocated.com.google.common.base.Joiner; +import org.apache.iceberg.relocated.com.google.common.base.Preconditions; +import org.apache.iceberg.relocated.com.google.common.collect.Iterables; +import org.apache.iceberg.relocated.com.google.common.collect.MapMaker; +import org.apache.iceberg.relocated.com.google.common.collect.Maps; +import org.apache.iceberg.relocated.com.google.common.collect.Sets; import org.apache.iceberg.util.Tasks; import org.apache.iceberg.util.ThreadPools; import org.slf4j.Logger; diff --git a/core/src/main/java/org/apache/iceberg/ManifestLists.java b/core/src/main/java/org/apache/iceberg/ManifestLists.java index 37c631766aa9..bf61716777ba 100644 --- a/core/src/main/java/org/apache/iceberg/ManifestLists.java +++ b/core/src/main/java/org/apache/iceberg/ManifestLists.java @@ -19,8 +19,6 @@ package org.apache.iceberg; -import com.google.common.base.Preconditions; -import com.google.common.collect.Lists; import java.io.IOException; import java.util.List; import org.apache.iceberg.avro.Avro; @@ -28,6 +26,8 @@ import org.apache.iceberg.io.CloseableIterable; import org.apache.iceberg.io.InputFile; import org.apache.iceberg.io.OutputFile; +import org.apache.iceberg.relocated.com.google.common.base.Preconditions; +import org.apache.iceberg.relocated.com.google.common.collect.Lists; class ManifestLists { private ManifestLists() { diff --git a/core/src/main/java/org/apache/iceberg/ManifestReader.java b/core/src/main/java/org/apache/iceberg/ManifestReader.java index 045ebe17da50..af5ec4f1fe12 100644 --- a/core/src/main/java/org/apache/iceberg/ManifestReader.java +++ b/core/src/main/java/org/apache/iceberg/ManifestReader.java @@ -19,10 +19,6 @@ package org.apache.iceberg; -import com.google.common.base.Preconditions; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.Iterables; -import com.google.common.collect.Lists; import java.io.IOException; import java.util.Collection; import java.util.Iterator; @@ -37,6 +33,10 @@ import org.apache.iceberg.io.CloseableIterable; import org.apache.iceberg.io.FileIO; import org.apache.iceberg.io.InputFile; +import org.apache.iceberg.relocated.com.google.common.base.Preconditions; +import org.apache.iceberg.relocated.com.google.common.collect.ImmutableList; +import org.apache.iceberg.relocated.com.google.common.collect.Iterables; +import org.apache.iceberg.relocated.com.google.common.collect.Lists; import org.apache.iceberg.types.Types; import static org.apache.iceberg.expressions.Expressions.alwaysTrue; diff --git a/core/src/main/java/org/apache/iceberg/PartitionData.java b/core/src/main/java/org/apache/iceberg/PartitionData.java index d708347ac89f..2b8c0db22110 100644 --- a/core/src/main/java/org/apache/iceberg/PartitionData.java +++ b/core/src/main/java/org/apache/iceberg/PartitionData.java @@ -19,9 +19,6 @@ package org.apache.iceberg; -import com.google.common.base.Preconditions; -import com.google.common.hash.Hasher; -import com.google.common.hash.Hashing; import java.io.Serializable; import java.nio.ByteBuffer; import java.util.Arrays; @@ -33,6 +30,9 @@ import org.apache.avro.specific.SpecificData; import org.apache.avro.util.Utf8; import org.apache.iceberg.avro.AvroSchemaUtil; +import org.apache.iceberg.relocated.com.google.common.base.Preconditions; +import org.apache.iceberg.relocated.com.google.common.hash.Hasher; +import org.apache.iceberg.relocated.com.google.common.hash.Hashing; import org.apache.iceberg.types.Type; import org.apache.iceberg.types.Types; diff --git a/core/src/main/java/org/apache/iceberg/PartitionSpecParser.java b/core/src/main/java/org/apache/iceberg/PartitionSpecParser.java index 6ae9dfd959c9..3060465db419 100644 --- a/core/src/main/java/org/apache/iceberg/PartitionSpecParser.java +++ b/core/src/main/java/org/apache/iceberg/PartitionSpecParser.java @@ -23,11 +23,11 @@ import com.fasterxml.jackson.databind.JsonNode; import com.github.benmanes.caffeine.cache.Cache; import com.github.benmanes.caffeine.cache.Caffeine; -import com.google.common.base.Preconditions; import java.io.IOException; import java.io.StringWriter; import java.util.Iterator; import org.apache.iceberg.exceptions.RuntimeIOException; +import org.apache.iceberg.relocated.com.google.common.base.Preconditions; import org.apache.iceberg.types.Types; import org.apache.iceberg.util.JsonUtil; import org.apache.iceberg.util.Pair; diff --git a/core/src/main/java/org/apache/iceberg/SchemaParser.java b/core/src/main/java/org/apache/iceberg/SchemaParser.java index 7ada2c818ab9..c2baaabe608e 100644 --- a/core/src/main/java/org/apache/iceberg/SchemaParser.java +++ b/core/src/main/java/org/apache/iceberg/SchemaParser.java @@ -23,13 +23,13 @@ import com.fasterxml.jackson.databind.JsonNode; import com.github.benmanes.caffeine.cache.Cache; import com.github.benmanes.caffeine.cache.Caffeine; -import com.google.common.base.Preconditions; -import com.google.common.collect.Lists; import java.io.IOException; import java.io.StringWriter; import java.util.Iterator; import java.util.List; import org.apache.iceberg.exceptions.RuntimeIOException; +import org.apache.iceberg.relocated.com.google.common.base.Preconditions; +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.iceberg.util.JsonUtil; diff --git a/core/src/main/java/org/apache/iceberg/SnapshotParser.java b/core/src/main/java/org/apache/iceberg/SnapshotParser.java index db81cded3b30..b5a4f7f87d36 100644 --- a/core/src/main/java/org/apache/iceberg/SnapshotParser.java +++ b/core/src/main/java/org/apache/iceberg/SnapshotParser.java @@ -21,9 +21,6 @@ import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.databind.JsonNode; -import com.google.common.base.Preconditions; -import com.google.common.collect.ImmutableMap; -import com.google.common.collect.Lists; import java.io.IOException; import java.io.StringWriter; import java.util.Iterator; @@ -31,6 +28,9 @@ import java.util.Map; import org.apache.iceberg.exceptions.RuntimeIOException; import org.apache.iceberg.io.FileIO; +import org.apache.iceberg.relocated.com.google.common.base.Preconditions; +import org.apache.iceberg.relocated.com.google.common.collect.ImmutableMap; +import org.apache.iceberg.relocated.com.google.common.collect.Lists; import org.apache.iceberg.util.JsonUtil; public class SnapshotParser { diff --git a/core/src/main/java/org/apache/iceberg/TableMetadataParser.java b/core/src/main/java/org/apache/iceberg/TableMetadataParser.java index f746860057f4..430c7b6c77a6 100644 --- a/core/src/main/java/org/apache/iceberg/TableMetadataParser.java +++ b/core/src/main/java/org/apache/iceberg/TableMetadataParser.java @@ -21,10 +21,6 @@ import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.databind.JsonNode; -import com.google.common.base.Preconditions; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.Lists; -import com.google.common.collect.Sets; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; @@ -45,6 +41,10 @@ import org.apache.iceberg.io.FileIO; import org.apache.iceberg.io.InputFile; import org.apache.iceberg.io.OutputFile; +import org.apache.iceberg.relocated.com.google.common.base.Preconditions; +import org.apache.iceberg.relocated.com.google.common.collect.ImmutableList; +import org.apache.iceberg.relocated.com.google.common.collect.Lists; +import org.apache.iceberg.relocated.com.google.common.collect.Sets; import org.apache.iceberg.util.JsonUtil; public class TableMetadataParser { diff --git a/core/src/main/java/org/apache/iceberg/avro/Avro.java b/core/src/main/java/org/apache/iceberg/avro/Avro.java index 40c43cbe5148..689a1a8ca126 100644 --- a/core/src/main/java/org/apache/iceberg/avro/Avro.java +++ b/core/src/main/java/org/apache/iceberg/avro/Avro.java @@ -19,8 +19,6 @@ package org.apache.iceberg.avro; -import com.google.common.base.Preconditions; -import com.google.common.collect.Maps; import java.io.IOException; import java.util.Locale; import java.util.Map; @@ -40,6 +38,8 @@ import org.apache.iceberg.io.InputFile; import org.apache.iceberg.io.OutputFile; import org.apache.iceberg.mapping.NameMapping; +import org.apache.iceberg.relocated.com.google.common.base.Preconditions; +import org.apache.iceberg.relocated.com.google.common.collect.Maps; import static org.apache.iceberg.TableProperties.AVRO_COMPRESSION; import static org.apache.iceberg.TableProperties.AVRO_COMPRESSION_DEFAULT; diff --git a/core/src/main/java/org/apache/iceberg/avro/AvroCustomOrderSchemaVisitor.java b/core/src/main/java/org/apache/iceberg/avro/AvroCustomOrderSchemaVisitor.java index 3139673ed7a2..bdef9210176d 100644 --- a/core/src/main/java/org/apache/iceberg/avro/AvroCustomOrderSchemaVisitor.java +++ b/core/src/main/java/org/apache/iceberg/avro/AvroCustomOrderSchemaVisitor.java @@ -19,13 +19,13 @@ package org.apache.iceberg.avro; -import com.google.common.base.Preconditions; -import com.google.common.collect.Iterables; -import com.google.common.collect.Lists; import java.util.Deque; import java.util.List; import java.util.function.Supplier; import org.apache.avro.Schema; +import org.apache.iceberg.relocated.com.google.common.base.Preconditions; +import org.apache.iceberg.relocated.com.google.common.collect.Iterables; +import org.apache.iceberg.relocated.com.google.common.collect.Lists; abstract class AvroCustomOrderSchemaVisitor { public static T visit(Schema schema, AvroCustomOrderSchemaVisitor visitor) { diff --git a/core/src/main/java/org/apache/iceberg/avro/AvroSchemaUtil.java b/core/src/main/java/org/apache/iceberg/avro/AvroSchemaUtil.java index 8c79fd13e55b..accb825fc959 100644 --- a/core/src/main/java/org/apache/iceberg/avro/AvroSchemaUtil.java +++ b/core/src/main/java/org/apache/iceberg/avro/AvroSchemaUtil.java @@ -19,10 +19,6 @@ package org.apache.iceberg.avro; -import com.google.common.base.Preconditions; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableMap; -import com.google.common.collect.Lists; import java.util.List; import java.util.Map; import java.util.Set; @@ -32,6 +28,10 @@ import org.apache.avro.Schema; import org.apache.iceberg.mapping.MappedField; import org.apache.iceberg.mapping.NameMapping; +import org.apache.iceberg.relocated.com.google.common.base.Preconditions; +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.Lists; import org.apache.iceberg.types.Type; import org.apache.iceberg.types.TypeUtil; import org.apache.iceberg.types.Types; diff --git a/core/src/main/java/org/apache/iceberg/avro/AvroSchemaVisitor.java b/core/src/main/java/org/apache/iceberg/avro/AvroSchemaVisitor.java index 2631983d42a5..281d45b51c2a 100644 --- a/core/src/main/java/org/apache/iceberg/avro/AvroSchemaVisitor.java +++ b/core/src/main/java/org/apache/iceberg/avro/AvroSchemaVisitor.java @@ -19,11 +19,11 @@ package org.apache.iceberg.avro; -import com.google.common.base.Preconditions; -import com.google.common.collect.Lists; import java.util.Deque; import java.util.List; import org.apache.avro.Schema; +import org.apache.iceberg.relocated.com.google.common.base.Preconditions; +import org.apache.iceberg.relocated.com.google.common.collect.Lists; public abstract class AvroSchemaVisitor { public static T visit(Schema schema, AvroSchemaVisitor visitor) { diff --git a/core/src/main/java/org/apache/iceberg/avro/AvroSchemaWithTypeVisitor.java b/core/src/main/java/org/apache/iceberg/avro/AvroSchemaWithTypeVisitor.java index d6e078a6838b..e6f1c6eb5097 100644 --- a/core/src/main/java/org/apache/iceberg/avro/AvroSchemaWithTypeVisitor.java +++ b/core/src/main/java/org/apache/iceberg/avro/AvroSchemaWithTypeVisitor.java @@ -19,11 +19,11 @@ package org.apache.iceberg.avro; -import com.google.common.base.Preconditions; -import com.google.common.collect.Lists; import java.util.Deque; import java.util.List; import org.apache.avro.Schema; +import org.apache.iceberg.relocated.com.google.common.base.Preconditions; +import org.apache.iceberg.relocated.com.google.common.collect.Lists; import org.apache.iceberg.types.Type; import org.apache.iceberg.types.Types; diff --git a/core/src/main/java/org/apache/iceberg/avro/BuildAvroProjection.java b/core/src/main/java/org/apache/iceberg/avro/BuildAvroProjection.java index 35b8981ca0fe..a1e0d05ce577 100644 --- a/core/src/main/java/org/apache/iceberg/avro/BuildAvroProjection.java +++ b/core/src/main/java/org/apache/iceberg/avro/BuildAvroProjection.java @@ -19,14 +19,14 @@ package org.apache.iceberg.avro; -import com.google.common.base.Preconditions; -import com.google.common.collect.Lists; -import com.google.common.collect.Maps; import java.util.List; import java.util.Map; import java.util.function.Supplier; import org.apache.avro.JsonProperties; import org.apache.avro.Schema; +import org.apache.iceberg.relocated.com.google.common.base.Preconditions; +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.Types; diff --git a/core/src/main/java/org/apache/iceberg/avro/GenericAvroWriter.java b/core/src/main/java/org/apache/iceberg/avro/GenericAvroWriter.java index dd97f2ee56d3..36f773fbdee6 100644 --- a/core/src/main/java/org/apache/iceberg/avro/GenericAvroWriter.java +++ b/core/src/main/java/org/apache/iceberg/avro/GenericAvroWriter.java @@ -19,7 +19,6 @@ package org.apache.iceberg.avro; -import com.google.common.base.Preconditions; import java.io.IOException; import java.util.List; import org.apache.avro.LogicalType; @@ -27,6 +26,7 @@ import org.apache.avro.Schema; import org.apache.avro.io.DatumWriter; import org.apache.avro.io.Encoder; +import org.apache.iceberg.relocated.com.google.common.base.Preconditions; class GenericAvroWriter implements DatumWriter { private ValueWriter writer = null; diff --git a/core/src/main/java/org/apache/iceberg/avro/LogicalMap.java b/core/src/main/java/org/apache/iceberg/avro/LogicalMap.java index 840cdcc53e24..04f7cd3015d6 100644 --- a/core/src/main/java/org/apache/iceberg/avro/LogicalMap.java +++ b/core/src/main/java/org/apache/iceberg/avro/LogicalMap.java @@ -19,9 +19,9 @@ package org.apache.iceberg.avro; -import com.google.common.base.Preconditions; import org.apache.avro.LogicalType; import org.apache.avro.Schema; +import org.apache.iceberg.relocated.com.google.common.base.Preconditions; public class LogicalMap extends LogicalType { static final String NAME = "map"; diff --git a/core/src/main/java/org/apache/iceberg/avro/PruneColumns.java b/core/src/main/java/org/apache/iceberg/avro/PruneColumns.java index eb13b4bd65a9..85a2684bff15 100644 --- a/core/src/main/java/org/apache/iceberg/avro/PruneColumns.java +++ b/core/src/main/java/org/apache/iceberg/avro/PruneColumns.java @@ -19,15 +19,15 @@ package org.apache.iceberg.avro; -import com.google.common.base.Preconditions; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.Lists; import java.util.List; import java.util.Map; import java.util.Set; import org.apache.avro.Schema; import org.apache.avro.SchemaNormalization; import org.apache.iceberg.mapping.NameMapping; +import org.apache.iceberg.relocated.com.google.common.base.Preconditions; +import org.apache.iceberg.relocated.com.google.common.collect.ImmutableList; +import org.apache.iceberg.relocated.com.google.common.collect.Lists; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/org/apache/iceberg/avro/SchemaToType.java b/core/src/main/java/org/apache/iceberg/avro/SchemaToType.java index 2469f33e30e5..7e8681cf9e35 100644 --- a/core/src/main/java/org/apache/iceberg/avro/SchemaToType.java +++ b/core/src/main/java/org/apache/iceberg/avro/SchemaToType.java @@ -19,12 +19,12 @@ package org.apache.iceberg.avro; -import com.google.common.base.Preconditions; -import com.google.common.collect.Lists; import java.util.List; import org.apache.avro.LogicalType; import org.apache.avro.LogicalTypes; import org.apache.avro.Schema; +import org.apache.iceberg.relocated.com.google.common.base.Preconditions; +import org.apache.iceberg.relocated.com.google.common.collect.Lists; import org.apache.iceberg.types.Type; import org.apache.iceberg.types.Types; diff --git a/core/src/main/java/org/apache/iceberg/hadoop/HadoopTableOperations.java b/core/src/main/java/org/apache/iceberg/hadoop/HadoopTableOperations.java index 8bad14884110..2a5a649332f9 100644 --- a/core/src/main/java/org/apache/iceberg/hadoop/HadoopTableOperations.java +++ b/core/src/main/java/org/apache/iceberg/hadoop/HadoopTableOperations.java @@ -19,8 +19,6 @@ package org.apache.iceberg.hadoop; -import com.google.common.base.Preconditions; -import com.google.common.collect.Sets; import java.io.BufferedReader; import java.io.IOException; import java.io.InputStreamReader; @@ -42,6 +40,8 @@ import org.apache.iceberg.exceptions.ValidationException; import org.apache.iceberg.io.FileIO; import org.apache.iceberg.io.LocationProvider; +import org.apache.iceberg.relocated.com.google.common.base.Preconditions; +import org.apache.iceberg.relocated.com.google.common.collect.Sets; import org.apache.iceberg.util.Tasks; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/org/apache/iceberg/util/BinPacking.java b/core/src/main/java/org/apache/iceberg/util/BinPacking.java index 27d22f26f684..59f2a9fc09d5 100644 --- a/core/src/main/java/org/apache/iceberg/util/BinPacking.java +++ b/core/src/main/java/org/apache/iceberg/util/BinPacking.java @@ -19,10 +19,6 @@ package org.apache.iceberg.util; -import com.google.common.base.Preconditions; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.Iterables; -import com.google.common.collect.Lists; import java.util.Collection; import java.util.Collections; import java.util.Comparator; @@ -31,6 +27,10 @@ import java.util.List; import java.util.NoSuchElementException; import java.util.function.Function; +import org.apache.iceberg.relocated.com.google.common.base.Preconditions; +import org.apache.iceberg.relocated.com.google.common.collect.ImmutableList; +import org.apache.iceberg.relocated.com.google.common.collect.Iterables; +import org.apache.iceberg.relocated.com.google.common.collect.Lists; public class BinPacking { public static class ListPacker { diff --git a/core/src/main/java/org/apache/iceberg/util/JsonUtil.java b/core/src/main/java/org/apache/iceberg/util/JsonUtil.java index e70351fcb99d..0d842607fdb2 100644 --- a/core/src/main/java/org/apache/iceberg/util/JsonUtil.java +++ b/core/src/main/java/org/apache/iceberg/util/JsonUtil.java @@ -22,12 +22,12 @@ import com.fasterxml.jackson.core.JsonFactory; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; -import com.google.common.base.Preconditions; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableMap; import java.util.Iterator; import java.util.List; import java.util.Map; +import org.apache.iceberg.relocated.com.google.common.base.Preconditions; +import org.apache.iceberg.relocated.com.google.common.collect.ImmutableList; +import org.apache.iceberg.relocated.com.google.common.collect.ImmutableMap; public class JsonUtil { diff --git a/data/src/main/java/org/apache/iceberg/data/GenericRecord.java b/data/src/main/java/org/apache/iceberg/data/GenericRecord.java index e52e0b74259a..46507b88b391 100644 --- a/data/src/main/java/org/apache/iceberg/data/GenericRecord.java +++ b/data/src/main/java/org/apache/iceberg/data/GenericRecord.java @@ -21,14 +21,14 @@ import com.github.benmanes.caffeine.cache.Caffeine; import com.github.benmanes.caffeine.cache.LoadingCache; -import com.google.common.base.Objects; -import com.google.common.base.Preconditions; -import com.google.common.collect.Maps; import java.util.Arrays; import java.util.List; import java.util.Map; import org.apache.iceberg.Schema; import org.apache.iceberg.StructLike; +import org.apache.iceberg.relocated.com.google.common.base.Objects; +import org.apache.iceberg.relocated.com.google.common.base.Preconditions; +import org.apache.iceberg.relocated.com.google.common.collect.Maps; import org.apache.iceberg.types.Types; import org.apache.iceberg.types.Types.StructType; diff --git a/data/src/main/java/org/apache/iceberg/data/IcebergGenerics.java b/data/src/main/java/org/apache/iceberg/data/IcebergGenerics.java index 311a80a49860..79ae144b92ab 100644 --- a/data/src/main/java/org/apache/iceberg/data/IcebergGenerics.java +++ b/data/src/main/java/org/apache/iceberg/data/IcebergGenerics.java @@ -19,10 +19,10 @@ package org.apache.iceberg.data; -import com.google.common.collect.ImmutableList; import org.apache.iceberg.Table; import org.apache.iceberg.TableScan; import org.apache.iceberg.expressions.Expression; +import org.apache.iceberg.relocated.com.google.common.collect.ImmutableList; public class IcebergGenerics { private IcebergGenerics() { diff --git a/data/src/main/java/org/apache/iceberg/data/TableScanIterable.java b/data/src/main/java/org/apache/iceberg/data/TableScanIterable.java index a683c019844f..e66e48a56c9f 100644 --- a/data/src/main/java/org/apache/iceberg/data/TableScanIterable.java +++ b/data/src/main/java/org/apache/iceberg/data/TableScanIterable.java @@ -19,9 +19,6 @@ package org.apache.iceberg.data; -import com.google.common.base.Preconditions; -import com.google.common.collect.Iterables; -import com.google.common.collect.Lists; import java.io.Closeable; import java.io.IOException; import java.util.Collections; @@ -47,6 +44,9 @@ import org.apache.iceberg.io.InputFile; import org.apache.iceberg.orc.ORC; import org.apache.iceberg.parquet.Parquet; +import org.apache.iceberg.relocated.com.google.common.base.Preconditions; +import org.apache.iceberg.relocated.com.google.common.collect.Iterables; +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.iceberg.util.PartitionUtil; diff --git a/data/src/main/java/org/apache/iceberg/data/avro/DataReader.java b/data/src/main/java/org/apache/iceberg/data/avro/DataReader.java index 1d226c3ecbad..8c7d0f3e72a6 100644 --- a/data/src/main/java/org/apache/iceberg/data/avro/DataReader.java +++ b/data/src/main/java/org/apache/iceberg/data/avro/DataReader.java @@ -19,8 +19,6 @@ package org.apache.iceberg.data.avro; -import com.google.common.collect.ImmutableMap; -import com.google.common.collect.MapMaker; import java.io.IOException; import java.util.HashMap; import java.util.List; @@ -37,6 +35,8 @@ import org.apache.iceberg.avro.ValueReader; import org.apache.iceberg.avro.ValueReaders; import org.apache.iceberg.exceptions.RuntimeIOException; +import org.apache.iceberg.relocated.com.google.common.collect.ImmutableMap; +import org.apache.iceberg.relocated.com.google.common.collect.MapMaker; import org.apache.iceberg.types.Type; import org.apache.iceberg.types.Types; diff --git a/data/src/main/java/org/apache/iceberg/data/avro/DataWriter.java b/data/src/main/java/org/apache/iceberg/data/avro/DataWriter.java index 322588b9aaab..fc47dd02723b 100644 --- a/data/src/main/java/org/apache/iceberg/data/avro/DataWriter.java +++ b/data/src/main/java/org/apache/iceberg/data/avro/DataWriter.java @@ -19,7 +19,6 @@ package org.apache.iceberg.data.avro; -import com.google.common.base.Preconditions; import java.io.IOException; import java.util.List; import org.apache.avro.LogicalType; @@ -32,6 +31,7 @@ import org.apache.iceberg.avro.LogicalMap; import org.apache.iceberg.avro.ValueWriter; import org.apache.iceberg.avro.ValueWriters; +import org.apache.iceberg.relocated.com.google.common.base.Preconditions; public class DataWriter implements DatumWriter { private ValueWriter writer = null; diff --git a/data/src/main/java/org/apache/iceberg/data/avro/IcebergDecoder.java b/data/src/main/java/org/apache/iceberg/data/avro/IcebergDecoder.java index 42b433f53185..aa4827b0f6a7 100644 --- a/data/src/main/java/org/apache/iceberg/data/avro/IcebergDecoder.java +++ b/data/src/main/java/org/apache/iceberg/data/avro/IcebergDecoder.java @@ -19,8 +19,6 @@ package org.apache.iceberg.data.avro; -import com.google.common.collect.ImmutableMap; -import com.google.common.collect.MapMaker; import java.io.IOException; import java.io.InputStream; import java.nio.ByteBuffer; @@ -38,6 +36,8 @@ import org.apache.avro.message.SchemaStore; import org.apache.iceberg.avro.AvroSchemaUtil; import org.apache.iceberg.avro.ProjectionDatumReader; +import org.apache.iceberg.relocated.com.google.common.collect.ImmutableMap; +import org.apache.iceberg.relocated.com.google.common.collect.MapMaker; public class IcebergDecoder extends MessageDecoder.BaseDecoder { private static final ThreadLocal HEADER_BUFFER = diff --git a/data/src/main/java/org/apache/iceberg/data/avro/IcebergEncoder.java b/data/src/main/java/org/apache/iceberg/data/avro/IcebergEncoder.java index ce9ca86b7d8b..9b1fe2d3ed1a 100644 --- a/data/src/main/java/org/apache/iceberg/data/avro/IcebergEncoder.java +++ b/data/src/main/java/org/apache/iceberg/data/avro/IcebergEncoder.java @@ -19,7 +19,6 @@ package org.apache.iceberg.data.avro; -import com.google.common.primitives.Bytes; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.OutputStream; @@ -33,6 +32,7 @@ import org.apache.avro.message.MessageEncoder; import org.apache.iceberg.Schema; import org.apache.iceberg.avro.AvroSchemaUtil; +import org.apache.iceberg.relocated.com.google.common.primitives.Bytes; public class IcebergEncoder implements MessageEncoder { diff --git a/data/src/main/java/org/apache/iceberg/data/orc/GenericOrcReader.java b/data/src/main/java/org/apache/iceberg/data/orc/GenericOrcReader.java index 03f03be89693..deea3c5c6746 100644 --- a/data/src/main/java/org/apache/iceberg/data/orc/GenericOrcReader.java +++ b/data/src/main/java/org/apache/iceberg/data/orc/GenericOrcReader.java @@ -19,9 +19,6 @@ package org.apache.iceberg.data.orc; -import com.google.common.base.Preconditions; -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; @@ -40,6 +37,9 @@ import org.apache.iceberg.data.Record; import org.apache.iceberg.orc.ORCSchemaUtil; import org.apache.iceberg.orc.OrcValueReader; +import org.apache.iceberg.relocated.com.google.common.base.Preconditions; +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.orc.TypeDescription; import org.apache.orc.storage.ql.exec.vector.BytesColumnVector; diff --git a/data/src/main/java/org/apache/iceberg/data/orc/GenericOrcWriter.java b/data/src/main/java/org/apache/iceberg/data/orc/GenericOrcWriter.java index d2b19f76663d..1bf466df5cb3 100644 --- a/data/src/main/java/org/apache/iceberg/data/orc/GenericOrcWriter.java +++ b/data/src/main/java/org/apache/iceberg/data/orc/GenericOrcWriter.java @@ -19,7 +19,6 @@ package org.apache.iceberg.data.orc; -import com.google.common.collect.Lists; import java.io.IOException; import java.math.BigDecimal; import java.nio.ByteBuffer; @@ -37,6 +36,7 @@ import org.apache.iceberg.data.Record; import org.apache.iceberg.orc.ORCSchemaUtil; import org.apache.iceberg.orc.OrcValueWriter; +import org.apache.iceberg.relocated.com.google.common.collect.Lists; import org.apache.orc.TypeDescription; import org.apache.orc.storage.common.type.HiveDecimal; import org.apache.orc.storage.ql.exec.vector.BytesColumnVector; diff --git a/data/src/main/java/org/apache/iceberg/data/parquet/GenericParquetReaders.java b/data/src/main/java/org/apache/iceberg/data/parquet/GenericParquetReaders.java index acb35ed29ca6..2f6f3b07933d 100644 --- a/data/src/main/java/org/apache/iceberg/data/parquet/GenericParquetReaders.java +++ b/data/src/main/java/org/apache/iceberg/data/parquet/GenericParquetReaders.java @@ -19,10 +19,6 @@ package org.apache.iceberg.data.parquet; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableMap; -import com.google.common.collect.Lists; -import com.google.common.collect.Maps; import java.time.Instant; import java.time.LocalDate; import java.time.LocalDateTime; @@ -50,6 +46,10 @@ import org.apache.iceberg.parquet.ParquetValueReaders.StructReader; import org.apache.iceberg.parquet.ParquetValueReaders.UnboxedReader; import org.apache.iceberg.parquet.TypeWithSchemaVisitor; +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.Lists; +import org.apache.iceberg.relocated.com.google.common.collect.Maps; import org.apache.iceberg.types.Type.TypeID; import org.apache.iceberg.types.Types; import org.apache.iceberg.types.Types.StructType; diff --git a/data/src/main/java/org/apache/iceberg/data/parquet/GenericParquetWriter.java b/data/src/main/java/org/apache/iceberg/data/parquet/GenericParquetWriter.java index d20db91af8c4..9fc40b270311 100644 --- a/data/src/main/java/org/apache/iceberg/data/parquet/GenericParquetWriter.java +++ b/data/src/main/java/org/apache/iceberg/data/parquet/GenericParquetWriter.java @@ -19,7 +19,6 @@ package org.apache.iceberg.data.parquet; -import com.google.common.collect.Lists; import java.time.Instant; import java.time.LocalDate; import java.time.LocalDateTime; @@ -34,6 +33,7 @@ import org.apache.iceberg.parquet.ParquetValueWriters; import org.apache.iceberg.parquet.ParquetValueWriters.PrimitiveWriter; import org.apache.iceberg.parquet.ParquetValueWriters.StructWriter; +import org.apache.iceberg.relocated.com.google.common.collect.Lists; import org.apache.parquet.column.ColumnDescriptor; import org.apache.parquet.io.api.Binary; import org.apache.parquet.schema.DecimalMetadata; diff --git a/data/src/test/java/org/apache/iceberg/TestSplitScan.java b/data/src/test/java/org/apache/iceberg/TestSplitScan.java index 3683dabe1400..b0d870a3e65a 100644 --- a/data/src/test/java/org/apache/iceberg/TestSplitScan.java +++ b/data/src/test/java/org/apache/iceberg/TestSplitScan.java @@ -19,7 +19,6 @@ package org.apache.iceberg; -import com.google.common.collect.Lists; import java.io.File; import java.io.IOException; import java.util.List; @@ -34,6 +33,7 @@ import org.apache.iceberg.hadoop.HadoopTables; import org.apache.iceberg.io.FileAppender; import org.apache.iceberg.parquet.Parquet; +import org.apache.iceberg.relocated.com.google.common.collect.Lists; import org.apache.iceberg.types.Types; import org.junit.Assert; import org.junit.Before; diff --git a/data/src/test/java/org/apache/iceberg/data/RandomGenericData.java b/data/src/test/java/org/apache/iceberg/data/RandomGenericData.java index d6e2f8f1219c..0fa80a9aca99 100644 --- a/data/src/test/java/org/apache/iceberg/data/RandomGenericData.java +++ b/data/src/test/java/org/apache/iceberg/data/RandomGenericData.java @@ -19,9 +19,6 @@ package org.apache.iceberg.data; -import com.google.common.collect.Lists; -import com.google.common.collect.Maps; -import com.google.common.collect.Sets; import java.math.BigDecimal; import java.math.BigInteger; import java.nio.ByteBuffer; @@ -38,6 +35,9 @@ import java.util.UUID; import java.util.function.Supplier; import org.apache.iceberg.Schema; +import org.apache.iceberg.relocated.com.google.common.collect.Lists; +import org.apache.iceberg.relocated.com.google.common.collect.Maps; +import org.apache.iceberg.relocated.com.google.common.collect.Sets; import org.apache.iceberg.types.Type; import org.apache.iceberg.types.TypeUtil; import org.apache.iceberg.types.Types; 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 673673097728..d50ecdba1982 100644 --- a/data/src/test/java/org/apache/iceberg/data/TestLocalScan.java +++ b/data/src/test/java/org/apache/iceberg/data/TestLocalScan.java @@ -19,11 +19,6 @@ package org.apache.iceberg.data; -import com.google.common.base.Preconditions; -import com.google.common.collect.ImmutableMap; -import com.google.common.collect.Iterables; -import com.google.common.collect.Lists; -import com.google.common.collect.Sets; import java.io.File; import java.io.IOException; import java.nio.ByteBuffer; @@ -54,6 +49,11 @@ import org.apache.iceberg.io.FileAppender; import org.apache.iceberg.orc.ORC; import org.apache.iceberg.parquet.Parquet; +import org.apache.iceberg.relocated.com.google.common.base.Preconditions; +import org.apache.iceberg.relocated.com.google.common.collect.ImmutableMap; +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.Sets; import org.apache.iceberg.types.Types; import org.junit.Assert; import org.junit.Before; diff --git a/data/src/test/java/org/apache/iceberg/data/TestReadProjection.java b/data/src/test/java/org/apache/iceberg/data/TestReadProjection.java index ada32703837a..08dc733c2e1c 100644 --- a/data/src/test/java/org/apache/iceberg/data/TestReadProjection.java +++ b/data/src/test/java/org/apache/iceberg/data/TestReadProjection.java @@ -19,14 +19,14 @@ package org.apache.iceberg.data; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableMap; -import com.google.common.collect.Maps; -import com.google.common.collect.Sets; import java.io.IOException; import java.util.List; import java.util.Map; import org.apache.iceberg.Schema; +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.Maps; +import org.apache.iceberg.relocated.com.google.common.collect.Sets; import org.apache.iceberg.types.Comparators; import org.apache.iceberg.types.Types; import org.junit.Assert; diff --git a/data/src/test/java/org/apache/iceberg/data/avro/TestGenericData.java b/data/src/test/java/org/apache/iceberg/data/avro/TestGenericData.java index c703ff7f81e2..287e54c203ee 100644 --- a/data/src/test/java/org/apache/iceberg/data/avro/TestGenericData.java +++ b/data/src/test/java/org/apache/iceberg/data/avro/TestGenericData.java @@ -19,7 +19,6 @@ package org.apache.iceberg.data.avro; -import com.google.common.collect.Lists; import java.io.File; import java.io.IOException; import java.util.List; @@ -32,6 +31,7 @@ import org.apache.iceberg.data.RandomGenericData; import org.apache.iceberg.data.Record; import org.apache.iceberg.io.FileAppender; +import org.apache.iceberg.relocated.com.google.common.collect.Lists; import org.junit.Assert; public class TestGenericData extends DataTest { diff --git a/data/src/test/java/org/apache/iceberg/data/avro/TestGenericReadProjection.java b/data/src/test/java/org/apache/iceberg/data/avro/TestGenericReadProjection.java index cfddb2b3bb55..3450348b402e 100644 --- a/data/src/test/java/org/apache/iceberg/data/avro/TestGenericReadProjection.java +++ b/data/src/test/java/org/apache/iceberg/data/avro/TestGenericReadProjection.java @@ -19,7 +19,6 @@ package org.apache.iceberg.data.avro; -import com.google.common.collect.Iterables; import java.io.File; import java.io.IOException; import org.apache.iceberg.Files; @@ -28,6 +27,7 @@ import org.apache.iceberg.data.Record; import org.apache.iceberg.data.TestReadProjection; import org.apache.iceberg.io.FileAppender; +import org.apache.iceberg.relocated.com.google.common.collect.Iterables; public class TestGenericReadProjection extends TestReadProjection { @Override diff --git a/data/src/test/java/org/apache/iceberg/data/avro/TestSingleMessageEncoding.java b/data/src/test/java/org/apache/iceberg/data/avro/TestSingleMessageEncoding.java index 37931818751e..15c44761981e 100644 --- a/data/src/test/java/org/apache/iceberg/data/avro/TestSingleMessageEncoding.java +++ b/data/src/test/java/org/apache/iceberg/data/avro/TestSingleMessageEncoding.java @@ -19,10 +19,6 @@ package org.apache.iceberg.data.avro; -import com.google.common.collect.Iterables; -import com.google.common.collect.Lists; -import com.google.common.collect.Ordering; -import com.google.common.collect.Sets; import java.nio.ByteBuffer; import java.util.Arrays; import java.util.List; @@ -37,6 +33,10 @@ import org.apache.iceberg.avro.AvroSchemaUtil; import org.apache.iceberg.data.GenericRecord; import org.apache.iceberg.data.Record; +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.Ordering; +import org.apache.iceberg.relocated.com.google.common.collect.Sets; import org.apache.iceberg.types.Types; import org.junit.Assert; import org.junit.Test; diff --git a/data/src/test/java/org/apache/iceberg/data/orc/TestGenericData.java b/data/src/test/java/org/apache/iceberg/data/orc/TestGenericData.java index 670b455aa9c3..efee11535e28 100644 --- a/data/src/test/java/org/apache/iceberg/data/orc/TestGenericData.java +++ b/data/src/test/java/org/apache/iceberg/data/orc/TestGenericData.java @@ -19,7 +19,6 @@ package org.apache.iceberg.data.orc; -import com.google.common.collect.Lists; import java.io.File; import java.io.IOException; import java.time.LocalDateTime; @@ -36,6 +35,7 @@ import org.apache.iceberg.io.CloseableIterable; import org.apache.iceberg.io.FileAppender; import org.apache.iceberg.orc.ORC; +import org.apache.iceberg.relocated.com.google.common.collect.Lists; import org.apache.iceberg.types.Types; import org.junit.Assert; import org.junit.Test; diff --git a/data/src/test/java/org/apache/iceberg/data/orc/TestGenericReadProjection.java b/data/src/test/java/org/apache/iceberg/data/orc/TestGenericReadProjection.java index ccb134692527..1aab27dbedb4 100644 --- a/data/src/test/java/org/apache/iceberg/data/orc/TestGenericReadProjection.java +++ b/data/src/test/java/org/apache/iceberg/data/orc/TestGenericReadProjection.java @@ -19,7 +19,6 @@ package org.apache.iceberg.data.orc; -import com.google.common.collect.Iterables; import java.io.File; import java.io.IOException; import org.apache.iceberg.Files; @@ -28,6 +27,7 @@ import org.apache.iceberg.data.TestReadProjection; import org.apache.iceberg.io.FileAppender; import org.apache.iceberg.orc.ORC; +import org.apache.iceberg.relocated.com.google.common.collect.Iterables; public class TestGenericReadProjection extends TestReadProjection { diff --git a/data/src/test/java/org/apache/iceberg/data/parquet/TestGenericData.java b/data/src/test/java/org/apache/iceberg/data/parquet/TestGenericData.java index 05c7f9a19e52..58f62988b6f7 100644 --- a/data/src/test/java/org/apache/iceberg/data/parquet/TestGenericData.java +++ b/data/src/test/java/org/apache/iceberg/data/parquet/TestGenericData.java @@ -19,7 +19,6 @@ package org.apache.iceberg.data.parquet; -import com.google.common.collect.Lists; import java.io.File; import java.io.IOException; import java.util.List; @@ -32,6 +31,7 @@ import org.apache.iceberg.io.CloseableIterable; import org.apache.iceberg.io.FileAppender; import org.apache.iceberg.parquet.Parquet; +import org.apache.iceberg.relocated.com.google.common.collect.Lists; import org.junit.Assert; public class TestGenericData extends DataTest { diff --git a/data/src/test/java/org/apache/iceberg/data/parquet/TestGenericReadProjection.java b/data/src/test/java/org/apache/iceberg/data/parquet/TestGenericReadProjection.java index 905073fbde64..9a0810dc16e3 100644 --- a/data/src/test/java/org/apache/iceberg/data/parquet/TestGenericReadProjection.java +++ b/data/src/test/java/org/apache/iceberg/data/parquet/TestGenericReadProjection.java @@ -19,7 +19,6 @@ package org.apache.iceberg.data.parquet; -import com.google.common.collect.Iterables; import java.io.File; import java.io.IOException; import org.apache.iceberg.Files; @@ -28,6 +27,7 @@ import org.apache.iceberg.data.TestReadProjection; import org.apache.iceberg.io.FileAppender; import org.apache.iceberg.parquet.Parquet; +import org.apache.iceberg.relocated.com.google.common.collect.Iterables; public class TestGenericReadProjection extends TestReadProjection { @Override diff --git a/mr/src/main/java/org/apache/iceberg/mr/mapreduce/IcebergInputFormat.java b/mr/src/main/java/org/apache/iceberg/mr/mapreduce/IcebergInputFormat.java index 0d35644ab89f..bb96c778d26a 100644 --- a/mr/src/main/java/org/apache/iceberg/mr/mapreduce/IcebergInputFormat.java +++ b/mr/src/main/java/org/apache/iceberg/mr/mapreduce/IcebergInputFormat.java @@ -19,11 +19,6 @@ package org.apache.iceberg.mr.mapreduce; -import com.google.common.base.Preconditions; -import com.google.common.collect.Iterators; -import com.google.common.collect.Lists; -import com.google.common.collect.Maps; -import com.google.common.collect.Sets; import java.io.Closeable; import java.io.DataInput; import java.io.DataOutput; @@ -73,6 +68,11 @@ import org.apache.iceberg.mr.SerializationUtil; import org.apache.iceberg.orc.ORC; import org.apache.iceberg.parquet.Parquet; +import org.apache.iceberg.relocated.com.google.common.base.Preconditions; +import org.apache.iceberg.relocated.com.google.common.collect.Iterators; +import org.apache.iceberg.relocated.com.google.common.collect.Lists; +import org.apache.iceberg.relocated.com.google.common.collect.Maps; +import org.apache.iceberg.relocated.com.google.common.collect.Sets; import org.apache.iceberg.types.TypeUtil; import org.apache.iceberg.types.Types; import org.slf4j.Logger; diff --git a/mr/src/test/java/org/apache/iceberg/mr/mapreduce/TestIcebergInputFormat.java b/mr/src/test/java/org/apache/iceberg/mr/mapreduce/TestIcebergInputFormat.java index 36be8200deed..a5dbbef0ac4e 100644 --- a/mr/src/test/java/org/apache/iceberg/mr/mapreduce/TestIcebergInputFormat.java +++ b/mr/src/test/java/org/apache/iceberg/mr/mapreduce/TestIcebergInputFormat.java @@ -19,11 +19,6 @@ package org.apache.iceberg.mr.mapreduce; -import com.google.common.collect.FluentIterable; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableMap; -import com.google.common.collect.ImmutableSet; -import com.google.common.collect.Sets; import java.io.File; import java.io.IOException; import java.util.ArrayList; @@ -65,6 +60,11 @@ import org.apache.iceberg.io.FileAppender; import org.apache.iceberg.orc.ORC; import org.apache.iceberg.parquet.Parquet; +import org.apache.iceberg.relocated.com.google.common.collect.FluentIterable; +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.relocated.com.google.common.collect.Sets; import org.apache.iceberg.types.TypeUtil; import org.apache.iceberg.types.Types; import org.junit.Assert; diff --git a/orc/src/main/java/org/apache/iceberg/orc/ORCSchemaUtil.java b/orc/src/main/java/org/apache/iceberg/orc/ORCSchemaUtil.java index 3af6f587783b..f9b1adbd4a40 100644 --- a/orc/src/main/java/org/apache/iceberg/orc/ORCSchemaUtil.java +++ b/orc/src/main/java/org/apache/iceberg/orc/ORCSchemaUtil.java @@ -19,10 +19,6 @@ package org.apache.iceberg.orc; -import com.google.common.base.Preconditions; -import com.google.common.collect.ImmutableMap; -import com.google.common.collect.Lists; -import com.google.common.collect.Maps; import java.util.ArrayList; import java.util.Collections; import java.util.List; @@ -31,6 +27,10 @@ import java.util.Optional; import java.util.concurrent.atomic.AtomicInteger; import org.apache.iceberg.Schema; +import org.apache.iceberg.relocated.com.google.common.base.Preconditions; +import org.apache.iceberg.relocated.com.google.common.collect.ImmutableMap; +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/parquet/src/main/java/org/apache/iceberg/parquet/Parquet.java b/parquet/src/main/java/org/apache/iceberg/parquet/Parquet.java index 689ddb1f8405..df23785e9bfc 100644 --- a/parquet/src/main/java/org/apache/iceberg/parquet/Parquet.java +++ b/parquet/src/main/java/org/apache/iceberg/parquet/Parquet.java @@ -19,9 +19,6 @@ package org.apache.iceberg.parquet; -import com.google.common.base.Preconditions; -import com.google.common.collect.Maps; -import com.google.common.collect.Sets; import java.io.IOException; import java.util.Collection; import java.util.Locale; @@ -41,6 +38,9 @@ import org.apache.iceberg.io.FileAppender; import org.apache.iceberg.io.InputFile; import org.apache.iceberg.io.OutputFile; +import org.apache.iceberg.relocated.com.google.common.base.Preconditions; +import org.apache.iceberg.relocated.com.google.common.collect.Maps; +import org.apache.iceberg.relocated.com.google.common.collect.Sets; import org.apache.parquet.HadoopReadOptions; import org.apache.parquet.ParquetReadOptions; import org.apache.parquet.avro.AvroReadSupport; From 1b0a02f188b02dc0fa7b222bb34066f911a5a057 Mon Sep 17 00:00:00 2001 From: awoodhead Date: Fri, 15 May 2020 13:51:25 +0100 Subject: [PATCH 08/16] put guava back in `versions.lock` for now --- versions.lock | 1 + 1 file changed, 1 insertion(+) diff --git a/versions.lock b/versions.lock index 19e17e7a87c3..f94a0ca1d756 100644 --- a/versions.lock +++ b/versions.lock @@ -20,6 +20,7 @@ com.google.code.gson:gson:2.2.4 (2 constraints: 9518bfd2) com.google.errorprone:error_prone_annotations:2.3.3 (2 constraints: 161a2544) com.google.flatbuffers:flatbuffers-java:1.9.0 (2 constraints: e5199714) com.google.guava:failureaccess:1.0.1 (1 constraints: 140ae1b4) +com.google.guava:guava:28.0-jre (21 constraints: 88453dad) com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava (1 constraints: bd17c918) com.google.inject:guice:3.0 (6 constraints: 6873914c) com.google.inject.extensions:guice-servlet:3.0 (11 constraints: a9d50a2b) From 43522a2a6c19368e1b1cbb7f749c16b4e30e4350 Mon Sep 17 00:00:00 2001 From: awoodhead Date: Fri, 15 May 2020 14:14:23 +0100 Subject: [PATCH 09/16] guava should be compileOnly to prevent transitive downstream dependencies --- build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 94024a9f4701..4147f9163764 100644 --- a/build.gradle +++ b/build.gradle @@ -113,7 +113,7 @@ project(':iceberg-bundled-guava') { tasks.install.dependsOn tasks.shadowJar dependencies { - compile('com.google.guava:guava') { + compileOnly('com.google.guava:guava') { exclude group: 'com.google.code.findbugs' // may be LGPL - use ALv2 findbugs-annotations instead exclude group: 'com.google.errorprone' @@ -155,7 +155,7 @@ project(':iceberg-common') { compile project(path: ':iceberg-bundled-guava', configuration: 'shadow') } } - + project(':iceberg-core') { dependencies { compile project(':iceberg-api') From 37575469d86ea89a4acc2bf19f1ae9c26ca13478 Mon Sep 17 00:00:00 2001 From: awoodhead Date: Fri, 15 May 2020 14:34:05 +0100 Subject: [PATCH 10/16] use compileOnly for building shaded jar --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 4147f9163764..051b8f0940e4 100644 --- a/build.gradle +++ b/build.gradle @@ -122,7 +122,7 @@ project(':iceberg-bundled-guava') { } shadowJar { - configurations = [project.configurations.compile] + configurations = [project.configurations.compileOnly] zip64 true // include the LICENSE and NOTICE files for the shaded Jar From 933118aed28e6f38bbfdbce530dc3231915ffee8 Mon Sep 17 00:00:00 2001 From: Christine Mathiesen Date: Fri, 15 May 2020 17:36:57 +0100 Subject: [PATCH 11/16] Change all imports to shaded guava, update spotless plugin config --- baseline.gradle | 4 ++-- .../iceberg/BaseMetastoreTableOperations.java | 6 +++--- .../org/apache/iceberg/BaseOverwriteFiles.java | 4 ++-- .../java/org/apache/iceberg/BaseRewriteFiles.java | 2 +- .../org/apache/iceberg/BaseRewriteManifests.java | 12 ++++++------ .../java/org/apache/iceberg/BaseTransaction.java | 8 ++++---- .../main/java/org/apache/iceberg/DataFiles.java | 4 ++-- .../main/java/org/apache/iceberg/FastAppend.java | 6 +++--- .../main/java/org/apache/iceberg/FileHistory.java | 8 ++++---- .../java/org/apache/iceberg/FilteredManifest.java | 6 +++--- .../main/java/org/apache/iceberg/FindFiles.java | 2 +- .../main/java/org/apache/iceberg/HistoryTable.java | 4 ++-- .../apache/iceberg/InheritableMetadataFactory.java | 2 +- .../java/org/apache/iceberg/LocationProviders.java | 2 +- .../java/org/apache/iceberg/ManifestFiles.java | 2 +- .../java/org/apache/iceberg/ManifestGroup.java | 6 +++--- .../org/apache/iceberg/ManifestListWriter.java | 2 +- .../java/org/apache/iceberg/ManifestWriter.java | 2 +- .../java/org/apache/iceberg/ManifestsTable.java | 2 +- .../main/java/org/apache/iceberg/MergeAppend.java | 2 +- .../apache/iceberg/MergingSnapshotProducer.java | 14 +++++++------- .../java/org/apache/iceberg/MetricsConfig.java | 2 +- .../main/java/org/apache/iceberg/MetricsModes.java | 2 +- .../java/org/apache/iceberg/PartitionsTable.java | 2 +- .../java/org/apache/iceberg/PropertiesUpdate.java | 6 +++--- .../java/org/apache/iceberg/RemoveSnapshots.java | 8 ++++---- .../main/java/org/apache/iceberg/ScanSummary.java | 14 +++++++------- .../main/java/org/apache/iceberg/SchemaUpdate.java | 10 +++++----- .../apache/iceberg/SerializableByteBufferMap.java | 2 +- .../java/org/apache/iceberg/SnapshotManager.java | 2 +- .../java/org/apache/iceberg/SnapshotProducer.java | 8 ++++---- .../java/org/apache/iceberg/SnapshotSummary.java | 6 +++--- .../java/org/apache/iceberg/StaticDataTask.java | 6 +++--- .../main/java/org/apache/iceberg/Transactions.java | 2 +- .../main/java/org/apache/iceberg/V2Metadata.java | 2 +- .../java/org/apache/iceberg/avro/AvroIterable.java | 2 +- .../org/apache/iceberg/avro/GenericAvroReader.java | 2 +- .../java/org/apache/iceberg/avro/TypeToSchema.java | 4 ++-- .../java/org/apache/iceberg/avro/ValueReaders.java | 4 ++-- .../java/org/apache/iceberg/avro/ValueWriters.java | 2 +- .../org/apache/iceberg/hadoop/HadoopCatalog.java | 10 +++++----- .../org/apache/iceberg/hadoop/HadoopInputFile.java | 2 +- .../org/apache/iceberg/hadoop/HadoopStreams.java | 2 +- .../org/apache/iceberg/hadoop/HadoopTables.java | 4 ++-- .../main/java/org/apache/iceberg/hadoop/Util.java | 2 +- .../org/apache/iceberg/mapping/MappedField.java | 4 ++-- .../org/apache/iceberg/mapping/MappedFields.java | 6 +++--- .../org/apache/iceberg/mapping/MappingUtil.java | 14 +++++++------- .../org/apache/iceberg/mapping/NameMapping.java | 4 ++-- .../apache/iceberg/mapping/NameMappingParser.java | 6 +++--- .../org/apache/iceberg/util/ManifestFileUtil.java | 2 +- .../main/java/org/apache/iceberg/util/Pair.java | 4 ++-- .../org/apache/iceberg/util/ParallelIterable.java | 4 ++-- .../java/org/apache/iceberg/util/SnapshotUtil.java | 2 +- .../main/java/org/apache/iceberg/util/Tasks.java | 2 +- .../java/org/apache/iceberg/util/ThreadPools.java | 4 ++-- .../org/apache/iceberg/LocalTableOperations.java | 2 +- .../apache/iceberg/TableMetadataParserTest.java | 2 +- .../java/org/apache/iceberg/TableTestBase.java | 10 +++++----- .../org/apache/iceberg/TestCreateTransaction.java | 2 +- .../apache/iceberg/TestEntriesMetadataTable.java | 2 +- .../java/org/apache/iceberg/TestFastAppend.java | 4 ++-- .../java/org/apache/iceberg/TestFilterFiles.java | 4 ++-- .../java/org/apache/iceberg/TestFindFiles.java | 6 +++--- .../TestFixedSizeSplitScanTaskIterator.java | 2 +- .../iceberg/TestIncrementalDataTableScan.java | 6 +++--- .../apache/iceberg/TestManifestListVersions.java | 6 +++--- .../org/apache/iceberg/TestManifestReader.java | 2 +- .../apache/iceberg/TestManifestWriterVersions.java | 6 +++--- .../java/org/apache/iceberg/TestMergeAppend.java | 6 +++--- .../test/java/org/apache/iceberg/TestMetrics.java | 6 +++--- .../java/org/apache/iceberg/TestMetricsModes.java | 2 +- .../TestOffsetsBasedSplitScanTaskIterator.java | 2 +- .../java/org/apache/iceberg/TestOverwrite.java | 2 +- .../iceberg/TestOverwriteWithValidation.java | 4 ++-- .../org/apache/iceberg/TestPartitionSpecInfo.java | 2 +- .../org/apache/iceberg/TestRemoveSnapshots.java | 6 +++--- .../org/apache/iceberg/TestReplaceTransaction.java | 2 +- .../org/apache/iceberg/TestRewriteManifests.java | 2 +- .../apache/iceberg/TestScanDataFileColumns.java | 2 +- .../java/org/apache/iceberg/TestScanSummary.java | 4 ++-- .../iceberg/TestScansAndSchemaEvolution.java | 2 +- .../apache/iceberg/TestSchemaAndMappingUpdate.java | 6 +++--- .../java/org/apache/iceberg/TestSchemaUpdate.java | 6 +++--- .../java/org/apache/iceberg/TestSnapshotJson.java | 4 ++-- .../org/apache/iceberg/TestSnapshotSelection.java | 4 ++-- .../java/org/apache/iceberg/TestSplitPlanning.java | 4 ++-- .../java/org/apache/iceberg/TestTableMetadata.java | 8 ++++---- .../test/java/org/apache/iceberg/TestTables.java | 6 +++--- .../java/org/apache/iceberg/TestTransaction.java | 4 ++-- .../org/apache/iceberg/avro/RandomAvroData.java | 6 +++--- .../java/org/apache/iceberg/avro/RemoveIds.java | 2 +- .../org/apache/iceberg/avro/TestAvroEnums.java | 4 ++-- .../apache/iceberg/avro/TestAvroNameMapping.java | 8 ++++---- .../iceberg/avro/TestAvroReadProjection.java | 2 +- .../org/apache/iceberg/avro/TestGenericAvro.java | 2 +- .../apache/iceberg/avro/TestReadProjection.java | 8 ++++---- .../apache/iceberg/avro/TestSchemaConversions.java | 4 ++-- .../apache/iceberg/hadoop/HadoopTableTestBase.java | 4 ++-- .../apache/iceberg/hadoop/TestHadoopCatalog.java | 7 +++---- .../apache/iceberg/hadoop/TestHadoopCommits.java | 4 ++-- .../apache/iceberg/mapping/TestMappingUpdates.java | 2 +- .../org/apache/iceberg/util/TestBinPacking.java | 2 +- .../java/org/apache/iceberg/hive/ClientPool.java | 2 +- .../java/org/apache/iceberg/hive/HiveCatalog.java | 8 ++++---- .../apache/iceberg/hive/HiveTableOperations.java | 4 ++-- .../iceberg/hive/HiveCreateReplaceTableTest.java | 4 ++-- .../org/apache/iceberg/hive/HiveTableTest.java | 2 +- .../org/apache/iceberg/hive/TestHiveCatalog.java | 4 ++-- .../iceberg/hive/TestHiveTableConcurrency.java | 4 ++-- orc/src/main/java/org/apache/iceberg/orc/ORC.java | 2 +- .../org/apache/iceberg/orc/OrcFileAppender.java | 4 ++-- .../apache/iceberg/parquet/BasePageIterator.java | 2 +- .../apache/iceberg/parquet/MessageTypeToType.java | 8 ++++---- .../org/apache/iceberg/parquet/PageIterator.java | 2 +- .../org/apache/iceberg/parquet/ParquetAvro.java | 4 ++-- .../iceberg/parquet/ParquetAvroValueReaders.java | 6 +++--- .../apache/iceberg/parquet/ParquetAvroWriter.java | 2 +- .../parquet/ParquetDictionaryRowGroupFilter.java | 6 +++--- .../parquet/ParquetMetricsRowGroupFilter.java | 2 +- .../apache/iceberg/parquet/ParquetReadSupport.java | 4 ++-- .../apache/iceberg/parquet/ParquetSchemaUtil.java | 2 +- .../apache/iceberg/parquet/ParquetTypeVisitor.java | 4 ++-- .../org/apache/iceberg/parquet/ParquetUtil.java | 4 ++-- .../iceberg/parquet/ParquetValueReaders.java | 6 +++--- .../iceberg/parquet/ParquetValueWriters.java | 4 ++-- .../iceberg/parquet/ParquetWriteAdapter.java | 2 +- .../iceberg/parquet/ParquetWriteSupport.java | 2 +- .../org/apache/iceberg/parquet/ParquetWriter.java | 2 +- .../org/apache/iceberg/parquet/PruneColumns.java | 4 ++-- .../java/org/apache/iceberg/parquet/ReadConf.java | 4 ++-- .../iceberg/parquet/TypeWithSchemaVisitor.java | 4 ++-- .../iceberg/parquet/ValuesAsBytesReader.java | 1 - .../apache/iceberg/parquet/VectorizedReader.java | 1 - .../iceberg/avro/TestParquetReadProjection.java | 2 +- .../apache/iceberg/avro/TestReadProjection.java | 8 ++++---- .../iceberg/parquet/ParquetWritingTestUtils.java | 2 +- .../org/apache/iceberg/parquet/TestParquet.java | 2 +- .../apache/iceberg/pig/IcebergPigInputFormat.java | 4 ++-- .../org/apache/iceberg/pig/IcebergStorage.java | 6 +++--- .../org/apache/iceberg/pig/PigParquetReader.java | 6 +++--- .../java/org/apache/iceberg/pig/SchemaUtil.java | 2 +- .../apache/iceberg/spark/SparkBenchmarkUtil.java | 2 +- .../SparkParquetReadersFlatDataBenchmark.java | 2 +- .../SparkParquetReadersNestedDataBenchmark.java | 2 +- .../source/IcebergSourceFlatDataBenchmark.java | 2 +- .../source/IcebergSourceNestedDataBenchmark.java | 2 +- .../IcebergSourceFlatAvroDataReadBenchmark.java | 2 +- .../IcebergSourceNestedAvroDataReadBenchmark.java | 2 +- ...cebergSourceFlatParquetDataFilterBenchmark.java | 2 +- .../IcebergSourceFlatParquetDataReadBenchmark.java | 2 +- ...IcebergSourceFlatParquetDataWriteBenchmark.java | 2 +- ...bergSourceNestedParquetDataFilterBenchmark.java | 2 +- ...cebergSourceNestedParquetDataReadBenchmark.java | 2 +- ...ebergSourceNestedParquetDataWriteBenchmark.java | 2 +- .../iceberg/actions/BaseSnapshotUpdateAction.java | 2 +- .../iceberg/actions/RemoveOrphanFilesAction.java | 2 +- .../iceberg/actions/RewriteManifestsAction.java | 8 ++++---- .../actions/RewriteManifestsActionResult.java | 2 +- .../java/org/apache/iceberg/spark/FixupTypes.java | 4 ++-- .../iceberg/spark/PruneColumnsWithReordering.java | 8 ++++---- .../spark/PruneColumnsWithoutReordering.java | 6 +++--- .../org/apache/iceberg/spark/SparkDataFile.java | 2 +- .../org/apache/iceberg/spark/SparkFilters.java | 4 ++-- .../org/apache/iceberg/spark/SparkSchemaUtil.java | 6 +++--- .../org/apache/iceberg/spark/SparkTypeToType.java | 2 +- .../org/apache/iceberg/spark/SparkTypeVisitor.java | 2 +- .../apache/iceberg/spark/SparkValueConverter.java | 4 ++-- .../org/apache/iceberg/spark/TypeToSparkType.java | 2 +- .../apache/iceberg/spark/data/SparkAvroReader.java | 4 ++-- .../apache/iceberg/spark/data/SparkAvroWriter.java | 4 ++-- .../iceberg/spark/data/SparkParquetReaders.java | 8 ++++---- .../iceberg/spark/data/SparkParquetWriters.java | 4 ++-- .../iceberg/spark/data/SparkValueReaders.java | 2 +- .../iceberg/spark/data/SparkValueWriters.java | 2 +- .../iceberg/spark/source/BaseDataReader.java | 6 +++--- .../apache/iceberg/spark/source/IcebergSource.java | 2 +- .../apache/iceberg/spark/source/PartitionKey.java | 2 +- .../org/apache/iceberg/spark/source/Reader.java | 4 ++-- .../apache/iceberg/spark/source/RowDataReader.java | 10 +++++----- .../iceberg/spark/source/StructInternalRow.java | 4 ++-- .../org/apache/iceberg/spark/source/Writer.java | 8 ++++---- .../org/apache/iceberg/spark/SparkTableUtil.scala | 2 +- .../apache/iceberg/TestDataFileSerialization.java | 4 ++-- .../iceberg/TestManifestFileSerialization.java | 2 +- .../apache/iceberg/TestRewriteManifestsAction.java | 4 ++-- .../actions/TestRemoveOrphanFilesAction.java | 4 ++-- .../iceberg/examples/ReadAndWriteTablesTest.java | 2 +- .../org/apache/iceberg/examples/SimpleRecord.java | 2 +- .../examples/SnapshotFunctionalityTest.java | 2 +- .../apache/iceberg/spark/TestSparkDataFile.java | 6 +++--- .../apache/iceberg/spark/data/GenericsHelpers.java | 2 +- .../org/apache/iceberg/spark/data/RandomData.java | 6 +++--- .../org/apache/iceberg/spark/data/TestHelpers.java | 2 +- .../iceberg/spark/data/TestSparkAvroEnums.java | 4 ++-- .../iceberg/spark/data/TestSparkAvroReader.java | 2 +- .../apache/iceberg/spark/source/SimpleRecord.java | 2 +- .../iceberg/spark/source/TestDataFrameWrites.java | 4 ++-- .../spark/source/TestDataSourceOptions.java | 4 ++-- .../iceberg/spark/source/TestFilteredScan.java | 4 ++-- .../spark/source/TestForwardCompatibility.java | 2 +- .../spark/source/TestIcebergSourceTablesBase.java | 6 +++--- .../spark/source/TestIdentityPartitionData.java | 5 ++--- .../iceberg/spark/source/TestPartitionValues.java | 2 +- .../iceberg/spark/source/TestReadProjection.java | 10 +++++----- .../spark/source/TestSnapshotSelection.java | 4 ++-- .../iceberg/spark/source/TestSparkDataWrite.java | 2 +- .../spark/source/TestSparkReadProjection.java | 4 ++-- .../iceberg/spark/source/TestSparkSchema.java | 2 +- .../iceberg/spark/source/TestSparkTableUtil.java | 4 ++-- .../TestSparkTableUtilWithInMemoryCatalog.java | 4 ++-- .../spark/source/TestStructuredStreaming.java | 4 ++-- .../apache/iceberg/spark/source/TestTables.java | 6 +++--- .../spark/source/TestWriteMetricsConfig.java | 4 ++-- 214 files changed, 423 insertions(+), 427 deletions(-) diff --git a/baseline.gradle b/baseline.gradle index b30d6b508873..5cf5c67f8741 100644 --- a/baseline.gradle +++ b/baseline.gradle @@ -50,9 +50,9 @@ subprojects { pluginManager.withPlugin('com.diffplug.gradle.spotless') { spotless { java { - target 'src/main/java/**/*.java', 'src/main/test/**/*.java' + target 'src/main/java/**/*.java', 'src/test/java/**/*.java', 'src/jmh/java/**/*.java' removeUnusedImports() - importOrder(['', 'static ']) + importOrder'', 'static ' trimTrailingWhitespace() indentWithSpaces 2 endWithNewline() diff --git a/core/src/main/java/org/apache/iceberg/BaseMetastoreTableOperations.java b/core/src/main/java/org/apache/iceberg/BaseMetastoreTableOperations.java index 3b8295aa7e9a..6f709832e34f 100644 --- a/core/src/main/java/org/apache/iceberg/BaseMetastoreTableOperations.java +++ b/core/src/main/java/org/apache/iceberg/BaseMetastoreTableOperations.java @@ -19,9 +19,6 @@ package org.apache.iceberg; -import com.google.common.base.Objects; -import com.google.common.base.Preconditions; -import com.google.common.collect.Sets; import java.util.Set; import java.util.UUID; import java.util.concurrent.atomic.AtomicReference; @@ -32,6 +29,9 @@ import org.apache.iceberg.io.FileIO; import org.apache.iceberg.io.LocationProvider; import org.apache.iceberg.io.OutputFile; +import org.apache.iceberg.relocated.com.google.common.base.Objects; +import org.apache.iceberg.relocated.com.google.common.base.Preconditions; +import org.apache.iceberg.relocated.com.google.common.collect.Sets; import org.apache.iceberg.util.Tasks; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/org/apache/iceberg/BaseOverwriteFiles.java b/core/src/main/java/org/apache/iceberg/BaseOverwriteFiles.java index 6f21a87e028f..28568668ca17 100644 --- a/core/src/main/java/org/apache/iceberg/BaseOverwriteFiles.java +++ b/core/src/main/java/org/apache/iceberg/BaseOverwriteFiles.java @@ -19,8 +19,6 @@ package org.apache.iceberg; -import com.google.common.base.Preconditions; -import com.google.common.collect.Iterables; import java.util.ArrayList; import java.util.List; import org.apache.iceberg.exceptions.ValidationException; @@ -29,6 +27,8 @@ import org.apache.iceberg.expressions.InclusiveMetricsEvaluator; import org.apache.iceberg.expressions.Projections; import org.apache.iceberg.expressions.StrictMetricsEvaluator; +import org.apache.iceberg.relocated.com.google.common.base.Preconditions; +import org.apache.iceberg.relocated.com.google.common.collect.Iterables; public class BaseOverwriteFiles extends MergingSnapshotProducer implements OverwriteFiles { private boolean validateAddedFilesMatchOverwriteFilter = false; diff --git a/core/src/main/java/org/apache/iceberg/BaseRewriteFiles.java b/core/src/main/java/org/apache/iceberg/BaseRewriteFiles.java index fd7ca4eb34fc..e45ea70b483c 100644 --- a/core/src/main/java/org/apache/iceberg/BaseRewriteFiles.java +++ b/core/src/main/java/org/apache/iceberg/BaseRewriteFiles.java @@ -19,8 +19,8 @@ package org.apache.iceberg; -import com.google.common.base.Preconditions; import java.util.Set; +import org.apache.iceberg.relocated.com.google.common.base.Preconditions; class BaseRewriteFiles extends MergingSnapshotProducer implements RewriteFiles { BaseRewriteFiles(TableOperations ops) { diff --git a/core/src/main/java/org/apache/iceberg/BaseRewriteManifests.java b/core/src/main/java/org/apache/iceberg/BaseRewriteManifests.java index e52c5484dc4c..accbb29b136a 100644 --- a/core/src/main/java/org/apache/iceberg/BaseRewriteManifests.java +++ b/core/src/main/java/org/apache/iceberg/BaseRewriteManifests.java @@ -19,12 +19,6 @@ package org.apache.iceberg; -import com.google.common.base.Preconditions; -import com.google.common.collect.ImmutableSet; -import com.google.common.collect.Iterables; -import com.google.common.collect.Lists; -import com.google.common.collect.Maps; -import com.google.common.collect.Sets; import java.io.IOException; import java.util.ArrayList; import java.util.Arrays; @@ -41,6 +35,12 @@ import org.apache.iceberg.exceptions.ValidationException; import org.apache.iceberg.io.InputFile; import org.apache.iceberg.io.OutputFile; +import org.apache.iceberg.relocated.com.google.common.base.Preconditions; +import org.apache.iceberg.relocated.com.google.common.collect.ImmutableSet; +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.relocated.com.google.common.collect.Sets; import org.apache.iceberg.util.Pair; import org.apache.iceberg.util.Tasks; import org.apache.iceberg.util.ThreadPools; diff --git a/core/src/main/java/org/apache/iceberg/BaseTransaction.java b/core/src/main/java/org/apache/iceberg/BaseTransaction.java index 1e968130f90a..b1507c8f83d3 100644 --- a/core/src/main/java/org/apache/iceberg/BaseTransaction.java +++ b/core/src/main/java/org/apache/iceberg/BaseTransaction.java @@ -19,10 +19,6 @@ package org.apache.iceberg; -import com.google.common.annotations.VisibleForTesting; -import com.google.common.base.Preconditions; -import com.google.common.collect.Lists; -import com.google.common.collect.Sets; import java.util.List; import java.util.Map; import java.util.Set; @@ -33,6 +29,10 @@ import org.apache.iceberg.exceptions.NoSuchTableException; import org.apache.iceberg.io.FileIO; import org.apache.iceberg.io.LocationProvider; +import org.apache.iceberg.relocated.com.google.common.annotations.VisibleForTesting; +import org.apache.iceberg.relocated.com.google.common.base.Preconditions; +import org.apache.iceberg.relocated.com.google.common.collect.Lists; +import org.apache.iceberg.relocated.com.google.common.collect.Sets; import org.apache.iceberg.util.PropertyUtil; import org.apache.iceberg.util.Tasks; import org.slf4j.Logger; diff --git a/core/src/main/java/org/apache/iceberg/DataFiles.java b/core/src/main/java/org/apache/iceberg/DataFiles.java index abab0f97d4fe..1406a52c246b 100644 --- a/core/src/main/java/org/apache/iceberg/DataFiles.java +++ b/core/src/main/java/org/apache/iceberg/DataFiles.java @@ -19,8 +19,6 @@ package org.apache.iceberg; -import com.google.common.base.Preconditions; -import com.google.common.collect.Lists; import java.nio.ByteBuffer; import java.util.List; import java.util.Locale; @@ -30,6 +28,8 @@ import org.apache.iceberg.encryption.EncryptionKeyMetadata; import org.apache.iceberg.hadoop.HadoopInputFile; import org.apache.iceberg.io.InputFile; +import org.apache.iceberg.relocated.com.google.common.base.Preconditions; +import org.apache.iceberg.relocated.com.google.common.collect.Lists; import org.apache.iceberg.types.Conversions; import org.apache.iceberg.util.ByteBuffers; diff --git a/core/src/main/java/org/apache/iceberg/FastAppend.java b/core/src/main/java/org/apache/iceberg/FastAppend.java index 9596932af8a1..ccce94deb8ba 100644 --- a/core/src/main/java/org/apache/iceberg/FastAppend.java +++ b/core/src/main/java/org/apache/iceberg/FastAppend.java @@ -19,9 +19,6 @@ package org.apache.iceberg; -import com.google.common.base.Preconditions; -import com.google.common.collect.Iterables; -import com.google.common.collect.Lists; import java.io.IOException; import java.util.List; import java.util.Map; @@ -30,6 +27,9 @@ import org.apache.iceberg.exceptions.RuntimeIOException; import org.apache.iceberg.io.InputFile; import org.apache.iceberg.io.OutputFile; +import org.apache.iceberg.relocated.com.google.common.base.Preconditions; +import org.apache.iceberg.relocated.com.google.common.collect.Iterables; +import org.apache.iceberg.relocated.com.google.common.collect.Lists; import static org.apache.iceberg.TableProperties.SNAPSHOT_ID_INHERITANCE_ENABLED; import static org.apache.iceberg.TableProperties.SNAPSHOT_ID_INHERITANCE_ENABLED_DEFAULT; diff --git a/core/src/main/java/org/apache/iceberg/FileHistory.java b/core/src/main/java/org/apache/iceberg/FileHistory.java index 5855b473e405..89d8fd367059 100644 --- a/core/src/main/java/org/apache/iceberg/FileHistory.java +++ b/core/src/main/java/org/apache/iceberg/FileHistory.java @@ -19,16 +19,16 @@ package org.apache.iceberg; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.Iterables; -import com.google.common.collect.Lists; -import com.google.common.collect.Sets; import java.io.IOException; import java.util.List; import java.util.Set; import org.apache.iceberg.exceptions.RuntimeIOException; import org.apache.iceberg.expressions.Literal; 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.Iterables; +import org.apache.iceberg.relocated.com.google.common.collect.Lists; +import org.apache.iceberg.relocated.com.google.common.collect.Sets; import org.apache.iceberg.types.Types; import org.apache.iceberg.util.CharSequenceWrapper; diff --git a/core/src/main/java/org/apache/iceberg/FilteredManifest.java b/core/src/main/java/org/apache/iceberg/FilteredManifest.java index 0018c0ef2186..c0ec0467fd38 100644 --- a/core/src/main/java/org/apache/iceberg/FilteredManifest.java +++ b/core/src/main/java/org/apache/iceberg/FilteredManifest.java @@ -19,9 +19,6 @@ package org.apache.iceberg; -import com.google.common.base.Preconditions; -import com.google.common.collect.Lists; -import com.google.common.collect.Sets; import java.io.IOException; import java.util.Collection; import java.util.Iterator; @@ -34,6 +31,9 @@ import org.apache.iceberg.expressions.InclusiveMetricsEvaluator; import org.apache.iceberg.expressions.Projections; import org.apache.iceberg.io.CloseableIterable; +import org.apache.iceberg.relocated.com.google.common.base.Preconditions; +import org.apache.iceberg.relocated.com.google.common.collect.Lists; +import org.apache.iceberg.relocated.com.google.common.collect.Sets; public class FilteredManifest implements Filterable { private static final Set STATS_COLUMNS = Sets.newHashSet( diff --git a/core/src/main/java/org/apache/iceberg/FindFiles.java b/core/src/main/java/org/apache/iceberg/FindFiles.java index 4690277cbafa..dfe202114540 100644 --- a/core/src/main/java/org/apache/iceberg/FindFiles.java +++ b/core/src/main/java/org/apache/iceberg/FindFiles.java @@ -19,7 +19,6 @@ package org.apache.iceberg; -import com.google.common.base.Preconditions; import java.time.Instant; import java.time.LocalDateTime; import java.time.ZoneId; @@ -29,6 +28,7 @@ import org.apache.iceberg.expressions.Expression; import org.apache.iceberg.expressions.Expressions; import org.apache.iceberg.io.CloseableIterable; +import org.apache.iceberg.relocated.com.google.common.base.Preconditions; public class FindFiles { private FindFiles() { diff --git a/core/src/main/java/org/apache/iceberg/HistoryTable.java b/core/src/main/java/org/apache/iceberg/HistoryTable.java index fd4914a22bf1..f116e915d217 100644 --- a/core/src/main/java/org/apache/iceberg/HistoryTable.java +++ b/core/src/main/java/org/apache/iceberg/HistoryTable.java @@ -19,12 +19,12 @@ package org.apache.iceberg; -import com.google.common.collect.Maps; -import com.google.common.collect.Sets; import java.util.Map; import java.util.Set; import java.util.function.Function; import org.apache.iceberg.io.CloseableIterable; +import org.apache.iceberg.relocated.com.google.common.collect.Maps; +import org.apache.iceberg.relocated.com.google.common.collect.Sets; import org.apache.iceberg.types.Types; import org.apache.iceberg.util.SnapshotUtil; diff --git a/core/src/main/java/org/apache/iceberg/InheritableMetadataFactory.java b/core/src/main/java/org/apache/iceberg/InheritableMetadataFactory.java index 043428053fd9..3c271bc1b65a 100644 --- a/core/src/main/java/org/apache/iceberg/InheritableMetadataFactory.java +++ b/core/src/main/java/org/apache/iceberg/InheritableMetadataFactory.java @@ -19,7 +19,7 @@ package org.apache.iceberg; -import com.google.common.base.Preconditions; +import org.apache.iceberg.relocated.com.google.common.base.Preconditions; class InheritableMetadataFactory { diff --git a/core/src/main/java/org/apache/iceberg/LocationProviders.java b/core/src/main/java/org/apache/iceberg/LocationProviders.java index af4414e9ade5..70de7ac9a77b 100644 --- a/core/src/main/java/org/apache/iceberg/LocationProviders.java +++ b/core/src/main/java/org/apache/iceberg/LocationProviders.java @@ -19,10 +19,10 @@ package org.apache.iceberg; -import com.google.common.base.Preconditions; import java.util.Map; import org.apache.hadoop.fs.Path; import org.apache.iceberg.io.LocationProvider; +import org.apache.iceberg.relocated.com.google.common.base.Preconditions; import org.apache.iceberg.transforms.Transform; import org.apache.iceberg.transforms.Transforms; import org.apache.iceberg.types.Types; diff --git a/core/src/main/java/org/apache/iceberg/ManifestFiles.java b/core/src/main/java/org/apache/iceberg/ManifestFiles.java index 2462d07b8546..c0f64c3c897c 100644 --- a/core/src/main/java/org/apache/iceberg/ManifestFiles.java +++ b/core/src/main/java/org/apache/iceberg/ManifestFiles.java @@ -19,13 +19,13 @@ package org.apache.iceberg; -import com.google.common.base.Preconditions; import java.io.IOException; import java.util.Map; import org.apache.iceberg.exceptions.RuntimeIOException; import org.apache.iceberg.io.FileIO; import org.apache.iceberg.io.InputFile; import org.apache.iceberg.io.OutputFile; +import org.apache.iceberg.relocated.com.google.common.base.Preconditions; public class ManifestFiles { private ManifestFiles() { diff --git a/core/src/main/java/org/apache/iceberg/ManifestGroup.java b/core/src/main/java/org/apache/iceberg/ManifestGroup.java index 767fae734766..dae859d01f18 100644 --- a/core/src/main/java/org/apache/iceberg/ManifestGroup.java +++ b/core/src/main/java/org/apache/iceberg/ManifestGroup.java @@ -21,9 +21,6 @@ import com.github.benmanes.caffeine.cache.Caffeine; import com.github.benmanes.caffeine.cache.LoadingCache; -import com.google.common.collect.Iterables; -import com.google.common.collect.Lists; -import com.google.common.collect.Sets; import java.util.List; import java.util.Map; import java.util.Set; @@ -38,6 +35,9 @@ import org.apache.iceberg.expressions.ResidualEvaluator; import org.apache.iceberg.io.CloseableIterable; import org.apache.iceberg.io.FileIO; +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.Sets; import org.apache.iceberg.types.Types; import org.apache.iceberg.util.ParallelIterable; diff --git a/core/src/main/java/org/apache/iceberg/ManifestListWriter.java b/core/src/main/java/org/apache/iceberg/ManifestListWriter.java index 1cf9c92e097b..6f0c682a0d2b 100644 --- a/core/src/main/java/org/apache/iceberg/ManifestListWriter.java +++ b/core/src/main/java/org/apache/iceberg/ManifestListWriter.java @@ -19,7 +19,6 @@ package org.apache.iceberg; -import com.google.common.collect.ImmutableMap; import java.io.IOException; import java.util.Iterator; import java.util.Map; @@ -27,6 +26,7 @@ import org.apache.iceberg.exceptions.RuntimeIOException; import org.apache.iceberg.io.FileAppender; import org.apache.iceberg.io.OutputFile; +import org.apache.iceberg.relocated.com.google.common.collect.ImmutableMap; abstract class ManifestListWriter implements FileAppender { private final FileAppender writer; diff --git a/core/src/main/java/org/apache/iceberg/ManifestWriter.java b/core/src/main/java/org/apache/iceberg/ManifestWriter.java index ddd74c8a3e1d..ce245715f62b 100644 --- a/core/src/main/java/org/apache/iceberg/ManifestWriter.java +++ b/core/src/main/java/org/apache/iceberg/ManifestWriter.java @@ -19,12 +19,12 @@ package org.apache.iceberg; -import com.google.common.base.Preconditions; import java.io.IOException; import org.apache.iceberg.avro.Avro; import org.apache.iceberg.exceptions.RuntimeIOException; import org.apache.iceberg.io.FileAppender; import org.apache.iceberg.io.OutputFile; +import org.apache.iceberg.relocated.com.google.common.base.Preconditions; /** * Writer for manifest files. diff --git a/core/src/main/java/org/apache/iceberg/ManifestsTable.java b/core/src/main/java/org/apache/iceberg/ManifestsTable.java index 25f0a5869ab7..7d955560e24b 100644 --- a/core/src/main/java/org/apache/iceberg/ManifestsTable.java +++ b/core/src/main/java/org/apache/iceberg/ManifestsTable.java @@ -19,8 +19,8 @@ package org.apache.iceberg; -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.Conversions; import org.apache.iceberg.types.Types; diff --git a/core/src/main/java/org/apache/iceberg/MergeAppend.java b/core/src/main/java/org/apache/iceberg/MergeAppend.java index 063315f68b8c..d79192672247 100644 --- a/core/src/main/java/org/apache/iceberg/MergeAppend.java +++ b/core/src/main/java/org/apache/iceberg/MergeAppend.java @@ -19,8 +19,8 @@ package org.apache.iceberg; -import com.google.common.base.Preconditions; import org.apache.iceberg.exceptions.CommitFailedException; +import org.apache.iceberg.relocated.com.google.common.base.Preconditions; /** * Append implementation that produces a minimal number of manifest files. diff --git a/core/src/main/java/org/apache/iceberg/MergingSnapshotProducer.java b/core/src/main/java/org/apache/iceberg/MergingSnapshotProducer.java index 9c83ebfbcf10..6d0443215eaa 100644 --- a/core/src/main/java/org/apache/iceberg/MergingSnapshotProducer.java +++ b/core/src/main/java/org/apache/iceberg/MergingSnapshotProducer.java @@ -19,13 +19,6 @@ package org.apache.iceberg; -import com.google.common.base.Joiner; -import com.google.common.base.Preconditions; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.Iterables; -import com.google.common.collect.Lists; -import com.google.common.collect.Maps; -import com.google.common.collect.Sets; import java.io.IOException; import java.lang.reflect.Array; import java.util.Arrays; @@ -44,6 +37,13 @@ import org.apache.iceberg.expressions.StrictMetricsEvaluator; import org.apache.iceberg.io.InputFile; import org.apache.iceberg.io.OutputFile; +import org.apache.iceberg.relocated.com.google.common.base.Joiner; +import org.apache.iceberg.relocated.com.google.common.base.Preconditions; +import org.apache.iceberg.relocated.com.google.common.collect.ImmutableList; +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.relocated.com.google.common.collect.Sets; import org.apache.iceberg.util.BinPacking.ListPacker; import org.apache.iceberg.util.CharSequenceWrapper; import org.apache.iceberg.util.ManifestFileUtil; diff --git a/core/src/main/java/org/apache/iceberg/MetricsConfig.java b/core/src/main/java/org/apache/iceberg/MetricsConfig.java index d2af7c88707d..cf78cd6e2920 100644 --- a/core/src/main/java/org/apache/iceberg/MetricsConfig.java +++ b/core/src/main/java/org/apache/iceberg/MetricsConfig.java @@ -19,10 +19,10 @@ package org.apache.iceberg; -import com.google.common.collect.Maps; import java.io.Serializable; import java.util.Map; import org.apache.iceberg.MetricsModes.MetricsMode; +import org.apache.iceberg.relocated.com.google.common.collect.Maps; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/org/apache/iceberg/MetricsModes.java b/core/src/main/java/org/apache/iceberg/MetricsModes.java index c1fc4c7a9ea4..47d0b506876d 100644 --- a/core/src/main/java/org/apache/iceberg/MetricsModes.java +++ b/core/src/main/java/org/apache/iceberg/MetricsModes.java @@ -19,13 +19,13 @@ package org.apache.iceberg; -import com.google.common.base.Preconditions; import java.io.ObjectStreamException; import java.io.Serializable; import java.util.Locale; import java.util.Objects; import java.util.regex.Matcher; import java.util.regex.Pattern; +import org.apache.iceberg.relocated.com.google.common.base.Preconditions; /** * This class defines different metrics modes, which allow users to control the collection of diff --git a/core/src/main/java/org/apache/iceberg/PartitionsTable.java b/core/src/main/java/org/apache/iceberg/PartitionsTable.java index 6897034f250c..331ce318f5fd 100644 --- a/core/src/main/java/org/apache/iceberg/PartitionsTable.java +++ b/core/src/main/java/org/apache/iceberg/PartitionsTable.java @@ -19,8 +19,8 @@ package org.apache.iceberg; -import com.google.common.collect.Maps; import java.util.Map; +import org.apache.iceberg.relocated.com.google.common.collect.Maps; import org.apache.iceberg.types.Types; import org.apache.iceberg.util.StructLikeWrapper; diff --git a/core/src/main/java/org/apache/iceberg/PropertiesUpdate.java b/core/src/main/java/org/apache/iceberg/PropertiesUpdate.java index 4da60f158673..f41a0e044367 100644 --- a/core/src/main/java/org/apache/iceberg/PropertiesUpdate.java +++ b/core/src/main/java/org/apache/iceberg/PropertiesUpdate.java @@ -19,12 +19,12 @@ package org.apache.iceberg; -import com.google.common.base.Preconditions; -import com.google.common.collect.Maps; -import com.google.common.collect.Sets; import java.util.Map; import java.util.Set; import org.apache.iceberg.exceptions.CommitFailedException; +import org.apache.iceberg.relocated.com.google.common.base.Preconditions; +import org.apache.iceberg.relocated.com.google.common.collect.Maps; +import org.apache.iceberg.relocated.com.google.common.collect.Sets; import org.apache.iceberg.util.Tasks; import static org.apache.iceberg.TableProperties.COMMIT_MAX_RETRY_WAIT_MS; diff --git a/core/src/main/java/org/apache/iceberg/RemoveSnapshots.java b/core/src/main/java/org/apache/iceberg/RemoveSnapshots.java index 0e6c0e142072..246458047209 100644 --- a/core/src/main/java/org/apache/iceberg/RemoveSnapshots.java +++ b/core/src/main/java/org/apache/iceberg/RemoveSnapshots.java @@ -19,10 +19,6 @@ package org.apache.iceberg; -import com.google.common.base.Joiner; -import com.google.common.base.Preconditions; -import com.google.common.collect.Lists; -import com.google.common.collect.Sets; import java.io.IOException; import java.util.Date; import java.util.List; @@ -34,6 +30,10 @@ import org.apache.iceberg.exceptions.NotFoundException; import org.apache.iceberg.exceptions.RuntimeIOException; import org.apache.iceberg.io.CloseableIterable; +import org.apache.iceberg.relocated.com.google.common.base.Joiner; +import org.apache.iceberg.relocated.com.google.common.base.Preconditions; +import org.apache.iceberg.relocated.com.google.common.collect.Lists; +import org.apache.iceberg.relocated.com.google.common.collect.Sets; import org.apache.iceberg.util.PropertyUtil; import org.apache.iceberg.util.SnapshotUtil; import org.apache.iceberg.util.Tasks; diff --git a/core/src/main/java/org/apache/iceberg/ScanSummary.java b/core/src/main/java/org/apache/iceberg/ScanSummary.java index 54756bd7e729..126ada811429 100644 --- a/core/src/main/java/org/apache/iceberg/ScanSummary.java +++ b/core/src/main/java/org/apache/iceberg/ScanSummary.java @@ -19,13 +19,6 @@ package org.apache.iceberg; -import com.google.common.base.Joiner; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableMap; -import com.google.common.collect.Iterables; -import com.google.common.collect.Lists; -import com.google.common.collect.Maps; -import com.google.common.collect.Sets; import java.io.IOException; import java.util.Comparator; import java.util.Date; @@ -43,6 +36,13 @@ import org.apache.iceberg.expressions.NamedReference; import org.apache.iceberg.expressions.UnboundPredicate; import org.apache.iceberg.io.CloseableIterable; +import org.apache.iceberg.relocated.com.google.common.base.Joiner; +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.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.relocated.com.google.common.collect.Sets; import org.apache.iceberg.types.Comparators; import org.apache.iceberg.types.Types; import org.apache.iceberg.util.Pair; diff --git a/core/src/main/java/org/apache/iceberg/SchemaUpdate.java b/core/src/main/java/org/apache/iceberg/SchemaUpdate.java index a1ef08cfd135..b5e1aa0346ab 100644 --- a/core/src/main/java/org/apache/iceberg/SchemaUpdate.java +++ b/core/src/main/java/org/apache/iceberg/SchemaUpdate.java @@ -19,11 +19,6 @@ package org.apache.iceberg; -import com.google.common.base.Preconditions; -import com.google.common.collect.Lists; -import com.google.common.collect.Maps; -import com.google.common.collect.Multimap; -import com.google.common.collect.Multimaps; import java.util.Collection; import java.util.List; import java.util.Map; @@ -31,6 +26,11 @@ import org.apache.iceberg.mapping.MappingUtil; import org.apache.iceberg.mapping.NameMapping; import org.apache.iceberg.mapping.NameMappingParser; +import org.apache.iceberg.relocated.com.google.common.base.Preconditions; +import org.apache.iceberg.relocated.com.google.common.collect.Lists; +import org.apache.iceberg.relocated.com.google.common.collect.Maps; +import org.apache.iceberg.relocated.com.google.common.collect.Multimap; +import org.apache.iceberg.relocated.com.google.common.collect.Multimaps; import org.apache.iceberg.types.Type; import org.apache.iceberg.types.TypeUtil; import org.apache.iceberg.types.Types; diff --git a/core/src/main/java/org/apache/iceberg/SerializableByteBufferMap.java b/core/src/main/java/org/apache/iceberg/SerializableByteBufferMap.java index 311185e30509..73732977717f 100644 --- a/core/src/main/java/org/apache/iceberg/SerializableByteBufferMap.java +++ b/core/src/main/java/org/apache/iceberg/SerializableByteBufferMap.java @@ -19,13 +19,13 @@ package org.apache.iceberg; -import com.google.common.collect.Maps; import java.io.ObjectStreamException; import java.io.Serializable; import java.nio.ByteBuffer; import java.util.Collection; import java.util.Map; import java.util.Set; +import org.apache.iceberg.relocated.com.google.common.collect.Maps; import org.apache.iceberg.util.ByteBuffers; class SerializableByteBufferMap implements Map, Serializable { diff --git a/core/src/main/java/org/apache/iceberg/SnapshotManager.java b/core/src/main/java/org/apache/iceberg/SnapshotManager.java index 7e8ada07d223..59ae006d2b81 100644 --- a/core/src/main/java/org/apache/iceberg/SnapshotManager.java +++ b/core/src/main/java/org/apache/iceberg/SnapshotManager.java @@ -19,11 +19,11 @@ package org.apache.iceberg; -import com.google.common.base.Preconditions; import java.util.List; import java.util.Map; import org.apache.iceberg.exceptions.CherrypickAncestorCommitException; import org.apache.iceberg.exceptions.ValidationException; +import org.apache.iceberg.relocated.com.google.common.base.Preconditions; import org.apache.iceberg.util.SnapshotUtil; import org.apache.iceberg.util.WapUtil; diff --git a/core/src/main/java/org/apache/iceberg/SnapshotProducer.java b/core/src/main/java/org/apache/iceberg/SnapshotProducer.java index 0e60ab947ce4..4e98d5bbaea3 100644 --- a/core/src/main/java/org/apache/iceberg/SnapshotProducer.java +++ b/core/src/main/java/org/apache/iceberg/SnapshotProducer.java @@ -21,10 +21,6 @@ import com.github.benmanes.caffeine.cache.Caffeine; import com.github.benmanes.caffeine.cache.LoadingCache; -import com.google.common.base.Preconditions; -import com.google.common.collect.ImmutableMap; -import com.google.common.collect.Lists; -import com.google.common.collect.Sets; import java.io.IOException; import java.util.Arrays; import java.util.List; @@ -37,6 +33,10 @@ import org.apache.iceberg.exceptions.CommitFailedException; import org.apache.iceberg.exceptions.RuntimeIOException; import org.apache.iceberg.io.OutputFile; +import org.apache.iceberg.relocated.com.google.common.base.Preconditions; +import org.apache.iceberg.relocated.com.google.common.collect.ImmutableMap; +import org.apache.iceberg.relocated.com.google.common.collect.Lists; +import org.apache.iceberg.relocated.com.google.common.collect.Sets; import org.apache.iceberg.util.Exceptions; import org.apache.iceberg.util.Tasks; import org.apache.iceberg.util.ThreadPools; diff --git a/core/src/main/java/org/apache/iceberg/SnapshotSummary.java b/core/src/main/java/org/apache/iceberg/SnapshotSummary.java index d003d73b32a0..8101d5c0f3f5 100644 --- a/core/src/main/java/org/apache/iceberg/SnapshotSummary.java +++ b/core/src/main/java/org/apache/iceberg/SnapshotSummary.java @@ -19,11 +19,11 @@ package org.apache.iceberg; -import com.google.common.collect.ImmutableMap; -import com.google.common.collect.Maps; -import com.google.common.collect.Sets; import java.util.Map; import java.util.Set; +import org.apache.iceberg.relocated.com.google.common.collect.ImmutableMap; +import org.apache.iceberg.relocated.com.google.common.collect.Maps; +import org.apache.iceberg.relocated.com.google.common.collect.Sets; public class SnapshotSummary { public static final String ADDED_FILES_PROP = "added-data-files"; diff --git a/core/src/main/java/org/apache/iceberg/StaticDataTask.java b/core/src/main/java/org/apache/iceberg/StaticDataTask.java index 9daecd2d91c4..8211d72b075e 100644 --- a/core/src/main/java/org/apache/iceberg/StaticDataTask.java +++ b/core/src/main/java/org/apache/iceberg/StaticDataTask.java @@ -19,9 +19,6 @@ package org.apache.iceberg; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.Iterables; -import com.google.common.collect.Lists; import java.io.Serializable; import java.util.Arrays; import java.util.function.Function; @@ -29,6 +26,9 @@ import org.apache.iceberg.expressions.Expressions; import org.apache.iceberg.io.CloseableIterable; import org.apache.iceberg.io.InputFile; +import org.apache.iceberg.relocated.com.google.common.collect.ImmutableList; +import org.apache.iceberg.relocated.com.google.common.collect.Iterables; +import org.apache.iceberg.relocated.com.google.common.collect.Lists; class StaticDataTask implements DataTask { diff --git a/core/src/main/java/org/apache/iceberg/Transactions.java b/core/src/main/java/org/apache/iceberg/Transactions.java index 07093ff8253c..e597d8246fbc 100644 --- a/core/src/main/java/org/apache/iceberg/Transactions.java +++ b/core/src/main/java/org/apache/iceberg/Transactions.java @@ -19,8 +19,8 @@ package org.apache.iceberg; -import com.google.common.base.Preconditions; import org.apache.iceberg.BaseTransaction.TransactionType; +import org.apache.iceberg.relocated.com.google.common.base.Preconditions; public final class Transactions { private Transactions() {} diff --git a/core/src/main/java/org/apache/iceberg/V2Metadata.java b/core/src/main/java/org/apache/iceberg/V2Metadata.java index 6ee9d3f20dbf..847dfdcfb2f0 100644 --- a/core/src/main/java/org/apache/iceberg/V2Metadata.java +++ b/core/src/main/java/org/apache/iceberg/V2Metadata.java @@ -19,10 +19,10 @@ package org.apache.iceberg; -import com.google.common.base.Preconditions; import java.util.List; import org.apache.avro.generic.IndexedRecord; import org.apache.iceberg.avro.AvroSchemaUtil; +import org.apache.iceberg.relocated.com.google.common.base.Preconditions; import org.apache.iceberg.types.Types; import static org.apache.iceberg.types.Types.NestedField.required; diff --git a/core/src/main/java/org/apache/iceberg/avro/AvroIterable.java b/core/src/main/java/org/apache/iceberg/avro/AvroIterable.java index 8ab194293f97..5632fd51ebbb 100644 --- a/core/src/main/java/org/apache/iceberg/avro/AvroIterable.java +++ b/core/src/main/java/org/apache/iceberg/avro/AvroIterable.java @@ -19,7 +19,6 @@ package org.apache.iceberg.avro; -import com.google.common.collect.Maps; import java.io.Closeable; import java.io.IOException; import java.util.Iterator; @@ -33,6 +32,7 @@ import org.apache.iceberg.io.CloseableGroup; import org.apache.iceberg.io.CloseableIterable; import org.apache.iceberg.io.InputFile; +import org.apache.iceberg.relocated.com.google.common.collect.Maps; public class AvroIterable extends CloseableGroup implements CloseableIterable { private final InputFile file; diff --git a/core/src/main/java/org/apache/iceberg/avro/GenericAvroReader.java b/core/src/main/java/org/apache/iceberg/avro/GenericAvroReader.java index d04ec53ad7f7..fc0f6dc6d660 100644 --- a/core/src/main/java/org/apache/iceberg/avro/GenericAvroReader.java +++ b/core/src/main/java/org/apache/iceberg/avro/GenericAvroReader.java @@ -19,7 +19,6 @@ package org.apache.iceberg.avro; -import com.google.common.collect.MapMaker; import java.io.IOException; import java.util.HashMap; import java.util.List; @@ -34,6 +33,7 @@ import org.apache.avro.io.ResolvingDecoder; import org.apache.iceberg.common.DynClasses; import org.apache.iceberg.exceptions.RuntimeIOException; +import org.apache.iceberg.relocated.com.google.common.collect.MapMaker; class GenericAvroReader implements DatumReader { diff --git a/core/src/main/java/org/apache/iceberg/avro/TypeToSchema.java b/core/src/main/java/org/apache/iceberg/avro/TypeToSchema.java index f3586840854a..fc72f4bed314 100644 --- a/core/src/main/java/org/apache/iceberg/avro/TypeToSchema.java +++ b/core/src/main/java/org/apache/iceberg/avro/TypeToSchema.java @@ -19,14 +19,14 @@ package org.apache.iceberg.avro; -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.avro.JsonProperties; import org.apache.avro.LogicalTypes; import org.apache.avro.Schema; +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/core/src/main/java/org/apache/iceberg/avro/ValueReaders.java b/core/src/main/java/org/apache/iceberg/avro/ValueReaders.java index 7d63509ce41f..81c59493ed81 100644 --- a/core/src/main/java/org/apache/iceberg/avro/ValueReaders.java +++ b/core/src/main/java/org/apache/iceberg/avro/ValueReaders.java @@ -19,8 +19,6 @@ package org.apache.iceberg.avro; -import com.google.common.collect.Lists; -import com.google.common.collect.Maps; import java.io.IOException; import java.math.BigDecimal; import java.math.BigInteger; @@ -40,6 +38,8 @@ import org.apache.avro.io.ResolvingDecoder; import org.apache.avro.util.Utf8; import org.apache.iceberg.common.DynConstructors; +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 static java.util.Collections.emptyIterator; diff --git a/core/src/main/java/org/apache/iceberg/avro/ValueWriters.java b/core/src/main/java/org/apache/iceberg/avro/ValueWriters.java index 02a40908cc5e..cc861bded06d 100644 --- a/core/src/main/java/org/apache/iceberg/avro/ValueWriters.java +++ b/core/src/main/java/org/apache/iceberg/avro/ValueWriters.java @@ -19,7 +19,6 @@ package org.apache.iceberg.avro; -import com.google.common.base.Preconditions; import java.io.IOException; import java.lang.reflect.Array; import java.math.BigDecimal; @@ -34,6 +33,7 @@ import org.apache.avro.generic.IndexedRecord; import org.apache.avro.io.Encoder; import org.apache.avro.util.Utf8; +import org.apache.iceberg.relocated.com.google.common.base.Preconditions; import org.apache.iceberg.types.TypeUtil; public class ValueWriters { diff --git a/core/src/main/java/org/apache/iceberg/hadoop/HadoopCatalog.java b/core/src/main/java/org/apache/iceberg/hadoop/HadoopCatalog.java index 200e979682c5..b92d36dbc123 100644 --- a/core/src/main/java/org/apache/iceberg/hadoop/HadoopCatalog.java +++ b/core/src/main/java/org/apache/iceberg/hadoop/HadoopCatalog.java @@ -19,11 +19,6 @@ package org.apache.iceberg.hadoop; -import com.google.common.base.Joiner; -import com.google.common.base.Preconditions; -import com.google.common.collect.ImmutableMap; -import com.google.common.collect.Lists; -import com.google.common.collect.Sets; import java.io.Closeable; import java.io.IOException; import java.util.Arrays; @@ -50,6 +45,11 @@ import org.apache.iceberg.exceptions.NoSuchNamespaceException; import org.apache.iceberg.exceptions.NoSuchTableException; import org.apache.iceberg.exceptions.RuntimeIOException; +import org.apache.iceberg.relocated.com.google.common.base.Joiner; +import org.apache.iceberg.relocated.com.google.common.base.Preconditions; +import org.apache.iceberg.relocated.com.google.common.collect.ImmutableMap; +import org.apache.iceberg.relocated.com.google.common.collect.Lists; +import org.apache.iceberg.relocated.com.google.common.collect.Sets; /** * HadoopCatalog provides a way to use table names like db.table to work with path-based tables under a common diff --git a/core/src/main/java/org/apache/iceberg/hadoop/HadoopInputFile.java b/core/src/main/java/org/apache/iceberg/hadoop/HadoopInputFile.java index 84c5bf26467b..3f5d1d47e63a 100644 --- a/core/src/main/java/org/apache/iceberg/hadoop/HadoopInputFile.java +++ b/core/src/main/java/org/apache/iceberg/hadoop/HadoopInputFile.java @@ -19,7 +19,6 @@ package org.apache.iceberg.hadoop; -import com.google.common.base.Preconditions; import java.io.FileNotFoundException; import java.io.IOException; import org.apache.hadoop.conf.Configuration; @@ -30,6 +29,7 @@ import org.apache.iceberg.exceptions.RuntimeIOException; import org.apache.iceberg.io.InputFile; import org.apache.iceberg.io.SeekableInputStream; +import org.apache.iceberg.relocated.com.google.common.base.Preconditions; /** * {@link InputFile} implementation using the Hadoop {@link FileSystem} API. diff --git a/core/src/main/java/org/apache/iceberg/hadoop/HadoopStreams.java b/core/src/main/java/org/apache/iceberg/hadoop/HadoopStreams.java index aed4ee05b00a..0dc1d9fba8b7 100644 --- a/core/src/main/java/org/apache/iceberg/hadoop/HadoopStreams.java +++ b/core/src/main/java/org/apache/iceberg/hadoop/HadoopStreams.java @@ -19,7 +19,6 @@ package org.apache.iceberg.hadoop; -import com.google.common.base.Joiner; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; @@ -31,6 +30,7 @@ import org.apache.iceberg.io.DelegatingOutputStream; import org.apache.iceberg.io.PositionOutputStream; import org.apache.iceberg.io.SeekableInputStream; +import org.apache.iceberg.relocated.com.google.common.base.Joiner; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/org/apache/iceberg/hadoop/HadoopTables.java b/core/src/main/java/org/apache/iceberg/hadoop/HadoopTables.java index 278586f8b684..79d0df516cd9 100644 --- a/core/src/main/java/org/apache/iceberg/hadoop/HadoopTables.java +++ b/core/src/main/java/org/apache/iceberg/hadoop/HadoopTables.java @@ -19,8 +19,6 @@ package org.apache.iceberg.hadoop; -import com.google.common.base.Preconditions; -import com.google.common.collect.ImmutableMap; import java.util.Map; import org.apache.hadoop.conf.Configurable; import org.apache.hadoop.conf.Configuration; @@ -44,6 +42,8 @@ import org.apache.iceberg.Tables; import org.apache.iceberg.exceptions.AlreadyExistsException; import org.apache.iceberg.exceptions.NoSuchTableException; +import org.apache.iceberg.relocated.com.google.common.base.Preconditions; +import org.apache.iceberg.relocated.com.google.common.collect.ImmutableMap; /** * Implementation of Iceberg tables that uses the Hadoop FileSystem diff --git a/core/src/main/java/org/apache/iceberg/hadoop/Util.java b/core/src/main/java/org/apache/iceberg/hadoop/Util.java index d61fa4d8149e..e7633c8fb938 100644 --- a/core/src/main/java/org/apache/iceberg/hadoop/Util.java +++ b/core/src/main/java/org/apache/iceberg/hadoop/Util.java @@ -19,7 +19,6 @@ package org.apache.iceberg.hadoop; -import com.google.common.collect.Sets; import java.io.IOException; import java.util.Arrays; import java.util.Set; @@ -30,6 +29,7 @@ import org.apache.iceberg.CombinedScanTask; import org.apache.iceberg.FileScanTask; import org.apache.iceberg.exceptions.RuntimeIOException; +import org.apache.iceberg.relocated.com.google.common.collect.Sets; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/org/apache/iceberg/mapping/MappedField.java b/core/src/main/java/org/apache/iceberg/mapping/MappedField.java index 94d5d7bc5568..92f70f44ebe3 100644 --- a/core/src/main/java/org/apache/iceberg/mapping/MappedField.java +++ b/core/src/main/java/org/apache/iceberg/mapping/MappedField.java @@ -19,10 +19,10 @@ package org.apache.iceberg.mapping; -import com.google.common.base.Joiner; -import com.google.common.collect.ImmutableSet; import java.util.Objects; import java.util.Set; +import org.apache.iceberg.relocated.com.google.common.base.Joiner; +import org.apache.iceberg.relocated.com.google.common.collect.ImmutableSet; /** * An immutable mapping between a field ID and a set of names. diff --git a/core/src/main/java/org/apache/iceberg/mapping/MappedFields.java b/core/src/main/java/org/apache/iceberg/mapping/MappedFields.java index fa3e1d4d7e6a..ee827c22a0ca 100644 --- a/core/src/main/java/org/apache/iceberg/mapping/MappedFields.java +++ b/core/src/main/java/org/apache/iceberg/mapping/MappedFields.java @@ -19,12 +19,12 @@ package org.apache.iceberg.mapping; -import com.google.common.base.Joiner; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableMap; import java.util.List; import java.util.Map; import java.util.Objects; +import org.apache.iceberg.relocated.com.google.common.base.Joiner; +import org.apache.iceberg.relocated.com.google.common.collect.ImmutableList; +import org.apache.iceberg.relocated.com.google.common.collect.ImmutableMap; public class MappedFields { diff --git a/core/src/main/java/org/apache/iceberg/mapping/MappingUtil.java b/core/src/main/java/org/apache/iceberg/mapping/MappingUtil.java index 6e5071c00a05..1cf1cbfc61a1 100644 --- a/core/src/main/java/org/apache/iceberg/mapping/MappingUtil.java +++ b/core/src/main/java/org/apache/iceberg/mapping/MappingUtil.java @@ -19,19 +19,19 @@ package org.apache.iceberg.mapping; -import com.google.common.base.Joiner; -import com.google.common.base.Preconditions; -import com.google.common.collect.ImmutableMap; -import com.google.common.collect.Lists; -import com.google.common.collect.Maps; -import com.google.common.collect.Multimap; -import com.google.common.collect.Sets; import java.util.Collection; import java.util.List; import java.util.Map; import java.util.Objects; import java.util.Set; import org.apache.iceberg.Schema; +import org.apache.iceberg.relocated.com.google.common.base.Joiner; +import org.apache.iceberg.relocated.com.google.common.base.Preconditions; +import org.apache.iceberg.relocated.com.google.common.collect.ImmutableMap; +import org.apache.iceberg.relocated.com.google.common.collect.Lists; +import org.apache.iceberg.relocated.com.google.common.collect.Maps; +import org.apache.iceberg.relocated.com.google.common.collect.Multimap; +import org.apache.iceberg.relocated.com.google.common.collect.Sets; import org.apache.iceberg.types.Type; import org.apache.iceberg.types.TypeUtil; import org.apache.iceberg.types.Types; diff --git a/core/src/main/java/org/apache/iceberg/mapping/NameMapping.java b/core/src/main/java/org/apache/iceberg/mapping/NameMapping.java index 4d8849eb23fd..5bde139e881d 100644 --- a/core/src/main/java/org/apache/iceberg/mapping/NameMapping.java +++ b/core/src/main/java/org/apache/iceberg/mapping/NameMapping.java @@ -19,10 +19,10 @@ package org.apache.iceberg.mapping; -import com.google.common.base.Joiner; -import com.google.common.collect.ImmutableList; import java.util.List; import java.util.Map; +import org.apache.iceberg.relocated.com.google.common.base.Joiner; +import org.apache.iceberg.relocated.com.google.common.collect.ImmutableList; /** * Represents a mapping from external schema names to Iceberg type IDs. diff --git a/core/src/main/java/org/apache/iceberg/mapping/NameMappingParser.java b/core/src/main/java/org/apache/iceberg/mapping/NameMappingParser.java index 453165c3d4ff..5eaef84abb10 100644 --- a/core/src/main/java/org/apache/iceberg/mapping/NameMappingParser.java +++ b/core/src/main/java/org/apache/iceberg/mapping/NameMappingParser.java @@ -21,14 +21,14 @@ import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.databind.JsonNode; -import com.google.common.base.Preconditions; -import com.google.common.collect.ImmutableSet; -import com.google.common.collect.Lists; import java.io.IOException; import java.io.StringWriter; import java.util.List; import java.util.Set; import org.apache.iceberg.exceptions.RuntimeIOException; +import org.apache.iceberg.relocated.com.google.common.base.Preconditions; +import org.apache.iceberg.relocated.com.google.common.collect.ImmutableSet; +import org.apache.iceberg.relocated.com.google.common.collect.Lists; import org.apache.iceberg.util.JsonUtil; /** diff --git a/core/src/main/java/org/apache/iceberg/util/ManifestFileUtil.java b/core/src/main/java/org/apache/iceberg/util/ManifestFileUtil.java index e0771db7737d..a26d86eb4f11 100644 --- a/core/src/main/java/org/apache/iceberg/util/ManifestFileUtil.java +++ b/core/src/main/java/org/apache/iceberg/util/ManifestFileUtil.java @@ -19,13 +19,13 @@ package org.apache.iceberg.util; -import com.google.common.collect.Lists; import java.util.Comparator; import java.util.List; import java.util.function.Function; import org.apache.iceberg.ManifestFile; import org.apache.iceberg.PartitionSpec; import org.apache.iceberg.StructLike; +import org.apache.iceberg.relocated.com.google.common.collect.Lists; import org.apache.iceberg.types.Comparators; import org.apache.iceberg.types.Conversions; import org.apache.iceberg.types.Type; diff --git a/core/src/main/java/org/apache/iceberg/util/Pair.java b/core/src/main/java/org/apache/iceberg/util/Pair.java index 76a4317a0c51..46d5010d8a75 100644 --- a/core/src/main/java/org/apache/iceberg/util/Pair.java +++ b/core/src/main/java/org/apache/iceberg/util/Pair.java @@ -22,13 +22,13 @@ import com.github.benmanes.caffeine.cache.CacheLoader; import com.github.benmanes.caffeine.cache.Caffeine; import com.github.benmanes.caffeine.cache.LoadingCache; -import com.google.common.base.Objects; -import com.google.common.collect.Lists; import java.io.Serializable; import org.apache.avro.Schema; import org.apache.avro.generic.IndexedRecord; import org.apache.avro.reflect.ReflectData; import org.apache.avro.specific.SpecificData; +import org.apache.iceberg.relocated.com.google.common.base.Objects; +import org.apache.iceberg.relocated.com.google.common.collect.Lists; public class Pair implements IndexedRecord, SpecificData.SchemaConstructable, Serializable { public static Pair of(X first, Y second) { diff --git a/core/src/main/java/org/apache/iceberg/util/ParallelIterable.java b/core/src/main/java/org/apache/iceberg/util/ParallelIterable.java index b77338a36885..5c09c8b82433 100644 --- a/core/src/main/java/org/apache/iceberg/util/ParallelIterable.java +++ b/core/src/main/java/org/apache/iceberg/util/ParallelIterable.java @@ -19,8 +19,6 @@ package org.apache.iceberg.util; -import com.google.common.base.Preconditions; -import com.google.common.collect.Iterables; import java.io.Closeable; import java.io.IOException; import java.util.Iterator; @@ -31,6 +29,8 @@ import org.apache.iceberg.exceptions.RuntimeIOException; import org.apache.iceberg.io.CloseableGroup; import org.apache.iceberg.io.CloseableIterable; +import org.apache.iceberg.relocated.com.google.common.base.Preconditions; +import org.apache.iceberg.relocated.com.google.common.collect.Iterables; public class ParallelIterable extends CloseableGroup implements CloseableIterable { private final Iterable> iterables; diff --git a/core/src/main/java/org/apache/iceberg/util/SnapshotUtil.java b/core/src/main/java/org/apache/iceberg/util/SnapshotUtil.java index a6c73f617e45..540e08add583 100644 --- a/core/src/main/java/org/apache/iceberg/util/SnapshotUtil.java +++ b/core/src/main/java/org/apache/iceberg/util/SnapshotUtil.java @@ -19,11 +19,11 @@ package org.apache.iceberg.util; -import com.google.common.collect.Lists; import java.util.List; import java.util.function.Function; import org.apache.iceberg.Snapshot; import org.apache.iceberg.Table; +import org.apache.iceberg.relocated.com.google.common.collect.Lists; public class SnapshotUtil { private SnapshotUtil() { diff --git a/core/src/main/java/org/apache/iceberg/util/Tasks.java b/core/src/main/java/org/apache/iceberg/util/Tasks.java index 239044a49e7a..430813294bf2 100644 --- a/core/src/main/java/org/apache/iceberg/util/Tasks.java +++ b/core/src/main/java/org/apache/iceberg/util/Tasks.java @@ -19,7 +19,6 @@ package org.apache.iceberg.util; -import com.google.common.collect.Lists; import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; @@ -36,6 +35,7 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; import java.util.function.Predicate; +import org.apache.iceberg.relocated.com.google.common.collect.Lists; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core/src/main/java/org/apache/iceberg/util/ThreadPools.java b/core/src/main/java/org/apache/iceberg/util/ThreadPools.java index ee19f253f2fd..87611145403e 100644 --- a/core/src/main/java/org/apache/iceberg/util/ThreadPools.java +++ b/core/src/main/java/org/apache/iceberg/util/ThreadPools.java @@ -19,12 +19,12 @@ package org.apache.iceberg.util; -import com.google.common.util.concurrent.MoreExecutors; -import com.google.common.util.concurrent.ThreadFactoryBuilder; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.ThreadPoolExecutor; import org.apache.iceberg.SystemProperties; +import org.apache.iceberg.relocated.com.google.common.util.concurrent.MoreExecutors; +import org.apache.iceberg.relocated.com.google.common.util.concurrent.ThreadFactoryBuilder; public class ThreadPools { diff --git a/core/src/test/java/org/apache/iceberg/LocalTableOperations.java b/core/src/test/java/org/apache/iceberg/LocalTableOperations.java index 2986e505ac84..f12c09942808 100644 --- a/core/src/test/java/org/apache/iceberg/LocalTableOperations.java +++ b/core/src/test/java/org/apache/iceberg/LocalTableOperations.java @@ -19,12 +19,12 @@ package org.apache.iceberg; -import com.google.common.collect.Maps; import java.io.IOException; import java.util.Map; import org.apache.iceberg.exceptions.RuntimeIOException; import org.apache.iceberg.io.FileIO; import org.apache.iceberg.io.LocationProvider; +import org.apache.iceberg.relocated.com.google.common.collect.Maps; import org.junit.rules.TemporaryFolder; class LocalTableOperations implements TableOperations { diff --git a/core/src/test/java/org/apache/iceberg/TableMetadataParserTest.java b/core/src/test/java/org/apache/iceberg/TableMetadataParserTest.java index a03a38a17e54..c332294f549b 100644 --- a/core/src/test/java/org/apache/iceberg/TableMetadataParserTest.java +++ b/core/src/test/java/org/apache/iceberg/TableMetadataParserTest.java @@ -19,7 +19,6 @@ package org.apache.iceberg; -import com.google.common.collect.Maps; import java.io.File; import java.io.FileInputStream; import java.io.IOException; @@ -31,6 +30,7 @@ import java.util.zip.ZipException; import org.apache.iceberg.TableMetadataParser.Codec; import org.apache.iceberg.io.OutputFile; +import org.apache.iceberg.relocated.com.google.common.collect.Maps; import org.apache.iceberg.types.Types.BooleanType; import org.junit.After; import org.junit.Assert; diff --git a/core/src/test/java/org/apache/iceberg/TableTestBase.java b/core/src/test/java/org/apache/iceberg/TableTestBase.java index c66e8b11ac26..79951caada26 100644 --- a/core/src/test/java/org/apache/iceberg/TableTestBase.java +++ b/core/src/test/java/org/apache/iceberg/TableTestBase.java @@ -19,11 +19,6 @@ package org.apache.iceberg; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.Iterators; -import com.google.common.collect.Lists; -import com.google.common.collect.Sets; -import com.google.common.io.Files; import java.io.File; import java.io.IOException; import java.util.Iterator; @@ -31,6 +26,11 @@ import java.util.Set; import org.apache.iceberg.io.FileIO; import org.apache.iceberg.io.OutputFile; +import org.apache.iceberg.relocated.com.google.common.collect.ImmutableList; +import org.apache.iceberg.relocated.com.google.common.collect.Iterators; +import org.apache.iceberg.relocated.com.google.common.collect.Lists; +import org.apache.iceberg.relocated.com.google.common.collect.Sets; +import org.apache.iceberg.relocated.com.google.common.io.Files; import org.apache.iceberg.types.Types; import org.junit.After; import org.junit.Assert; diff --git a/core/src/test/java/org/apache/iceberg/TestCreateTransaction.java b/core/src/test/java/org/apache/iceberg/TestCreateTransaction.java index 342e91306b17..e9be1c8a398c 100644 --- a/core/src/test/java/org/apache/iceberg/TestCreateTransaction.java +++ b/core/src/test/java/org/apache/iceberg/TestCreateTransaction.java @@ -19,10 +19,10 @@ package org.apache.iceberg; -import com.google.common.collect.Sets; import java.io.File; import java.io.IOException; import org.apache.iceberg.exceptions.CommitFailedException; +import org.apache.iceberg.relocated.com.google.common.collect.Sets; import org.apache.iceberg.types.TypeUtil; import org.junit.Assert; import org.junit.Test; diff --git a/core/src/test/java/org/apache/iceberg/TestEntriesMetadataTable.java b/core/src/test/java/org/apache/iceberg/TestEntriesMetadataTable.java index 2255b6e3fb31..81362b97521d 100644 --- a/core/src/test/java/org/apache/iceberg/TestEntriesMetadataTable.java +++ b/core/src/test/java/org/apache/iceberg/TestEntriesMetadataTable.java @@ -19,7 +19,7 @@ package org.apache.iceberg; -import com.google.common.collect.Iterables; +import org.apache.iceberg.relocated.com.google.common.collect.Iterables; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/core/src/test/java/org/apache/iceberg/TestFastAppend.java b/core/src/test/java/org/apache/iceberg/TestFastAppend.java index 4f071e1570e7..2bda21dccd29 100644 --- a/core/src/test/java/org/apache/iceberg/TestFastAppend.java +++ b/core/src/test/java/org/apache/iceberg/TestFastAppend.java @@ -19,14 +19,14 @@ package org.apache.iceberg; -import com.google.common.collect.Lists; -import com.google.common.collect.Sets; import java.io.File; import java.io.IOException; import java.util.List; import java.util.Set; import org.apache.iceberg.ManifestEntry.Status; import org.apache.iceberg.exceptions.CommitFailedException; +import org.apache.iceberg.relocated.com.google.common.collect.Lists; +import org.apache.iceberg.relocated.com.google.common.collect.Sets; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/core/src/test/java/org/apache/iceberg/TestFilterFiles.java b/core/src/test/java/org/apache/iceberg/TestFilterFiles.java index d023048de549..2eea70033b18 100644 --- a/core/src/test/java/org/apache/iceberg/TestFilterFiles.java +++ b/core/src/test/java/org/apache/iceberg/TestFilterFiles.java @@ -19,14 +19,14 @@ package org.apache.iceberg; -import com.google.common.collect.Iterables; -import com.google.common.collect.Maps; import java.io.File; import java.io.IOException; import java.nio.ByteBuffer; import java.util.HashMap; import java.util.Map; import org.apache.iceberg.expressions.Expressions; +import org.apache.iceberg.relocated.com.google.common.collect.Iterables; +import org.apache.iceberg.relocated.com.google.common.collect.Maps; import org.apache.iceberg.types.Conversions; import org.apache.iceberg.types.Types; import org.junit.After; diff --git a/core/src/test/java/org/apache/iceberg/TestFindFiles.java b/core/src/test/java/org/apache/iceberg/TestFindFiles.java index 68121d3f6bee..11d01ff770f5 100644 --- a/core/src/test/java/org/apache/iceberg/TestFindFiles.java +++ b/core/src/test/java/org/apache/iceberg/TestFindFiles.java @@ -19,12 +19,12 @@ package org.apache.iceberg; -import com.google.common.collect.ImmutableMap; -import com.google.common.collect.Iterables; -import com.google.common.collect.Sets; import java.util.Arrays; import java.util.Set; import org.apache.iceberg.expressions.Expressions; +import org.apache.iceberg.relocated.com.google.common.collect.ImmutableMap; +import org.apache.iceberg.relocated.com.google.common.collect.Iterables; +import org.apache.iceberg.relocated.com.google.common.collect.Sets; import org.apache.iceberg.types.Conversions; import org.apache.iceberg.types.Types; import org.junit.Assert; diff --git a/core/src/test/java/org/apache/iceberg/TestFixedSizeSplitScanTaskIterator.java b/core/src/test/java/org/apache/iceberg/TestFixedSizeSplitScanTaskIterator.java index bac47e04fbc9..2aabafc38b0e 100644 --- a/core/src/test/java/org/apache/iceberg/TestFixedSizeSplitScanTaskIterator.java +++ b/core/src/test/java/org/apache/iceberg/TestFixedSizeSplitScanTaskIterator.java @@ -19,8 +19,8 @@ package org.apache.iceberg; -import com.google.common.collect.Lists; import java.util.List; +import org.apache.iceberg.relocated.com.google.common.collect.Lists; import org.junit.Assert; import org.junit.Test; diff --git a/core/src/test/java/org/apache/iceberg/TestIncrementalDataTableScan.java b/core/src/test/java/org/apache/iceberg/TestIncrementalDataTableScan.java index 485d4c2fea71..bcbb894ae10d 100644 --- a/core/src/test/java/org/apache/iceberg/TestIncrementalDataTableScan.java +++ b/core/src/test/java/org/apache/iceberg/TestIncrementalDataTableScan.java @@ -19,11 +19,11 @@ package org.apache.iceberg; -import com.google.common.collect.Iterables; -import com.google.common.collect.Lists; -import com.google.common.collect.Sets; import java.util.Collections; import java.util.List; +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.Sets; import org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/core/src/test/java/org/apache/iceberg/TestManifestListVersions.java b/core/src/test/java/org/apache/iceberg/TestManifestListVersions.java index 65ec4b24b293..87231f09dbc6 100644 --- a/core/src/test/java/org/apache/iceberg/TestManifestListVersions.java +++ b/core/src/test/java/org/apache/iceberg/TestManifestListVersions.java @@ -19,9 +19,6 @@ package org.apache.iceberg; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.Iterables; -import com.google.common.collect.Lists; import java.io.File; import java.io.IOException; import java.util.Collection; @@ -34,6 +31,9 @@ import org.apache.iceberg.io.FileAppender; import org.apache.iceberg.io.InputFile; import org.apache.iceberg.io.OutputFile; +import org.apache.iceberg.relocated.com.google.common.collect.ImmutableList; +import org.apache.iceberg.relocated.com.google.common.collect.Iterables; +import org.apache.iceberg.relocated.com.google.common.collect.Lists; import org.junit.Assert; import org.junit.Rule; import org.junit.Test; diff --git a/core/src/test/java/org/apache/iceberg/TestManifestReader.java b/core/src/test/java/org/apache/iceberg/TestManifestReader.java index 058a845e47ed..53922be4f0c0 100644 --- a/core/src/test/java/org/apache/iceberg/TestManifestReader.java +++ b/core/src/test/java/org/apache/iceberg/TestManifestReader.java @@ -19,10 +19,10 @@ package org.apache.iceberg; -import com.google.common.collect.Iterables; import java.io.IOException; import java.util.List; import org.apache.iceberg.ManifestEntry.Status; +import org.apache.iceberg.relocated.com.google.common.collect.Iterables; import org.apache.iceberg.types.Types; import org.junit.Assert; import org.junit.Test; diff --git a/core/src/test/java/org/apache/iceberg/TestManifestWriterVersions.java b/core/src/test/java/org/apache/iceberg/TestManifestWriterVersions.java index 423cd51074dd..61777971778e 100644 --- a/core/src/test/java/org/apache/iceberg/TestManifestWriterVersions.java +++ b/core/src/test/java/org/apache/iceberg/TestManifestWriterVersions.java @@ -19,9 +19,6 @@ package org.apache.iceberg; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableMap; -import com.google.common.collect.Lists; import java.io.IOException; import java.util.List; import org.apache.iceberg.io.CloseableIterable; @@ -29,6 +26,9 @@ import org.apache.iceberg.io.FileIO; import org.apache.iceberg.io.InputFile; import org.apache.iceberg.io.OutputFile; +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.Lists; import org.apache.iceberg.types.Conversions; import org.apache.iceberg.types.Types; import org.junit.Assert; diff --git a/core/src/test/java/org/apache/iceberg/TestMergeAppend.java b/core/src/test/java/org/apache/iceberg/TestMergeAppend.java index 88dc997e0049..47f0d90d6f6d 100644 --- a/core/src/test/java/org/apache/iceberg/TestMergeAppend.java +++ b/core/src/test/java/org/apache/iceberg/TestMergeAppend.java @@ -19,21 +19,21 @@ package org.apache.iceberg; -import com.google.common.collect.Lists; -import com.google.common.collect.Sets; import java.io.File; import java.io.IOException; import java.util.List; import java.util.Set; import org.apache.iceberg.ManifestEntry.Status; import org.apache.iceberg.exceptions.CommitFailedException; +import org.apache.iceberg.relocated.com.google.common.collect.Lists; +import org.apache.iceberg.relocated.com.google.common.collect.Sets; import org.apache.iceberg.types.Types; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; -import static com.google.common.collect.Iterators.concat; +import static org.apache.iceberg.relocated.com.google.common.collect.Iterators.concat; @RunWith(Parameterized.class) public class TestMergeAppend extends TableTestBase { diff --git a/core/src/test/java/org/apache/iceberg/TestMetrics.java b/core/src/test/java/org/apache/iceberg/TestMetrics.java index 0017cec90dd2..190712b96cb7 100644 --- a/core/src/test/java/org/apache/iceberg/TestMetrics.java +++ b/core/src/test/java/org/apache/iceberg/TestMetrics.java @@ -19,9 +19,6 @@ package org.apache.iceberg; -import com.google.common.collect.ImmutableMap; -import com.google.common.collect.Lists; -import com.google.common.collect.Maps; import java.io.File; import java.io.IOException; import java.math.BigDecimal; @@ -37,6 +34,9 @@ import org.apache.avro.generic.GenericFixed; import org.apache.iceberg.avro.AvroSchemaUtil; import org.apache.iceberg.io.InputFile; +import org.apache.iceberg.relocated.com.google.common.collect.ImmutableMap; +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.Types; import org.apache.iceberg.types.Types.BinaryType; diff --git a/core/src/test/java/org/apache/iceberg/TestMetricsModes.java b/core/src/test/java/org/apache/iceberg/TestMetricsModes.java index 698f5c3a193f..65a31d4b0f8c 100644 --- a/core/src/test/java/org/apache/iceberg/TestMetricsModes.java +++ b/core/src/test/java/org/apache/iceberg/TestMetricsModes.java @@ -19,12 +19,12 @@ package org.apache.iceberg; -import com.google.common.collect.ImmutableMap; import java.util.Map; import org.apache.iceberg.MetricsModes.Counts; import org.apache.iceberg.MetricsModes.Full; import org.apache.iceberg.MetricsModes.None; import org.apache.iceberg.MetricsModes.Truncate; +import org.apache.iceberg.relocated.com.google.common.collect.ImmutableMap; import org.junit.Assert; import org.junit.Rule; import org.junit.Test; diff --git a/core/src/test/java/org/apache/iceberg/TestOffsetsBasedSplitScanTaskIterator.java b/core/src/test/java/org/apache/iceberg/TestOffsetsBasedSplitScanTaskIterator.java index f5524c89c0b8..eb006af72d32 100644 --- a/core/src/test/java/org/apache/iceberg/TestOffsetsBasedSplitScanTaskIterator.java +++ b/core/src/test/java/org/apache/iceberg/TestOffsetsBasedSplitScanTaskIterator.java @@ -19,8 +19,8 @@ package org.apache.iceberg; -import com.google.common.collect.Lists; import java.util.List; +import org.apache.iceberg.relocated.com.google.common.collect.Lists; import org.junit.Assert; import org.junit.Test; diff --git a/core/src/test/java/org/apache/iceberg/TestOverwrite.java b/core/src/test/java/org/apache/iceberg/TestOverwrite.java index dca9875ff3ea..4c379e9908c7 100644 --- a/core/src/test/java/org/apache/iceberg/TestOverwrite.java +++ b/core/src/test/java/org/apache/iceberg/TestOverwrite.java @@ -19,13 +19,13 @@ package org.apache.iceberg; -import com.google.common.collect.ImmutableMap; import java.io.File; import java.io.IOException; import java.nio.ByteBuffer; import java.nio.ByteOrder; import org.apache.iceberg.ManifestEntry.Status; import org.apache.iceberg.exceptions.ValidationException; +import org.apache.iceberg.relocated.com.google.common.collect.ImmutableMap; import org.apache.iceberg.types.Types; import org.junit.Assert; import org.junit.Before; diff --git a/core/src/test/java/org/apache/iceberg/TestOverwriteWithValidation.java b/core/src/test/java/org/apache/iceberg/TestOverwriteWithValidation.java index 9eea57c03d0b..881a6fc450b9 100644 --- a/core/src/test/java/org/apache/iceberg/TestOverwriteWithValidation.java +++ b/core/src/test/java/org/apache/iceberg/TestOverwriteWithValidation.java @@ -19,14 +19,14 @@ package org.apache.iceberg; -import com.google.common.collect.ImmutableMap; -import com.google.common.collect.ImmutableSet; import java.io.File; import java.io.IOException; import java.nio.ByteBuffer; import java.nio.ByteOrder; import org.apache.iceberg.exceptions.ValidationException; import org.apache.iceberg.expressions.Expression; +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.Types; import org.junit.Assert; import org.junit.Before; diff --git a/core/src/test/java/org/apache/iceberg/TestPartitionSpecInfo.java b/core/src/test/java/org/apache/iceberg/TestPartitionSpecInfo.java index 2d70bbe90819..b0395f004323 100644 --- a/core/src/test/java/org/apache/iceberg/TestPartitionSpecInfo.java +++ b/core/src/test/java/org/apache/iceberg/TestPartitionSpecInfo.java @@ -19,9 +19,9 @@ package org.apache.iceberg; -import com.google.common.collect.ImmutableMap; import java.io.File; import java.io.IOException; +import org.apache.iceberg.relocated.com.google.common.collect.ImmutableMap; import org.apache.iceberg.types.Types; import org.junit.After; import org.junit.Assert; diff --git a/core/src/test/java/org/apache/iceberg/TestRemoveSnapshots.java b/core/src/test/java/org/apache/iceberg/TestRemoveSnapshots.java index ae3b45f9bd8e..da6e394a82c8 100644 --- a/core/src/test/java/org/apache/iceberg/TestRemoveSnapshots.java +++ b/core/src/test/java/org/apache/iceberg/TestRemoveSnapshots.java @@ -19,15 +19,15 @@ package org.apache.iceberg; -import com.google.common.collect.ImmutableSet; -import com.google.common.collect.Lists; -import com.google.common.collect.Sets; import java.io.IOException; import java.util.ArrayList; import java.util.HashSet; import java.util.List; import java.util.Set; import org.apache.iceberg.ManifestEntry.Status; +import org.apache.iceberg.relocated.com.google.common.collect.ImmutableSet; +import org.apache.iceberg.relocated.com.google.common.collect.Lists; +import org.apache.iceberg.relocated.com.google.common.collect.Sets; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/core/src/test/java/org/apache/iceberg/TestReplaceTransaction.java b/core/src/test/java/org/apache/iceberg/TestReplaceTransaction.java index 9a35dfb1e030..c6c46ed4b31e 100644 --- a/core/src/test/java/org/apache/iceberg/TestReplaceTransaction.java +++ b/core/src/test/java/org/apache/iceberg/TestReplaceTransaction.java @@ -19,12 +19,12 @@ package org.apache.iceberg; -import com.google.common.collect.Sets; import java.io.File; import java.io.IOException; import java.util.Set; import java.util.concurrent.atomic.AtomicInteger; import org.apache.iceberg.exceptions.CommitFailedException; +import org.apache.iceberg.relocated.com.google.common.collect.Sets; import org.apache.iceberg.types.TypeUtil; import org.apache.iceberg.types.Types; import org.junit.Assert; diff --git a/core/src/test/java/org/apache/iceberg/TestRewriteManifests.java b/core/src/test/java/org/apache/iceberg/TestRewriteManifests.java index c664bf50c26c..f6d0134e8fd5 100644 --- a/core/src/test/java/org/apache/iceberg/TestRewriteManifests.java +++ b/core/src/test/java/org/apache/iceberg/TestRewriteManifests.java @@ -19,7 +19,6 @@ package org.apache.iceberg; -import com.google.common.collect.Iterables; import java.io.File; import java.io.IOException; import java.util.Arrays; @@ -30,6 +29,7 @@ import org.apache.iceberg.exceptions.RuntimeIOException; import org.apache.iceberg.exceptions.ValidationException; import org.apache.iceberg.expressions.Expressions; +import org.apache.iceberg.relocated.com.google.common.collect.Iterables; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/core/src/test/java/org/apache/iceberg/TestScanDataFileColumns.java b/core/src/test/java/org/apache/iceberg/TestScanDataFileColumns.java index 50f30214debf..2f3fcf355651 100644 --- a/core/src/test/java/org/apache/iceberg/TestScanDataFileColumns.java +++ b/core/src/test/java/org/apache/iceberg/TestScanDataFileColumns.java @@ -19,13 +19,13 @@ package org.apache.iceberg; -import com.google.common.collect.ImmutableMap; import java.io.File; import java.io.IOException; import java.nio.ByteBuffer; import java.nio.ByteOrder; import org.apache.hadoop.conf.Configuration; import org.apache.iceberg.hadoop.HadoopTables; +import org.apache.iceberg.relocated.com.google.common.collect.ImmutableMap; import org.apache.iceberg.types.Types; import org.junit.Assert; import org.junit.Before; diff --git a/core/src/test/java/org/apache/iceberg/TestScanSummary.java b/core/src/test/java/org/apache/iceberg/TestScanSummary.java index 77068f9e7a4b..dc0d45c82e9a 100644 --- a/core/src/test/java/org/apache/iceberg/TestScanSummary.java +++ b/core/src/test/java/org/apache/iceberg/TestScanSummary.java @@ -19,8 +19,8 @@ package org.apache.iceberg; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.Lists; +import org.apache.iceberg.relocated.com.google.common.collect.ImmutableList; +import org.apache.iceberg.relocated.com.google.common.collect.Lists; import org.apache.iceberg.util.Pair; import org.junit.Assert; import org.junit.Test; diff --git a/core/src/test/java/org/apache/iceberg/TestScansAndSchemaEvolution.java b/core/src/test/java/org/apache/iceberg/TestScansAndSchemaEvolution.java index 274ee80df9a6..efac9fe6a827 100644 --- a/core/src/test/java/org/apache/iceberg/TestScansAndSchemaEvolution.java +++ b/core/src/test/java/org/apache/iceberg/TestScansAndSchemaEvolution.java @@ -19,7 +19,6 @@ package org.apache.iceberg; -import com.google.common.collect.Lists; import java.io.File; import java.io.IOException; import java.util.List; @@ -29,6 +28,7 @@ import org.apache.iceberg.avro.RandomAvroData; import org.apache.iceberg.expressions.Expressions; import org.apache.iceberg.io.FileAppender; +import org.apache.iceberg.relocated.com.google.common.collect.Lists; import org.apache.iceberg.types.Types; import org.junit.After; import org.junit.Assert; diff --git a/core/src/test/java/org/apache/iceberg/TestSchemaAndMappingUpdate.java b/core/src/test/java/org/apache/iceberg/TestSchemaAndMappingUpdate.java index 07e5a26e0d1c..44c697edee8a 100644 --- a/core/src/test/java/org/apache/iceberg/TestSchemaAndMappingUpdate.java +++ b/core/src/test/java/org/apache/iceberg/TestSchemaAndMappingUpdate.java @@ -19,9 +19,6 @@ package org.apache.iceberg; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.Iterables; -import com.google.common.collect.Sets; import java.util.Objects; import java.util.Set; import org.apache.iceberg.mapping.MappedField; @@ -29,6 +26,9 @@ import org.apache.iceberg.mapping.MappingUtil; import org.apache.iceberg.mapping.NameMapping; import org.apache.iceberg.mapping.NameMappingParser; +import org.apache.iceberg.relocated.com.google.common.collect.ImmutableList; +import org.apache.iceberg.relocated.com.google.common.collect.Iterables; +import org.apache.iceberg.relocated.com.google.common.collect.Sets; import org.apache.iceberg.types.Types; import org.junit.Assert; import org.junit.Test; diff --git a/core/src/test/java/org/apache/iceberg/TestSchemaUpdate.java b/core/src/test/java/org/apache/iceberg/TestSchemaUpdate.java index 0875ab61d3dc..4c3de726ef17 100644 --- a/core/src/test/java/org/apache/iceberg/TestSchemaUpdate.java +++ b/core/src/test/java/org/apache/iceberg/TestSchemaUpdate.java @@ -19,11 +19,11 @@ package org.apache.iceberg; -import com.google.common.collect.ImmutableSet; -import com.google.common.collect.Lists; -import com.google.common.collect.Sets; import java.util.List; import java.util.Set; +import org.apache.iceberg.relocated.com.google.common.collect.ImmutableSet; +import org.apache.iceberg.relocated.com.google.common.collect.Lists; +import org.apache.iceberg.relocated.com.google.common.collect.Sets; import org.apache.iceberg.types.Type; import org.apache.iceberg.types.TypeUtil; import org.apache.iceberg.types.Types; diff --git a/core/src/test/java/org/apache/iceberg/TestSnapshotJson.java b/core/src/test/java/org/apache/iceberg/TestSnapshotJson.java index 383a4826145c..be383e8e824e 100644 --- a/core/src/test/java/org/apache/iceberg/TestSnapshotJson.java +++ b/core/src/test/java/org/apache/iceberg/TestSnapshotJson.java @@ -19,11 +19,11 @@ package org.apache.iceberg; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableMap; import java.io.File; import java.io.IOException; import java.util.List; +import org.apache.iceberg.relocated.com.google.common.collect.ImmutableList; +import org.apache.iceberg.relocated.com.google.common.collect.ImmutableMap; import org.junit.Assert; import org.junit.Rule; import org.junit.Test; diff --git a/core/src/test/java/org/apache/iceberg/TestSnapshotSelection.java b/core/src/test/java/org/apache/iceberg/TestSnapshotSelection.java index 17d54c2808c2..2d96c65f6935 100644 --- a/core/src/test/java/org/apache/iceberg/TestSnapshotSelection.java +++ b/core/src/test/java/org/apache/iceberg/TestSnapshotSelection.java @@ -19,10 +19,10 @@ package org.apache.iceberg; -import com.google.common.collect.ImmutableMap; -import com.google.common.collect.Iterables; import java.nio.ByteBuffer; import java.nio.ByteOrder; +import org.apache.iceberg.relocated.com.google.common.collect.ImmutableMap; +import org.apache.iceberg.relocated.com.google.common.collect.Iterables; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/core/src/test/java/org/apache/iceberg/TestSplitPlanning.java b/core/src/test/java/org/apache/iceberg/TestSplitPlanning.java index e827def67daa..e140de66374b 100644 --- a/core/src/test/java/org/apache/iceberg/TestSplitPlanning.java +++ b/core/src/test/java/org/apache/iceberg/TestSplitPlanning.java @@ -19,8 +19,6 @@ package org.apache.iceberg; -import com.google.common.collect.Iterables; -import com.google.common.collect.Lists; import java.io.File; import java.io.IOException; import java.util.List; @@ -28,6 +26,8 @@ import org.apache.hadoop.conf.Configuration; import org.apache.iceberg.hadoop.HadoopTables; import org.apache.iceberg.io.CloseableIterable; +import org.apache.iceberg.relocated.com.google.common.collect.Iterables; +import org.apache.iceberg.relocated.com.google.common.collect.Lists; import org.apache.iceberg.types.Types; import org.junit.Assert; import org.junit.Before; diff --git a/core/src/test/java/org/apache/iceberg/TestTableMetadata.java b/core/src/test/java/org/apache/iceberg/TestTableMetadata.java index 1d5d3d3b4638..fc030f13ccc0 100644 --- a/core/src/test/java/org/apache/iceberg/TestTableMetadata.java +++ b/core/src/test/java/org/apache/iceberg/TestTableMetadata.java @@ -21,10 +21,6 @@ import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.databind.JsonNode; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableMap; -import com.google.common.collect.Lists; -import com.google.common.collect.Sets; import java.io.IOException; import java.io.StringWriter; import java.util.Arrays; @@ -39,6 +35,10 @@ import org.apache.iceberg.TableMetadata.SnapshotLogEntry; import org.apache.iceberg.exceptions.RuntimeIOException; import org.apache.iceberg.exceptions.ValidationException; +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.Lists; +import org.apache.iceberg.relocated.com.google.common.collect.Sets; import org.apache.iceberg.types.Types; import org.apache.iceberg.util.JsonUtil; import org.junit.Assert; diff --git a/core/src/test/java/org/apache/iceberg/TestTables.java b/core/src/test/java/org/apache/iceberg/TestTables.java index e7897ce5eea8..b8611e952ec7 100644 --- a/core/src/test/java/org/apache/iceberg/TestTables.java +++ b/core/src/test/java/org/apache/iceberg/TestTables.java @@ -19,9 +19,6 @@ package org.apache.iceberg; -import com.google.common.base.Preconditions; -import com.google.common.collect.ImmutableMap; -import com.google.common.collect.Maps; import java.io.File; import java.util.Map; import org.apache.iceberg.exceptions.AlreadyExistsException; @@ -31,6 +28,9 @@ import org.apache.iceberg.io.InputFile; import org.apache.iceberg.io.LocationProvider; import org.apache.iceberg.io.OutputFile; +import org.apache.iceberg.relocated.com.google.common.base.Preconditions; +import org.apache.iceberg.relocated.com.google.common.collect.ImmutableMap; +import org.apache.iceberg.relocated.com.google.common.collect.Maps; import static org.apache.iceberg.TableMetadata.newTableMetadata; diff --git a/core/src/test/java/org/apache/iceberg/TestTransaction.java b/core/src/test/java/org/apache/iceberg/TestTransaction.java index d855e16e2e45..bceaa73ad4d8 100644 --- a/core/src/test/java/org/apache/iceberg/TestTransaction.java +++ b/core/src/test/java/org/apache/iceberg/TestTransaction.java @@ -19,8 +19,6 @@ package org.apache.iceberg; -import com.google.common.collect.Iterables; -import com.google.common.collect.Sets; import java.io.File; import java.io.IOException; import java.util.List; @@ -29,6 +27,8 @@ import org.apache.iceberg.ManifestEntry.Status; import org.apache.iceberg.exceptions.CommitFailedException; import org.apache.iceberg.io.OutputFile; +import org.apache.iceberg.relocated.com.google.common.collect.Iterables; +import org.apache.iceberg.relocated.com.google.common.collect.Sets; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/core/src/test/java/org/apache/iceberg/avro/RandomAvroData.java b/core/src/test/java/org/apache/iceberg/avro/RandomAvroData.java index 2e037308002b..d36731d9d41b 100644 --- a/core/src/test/java/org/apache/iceberg/avro/RandomAvroData.java +++ b/core/src/test/java/org/apache/iceberg/avro/RandomAvroData.java @@ -19,9 +19,6 @@ package org.apache.iceberg.avro; -import com.google.common.collect.Lists; -import com.google.common.collect.Maps; -import com.google.common.collect.Sets; import java.math.BigDecimal; import java.math.BigInteger; import java.nio.ByteBuffer; @@ -35,6 +32,9 @@ import org.apache.avro.generic.GenericData.Record; import org.apache.avro.util.Utf8; import org.apache.iceberg.Schema; +import org.apache.iceberg.relocated.com.google.common.collect.Lists; +import org.apache.iceberg.relocated.com.google.common.collect.Maps; +import org.apache.iceberg.relocated.com.google.common.collect.Sets; import org.apache.iceberg.types.Type; import org.apache.iceberg.types.TypeUtil; import org.apache.iceberg.types.Types; diff --git a/core/src/test/java/org/apache/iceberg/avro/RemoveIds.java b/core/src/test/java/org/apache/iceberg/avro/RemoveIds.java index b26b1c2e8d91..4e91012ca835 100644 --- a/core/src/test/java/org/apache/iceberg/avro/RemoveIds.java +++ b/core/src/test/java/org/apache/iceberg/avro/RemoveIds.java @@ -19,10 +19,10 @@ package org.apache.iceberg.avro; -import com.google.common.collect.Lists; import java.util.List; import java.util.Map; import org.apache.avro.Schema; +import org.apache.iceberg.relocated.com.google.common.collect.Lists; class RemoveIds extends AvroSchemaVisitor { @Override diff --git a/core/src/test/java/org/apache/iceberg/avro/TestAvroEnums.java b/core/src/test/java/org/apache/iceberg/avro/TestAvroEnums.java index 6be09cc5a2a4..5afd2a6e5de1 100644 --- a/core/src/test/java/org/apache/iceberg/avro/TestAvroEnums.java +++ b/core/src/test/java/org/apache/iceberg/avro/TestAvroEnums.java @@ -19,8 +19,6 @@ package org.apache.iceberg.avro; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.Lists; import java.io.File; import java.io.IOException; import java.util.List; @@ -31,6 +29,8 @@ import org.apache.avro.generic.GenericDatumWriter; import org.apache.iceberg.Files; import org.apache.iceberg.Schema; +import org.apache.iceberg.relocated.com.google.common.collect.ImmutableList; +import org.apache.iceberg.relocated.com.google.common.collect.Lists; import org.junit.Assert; import org.junit.Rule; import org.junit.Test; diff --git a/core/src/test/java/org/apache/iceberg/avro/TestAvroNameMapping.java b/core/src/test/java/org/apache/iceberg/avro/TestAvroNameMapping.java index b8e1d419e423..02025a74f6da 100644 --- a/core/src/test/java/org/apache/iceberg/avro/TestAvroNameMapping.java +++ b/core/src/test/java/org/apache/iceberg/avro/TestAvroNameMapping.java @@ -19,10 +19,6 @@ package org.apache.iceberg.avro; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableMap; -import com.google.common.collect.Iterables; -import com.google.common.collect.Lists; import java.io.File; import java.io.IOException; import java.util.List; @@ -38,6 +34,10 @@ import org.apache.iceberg.mapping.MappedFields; import org.apache.iceberg.mapping.MappingUtil; import org.apache.iceberg.mapping.NameMapping; +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.Iterables; +import org.apache.iceberg.relocated.com.google.common.collect.Lists; import org.apache.iceberg.types.Comparators; import org.apache.iceberg.types.Types; import org.junit.Assert; diff --git a/core/src/test/java/org/apache/iceberg/avro/TestAvroReadProjection.java b/core/src/test/java/org/apache/iceberg/avro/TestAvroReadProjection.java index 9742c1e8f5b4..c367e53cb548 100644 --- a/core/src/test/java/org/apache/iceberg/avro/TestAvroReadProjection.java +++ b/core/src/test/java/org/apache/iceberg/avro/TestAvroReadProjection.java @@ -19,13 +19,13 @@ package org.apache.iceberg.avro; -import com.google.common.collect.Iterables; import java.io.File; import java.io.IOException; import org.apache.avro.generic.GenericData; import org.apache.iceberg.Files; import org.apache.iceberg.Schema; import org.apache.iceberg.io.FileAppender; +import org.apache.iceberg.relocated.com.google.common.collect.Iterables; public class TestAvroReadProjection extends TestReadProjection { @Override diff --git a/core/src/test/java/org/apache/iceberg/avro/TestGenericAvro.java b/core/src/test/java/org/apache/iceberg/avro/TestGenericAvro.java index 8b89fda4d566..6849657ddf33 100644 --- a/core/src/test/java/org/apache/iceberg/avro/TestGenericAvro.java +++ b/core/src/test/java/org/apache/iceberg/avro/TestGenericAvro.java @@ -19,7 +19,6 @@ package org.apache.iceberg.avro; -import com.google.common.collect.Lists; import java.io.File; import java.io.IOException; import java.util.List; @@ -27,6 +26,7 @@ import org.apache.iceberg.Files; import org.apache.iceberg.Schema; import org.apache.iceberg.io.FileAppender; +import org.apache.iceberg.relocated.com.google.common.collect.Lists; import org.junit.Assert; public class TestGenericAvro extends AvroDataTest { diff --git a/core/src/test/java/org/apache/iceberg/avro/TestReadProjection.java b/core/src/test/java/org/apache/iceberg/avro/TestReadProjection.java index b0d18d0ce910..9243a809ff1e 100644 --- a/core/src/test/java/org/apache/iceberg/avro/TestReadProjection.java +++ b/core/src/test/java/org/apache/iceberg/avro/TestReadProjection.java @@ -19,15 +19,15 @@ package org.apache.iceberg.avro; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableMap; -import com.google.common.collect.Maps; -import com.google.common.collect.Sets; import java.io.IOException; import java.util.List; import java.util.Map; import org.apache.avro.generic.GenericData.Record; import org.apache.iceberg.Schema; +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.Maps; +import org.apache.iceberg.relocated.com.google.common.collect.Sets; import org.apache.iceberg.types.Comparators; import org.apache.iceberg.types.Types; import org.junit.Assert; diff --git a/core/src/test/java/org/apache/iceberg/avro/TestSchemaConversions.java b/core/src/test/java/org/apache/iceberg/avro/TestSchemaConversions.java index 88320dbff45d..be8c7caf3319 100644 --- a/core/src/test/java/org/apache/iceberg/avro/TestSchemaConversions.java +++ b/core/src/test/java/org/apache/iceberg/avro/TestSchemaConversions.java @@ -19,12 +19,12 @@ package org.apache.iceberg.avro; -import com.google.common.collect.Iterables; -import com.google.common.collect.Lists; import java.util.List; import org.apache.avro.LogicalTypes; import org.apache.avro.Schema; import org.apache.avro.SchemaBuilder; +import org.apache.iceberg.relocated.com.google.common.collect.Iterables; +import org.apache.iceberg.relocated.com.google.common.collect.Lists; import org.apache.iceberg.types.Type; import org.apache.iceberg.types.Types; import org.junit.Assert; diff --git a/core/src/test/java/org/apache/iceberg/hadoop/HadoopTableTestBase.java b/core/src/test/java/org/apache/iceberg/hadoop/HadoopTableTestBase.java index a3b450724e6c..d5c18ddabe18 100644 --- a/core/src/test/java/org/apache/iceberg/hadoop/HadoopTableTestBase.java +++ b/core/src/test/java/org/apache/iceberg/hadoop/HadoopTableTestBase.java @@ -19,8 +19,6 @@ package org.apache.iceberg.hadoop; -import com.google.common.collect.Lists; -import com.google.common.io.Files; import java.io.File; import java.io.FileInputStream; import java.io.FileOutputStream; @@ -37,6 +35,8 @@ import org.apache.iceberg.TableMetadata; import org.apache.iceberg.TableMetadataParser; import org.apache.iceberg.TestTables; +import org.apache.iceberg.relocated.com.google.common.collect.Lists; +import org.apache.iceberg.relocated.com.google.common.io.Files; import org.apache.iceberg.types.Types; import org.junit.Before; import org.junit.Rule; diff --git a/core/src/test/java/org/apache/iceberg/hadoop/TestHadoopCatalog.java b/core/src/test/java/org/apache/iceberg/hadoop/TestHadoopCatalog.java index 1cafc25eeae6..37742b0ab464 100644 --- a/core/src/test/java/org/apache/iceberg/hadoop/TestHadoopCatalog.java +++ b/core/src/test/java/org/apache/iceberg/hadoop/TestHadoopCatalog.java @@ -19,9 +19,6 @@ package org.apache.iceberg.hadoop; -import com.google.common.collect.ImmutableMap; -import com.google.common.collect.Lists; -import com.google.common.collect.Sets; import java.io.IOException; import java.util.List; import java.util.Set; @@ -36,6 +33,9 @@ import org.apache.iceberg.catalog.TableIdentifier; import org.apache.iceberg.exceptions.NoSuchNamespaceException; import org.apache.iceberg.exceptions.RuntimeIOException; +import org.apache.iceberg.relocated.com.google.common.collect.ImmutableMap; +import org.apache.iceberg.relocated.com.google.common.collect.Lists; +import org.apache.iceberg.relocated.com.google.common.collect.Sets; import org.junit.Assert; import org.junit.Test; @@ -311,4 +311,3 @@ public void testDropNamespace() throws IOException { Assert.assertFalse(fs.isDirectory(new Path(metaLocation))); } } - diff --git a/core/src/test/java/org/apache/iceberg/hadoop/TestHadoopCommits.java b/core/src/test/java/org/apache/iceberg/hadoop/TestHadoopCommits.java index c1c8e2e5e820..67287246e04b 100644 --- a/core/src/test/java/org/apache/iceberg/hadoop/TestHadoopCommits.java +++ b/core/src/test/java/org/apache/iceberg/hadoop/TestHadoopCommits.java @@ -19,8 +19,6 @@ package org.apache.iceberg.hadoop; -import com.google.common.collect.Lists; -import com.google.common.collect.Sets; import java.io.File; import java.io.IOException; import java.util.List; @@ -37,6 +35,8 @@ import org.apache.iceberg.TableOperations; import org.apache.iceberg.UpdateSchema; import org.apache.iceberg.exceptions.CommitFailedException; +import org.apache.iceberg.relocated.com.google.common.collect.Lists; +import org.apache.iceberg.relocated.com.google.common.collect.Sets; import org.apache.iceberg.types.Types; import org.junit.Assert; import org.junit.Test; diff --git a/core/src/test/java/org/apache/iceberg/mapping/TestMappingUpdates.java b/core/src/test/java/org/apache/iceberg/mapping/TestMappingUpdates.java index ae30bc67f64d..8f5ce56dc328 100644 --- a/core/src/test/java/org/apache/iceberg/mapping/TestMappingUpdates.java +++ b/core/src/test/java/org/apache/iceberg/mapping/TestMappingUpdates.java @@ -19,9 +19,9 @@ package org.apache.iceberg.mapping; -import com.google.common.collect.ImmutableList; import org.apache.iceberg.TableProperties; import org.apache.iceberg.TableTestBase; +import org.apache.iceberg.relocated.com.google.common.collect.ImmutableList; import org.apache.iceberg.types.Types; import org.junit.Assert; import org.junit.Test; diff --git a/core/src/test/java/org/apache/iceberg/util/TestBinPacking.java b/core/src/test/java/org/apache/iceberg/util/TestBinPacking.java index 8e50f4e76644..fd8267ff0c3a 100644 --- a/core/src/test/java/org/apache/iceberg/util/TestBinPacking.java +++ b/core/src/test/java/org/apache/iceberg/util/TestBinPacking.java @@ -19,8 +19,8 @@ package org.apache.iceberg.util; -import com.google.common.collect.Lists; import java.util.List; +import org.apache.iceberg.relocated.com.google.common.collect.Lists; import org.apache.iceberg.util.BinPacking.ListPacker; import org.junit.Assert; import org.junit.Test; diff --git a/hive/src/main/java/org/apache/iceberg/hive/ClientPool.java b/hive/src/main/java/org/apache/iceberg/hive/ClientPool.java index c66df743f9ce..b8bfbfe2c904 100644 --- a/hive/src/main/java/org/apache/iceberg/hive/ClientPool.java +++ b/hive/src/main/java/org/apache/iceberg/hive/ClientPool.java @@ -19,10 +19,10 @@ package org.apache.iceberg.hive; -import com.google.common.base.Preconditions; import java.io.Closeable; import java.util.ArrayDeque; import java.util.Deque; +import org.apache.iceberg.relocated.com.google.common.base.Preconditions; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/hive/src/main/java/org/apache/iceberg/hive/HiveCatalog.java b/hive/src/main/java/org/apache/iceberg/hive/HiveCatalog.java index 4973b063f747..aab9710b1f7e 100644 --- a/hive/src/main/java/org/apache/iceberg/hive/HiveCatalog.java +++ b/hive/src/main/java/org/apache/iceberg/hive/HiveCatalog.java @@ -19,10 +19,6 @@ package org.apache.iceberg.hive; -import com.google.common.base.Joiner; -import com.google.common.base.Preconditions; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.Maps; import java.io.Closeable; import java.util.Arrays; import java.util.List; @@ -47,6 +43,10 @@ import org.apache.iceberg.exceptions.NamespaceNotEmptyException; import org.apache.iceberg.exceptions.NoSuchNamespaceException; import org.apache.iceberg.exceptions.NoSuchTableException; +import org.apache.iceberg.relocated.com.google.common.base.Joiner; +import org.apache.iceberg.relocated.com.google.common.base.Preconditions; +import org.apache.iceberg.relocated.com.google.common.collect.ImmutableList; +import org.apache.iceberg.relocated.com.google.common.collect.Maps; import org.apache.thrift.TException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/hive/src/main/java/org/apache/iceberg/hive/HiveTableOperations.java b/hive/src/main/java/org/apache/iceberg/hive/HiveTableOperations.java index 0823184117cf..d47b0af8b9d5 100644 --- a/hive/src/main/java/org/apache/iceberg/hive/HiveTableOperations.java +++ b/hive/src/main/java/org/apache/iceberg/hive/HiveTableOperations.java @@ -19,8 +19,6 @@ package org.apache.iceberg.hive; -import com.google.common.collect.ImmutableMap; -import com.google.common.collect.Lists; import java.net.InetAddress; import java.net.UnknownHostException; import java.util.Collections; @@ -56,6 +54,8 @@ import org.apache.iceberg.exceptions.NoSuchTableException; import org.apache.iceberg.hadoop.HadoopFileIO; import org.apache.iceberg.io.FileIO; +import org.apache.iceberg.relocated.com.google.common.collect.ImmutableMap; +import org.apache.iceberg.relocated.com.google.common.collect.Lists; import org.apache.thrift.TException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/hive/src/test/java/org/apache/iceberg/hive/HiveCreateReplaceTableTest.java b/hive/src/test/java/org/apache/iceberg/hive/HiveCreateReplaceTableTest.java index c8406a3bd774..bb3fb828b735 100644 --- a/hive/src/test/java/org/apache/iceberg/hive/HiveCreateReplaceTableTest.java +++ b/hive/src/test/java/org/apache/iceberg/hive/HiveCreateReplaceTableTest.java @@ -19,8 +19,6 @@ package org.apache.iceberg.hive; -import com.google.common.collect.Iterables; -import com.google.common.collect.Maps; import java.io.IOException; import org.apache.iceberg.AppendFiles; import org.apache.iceberg.AssertHelpers; @@ -34,6 +32,8 @@ import org.apache.iceberg.catalog.TableIdentifier; import org.apache.iceberg.exceptions.AlreadyExistsException; import org.apache.iceberg.exceptions.NoSuchTableException; +import org.apache.iceberg.relocated.com.google.common.collect.Iterables; +import org.apache.iceberg.relocated.com.google.common.collect.Maps; import org.apache.iceberg.types.Types; import org.junit.After; import org.junit.Assert; diff --git a/hive/src/test/java/org/apache/iceberg/hive/HiveTableTest.java b/hive/src/test/java/org/apache/iceberg/hive/HiveTableTest.java index 3138ea9a3ea6..3adc5619b750 100644 --- a/hive/src/test/java/org/apache/iceberg/hive/HiveTableTest.java +++ b/hive/src/test/java/org/apache/iceberg/hive/HiveTableTest.java @@ -19,7 +19,6 @@ package org.apache.iceberg.hive; -import com.google.common.collect.Lists; import java.io.File; import java.io.IOException; import java.util.List; @@ -39,6 +38,7 @@ import org.apache.iceberg.catalog.TableIdentifier; import org.apache.iceberg.exceptions.CommitFailedException; import org.apache.iceberg.io.FileAppender; +import org.apache.iceberg.relocated.com.google.common.collect.Lists; import org.apache.iceberg.types.Types; import org.apache.thrift.TException; import org.junit.Assert; diff --git a/hive/src/test/java/org/apache/iceberg/hive/TestHiveCatalog.java b/hive/src/test/java/org/apache/iceberg/hive/TestHiveCatalog.java index 744295c1a1df..7a04094a5293 100644 --- a/hive/src/test/java/org/apache/iceberg/hive/TestHiveCatalog.java +++ b/hive/src/test/java/org/apache/iceberg/hive/TestHiveCatalog.java @@ -19,8 +19,6 @@ package org.apache.iceberg.hive; -import com.google.common.collect.ImmutableMap; -import com.google.common.collect.ImmutableSet; import java.util.List; import java.util.Map; import java.util.UUID; @@ -32,6 +30,8 @@ import org.apache.iceberg.exceptions.AlreadyExistsException; import org.apache.iceberg.exceptions.NamespaceNotEmptyException; import org.apache.iceberg.exceptions.NoSuchNamespaceException; +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.Types; import org.apache.thrift.TException; import org.junit.Assert; diff --git a/hive/src/test/java/org/apache/iceberg/hive/TestHiveTableConcurrency.java b/hive/src/test/java/org/apache/iceberg/hive/TestHiveTableConcurrency.java index 7d81a01e029b..88a70f8ae36d 100644 --- a/hive/src/test/java/org/apache/iceberg/hive/TestHiveTableConcurrency.java +++ b/hive/src/test/java/org/apache/iceberg/hive/TestHiveTableConcurrency.java @@ -19,8 +19,6 @@ package org.apache.iceberg.hive; -import com.google.common.collect.Iterables; -import com.google.common.util.concurrent.MoreExecutors; import java.util.UUID; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; @@ -31,6 +29,8 @@ import org.apache.iceberg.DataFiles; import org.apache.iceberg.FileFormat; import org.apache.iceberg.Table; +import org.apache.iceberg.relocated.com.google.common.collect.Iterables; +import org.apache.iceberg.relocated.com.google.common.util.concurrent.MoreExecutors; import org.apache.iceberg.util.Tasks; import org.junit.Assert; import org.junit.Test; diff --git a/orc/src/main/java/org/apache/iceberg/orc/ORC.java b/orc/src/main/java/org/apache/iceberg/orc/ORC.java index 7236a3c7a9cf..9bb422989359 100644 --- a/orc/src/main/java/org/apache/iceberg/orc/ORC.java +++ b/orc/src/main/java/org/apache/iceberg/orc/ORC.java @@ -19,7 +19,6 @@ package org.apache.iceberg.orc; -import com.google.common.base.Preconditions; import java.io.IOException; import java.nio.charset.StandardCharsets; import java.util.HashMap; @@ -35,6 +34,7 @@ import org.apache.iceberg.io.FileAppender; import org.apache.iceberg.io.InputFile; import org.apache.iceberg.io.OutputFile; +import org.apache.iceberg.relocated.com.google.common.base.Preconditions; import org.apache.orc.OrcConf; import org.apache.orc.OrcFile; import org.apache.orc.OrcFile.ReaderOptions; diff --git a/orc/src/main/java/org/apache/iceberg/orc/OrcFileAppender.java b/orc/src/main/java/org/apache/iceberg/orc/OrcFileAppender.java index 78c8acf23512..4e961bb0d972 100644 --- a/orc/src/main/java/org/apache/iceberg/orc/OrcFileAppender.java +++ b/orc/src/main/java/org/apache/iceberg/orc/OrcFileAppender.java @@ -19,8 +19,6 @@ package org.apache.iceberg.orc; -import com.google.common.base.Preconditions; -import com.google.common.collect.Lists; import java.io.IOException; import java.nio.ByteBuffer; import java.util.Collections; @@ -35,6 +33,8 @@ import org.apache.iceberg.hadoop.HadoopOutputFile; import org.apache.iceberg.io.FileAppender; import org.apache.iceberg.io.OutputFile; +import org.apache.iceberg.relocated.com.google.common.base.Preconditions; +import org.apache.iceberg.relocated.com.google.common.collect.Lists; import org.apache.orc.OrcFile; import org.apache.orc.Reader; import org.apache.orc.StripeInformation; diff --git a/parquet/src/main/java/org/apache/iceberg/parquet/BasePageIterator.java b/parquet/src/main/java/org/apache/iceberg/parquet/BasePageIterator.java index fd1ccf51dce4..cf79418ed866 100644 --- a/parquet/src/main/java/org/apache/iceberg/parquet/BasePageIterator.java +++ b/parquet/src/main/java/org/apache/iceberg/parquet/BasePageIterator.java @@ -19,8 +19,8 @@ package org.apache.iceberg.parquet; -import com.google.common.base.Preconditions; import java.io.IOException; +import org.apache.iceberg.relocated.com.google.common.base.Preconditions; import org.apache.parquet.bytes.ByteBufferInputStream; import org.apache.parquet.bytes.BytesInput; import org.apache.parquet.bytes.BytesUtils; diff --git a/parquet/src/main/java/org/apache/iceberg/parquet/MessageTypeToType.java b/parquet/src/main/java/org/apache/iceberg/parquet/MessageTypeToType.java index ffdbc17218d7..2a58b6d9ab92 100644 --- a/parquet/src/main/java/org/apache/iceberg/parquet/MessageTypeToType.java +++ b/parquet/src/main/java/org/apache/iceberg/parquet/MessageTypeToType.java @@ -19,12 +19,12 @@ package org.apache.iceberg.parquet; -import com.google.common.base.Joiner; -import com.google.common.base.Preconditions; -import com.google.common.collect.Lists; -import com.google.common.collect.Maps; import java.util.List; import java.util.Map; +import org.apache.iceberg.relocated.com.google.common.base.Joiner; +import org.apache.iceberg.relocated.com.google.common.base.Preconditions; +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.Types; import org.apache.parquet.schema.DecimalMetadata; diff --git a/parquet/src/main/java/org/apache/iceberg/parquet/PageIterator.java b/parquet/src/main/java/org/apache/iceberg/parquet/PageIterator.java index 0c1297b38aed..e34db05e47d0 100644 --- a/parquet/src/main/java/org/apache/iceberg/parquet/PageIterator.java +++ b/parquet/src/main/java/org/apache/iceberg/parquet/PageIterator.java @@ -19,8 +19,8 @@ package org.apache.iceberg.parquet; -import com.google.common.base.Preconditions; import java.io.IOException; +import org.apache.iceberg.relocated.com.google.common.base.Preconditions; import org.apache.parquet.CorruptDeltaByteArrays; import org.apache.parquet.bytes.ByteBufferInputStream; import org.apache.parquet.column.ColumnDescriptor; diff --git a/parquet/src/main/java/org/apache/iceberg/parquet/ParquetAvro.java b/parquet/src/main/java/org/apache/iceberg/parquet/ParquetAvro.java index a417c485ba67..669269a2a99f 100644 --- a/parquet/src/main/java/org/apache/iceberg/parquet/ParquetAvro.java +++ b/parquet/src/main/java/org/apache/iceberg/parquet/ParquetAvro.java @@ -19,8 +19,6 @@ package org.apache.iceberg.parquet; -import com.google.common.base.Preconditions; -import com.google.common.collect.Lists; import java.math.BigDecimal; import java.util.List; import java.util.Map; @@ -34,6 +32,8 @@ import org.apache.avro.specific.SpecificData; import org.apache.iceberg.avro.AvroSchemaVisitor; import org.apache.iceberg.avro.UUIDConversion; +import org.apache.iceberg.relocated.com.google.common.base.Preconditions; +import org.apache.iceberg.relocated.com.google.common.collect.Lists; import org.apache.iceberg.types.TypeUtil; class ParquetAvro { diff --git a/parquet/src/main/java/org/apache/iceberg/parquet/ParquetAvroValueReaders.java b/parquet/src/main/java/org/apache/iceberg/parquet/ParquetAvroValueReaders.java index 6a2727456609..cb25f2caa6fb 100644 --- a/parquet/src/main/java/org/apache/iceberg/parquet/ParquetAvroValueReaders.java +++ b/parquet/src/main/java/org/apache/iceberg/parquet/ParquetAvroValueReaders.java @@ -19,9 +19,6 @@ package org.apache.iceberg.parquet; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.Lists; -import com.google.common.collect.Maps; import java.math.BigDecimal; import java.math.BigInteger; import java.nio.ByteBuffer; @@ -43,6 +40,9 @@ import org.apache.iceberg.parquet.ParquetValueReaders.MapReader; import org.apache.iceberg.parquet.ParquetValueReaders.StructReader; import org.apache.iceberg.parquet.ParquetValueReaders.UnboxedReader; +import org.apache.iceberg.relocated.com.google.common.collect.ImmutableList; +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.TypeID; import org.apache.iceberg.types.Types; import org.apache.parquet.column.ColumnDescriptor; diff --git a/parquet/src/main/java/org/apache/iceberg/parquet/ParquetAvroWriter.java b/parquet/src/main/java/org/apache/iceberg/parquet/ParquetAvroWriter.java index a900669cd09a..912b2dc38473 100644 --- a/parquet/src/main/java/org/apache/iceberg/parquet/ParquetAvroWriter.java +++ b/parquet/src/main/java/org/apache/iceberg/parquet/ParquetAvroWriter.java @@ -19,12 +19,12 @@ package org.apache.iceberg.parquet; -import com.google.common.collect.Lists; import java.util.List; import org.apache.avro.generic.GenericData.Fixed; import org.apache.avro.generic.IndexedRecord; import org.apache.iceberg.parquet.ParquetValueWriters.PrimitiveWriter; import org.apache.iceberg.parquet.ParquetValueWriters.StructWriter; +import org.apache.iceberg.relocated.com.google.common.collect.Lists; import org.apache.parquet.column.ColumnDescriptor; import org.apache.parquet.io.api.Binary; import org.apache.parquet.schema.DecimalMetadata; diff --git a/parquet/src/main/java/org/apache/iceberg/parquet/ParquetDictionaryRowGroupFilter.java b/parquet/src/main/java/org/apache/iceberg/parquet/ParquetDictionaryRowGroupFilter.java index 6dc1f6de47a3..351fb69512d3 100644 --- a/parquet/src/main/java/org/apache/iceberg/parquet/ParquetDictionaryRowGroupFilter.java +++ b/parquet/src/main/java/org/apache/iceberg/parquet/ParquetDictionaryRowGroupFilter.java @@ -19,9 +19,6 @@ package org.apache.iceberg.parquet; -import com.google.common.base.Preconditions; -import com.google.common.collect.Maps; -import com.google.common.collect.Sets; import java.io.IOException; import java.util.Comparator; import java.util.Map; @@ -36,6 +33,9 @@ import org.apache.iceberg.expressions.ExpressionVisitors.BoundExpressionVisitor; import org.apache.iceberg.expressions.Expressions; import org.apache.iceberg.expressions.Literal; +import org.apache.iceberg.relocated.com.google.common.base.Preconditions; +import org.apache.iceberg.relocated.com.google.common.collect.Maps; +import org.apache.iceberg.relocated.com.google.common.collect.Sets; import org.apache.iceberg.types.Types.StructType; import org.apache.parquet.column.ColumnDescriptor; import org.apache.parquet.column.Dictionary; diff --git a/parquet/src/main/java/org/apache/iceberg/parquet/ParquetMetricsRowGroupFilter.java b/parquet/src/main/java/org/apache/iceberg/parquet/ParquetMetricsRowGroupFilter.java index 2d072222cfbc..3fdf905cb9a9 100644 --- a/parquet/src/main/java/org/apache/iceberg/parquet/ParquetMetricsRowGroupFilter.java +++ b/parquet/src/main/java/org/apache/iceberg/parquet/ParquetMetricsRowGroupFilter.java @@ -19,7 +19,6 @@ package org.apache.iceberg.parquet; -import com.google.common.collect.Maps; import java.nio.ByteBuffer; import java.util.Collection; import java.util.Comparator; @@ -35,6 +34,7 @@ import org.apache.iceberg.expressions.ExpressionVisitors.BoundExpressionVisitor; import org.apache.iceberg.expressions.Expressions; import org.apache.iceberg.expressions.Literal; +import org.apache.iceberg.relocated.com.google.common.collect.Maps; import org.apache.iceberg.types.Comparators; import org.apache.iceberg.types.Type; import org.apache.iceberg.types.Types.StructType; diff --git a/parquet/src/main/java/org/apache/iceberg/parquet/ParquetReadSupport.java b/parquet/src/main/java/org/apache/iceberg/parquet/ParquetReadSupport.java index 9588676cce20..bedc91a10b58 100644 --- a/parquet/src/main/java/org/apache/iceberg/parquet/ParquetReadSupport.java +++ b/parquet/src/main/java/org/apache/iceberg/parquet/ParquetReadSupport.java @@ -19,13 +19,13 @@ package org.apache.iceberg.parquet; -import com.google.common.collect.ImmutableMap; -import com.google.common.collect.Sets; import java.util.Map; import java.util.Set; import org.apache.hadoop.conf.Configuration; import org.apache.iceberg.Schema; import org.apache.iceberg.avro.AvroSchemaUtil; +import org.apache.iceberg.relocated.com.google.common.collect.ImmutableMap; +import org.apache.iceberg.relocated.com.google.common.collect.Sets; import org.apache.parquet.avro.AvroReadSupport; import org.apache.parquet.hadoop.api.InitContext; import org.apache.parquet.hadoop.api.ReadSupport; diff --git a/parquet/src/main/java/org/apache/iceberg/parquet/ParquetSchemaUtil.java b/parquet/src/main/java/org/apache/iceberg/parquet/ParquetSchemaUtil.java index 421020235653..86dcf6bd95e3 100644 --- a/parquet/src/main/java/org/apache/iceberg/parquet/ParquetSchemaUtil.java +++ b/parquet/src/main/java/org/apache/iceberg/parquet/ParquetSchemaUtil.java @@ -19,9 +19,9 @@ package org.apache.iceberg.parquet; -import com.google.common.collect.Sets; import java.util.Set; import org.apache.iceberg.Schema; +import org.apache.iceberg.relocated.com.google.common.collect.Sets; import org.apache.iceberg.types.TypeUtil; import org.apache.iceberg.types.Types; import org.apache.parquet.schema.MessageType; diff --git a/parquet/src/main/java/org/apache/iceberg/parquet/ParquetTypeVisitor.java b/parquet/src/main/java/org/apache/iceberg/parquet/ParquetTypeVisitor.java index 6b68c84edb7e..4b87f96dad58 100644 --- a/parquet/src/main/java/org/apache/iceberg/parquet/ParquetTypeVisitor.java +++ b/parquet/src/main/java/org/apache/iceberg/parquet/ParquetTypeVisitor.java @@ -19,10 +19,10 @@ package org.apache.iceberg.parquet; -import com.google.common.base.Preconditions; -import com.google.common.collect.Lists; import java.util.Deque; import java.util.List; +import org.apache.iceberg.relocated.com.google.common.base.Preconditions; +import org.apache.iceberg.relocated.com.google.common.collect.Lists; import org.apache.parquet.schema.GroupType; import org.apache.parquet.schema.MessageType; import org.apache.parquet.schema.OriginalType; diff --git a/parquet/src/main/java/org/apache/iceberg/parquet/ParquetUtil.java b/parquet/src/main/java/org/apache/iceberg/parquet/ParquetUtil.java index 09726a523f19..f92230c6eb1f 100644 --- a/parquet/src/main/java/org/apache/iceberg/parquet/ParquetUtil.java +++ b/parquet/src/main/java/org/apache/iceberg/parquet/ParquetUtil.java @@ -19,8 +19,6 @@ package org.apache.iceberg.parquet; -import com.google.common.collect.Maps; -import com.google.common.collect.Sets; import java.io.IOException; import java.nio.ByteBuffer; import java.util.ArrayList; @@ -38,6 +36,8 @@ import org.apache.iceberg.exceptions.RuntimeIOException; import org.apache.iceberg.expressions.Literal; import org.apache.iceberg.io.InputFile; +import org.apache.iceberg.relocated.com.google.common.collect.Maps; +import org.apache.iceberg.relocated.com.google.common.collect.Sets; import org.apache.iceberg.types.Conversions; import org.apache.iceberg.types.Type; import org.apache.iceberg.types.Types; 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 aa7f5726f08e..55bf925e0581 100644 --- a/parquet/src/main/java/org/apache/iceberg/parquet/ParquetValueReaders.java +++ b/parquet/src/main/java/org/apache/iceberg/parquet/ParquetValueReaders.java @@ -19,9 +19,6 @@ package org.apache.iceberg.parquet; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.Lists; -import com.google.common.collect.Maps; import java.lang.reflect.Array; import java.math.BigDecimal; import java.math.BigInteger; @@ -29,6 +26,9 @@ import java.util.Iterator; import java.util.List; import java.util.Map; +import org.apache.iceberg.relocated.com.google.common.collect.ImmutableList; +import org.apache.iceberg.relocated.com.google.common.collect.Lists; +import org.apache.iceberg.relocated.com.google.common.collect.Maps; import org.apache.parquet.column.ColumnDescriptor; import org.apache.parquet.column.page.PageReadStore; import org.apache.parquet.io.api.Binary; diff --git a/parquet/src/main/java/org/apache/iceberg/parquet/ParquetValueWriters.java b/parquet/src/main/java/org/apache/iceberg/parquet/ParquetValueWriters.java index 18f1410e7ed9..761bd7d51da4 100644 --- a/parquet/src/main/java/org/apache/iceberg/parquet/ParquetValueWriters.java +++ b/parquet/src/main/java/org/apache/iceberg/parquet/ParquetValueWriters.java @@ -19,8 +19,6 @@ package org.apache.iceberg.parquet; -import com.google.common.base.Preconditions; -import com.google.common.collect.ImmutableList; import java.lang.reflect.Array; import java.math.BigDecimal; import java.nio.ByteBuffer; @@ -29,6 +27,8 @@ import java.util.List; import java.util.Map; import org.apache.avro.util.Utf8; +import org.apache.iceberg.relocated.com.google.common.base.Preconditions; +import org.apache.iceberg.relocated.com.google.common.collect.ImmutableList; import org.apache.iceberg.types.TypeUtil; import org.apache.parquet.column.ColumnDescriptor; import org.apache.parquet.column.ColumnWriteStore; diff --git a/parquet/src/main/java/org/apache/iceberg/parquet/ParquetWriteAdapter.java b/parquet/src/main/java/org/apache/iceberg/parquet/ParquetWriteAdapter.java index 463fb9a80497..703a833f1b57 100644 --- a/parquet/src/main/java/org/apache/iceberg/parquet/ParquetWriteAdapter.java +++ b/parquet/src/main/java/org/apache/iceberg/parquet/ParquetWriteAdapter.java @@ -19,13 +19,13 @@ package org.apache.iceberg.parquet; -import com.google.common.base.Preconditions; import java.io.IOException; import java.util.List; import org.apache.iceberg.Metrics; import org.apache.iceberg.MetricsConfig; import org.apache.iceberg.exceptions.RuntimeIOException; import org.apache.iceberg.io.FileAppender; +import org.apache.iceberg.relocated.com.google.common.base.Preconditions; import org.apache.parquet.hadoop.ParquetWriter; import org.apache.parquet.hadoop.metadata.ParquetMetadata; diff --git a/parquet/src/main/java/org/apache/iceberg/parquet/ParquetWriteSupport.java b/parquet/src/main/java/org/apache/iceberg/parquet/ParquetWriteSupport.java index 633f9f80cecc..2990bd11356a 100644 --- a/parquet/src/main/java/org/apache/iceberg/parquet/ParquetWriteSupport.java +++ b/parquet/src/main/java/org/apache/iceberg/parquet/ParquetWriteSupport.java @@ -19,9 +19,9 @@ package org.apache.iceberg.parquet; -import com.google.common.collect.ImmutableMap; import java.util.Map; import org.apache.hadoop.conf.Configuration; +import org.apache.iceberg.relocated.com.google.common.collect.ImmutableMap; import org.apache.parquet.hadoop.api.WriteSupport; import org.apache.parquet.io.api.RecordConsumer; import org.apache.parquet.schema.MessageType; diff --git a/parquet/src/main/java/org/apache/iceberg/parquet/ParquetWriter.java b/parquet/src/main/java/org/apache/iceberg/parquet/ParquetWriter.java index 18d6ad6ac62f..071b2e623d01 100644 --- a/parquet/src/main/java/org/apache/iceberg/parquet/ParquetWriter.java +++ b/parquet/src/main/java/org/apache/iceberg/parquet/ParquetWriter.java @@ -19,7 +19,6 @@ package org.apache.iceberg.parquet; -import com.google.common.collect.ImmutableMap; import java.io.Closeable; import java.io.IOException; import java.util.List; @@ -34,6 +33,7 @@ import org.apache.iceberg.exceptions.RuntimeIOException; import org.apache.iceberg.io.FileAppender; import org.apache.iceberg.io.OutputFile; +import org.apache.iceberg.relocated.com.google.common.collect.ImmutableMap; import org.apache.parquet.bytes.ByteBufferAllocator; import org.apache.parquet.column.ColumnWriteStore; import org.apache.parquet.column.ParquetProperties; diff --git a/parquet/src/main/java/org/apache/iceberg/parquet/PruneColumns.java b/parquet/src/main/java/org/apache/iceberg/parquet/PruneColumns.java index 43e06aef79cf..bd5db4016e92 100644 --- a/parquet/src/main/java/org/apache/iceberg/parquet/PruneColumns.java +++ b/parquet/src/main/java/org/apache/iceberg/parquet/PruneColumns.java @@ -19,10 +19,10 @@ package org.apache.iceberg.parquet; -import com.google.common.base.Preconditions; -import com.google.common.collect.Lists; import java.util.List; import java.util.Set; +import org.apache.iceberg.relocated.com.google.common.base.Preconditions; +import org.apache.iceberg.relocated.com.google.common.collect.Lists; import org.apache.parquet.schema.GroupType; import org.apache.parquet.schema.MessageType; import org.apache.parquet.schema.PrimitiveType; diff --git a/parquet/src/main/java/org/apache/iceberg/parquet/ReadConf.java b/parquet/src/main/java/org/apache/iceberg/parquet/ReadConf.java index 51a19d4a2b9c..e25730ba3871 100644 --- a/parquet/src/main/java/org/apache/iceberg/parquet/ReadConf.java +++ b/parquet/src/main/java/org/apache/iceberg/parquet/ReadConf.java @@ -19,8 +19,6 @@ package org.apache.iceberg.parquet; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableMap; import java.io.IOException; import java.util.List; import java.util.Map; @@ -32,6 +30,8 @@ import org.apache.iceberg.exceptions.RuntimeIOException; import org.apache.iceberg.expressions.Expression; import org.apache.iceberg.io.InputFile; +import org.apache.iceberg.relocated.com.google.common.collect.ImmutableList; +import org.apache.iceberg.relocated.com.google.common.collect.ImmutableMap; import org.apache.parquet.ParquetReadOptions; import org.apache.parquet.hadoop.ParquetFileReader; import org.apache.parquet.hadoop.metadata.BlockMetaData; diff --git a/parquet/src/main/java/org/apache/iceberg/parquet/TypeWithSchemaVisitor.java b/parquet/src/main/java/org/apache/iceberg/parquet/TypeWithSchemaVisitor.java index a13705db9a22..6dd76d722074 100644 --- a/parquet/src/main/java/org/apache/iceberg/parquet/TypeWithSchemaVisitor.java +++ b/parquet/src/main/java/org/apache/iceberg/parquet/TypeWithSchemaVisitor.java @@ -19,10 +19,10 @@ package org.apache.iceberg.parquet; -import com.google.common.base.Preconditions; -import com.google.common.collect.Lists; import java.util.LinkedList; import java.util.List; +import org.apache.iceberg.relocated.com.google.common.base.Preconditions; +import org.apache.iceberg.relocated.com.google.common.collect.Lists; import org.apache.iceberg.types.Types; import org.apache.parquet.schema.GroupType; import org.apache.parquet.schema.MessageType; diff --git a/parquet/src/main/java/org/apache/iceberg/parquet/ValuesAsBytesReader.java b/parquet/src/main/java/org/apache/iceberg/parquet/ValuesAsBytesReader.java index 1bc859f6a4fa..53a4f1f401ff 100644 --- a/parquet/src/main/java/org/apache/iceberg/parquet/ValuesAsBytesReader.java +++ b/parquet/src/main/java/org/apache/iceberg/parquet/ValuesAsBytesReader.java @@ -115,4 +115,3 @@ private byte getByte() { } } } - diff --git a/parquet/src/main/java/org/apache/iceberg/parquet/VectorizedReader.java b/parquet/src/main/java/org/apache/iceberg/parquet/VectorizedReader.java index 63a43baaa853..3eb3303d4eef 100644 --- a/parquet/src/main/java/org/apache/iceberg/parquet/VectorizedReader.java +++ b/parquet/src/main/java/org/apache/iceberg/parquet/VectorizedReader.java @@ -53,4 +53,3 @@ public interface VectorizedReader { */ void close(); } - diff --git a/parquet/src/test/java/org/apache/iceberg/avro/TestParquetReadProjection.java b/parquet/src/test/java/org/apache/iceberg/avro/TestParquetReadProjection.java index 113c3177b05f..d9ab284d264c 100644 --- a/parquet/src/test/java/org/apache/iceberg/avro/TestParquetReadProjection.java +++ b/parquet/src/test/java/org/apache/iceberg/avro/TestParquetReadProjection.java @@ -19,7 +19,6 @@ package org.apache.iceberg.avro; -import com.google.common.collect.Iterables; import java.io.File; import java.io.IOException; import org.apache.avro.generic.GenericData; @@ -27,6 +26,7 @@ import org.apache.iceberg.Schema; import org.apache.iceberg.io.FileAppender; import org.apache.iceberg.parquet.Parquet; +import org.apache.iceberg.relocated.com.google.common.collect.Iterables; public class TestParquetReadProjection extends TestReadProjection { @Override diff --git a/parquet/src/test/java/org/apache/iceberg/avro/TestReadProjection.java b/parquet/src/test/java/org/apache/iceberg/avro/TestReadProjection.java index b0d18d0ce910..9243a809ff1e 100644 --- a/parquet/src/test/java/org/apache/iceberg/avro/TestReadProjection.java +++ b/parquet/src/test/java/org/apache/iceberg/avro/TestReadProjection.java @@ -19,15 +19,15 @@ package org.apache.iceberg.avro; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableMap; -import com.google.common.collect.Maps; -import com.google.common.collect.Sets; import java.io.IOException; import java.util.List; import java.util.Map; import org.apache.avro.generic.GenericData.Record; import org.apache.iceberg.Schema; +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.Maps; +import org.apache.iceberg.relocated.com.google.common.collect.Sets; import org.apache.iceberg.types.Comparators; import org.apache.iceberg.types.Types; import org.junit.Assert; diff --git a/parquet/src/test/java/org/apache/iceberg/parquet/ParquetWritingTestUtils.java b/parquet/src/test/java/org/apache/iceberg/parquet/ParquetWritingTestUtils.java index 4f37ebe5cd0b..edf551ed9e52 100644 --- a/parquet/src/test/java/org/apache/iceberg/parquet/ParquetWritingTestUtils.java +++ b/parquet/src/test/java/org/apache/iceberg/parquet/ParquetWritingTestUtils.java @@ -19,7 +19,6 @@ package org.apache.iceberg.parquet; -import com.google.common.collect.Lists; import java.io.File; import java.io.IOException; import java.util.Collections; @@ -30,6 +29,7 @@ import org.apache.iceberg.FileFormat; import org.apache.iceberg.Schema; import org.apache.iceberg.io.FileAppender; +import org.apache.iceberg.relocated.com.google.common.collect.Lists; import org.apache.parquet.schema.MessageType; import org.junit.rules.TemporaryFolder; diff --git a/parquet/src/test/java/org/apache/iceberg/parquet/TestParquet.java b/parquet/src/test/java/org/apache/iceberg/parquet/TestParquet.java index f5433eaa160c..d9d5eb0af93c 100644 --- a/parquet/src/test/java/org/apache/iceberg/parquet/TestParquet.java +++ b/parquet/src/test/java/org/apache/iceberg/parquet/TestParquet.java @@ -19,7 +19,6 @@ package org.apache.iceberg.parquet; -import com.google.common.collect.ImmutableMap; import java.io.File; import java.io.IOException; import java.util.ArrayList; @@ -28,6 +27,7 @@ import org.apache.avro.generic.GenericData; import org.apache.iceberg.Schema; import org.apache.iceberg.avro.AvroSchemaUtil; +import org.apache.iceberg.relocated.com.google.common.collect.ImmutableMap; import org.apache.iceberg.types.Types.IntegerType; import org.apache.parquet.hadoop.ParquetFileReader; import org.apache.parquet.schema.MessageType; diff --git a/pig/src/main/java/org/apache/iceberg/pig/IcebergPigInputFormat.java b/pig/src/main/java/org/apache/iceberg/pig/IcebergPigInputFormat.java index ef12cac53a83..ddefa1f7a648 100644 --- a/pig/src/main/java/org/apache/iceberg/pig/IcebergPigInputFormat.java +++ b/pig/src/main/java/org/apache/iceberg/pig/IcebergPigInputFormat.java @@ -19,8 +19,6 @@ package org.apache.iceberg.pig; -import com.google.common.collect.Lists; -import com.google.common.collect.Maps; import java.io.DataInput; import java.io.DataOutput; import java.io.IOException; @@ -48,6 +46,8 @@ import org.apache.iceberg.io.CloseableIterable; import org.apache.iceberg.io.InputFile; import org.apache.iceberg.parquet.Parquet; +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/pig/src/main/java/org/apache/iceberg/pig/IcebergStorage.java b/pig/src/main/java/org/apache/iceberg/pig/IcebergStorage.java index d27c5769d142..6a41f8fe0248 100644 --- a/pig/src/main/java/org/apache/iceberg/pig/IcebergStorage.java +++ b/pig/src/main/java/org/apache/iceberg/pig/IcebergStorage.java @@ -19,9 +19,6 @@ package org.apache.iceberg.pig; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.Lists; -import com.google.common.collect.Maps; import java.io.IOException; import java.io.Serializable; import java.util.Collections; @@ -41,6 +38,9 @@ import org.apache.iceberg.expressions.Expressions; import org.apache.iceberg.hadoop.HadoopTables; import org.apache.iceberg.pig.IcebergPigInputFormat.IcebergRecordReader; +import org.apache.iceberg.relocated.com.google.common.collect.ImmutableList; +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.pig.Expression; import org.apache.pig.Expression.BetweenExpression; diff --git a/pig/src/main/java/org/apache/iceberg/pig/PigParquetReader.java b/pig/src/main/java/org/apache/iceberg/pig/PigParquetReader.java index fd9e9ac2dfe4..c90c8a910b16 100644 --- a/pig/src/main/java/org/apache/iceberg/pig/PigParquetReader.java +++ b/pig/src/main/java/org/apache/iceberg/pig/PigParquetReader.java @@ -19,9 +19,6 @@ package org.apache.iceberg.pig; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.Lists; -import com.google.common.collect.Maps; import java.time.Instant; import java.time.OffsetDateTime; import java.time.ZoneOffset; @@ -46,6 +43,9 @@ import org.apache.iceberg.parquet.ParquetValueReaders.StructReader; import org.apache.iceberg.parquet.ParquetValueReaders.UnboxedReader; import org.apache.iceberg.parquet.TypeWithSchemaVisitor; +import org.apache.iceberg.relocated.com.google.common.collect.ImmutableList; +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.TypeID; import org.apache.iceberg.types.Types; import org.apache.parquet.column.ColumnDescriptor; diff --git a/pig/src/main/java/org/apache/iceberg/pig/SchemaUtil.java b/pig/src/main/java/org/apache/iceberg/pig/SchemaUtil.java index 3e3abd360e86..7bdbf4edd960 100644 --- a/pig/src/main/java/org/apache/iceberg/pig/SchemaUtil.java +++ b/pig/src/main/java/org/apache/iceberg/pig/SchemaUtil.java @@ -19,10 +19,10 @@ package org.apache.iceberg.pig; -import com.google.common.collect.Lists; import java.io.IOException; import java.util.List; import org.apache.iceberg.Schema; +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.pig.ResourceSchema; diff --git a/spark/src/jmh/java/org/apache/iceberg/spark/SparkBenchmarkUtil.java b/spark/src/jmh/java/org/apache/iceberg/spark/SparkBenchmarkUtil.java index 6399bc7e5899..3f9c325eef14 100644 --- a/spark/src/jmh/java/org/apache/iceberg/spark/SparkBenchmarkUtil.java +++ b/spark/src/jmh/java/org/apache/iceberg/spark/SparkBenchmarkUtil.java @@ -19,9 +19,9 @@ package org.apache.iceberg.spark; -import com.google.common.collect.Lists; import java.util.List; import org.apache.iceberg.Schema; +import org.apache.iceberg.relocated.com.google.common.collect.Lists; import org.apache.iceberg.types.Types; import org.apache.spark.sql.catalyst.expressions.Attribute; import org.apache.spark.sql.catalyst.expressions.AttributeReference; diff --git a/spark/src/jmh/java/org/apache/iceberg/spark/data/parquet/SparkParquetReadersFlatDataBenchmark.java b/spark/src/jmh/java/org/apache/iceberg/spark/data/parquet/SparkParquetReadersFlatDataBenchmark.java index 92fbdee7d97e..a37876f48d15 100644 --- a/spark/src/jmh/java/org/apache/iceberg/spark/data/parquet/SparkParquetReadersFlatDataBenchmark.java +++ b/spark/src/jmh/java/org/apache/iceberg/spark/data/parquet/SparkParquetReadersFlatDataBenchmark.java @@ -19,7 +19,6 @@ package org.apache.iceberg.spark.data.parquet; -import com.google.common.collect.Iterables; import java.io.File; import java.io.IOException; import java.util.List; @@ -30,6 +29,7 @@ import org.apache.iceberg.io.CloseableIterable; import org.apache.iceberg.io.FileAppender; import org.apache.iceberg.parquet.Parquet; +import org.apache.iceberg.relocated.com.google.common.collect.Iterables; import org.apache.iceberg.spark.SparkBenchmarkUtil; import org.apache.iceberg.spark.SparkSchemaUtil; import org.apache.iceberg.spark.data.RandomData; diff --git a/spark/src/jmh/java/org/apache/iceberg/spark/data/parquet/SparkParquetReadersNestedDataBenchmark.java b/spark/src/jmh/java/org/apache/iceberg/spark/data/parquet/SparkParquetReadersNestedDataBenchmark.java index 199d884da1b0..3011d140b23d 100644 --- a/spark/src/jmh/java/org/apache/iceberg/spark/data/parquet/SparkParquetReadersNestedDataBenchmark.java +++ b/spark/src/jmh/java/org/apache/iceberg/spark/data/parquet/SparkParquetReadersNestedDataBenchmark.java @@ -19,7 +19,6 @@ package org.apache.iceberg.spark.data.parquet; -import com.google.common.collect.Iterables; import java.io.File; import java.io.IOException; import java.util.List; @@ -30,6 +29,7 @@ import org.apache.iceberg.io.CloseableIterable; import org.apache.iceberg.io.FileAppender; import org.apache.iceberg.parquet.Parquet; +import org.apache.iceberg.relocated.com.google.common.collect.Iterables; import org.apache.iceberg.spark.SparkBenchmarkUtil; import org.apache.iceberg.spark.SparkSchemaUtil; import org.apache.iceberg.spark.data.RandomData; diff --git a/spark/src/jmh/java/org/apache/iceberg/spark/source/IcebergSourceFlatDataBenchmark.java b/spark/src/jmh/java/org/apache/iceberg/spark/source/IcebergSourceFlatDataBenchmark.java index 9f9a07021e7f..9e206321a540 100644 --- a/spark/src/jmh/java/org/apache/iceberg/spark/source/IcebergSourceFlatDataBenchmark.java +++ b/spark/src/jmh/java/org/apache/iceberg/spark/source/IcebergSourceFlatDataBenchmark.java @@ -19,7 +19,6 @@ package org.apache.iceberg.spark.source; -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.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.types.Types; import static org.apache.iceberg.types.Types.NestedField.optional; diff --git a/spark/src/jmh/java/org/apache/iceberg/spark/source/IcebergSourceNestedDataBenchmark.java b/spark/src/jmh/java/org/apache/iceberg/spark/source/IcebergSourceNestedDataBenchmark.java index 16468a169852..5a0d9359ec6b 100644 --- a/spark/src/jmh/java/org/apache/iceberg/spark/source/IcebergSourceNestedDataBenchmark.java +++ b/spark/src/jmh/java/org/apache/iceberg/spark/source/IcebergSourceNestedDataBenchmark.java @@ -19,7 +19,6 @@ package org.apache.iceberg.spark.source; -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.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.types.Types; import static org.apache.iceberg.types.Types.NestedField.optional; diff --git a/spark/src/jmh/java/org/apache/iceberg/spark/source/avro/IcebergSourceFlatAvroDataReadBenchmark.java b/spark/src/jmh/java/org/apache/iceberg/spark/source/avro/IcebergSourceFlatAvroDataReadBenchmark.java index cbf744c11d7c..762218b021e6 100644 --- a/spark/src/jmh/java/org/apache/iceberg/spark/source/avro/IcebergSourceFlatAvroDataReadBenchmark.java +++ b/spark/src/jmh/java/org/apache/iceberg/spark/source/avro/IcebergSourceFlatAvroDataReadBenchmark.java @@ -19,9 +19,9 @@ package org.apache.iceberg.spark.source.avro; -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.IcebergSourceFlatDataBenchmark; import org.apache.spark.sql.Dataset; import org.apache.spark.sql.Row; diff --git a/spark/src/jmh/java/org/apache/iceberg/spark/source/avro/IcebergSourceNestedAvroDataReadBenchmark.java b/spark/src/jmh/java/org/apache/iceberg/spark/source/avro/IcebergSourceNestedAvroDataReadBenchmark.java index 0abfac3ee240..77016b25fd00 100644 --- a/spark/src/jmh/java/org/apache/iceberg/spark/source/avro/IcebergSourceNestedAvroDataReadBenchmark.java +++ b/spark/src/jmh/java/org/apache/iceberg/spark/source/avro/IcebergSourceNestedAvroDataReadBenchmark.java @@ -19,9 +19,9 @@ package org.apache.iceberg.spark.source.avro; -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/jmh/java/org/apache/iceberg/spark/source/parquet/IcebergSourceFlatParquetDataFilterBenchmark.java b/spark/src/jmh/java/org/apache/iceberg/spark/source/parquet/IcebergSourceFlatParquetDataFilterBenchmark.java index 1c9164593eaa..34bede0a6089 100644 --- a/spark/src/jmh/java/org/apache/iceberg/spark/source/parquet/IcebergSourceFlatParquetDataFilterBenchmark.java +++ b/spark/src/jmh/java/org/apache/iceberg/spark/source/parquet/IcebergSourceFlatParquetDataFilterBenchmark.java @@ -19,9 +19,9 @@ package org.apache.iceberg.spark.source.parquet; -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.IcebergSourceFlatDataBenchmark; import org.apache.spark.sql.Dataset; import org.apache.spark.sql.Row; diff --git a/spark/src/jmh/java/org/apache/iceberg/spark/source/parquet/IcebergSourceFlatParquetDataReadBenchmark.java b/spark/src/jmh/java/org/apache/iceberg/spark/source/parquet/IcebergSourceFlatParquetDataReadBenchmark.java index 37a63369981c..a980daad1f0d 100644 --- a/spark/src/jmh/java/org/apache/iceberg/spark/source/parquet/IcebergSourceFlatParquetDataReadBenchmark.java +++ b/spark/src/jmh/java/org/apache/iceberg/spark/source/parquet/IcebergSourceFlatParquetDataReadBenchmark.java @@ -19,9 +19,9 @@ package org.apache.iceberg.spark.source.parquet; -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.IcebergSourceFlatDataBenchmark; import org.apache.spark.sql.Dataset; import org.apache.spark.sql.Row; diff --git a/spark/src/jmh/java/org/apache/iceberg/spark/source/parquet/IcebergSourceFlatParquetDataWriteBenchmark.java b/spark/src/jmh/java/org/apache/iceberg/spark/source/parquet/IcebergSourceFlatParquetDataWriteBenchmark.java index ab62f53e7008..a4db9db25287 100644 --- a/spark/src/jmh/java/org/apache/iceberg/spark/source/parquet/IcebergSourceFlatParquetDataWriteBenchmark.java +++ b/spark/src/jmh/java/org/apache/iceberg/spark/source/parquet/IcebergSourceFlatParquetDataWriteBenchmark.java @@ -19,9 +19,9 @@ package org.apache.iceberg.spark.source.parquet; -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.IcebergSourceFlatDataBenchmark; import org.apache.spark.sql.Dataset; import org.apache.spark.sql.Row; diff --git a/spark/src/jmh/java/org/apache/iceberg/spark/source/parquet/IcebergSourceNestedParquetDataFilterBenchmark.java b/spark/src/jmh/java/org/apache/iceberg/spark/source/parquet/IcebergSourceNestedParquetDataFilterBenchmark.java index c12f3ee668a2..8cdb03c02f94 100644 --- a/spark/src/jmh/java/org/apache/iceberg/spark/source/parquet/IcebergSourceNestedParquetDataFilterBenchmark.java +++ b/spark/src/jmh/java/org/apache/iceberg/spark/source/parquet/IcebergSourceNestedParquetDataFilterBenchmark.java @@ -19,9 +19,9 @@ package org.apache.iceberg.spark.source.parquet; -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/jmh/java/org/apache/iceberg/spark/source/parquet/IcebergSourceNestedParquetDataReadBenchmark.java b/spark/src/jmh/java/org/apache/iceberg/spark/source/parquet/IcebergSourceNestedParquetDataReadBenchmark.java index acba2e5d330d..501ffa7a3bc4 100644 --- a/spark/src/jmh/java/org/apache/iceberg/spark/source/parquet/IcebergSourceNestedParquetDataReadBenchmark.java +++ b/spark/src/jmh/java/org/apache/iceberg/spark/source/parquet/IcebergSourceNestedParquetDataReadBenchmark.java @@ -19,9 +19,9 @@ package org.apache.iceberg.spark.source.parquet; -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/jmh/java/org/apache/iceberg/spark/source/parquet/IcebergSourceNestedParquetDataWriteBenchmark.java b/spark/src/jmh/java/org/apache/iceberg/spark/source/parquet/IcebergSourceNestedParquetDataWriteBenchmark.java index 0bd98610da99..20e4e9339e1e 100644 --- a/spark/src/jmh/java/org/apache/iceberg/spark/source/parquet/IcebergSourceNestedParquetDataWriteBenchmark.java +++ b/spark/src/jmh/java/org/apache/iceberg/spark/source/parquet/IcebergSourceNestedParquetDataWriteBenchmark.java @@ -19,9 +19,9 @@ package org.apache.iceberg.spark.source.parquet; -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/actions/BaseSnapshotUpdateAction.java b/spark/src/main/java/org/apache/iceberg/actions/BaseSnapshotUpdateAction.java index b9a8c949b1a6..fe5d41266875 100644 --- a/spark/src/main/java/org/apache/iceberg/actions/BaseSnapshotUpdateAction.java +++ b/spark/src/main/java/org/apache/iceberg/actions/BaseSnapshotUpdateAction.java @@ -19,9 +19,9 @@ package org.apache.iceberg.actions; -import com.google.common.collect.Maps; import java.util.Map; import org.apache.iceberg.SnapshotUpdate; +import org.apache.iceberg.relocated.com.google.common.collect.Maps; abstract class BaseSnapshotUpdateAction extends BaseAction implements SnapshotUpdateAction { diff --git a/spark/src/main/java/org/apache/iceberg/actions/RemoveOrphanFilesAction.java b/spark/src/main/java/org/apache/iceberg/actions/RemoveOrphanFilesAction.java index b782f0839bd2..7909c4302b46 100644 --- a/spark/src/main/java/org/apache/iceberg/actions/RemoveOrphanFilesAction.java +++ b/spark/src/main/java/org/apache/iceberg/actions/RemoveOrphanFilesAction.java @@ -19,7 +19,6 @@ package org.apache.iceberg.actions; -import com.google.common.collect.Lists; import java.io.IOException; import java.util.Iterator; import java.util.List; @@ -38,6 +37,7 @@ import org.apache.iceberg.TableOperations; import org.apache.iceberg.exceptions.RuntimeIOException; import org.apache.iceberg.hadoop.HiddenPathFilter; +import org.apache.iceberg.relocated.com.google.common.collect.Lists; import org.apache.iceberg.util.Tasks; import org.apache.spark.api.java.JavaRDD; import org.apache.spark.api.java.JavaSparkContext; diff --git a/spark/src/main/java/org/apache/iceberg/actions/RewriteManifestsAction.java b/spark/src/main/java/org/apache/iceberg/actions/RewriteManifestsAction.java index b726fde37836..fa9d377e8da7 100644 --- a/spark/src/main/java/org/apache/iceberg/actions/RewriteManifestsAction.java +++ b/spark/src/main/java/org/apache/iceberg/actions/RewriteManifestsAction.java @@ -19,10 +19,6 @@ package org.apache.iceberg.actions; -import com.google.common.base.Preconditions; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.Iterables; -import com.google.common.collect.Lists; import java.io.IOException; import java.util.Collections; import java.util.List; @@ -48,6 +44,10 @@ import org.apache.iceberg.hadoop.HadoopFileIO; import org.apache.iceberg.io.FileIO; import org.apache.iceberg.io.OutputFile; +import org.apache.iceberg.relocated.com.google.common.base.Preconditions; +import org.apache.iceberg.relocated.com.google.common.collect.ImmutableList; +import org.apache.iceberg.relocated.com.google.common.collect.Iterables; +import org.apache.iceberg.relocated.com.google.common.collect.Lists; import org.apache.iceberg.spark.SparkDataFile; import org.apache.iceberg.types.Types; import org.apache.iceberg.util.PropertyUtil; diff --git a/spark/src/main/java/org/apache/iceberg/actions/RewriteManifestsActionResult.java b/spark/src/main/java/org/apache/iceberg/actions/RewriteManifestsActionResult.java index b122450129d6..e6f1cd2645dc 100644 --- a/spark/src/main/java/org/apache/iceberg/actions/RewriteManifestsActionResult.java +++ b/spark/src/main/java/org/apache/iceberg/actions/RewriteManifestsActionResult.java @@ -19,9 +19,9 @@ package org.apache.iceberg.actions; -import com.google.common.collect.ImmutableList; import java.util.List; import org.apache.iceberg.ManifestFile; +import org.apache.iceberg.relocated.com.google.common.collect.ImmutableList; public class RewriteManifestsActionResult { diff --git a/spark/src/main/java/org/apache/iceberg/spark/FixupTypes.java b/spark/src/main/java/org/apache/iceberg/spark/FixupTypes.java index 74005eebdd1c..3c3cc1ea67c2 100644 --- a/spark/src/main/java/org/apache/iceberg/spark/FixupTypes.java +++ b/spark/src/main/java/org/apache/iceberg/spark/FixupTypes.java @@ -19,11 +19,11 @@ package org.apache.iceberg.spark; -import com.google.common.base.Preconditions; -import com.google.common.collect.Lists; import java.util.List; import java.util.function.Supplier; import org.apache.iceberg.Schema; +import org.apache.iceberg.relocated.com.google.common.base.Preconditions; +import org.apache.iceberg.relocated.com.google.common.collect.Lists; import org.apache.iceberg.types.Type; import org.apache.iceberg.types.TypeUtil; import org.apache.iceberg.types.Types; 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 b8ddef164d5f..3bdf984ed219 100644 --- a/spark/src/main/java/org/apache/iceberg/spark/PruneColumnsWithReordering.java +++ b/spark/src/main/java/org/apache/iceberg/spark/PruneColumnsWithReordering.java @@ -19,15 +19,15 @@ package org.apache.iceberg.spark; -import com.google.common.base.Preconditions; -import com.google.common.collect.ImmutableMap; -import com.google.common.collect.Lists; -import com.google.common.collect.Maps; import java.util.List; import java.util.Map; import java.util.Set; import java.util.function.Supplier; import org.apache.iceberg.Schema; +import org.apache.iceberg.relocated.com.google.common.base.Preconditions; +import org.apache.iceberg.relocated.com.google.common.collect.ImmutableMap; +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.Type.TypeID; import org.apache.iceberg.types.TypeUtil; 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 47af527f973e..653c27313ec3 100644 --- a/spark/src/main/java/org/apache/iceberg/spark/PruneColumnsWithoutReordering.java +++ b/spark/src/main/java/org/apache/iceberg/spark/PruneColumnsWithoutReordering.java @@ -19,13 +19,13 @@ package org.apache.iceberg.spark; -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.Set; import java.util.function.Supplier; import org.apache.iceberg.Schema; +import org.apache.iceberg.relocated.com.google.common.base.Preconditions; +import org.apache.iceberg.relocated.com.google.common.collect.ImmutableMap; +import org.apache.iceberg.relocated.com.google.common.collect.Lists; import org.apache.iceberg.types.Type; import org.apache.iceberg.types.Type.TypeID; import org.apache.iceberg.types.TypeUtil; diff --git a/spark/src/main/java/org/apache/iceberg/spark/SparkDataFile.java b/spark/src/main/java/org/apache/iceberg/spark/SparkDataFile.java index 4991980d83d4..fe7c00401fc1 100644 --- a/spark/src/main/java/org/apache/iceberg/spark/SparkDataFile.java +++ b/spark/src/main/java/org/apache/iceberg/spark/SparkDataFile.java @@ -19,7 +19,6 @@ package org.apache.iceberg.spark; -import com.google.common.collect.Maps; import java.nio.ByteBuffer; import java.util.List; import java.util.Locale; @@ -27,6 +26,7 @@ import org.apache.iceberg.DataFile; import org.apache.iceberg.FileFormat; import org.apache.iceberg.StructLike; +import org.apache.iceberg.relocated.com.google.common.collect.Maps; import org.apache.iceberg.types.Type; import org.apache.iceberg.types.Types; import org.apache.spark.sql.Row; 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 80bae9863c84..0e8bb67d7b7b 100644 --- a/spark/src/main/java/org/apache/iceberg/spark/SparkFilters.java +++ b/spark/src/main/java/org/apache/iceberg/spark/SparkFilters.java @@ -19,8 +19,6 @@ package org.apache.iceberg.spark; -import com.google.common.base.Preconditions; -import com.google.common.collect.ImmutableMap; import java.sql.Date; import java.sql.Timestamp; import java.util.Objects; @@ -28,6 +26,8 @@ import java.util.stream.Stream; import org.apache.iceberg.expressions.Expression; import org.apache.iceberg.expressions.Expression.Operation; +import org.apache.iceberg.relocated.com.google.common.base.Preconditions; +import org.apache.iceberg.relocated.com.google.common.collect.ImmutableMap; import org.apache.spark.sql.catalyst.util.DateTimeUtils; import org.apache.spark.sql.sources.And; import org.apache.spark.sql.sources.EqualNullSafe; diff --git a/spark/src/main/java/org/apache/iceberg/spark/SparkSchemaUtil.java b/spark/src/main/java/org/apache/iceberg/spark/SparkSchemaUtil.java index 58e785f8e115..843a7dcd95c9 100644 --- a/spark/src/main/java/org/apache/iceberg/spark/SparkSchemaUtil.java +++ b/spark/src/main/java/org/apache/iceberg/spark/SparkSchemaUtil.java @@ -19,9 +19,6 @@ package org.apache.iceberg.spark; -import com.google.common.base.Splitter; -import com.google.common.collect.ImmutableSet; -import com.google.common.collect.Lists; import java.util.Collection; import java.util.Collections; import java.util.List; @@ -30,6 +27,9 @@ import org.apache.iceberg.Schema; import org.apache.iceberg.expressions.Binder; import org.apache.iceberg.expressions.Expression; +import org.apache.iceberg.relocated.com.google.common.base.Splitter; +import org.apache.iceberg.relocated.com.google.common.collect.ImmutableSet; +import org.apache.iceberg.relocated.com.google.common.collect.Lists; import org.apache.iceberg.types.Type; import org.apache.iceberg.types.TypeUtil; import org.apache.iceberg.types.Types; diff --git a/spark/src/main/java/org/apache/iceberg/spark/SparkTypeToType.java b/spark/src/main/java/org/apache/iceberg/spark/SparkTypeToType.java index f01c9761f7f5..90c612957d4d 100644 --- a/spark/src/main/java/org/apache/iceberg/spark/SparkTypeToType.java +++ b/spark/src/main/java/org/apache/iceberg/spark/SparkTypeToType.java @@ -19,8 +19,8 @@ package org.apache.iceberg.spark; -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.spark.sql.types.ArrayType; diff --git a/spark/src/main/java/org/apache/iceberg/spark/SparkTypeVisitor.java b/spark/src/main/java/org/apache/iceberg/spark/SparkTypeVisitor.java index 381bcf22fb57..83b31940711e 100644 --- a/spark/src/main/java/org/apache/iceberg/spark/SparkTypeVisitor.java +++ b/spark/src/main/java/org/apache/iceberg/spark/SparkTypeVisitor.java @@ -19,8 +19,8 @@ package org.apache.iceberg.spark; -import com.google.common.collect.Lists; import java.util.List; +import org.apache.iceberg.relocated.com.google.common.collect.Lists; import org.apache.spark.sql.types.ArrayType; import org.apache.spark.sql.types.DataType; import org.apache.spark.sql.types.MapType; diff --git a/spark/src/main/java/org/apache/iceberg/spark/SparkValueConverter.java b/spark/src/main/java/org/apache/iceberg/spark/SparkValueConverter.java index 8e028272156c..b0384e27f124 100644 --- a/spark/src/main/java/org/apache/iceberg/spark/SparkValueConverter.java +++ b/spark/src/main/java/org/apache/iceberg/spark/SparkValueConverter.java @@ -19,8 +19,6 @@ package org.apache.iceberg.spark; -import com.google.common.collect.Lists; -import com.google.common.collect.Maps; import java.nio.ByteBuffer; import java.sql.Date; import java.sql.Timestamp; @@ -29,6 +27,8 @@ import org.apache.iceberg.Schema; import org.apache.iceberg.data.GenericRecord; import org.apache.iceberg.data.Record; +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.Types; import org.apache.spark.sql.Row; diff --git a/spark/src/main/java/org/apache/iceberg/spark/TypeToSparkType.java b/spark/src/main/java/org/apache/iceberg/spark/TypeToSparkType.java index f1fe2906ebda..b9e9dfade792 100644 --- a/spark/src/main/java/org/apache/iceberg/spark/TypeToSparkType.java +++ b/spark/src/main/java/org/apache/iceberg/spark/TypeToSparkType.java @@ -19,9 +19,9 @@ package org.apache.iceberg.spark; -import com.google.common.collect.Lists; import java.util.List; import org.apache.iceberg.Schema; +import org.apache.iceberg.relocated.com.google.common.collect.Lists; import org.apache.iceberg.types.Type; import org.apache.iceberg.types.TypeUtil; import org.apache.iceberg.types.Types; diff --git a/spark/src/main/java/org/apache/iceberg/spark/data/SparkAvroReader.java b/spark/src/main/java/org/apache/iceberg/spark/data/SparkAvroReader.java index 215a2654ebfb..b112f68eddb0 100644 --- a/spark/src/main/java/org/apache/iceberg/spark/data/SparkAvroReader.java +++ b/spark/src/main/java/org/apache/iceberg/spark/data/SparkAvroReader.java @@ -19,8 +19,6 @@ package org.apache.iceberg.spark.data; -import com.google.common.collect.ImmutableMap; -import com.google.common.collect.MapMaker; import java.io.IOException; import java.util.HashMap; import java.util.List; @@ -36,6 +34,8 @@ import org.apache.iceberg.avro.ValueReader; import org.apache.iceberg.avro.ValueReaders; import org.apache.iceberg.exceptions.RuntimeIOException; +import org.apache.iceberg.relocated.com.google.common.collect.ImmutableMap; +import org.apache.iceberg.relocated.com.google.common.collect.MapMaker; import org.apache.iceberg.types.Type; import org.apache.iceberg.types.Types; import org.apache.spark.sql.catalyst.InternalRow; diff --git a/spark/src/main/java/org/apache/iceberg/spark/data/SparkAvroWriter.java b/spark/src/main/java/org/apache/iceberg/spark/data/SparkAvroWriter.java index a24c205fb7ac..b849a56b0009 100644 --- a/spark/src/main/java/org/apache/iceberg/spark/data/SparkAvroWriter.java +++ b/spark/src/main/java/org/apache/iceberg/spark/data/SparkAvroWriter.java @@ -19,8 +19,6 @@ package org.apache.iceberg.spark.data; -import com.google.common.base.Preconditions; -import com.google.common.collect.Lists; import java.io.IOException; import java.util.List; import org.apache.avro.LogicalType; @@ -32,6 +30,8 @@ import org.apache.iceberg.avro.AvroSchemaVisitor; import org.apache.iceberg.avro.ValueWriter; import org.apache.iceberg.avro.ValueWriters; +import org.apache.iceberg.relocated.com.google.common.base.Preconditions; +import org.apache.iceberg.relocated.com.google.common.collect.Lists; import org.apache.iceberg.spark.SparkSchemaUtil; import org.apache.iceberg.types.Type; import org.apache.spark.sql.catalyst.InternalRow; diff --git a/spark/src/main/java/org/apache/iceberg/spark/data/SparkParquetReaders.java b/spark/src/main/java/org/apache/iceberg/spark/data/SparkParquetReaders.java index 60a41380e42a..2baf59ea6f08 100644 --- a/spark/src/main/java/org/apache/iceberg/spark/data/SparkParquetReaders.java +++ b/spark/src/main/java/org/apache/iceberg/spark/data/SparkParquetReaders.java @@ -19,10 +19,6 @@ package org.apache.iceberg.spark.data; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableMap; -import com.google.common.collect.Lists; -import com.google.common.collect.Maps; import java.math.BigDecimal; import java.math.BigInteger; import java.nio.ByteBuffer; @@ -42,6 +38,10 @@ import org.apache.iceberg.parquet.ParquetValueReaders.StructReader; import org.apache.iceberg.parquet.ParquetValueReaders.UnboxedReader; import org.apache.iceberg.parquet.TypeWithSchemaVisitor; +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.Lists; +import org.apache.iceberg.relocated.com.google.common.collect.Maps; import org.apache.iceberg.types.Type.TypeID; import org.apache.iceberg.types.Types; import org.apache.parquet.column.ColumnDescriptor; diff --git a/spark/src/main/java/org/apache/iceberg/spark/data/SparkParquetWriters.java b/spark/src/main/java/org/apache/iceberg/spark/data/SparkParquetWriters.java index 52ebd823335a..2632da63d5ed 100644 --- a/spark/src/main/java/org/apache/iceberg/spark/data/SparkParquetWriters.java +++ b/spark/src/main/java/org/apache/iceberg/spark/data/SparkParquetWriters.java @@ -19,8 +19,6 @@ package org.apache.iceberg.spark.data; -import com.google.common.base.Preconditions; -import com.google.common.collect.Lists; import java.math.BigDecimal; import java.util.Iterator; import java.util.List; @@ -34,6 +32,8 @@ import org.apache.iceberg.parquet.ParquetValueWriters.PrimitiveWriter; import org.apache.iceberg.parquet.ParquetValueWriters.RepeatedKeyValueWriter; import org.apache.iceberg.parquet.ParquetValueWriters.RepeatedWriter; +import org.apache.iceberg.relocated.com.google.common.base.Preconditions; +import org.apache.iceberg.relocated.com.google.common.collect.Lists; import org.apache.iceberg.spark.SparkSchemaUtil; import org.apache.iceberg.types.TypeUtil; import org.apache.parquet.column.ColumnDescriptor; diff --git a/spark/src/main/java/org/apache/iceberg/spark/data/SparkValueReaders.java b/spark/src/main/java/org/apache/iceberg/spark/data/SparkValueReaders.java index 7408ca20be58..eaeb85f3c344 100644 --- a/spark/src/main/java/org/apache/iceberg/spark/data/SparkValueReaders.java +++ b/spark/src/main/java/org/apache/iceberg/spark/data/SparkValueReaders.java @@ -19,7 +19,6 @@ package org.apache.iceberg.spark.data; -import com.google.common.collect.Lists; import java.io.IOException; import java.math.BigDecimal; import java.math.BigInteger; @@ -33,6 +32,7 @@ import org.apache.avro.util.Utf8; import org.apache.iceberg.avro.ValueReader; import org.apache.iceberg.avro.ValueReaders; +import org.apache.iceberg.relocated.com.google.common.collect.Lists; import org.apache.iceberg.types.Types; import org.apache.spark.sql.catalyst.InternalRow; import org.apache.spark.sql.catalyst.expressions.GenericInternalRow; diff --git a/spark/src/main/java/org/apache/iceberg/spark/data/SparkValueWriters.java b/spark/src/main/java/org/apache/iceberg/spark/data/SparkValueWriters.java index fc519d1146e2..e3c9133b6cdd 100644 --- a/spark/src/main/java/org/apache/iceberg/spark/data/SparkValueWriters.java +++ b/spark/src/main/java/org/apache/iceberg/spark/data/SparkValueWriters.java @@ -19,7 +19,6 @@ package org.apache.iceberg.spark.data; -import com.google.common.base.Preconditions; import java.io.IOException; import java.lang.reflect.Array; import java.math.BigDecimal; @@ -30,6 +29,7 @@ import org.apache.avro.io.Encoder; import org.apache.avro.util.Utf8; import org.apache.iceberg.avro.ValueWriter; +import org.apache.iceberg.relocated.com.google.common.base.Preconditions; import org.apache.iceberg.types.TypeUtil; import org.apache.spark.sql.catalyst.InternalRow; import org.apache.spark.sql.catalyst.util.ArrayData; diff --git a/spark/src/main/java/org/apache/iceberg/spark/source/BaseDataReader.java b/spark/src/main/java/org/apache/iceberg/spark/source/BaseDataReader.java index fab6680ca8ad..ee0fad2e4907 100644 --- a/spark/src/main/java/org/apache/iceberg/spark/source/BaseDataReader.java +++ b/spark/src/main/java/org/apache/iceberg/spark/source/BaseDataReader.java @@ -19,9 +19,6 @@ package org.apache.iceberg.spark.source; -import com.google.common.base.Preconditions; -import com.google.common.collect.ImmutableMap; -import com.google.common.collect.Iterables; import java.io.Closeable; import java.io.IOException; import java.util.Collections; @@ -34,6 +31,9 @@ import org.apache.iceberg.io.CloseableIterable; import org.apache.iceberg.io.FileIO; import org.apache.iceberg.io.InputFile; +import org.apache.iceberg.relocated.com.google.common.base.Preconditions; +import org.apache.iceberg.relocated.com.google.common.collect.ImmutableMap; +import org.apache.iceberg.relocated.com.google.common.collect.Iterables; import org.apache.spark.rdd.InputFileBlockHolder; import org.apache.spark.sql.sources.v2.reader.InputPartitionReader; diff --git a/spark/src/main/java/org/apache/iceberg/spark/source/IcebergSource.java b/spark/src/main/java/org/apache/iceberg/spark/source/IcebergSource.java index 18c5aeaf6e16..b76dadee8392 100644 --- a/spark/src/main/java/org/apache/iceberg/spark/source/IcebergSource.java +++ b/spark/src/main/java/org/apache/iceberg/spark/source/IcebergSource.java @@ -19,7 +19,6 @@ package org.apache.iceberg.spark.source; -import com.google.common.base.Preconditions; import java.util.List; import java.util.Map; import java.util.Optional; @@ -36,6 +35,7 @@ import org.apache.iceberg.hive.HiveCatalog; import org.apache.iceberg.hive.HiveCatalogs; import org.apache.iceberg.io.FileIO; +import org.apache.iceberg.relocated.com.google.common.base.Preconditions; import org.apache.iceberg.spark.SparkSchemaUtil; import org.apache.iceberg.transforms.Transform; import org.apache.iceberg.transforms.UnknownTransform; diff --git a/spark/src/main/java/org/apache/iceberg/spark/source/PartitionKey.java b/spark/src/main/java/org/apache/iceberg/spark/source/PartitionKey.java index 098423716d85..32d01adc26e8 100644 --- a/spark/src/main/java/org/apache/iceberg/spark/source/PartitionKey.java +++ b/spark/src/main/java/org/apache/iceberg/spark/source/PartitionKey.java @@ -19,7 +19,6 @@ package org.apache.iceberg.spark.source; -import com.google.common.collect.Maps; import java.lang.reflect.Array; import java.nio.ByteBuffer; import java.util.Arrays; @@ -29,6 +28,7 @@ import org.apache.iceberg.PartitionSpec; import org.apache.iceberg.Schema; import org.apache.iceberg.StructLike; +import org.apache.iceberg.relocated.com.google.common.collect.Maps; import org.apache.iceberg.spark.SparkSchemaUtil; import org.apache.iceberg.transforms.Transform; import org.apache.iceberg.types.Type; diff --git a/spark/src/main/java/org/apache/iceberg/spark/source/Reader.java b/spark/src/main/java/org/apache/iceberg/spark/source/Reader.java index 0d25fb969840..b30e75205d82 100644 --- a/spark/src/main/java/org/apache/iceberg/spark/source/Reader.java +++ b/spark/src/main/java/org/apache/iceberg/spark/source/Reader.java @@ -19,8 +19,6 @@ package org.apache.iceberg.spark.source; -import com.google.common.collect.ImmutableSet; -import com.google.common.collect.Lists; import java.io.IOException; import java.io.Serializable; import java.util.List; @@ -43,6 +41,8 @@ import org.apache.iceberg.hadoop.Util; import org.apache.iceberg.io.CloseableIterable; import org.apache.iceberg.io.FileIO; +import org.apache.iceberg.relocated.com.google.common.collect.ImmutableSet; +import org.apache.iceberg.relocated.com.google.common.collect.Lists; import org.apache.iceberg.spark.SparkFilters; import org.apache.iceberg.spark.SparkSchemaUtil; import org.apache.spark.broadcast.Broadcast; diff --git a/spark/src/main/java/org/apache/iceberg/spark/source/RowDataReader.java b/spark/src/main/java/org/apache/iceberg/spark/source/RowDataReader.java index ec9aa706ef09..4f3ac75ce962 100644 --- a/spark/src/main/java/org/apache/iceberg/spark/source/RowDataReader.java +++ b/spark/src/main/java/org/apache/iceberg/spark/source/RowDataReader.java @@ -19,11 +19,6 @@ package org.apache.iceberg.spark.source; -import com.google.common.base.Preconditions; -import com.google.common.collect.ImmutableMap; -import com.google.common.collect.Iterators; -import com.google.common.collect.Lists; -import com.google.common.collect.Sets; import java.math.BigDecimal; import java.nio.ByteBuffer; import java.util.Iterator; @@ -47,6 +42,11 @@ import org.apache.iceberg.io.InputFile; import org.apache.iceberg.orc.ORC; import org.apache.iceberg.parquet.Parquet; +import org.apache.iceberg.relocated.com.google.common.base.Preconditions; +import org.apache.iceberg.relocated.com.google.common.collect.ImmutableMap; +import org.apache.iceberg.relocated.com.google.common.collect.Iterators; +import org.apache.iceberg.relocated.com.google.common.collect.Lists; +import org.apache.iceberg.relocated.com.google.common.collect.Sets; import org.apache.iceberg.spark.SparkSchemaUtil; import org.apache.iceberg.spark.data.SparkAvroReader; import org.apache.iceberg.spark.data.SparkOrcReader; diff --git a/spark/src/main/java/org/apache/iceberg/spark/source/StructInternalRow.java b/spark/src/main/java/org/apache/iceberg/spark/source/StructInternalRow.java index d946095fd6df..231d8c360585 100644 --- a/spark/src/main/java/org/apache/iceberg/spark/source/StructInternalRow.java +++ b/spark/src/main/java/org/apache/iceberg/spark/source/StructInternalRow.java @@ -19,8 +19,6 @@ package org.apache.iceberg.spark.source; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.Lists; import java.math.BigDecimal; import java.nio.ByteBuffer; import java.util.Collection; @@ -29,6 +27,8 @@ import java.util.function.BiConsumer; import java.util.function.Function; import org.apache.iceberg.StructLike; +import org.apache.iceberg.relocated.com.google.common.collect.ImmutableList; +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.iceberg.util.ByteBuffers; diff --git a/spark/src/main/java/org/apache/iceberg/spark/source/Writer.java b/spark/src/main/java/org/apache/iceberg/spark/source/Writer.java index 88f8a240ce1a..475b4babff72 100644 --- a/spark/src/main/java/org/apache/iceberg/spark/source/Writer.java +++ b/spark/src/main/java/org/apache/iceberg/spark/source/Writer.java @@ -19,10 +19,6 @@ package org.apache.iceberg.spark.source; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.Iterables; -import com.google.common.collect.Lists; -import com.google.common.collect.Sets; import java.io.IOException; import java.util.Arrays; import java.util.List; @@ -54,6 +50,10 @@ import org.apache.iceberg.io.OutputFile; import org.apache.iceberg.orc.ORC; import org.apache.iceberg.parquet.Parquet; +import org.apache.iceberg.relocated.com.google.common.collect.ImmutableList; +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.Sets; import org.apache.iceberg.spark.data.SparkAvroWriter; import org.apache.iceberg.spark.data.SparkOrcWriter; import org.apache.iceberg.spark.data.SparkParquetWriters; diff --git a/spark/src/main/scala/org/apache/iceberg/spark/SparkTableUtil.scala b/spark/src/main/scala/org/apache/iceberg/spark/SparkTableUtil.scala index eb4a72685256..55ceda2b52e1 100644 --- a/spark/src/main/scala/org/apache/iceberg/spark/SparkTableUtil.scala +++ b/spark/src/main/scala/org/apache/iceberg/spark/SparkTableUtil.scala @@ -19,7 +19,6 @@ package org.apache.iceberg.spark -import com.google.common.collect.Maps import org.apache.hadoop.conf.Configuration import org.apache.hadoop.fs.{Path, PathFilter} import org.apache.iceberg.{DataFile, DataFiles, FileFormat, ManifestFile, ManifestFiles} @@ -28,6 +27,7 @@ import org.apache.iceberg.exceptions.NoSuchTableException import org.apache.iceberg.hadoop.{HadoopFileIO, HadoopInputFile, SerializableConfiguration} import org.apache.iceberg.orc.OrcMetrics import org.apache.iceberg.parquet.ParquetUtil +import org.apache.iceberg.relocated.com.google.common.collect.Maps import org.apache.iceberg.util.PropertyUtil import org.apache.parquet.hadoop.ParquetFileReader import org.apache.spark.TaskContext diff --git a/spark/src/test/java/org/apache/iceberg/TestDataFileSerialization.java b/spark/src/test/java/org/apache/iceberg/TestDataFileSerialization.java index 64c9d519f16b..e497c1a41675 100644 --- a/spark/src/test/java/org/apache/iceberg/TestDataFileSerialization.java +++ b/spark/src/test/java/org/apache/iceberg/TestDataFileSerialization.java @@ -22,8 +22,6 @@ import com.esotericsoftware.kryo.Kryo; import com.esotericsoftware.kryo.io.Input; import com.esotericsoftware.kryo.io.Output; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.Maps; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.File; @@ -38,6 +36,8 @@ import java.util.UUID; import org.apache.iceberg.io.FileAppender; import org.apache.iceberg.parquet.Parquet; +import org.apache.iceberg.relocated.com.google.common.collect.ImmutableList; +import org.apache.iceberg.relocated.com.google.common.collect.Maps; import org.apache.iceberg.spark.data.RandomData; import org.apache.iceberg.spark.data.SparkParquetWriters; import org.apache.iceberg.types.Types; diff --git a/spark/src/test/java/org/apache/iceberg/TestManifestFileSerialization.java b/spark/src/test/java/org/apache/iceberg/TestManifestFileSerialization.java index 00cec599dcf3..8ea2a175c36d 100644 --- a/spark/src/test/java/org/apache/iceberg/TestManifestFileSerialization.java +++ b/spark/src/test/java/org/apache/iceberg/TestManifestFileSerialization.java @@ -22,7 +22,6 @@ import com.esotericsoftware.kryo.Kryo; import com.esotericsoftware.kryo.io.Input; import com.esotericsoftware.kryo.io.Output; -import com.google.common.collect.ImmutableMap; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.File; @@ -38,6 +37,7 @@ import org.apache.iceberg.hadoop.HadoopFileIO; import org.apache.iceberg.io.FileIO; import org.apache.iceberg.io.OutputFile; +import org.apache.iceberg.relocated.com.google.common.collect.ImmutableMap; import org.apache.iceberg.types.Types; import org.apache.spark.SparkConf; import org.apache.spark.serializer.KryoSerializer; diff --git a/spark/src/test/java/org/apache/iceberg/TestRewriteManifestsAction.java b/spark/src/test/java/org/apache/iceberg/TestRewriteManifestsAction.java index 0554d46e01c6..3f455b76cb26 100644 --- a/spark/src/test/java/org/apache/iceberg/TestRewriteManifestsAction.java +++ b/spark/src/test/java/org/apache/iceberg/TestRewriteManifestsAction.java @@ -19,8 +19,6 @@ package org.apache.iceberg; -import com.google.common.collect.Lists; -import com.google.common.collect.Maps; import java.io.File; import java.io.IOException; import java.util.List; @@ -29,6 +27,8 @@ import org.apache.iceberg.actions.Actions; import org.apache.iceberg.actions.RewriteManifestsActionResult; import org.apache.iceberg.hadoop.HadoopTables; +import org.apache.iceberg.relocated.com.google.common.collect.Lists; +import org.apache.iceberg.relocated.com.google.common.collect.Maps; import org.apache.iceberg.spark.SparkTableUtil; import org.apache.iceberg.spark.source.ThreeColumnRecord; import org.apache.iceberg.types.Types; diff --git a/spark/src/test/java/org/apache/iceberg/actions/TestRemoveOrphanFilesAction.java b/spark/src/test/java/org/apache/iceberg/actions/TestRemoveOrphanFilesAction.java index e0245b5bf65a..b28ff145efa9 100644 --- a/spark/src/test/java/org/apache/iceberg/actions/TestRemoveOrphanFilesAction.java +++ b/spark/src/test/java/org/apache/iceberg/actions/TestRemoveOrphanFilesAction.java @@ -19,8 +19,6 @@ package org.apache.iceberg.actions; -import com.google.common.collect.Lists; -import com.google.common.collect.Maps; import java.io.File; import java.io.IOException; import java.util.Arrays; @@ -38,6 +36,8 @@ import org.apache.iceberg.TableProperties; import org.apache.iceberg.hadoop.HadoopTables; import org.apache.iceberg.hadoop.HiddenPathFilter; +import org.apache.iceberg.relocated.com.google.common.collect.Lists; +import org.apache.iceberg.relocated.com.google.common.collect.Maps; import org.apache.iceberg.spark.source.ThreeColumnRecord; import org.apache.iceberg.types.Types; import org.apache.spark.sql.Dataset; diff --git a/spark/src/test/java/org/apache/iceberg/examples/ReadAndWriteTablesTest.java b/spark/src/test/java/org/apache/iceberg/examples/ReadAndWriteTablesTest.java index 0f495741dc36..0fd68cebd4cd 100644 --- a/spark/src/test/java/org/apache/iceberg/examples/ReadAndWriteTablesTest.java +++ b/spark/src/test/java/org/apache/iceberg/examples/ReadAndWriteTablesTest.java @@ -19,7 +19,6 @@ package org.apache.iceberg.examples; -import com.google.common.collect.Lists; import java.io.File; import java.io.IOException; import java.nio.file.Files; @@ -29,6 +28,7 @@ import org.apache.iceberg.Schema; import org.apache.iceberg.Table; import org.apache.iceberg.hadoop.HadoopTables; +import org.apache.iceberg.relocated.com.google.common.collect.Lists; import org.apache.iceberg.types.Types; import org.apache.spark.sql.Dataset; import org.apache.spark.sql.Row; diff --git a/spark/src/test/java/org/apache/iceberg/examples/SimpleRecord.java b/spark/src/test/java/org/apache/iceberg/examples/SimpleRecord.java index f7394f3ff4d2..af8a5a765c9a 100644 --- a/spark/src/test/java/org/apache/iceberg/examples/SimpleRecord.java +++ b/spark/src/test/java/org/apache/iceberg/examples/SimpleRecord.java @@ -19,7 +19,7 @@ package org.apache.iceberg.examples; -import com.google.common.base.Objects; +import org.apache.iceberg.relocated.com.google.common.base.Objects; public class SimpleRecord { private Integer id; diff --git a/spark/src/test/java/org/apache/iceberg/examples/SnapshotFunctionalityTest.java b/spark/src/test/java/org/apache/iceberg/examples/SnapshotFunctionalityTest.java index 4649d9a2a8eb..6052b22210e9 100644 --- a/spark/src/test/java/org/apache/iceberg/examples/SnapshotFunctionalityTest.java +++ b/spark/src/test/java/org/apache/iceberg/examples/SnapshotFunctionalityTest.java @@ -19,7 +19,6 @@ package org.apache.iceberg.examples; -import com.google.common.collect.Lists; import java.io.File; import java.io.IOException; import java.nio.file.Files; @@ -33,6 +32,7 @@ import org.apache.iceberg.Snapshot; import org.apache.iceberg.Table; import org.apache.iceberg.hadoop.HadoopTables; +import org.apache.iceberg.relocated.com.google.common.collect.Lists; import org.apache.iceberg.types.Types; import org.apache.spark.sql.Dataset; import org.apache.spark.sql.Row; diff --git a/spark/src/test/java/org/apache/iceberg/spark/TestSparkDataFile.java b/spark/src/test/java/org/apache/iceberg/spark/TestSparkDataFile.java index 2ebb3dd473f7..b22b294211e2 100644 --- a/spark/src/test/java/org/apache/iceberg/spark/TestSparkDataFile.java +++ b/spark/src/test/java/org/apache/iceberg/spark/TestSparkDataFile.java @@ -19,9 +19,6 @@ package org.apache.iceberg.spark; -import com.google.common.collect.Iterables; -import com.google.common.collect.Lists; -import com.google.common.collect.Maps; import java.io.File; import java.io.IOException; import java.util.Arrays; @@ -40,6 +37,9 @@ 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.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.spark.data.RandomData; import org.apache.iceberg.types.Types; import org.apache.spark.api.java.JavaRDD; diff --git a/spark/src/test/java/org/apache/iceberg/spark/data/GenericsHelpers.java b/spark/src/test/java/org/apache/iceberg/spark/data/GenericsHelpers.java index 6b7c504a83b9..821f5bd66f9f 100644 --- a/spark/src/test/java/org/apache/iceberg/spark/data/GenericsHelpers.java +++ b/spark/src/test/java/org/apache/iceberg/spark/data/GenericsHelpers.java @@ -19,7 +19,6 @@ package org.apache.iceberg.spark.data; -import com.google.common.collect.Lists; import java.math.BigDecimal; import java.nio.ByteBuffer; import java.sql.Timestamp; @@ -34,6 +33,7 @@ import java.util.Map; import java.util.UUID; import org.apache.iceberg.data.Record; +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.spark.sql.Row; diff --git a/spark/src/test/java/org/apache/iceberg/spark/data/RandomData.java b/spark/src/test/java/org/apache/iceberg/spark/data/RandomData.java index 4b8952698bf8..e960a7fa474c 100644 --- a/spark/src/test/java/org/apache/iceberg/spark/data/RandomData.java +++ b/spark/src/test/java/org/apache/iceberg/spark/data/RandomData.java @@ -19,9 +19,6 @@ package org.apache.iceberg.spark.data; -import com.google.common.collect.Lists; -import com.google.common.collect.Maps; -import com.google.common.collect.Sets; import java.math.BigDecimal; import java.math.BigInteger; import java.nio.ByteBuffer; @@ -37,6 +34,9 @@ import org.apache.avro.generic.GenericData.Record; import org.apache.iceberg.Schema; import org.apache.iceberg.avro.AvroSchemaUtil; +import org.apache.iceberg.relocated.com.google.common.collect.Lists; +import org.apache.iceberg.relocated.com.google.common.collect.Maps; +import org.apache.iceberg.relocated.com.google.common.collect.Sets; import org.apache.iceberg.types.Type; import org.apache.iceberg.types.TypeUtil; import org.apache.iceberg.types.Types; diff --git a/spark/src/test/java/org/apache/iceberg/spark/data/TestHelpers.java b/spark/src/test/java/org/apache/iceberg/spark/data/TestHelpers.java index c20bc67a69e1..433f87c75582 100644 --- a/spark/src/test/java/org/apache/iceberg/spark/data/TestHelpers.java +++ b/spark/src/test/java/org/apache/iceberg/spark/data/TestHelpers.java @@ -19,7 +19,6 @@ package org.apache.iceberg.spark.data; -import com.google.common.collect.Lists; import java.math.BigDecimal; import java.nio.ByteBuffer; import java.sql.Timestamp; @@ -36,6 +35,7 @@ import org.apache.avro.generic.GenericData; import org.apache.avro.generic.GenericData.Record; import org.apache.iceberg.Schema; +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.storage.serde2.io.DateWritable; diff --git a/spark/src/test/java/org/apache/iceberg/spark/data/TestSparkAvroEnums.java b/spark/src/test/java/org/apache/iceberg/spark/data/TestSparkAvroEnums.java index 760b33d608aa..3517c32ffebb 100644 --- a/spark/src/test/java/org/apache/iceberg/spark/data/TestSparkAvroEnums.java +++ b/spark/src/test/java/org/apache/iceberg/spark/data/TestSparkAvroEnums.java @@ -19,8 +19,6 @@ package org.apache.iceberg.spark.data; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.Lists; import java.io.File; import java.io.IOException; import java.util.List; @@ -34,6 +32,8 @@ import org.apache.iceberg.avro.Avro; import org.apache.iceberg.avro.AvroIterable; import org.apache.iceberg.avro.AvroSchemaUtil; +import org.apache.iceberg.relocated.com.google.common.collect.ImmutableList; +import org.apache.iceberg.relocated.com.google.common.collect.Lists; import org.apache.spark.sql.catalyst.InternalRow; import org.junit.Assert; import org.junit.Rule; diff --git a/spark/src/test/java/org/apache/iceberg/spark/data/TestSparkAvroReader.java b/spark/src/test/java/org/apache/iceberg/spark/data/TestSparkAvroReader.java index 22be13113621..e4398df39cc8 100644 --- a/spark/src/test/java/org/apache/iceberg/spark/data/TestSparkAvroReader.java +++ b/spark/src/test/java/org/apache/iceberg/spark/data/TestSparkAvroReader.java @@ -19,7 +19,6 @@ package org.apache.iceberg.spark.data; -import com.google.common.collect.Lists; import java.io.File; import java.io.IOException; import java.util.List; @@ -29,6 +28,7 @@ import org.apache.iceberg.avro.Avro; import org.apache.iceberg.avro.AvroIterable; import org.apache.iceberg.io.FileAppender; +import org.apache.iceberg.relocated.com.google.common.collect.Lists; import org.apache.spark.sql.catalyst.InternalRow; import org.junit.Assert; diff --git a/spark/src/test/java/org/apache/iceberg/spark/source/SimpleRecord.java b/spark/src/test/java/org/apache/iceberg/spark/source/SimpleRecord.java index bc7e54b71150..76cd5cadcfd8 100644 --- a/spark/src/test/java/org/apache/iceberg/spark/source/SimpleRecord.java +++ b/spark/src/test/java/org/apache/iceberg/spark/source/SimpleRecord.java @@ -19,7 +19,7 @@ package org.apache.iceberg.spark.source; -import com.google.common.base.Objects; +import org.apache.iceberg.relocated.com.google.common.base.Objects; public class SimpleRecord { private Integer id; diff --git a/spark/src/test/java/org/apache/iceberg/spark/source/TestDataFrameWrites.java b/spark/src/test/java/org/apache/iceberg/spark/source/TestDataFrameWrites.java index 1bcf5249fd5a..0c2f4a120ee5 100644 --- a/spark/src/test/java/org/apache/iceberg/spark/source/TestDataFrameWrites.java +++ b/spark/src/test/java/org/apache/iceberg/spark/source/TestDataFrameWrites.java @@ -19,8 +19,6 @@ package org.apache.iceberg.spark.source; -import com.google.common.collect.ImmutableMap; -import com.google.common.collect.Lists; import java.io.File; import java.io.IOException; import java.net.URI; @@ -39,6 +37,8 @@ import org.apache.iceberg.avro.AvroIterable; import org.apache.iceberg.hadoop.HadoopTables; import org.apache.iceberg.io.FileAppender; +import org.apache.iceberg.relocated.com.google.common.collect.ImmutableMap; +import org.apache.iceberg.relocated.com.google.common.collect.Lists; import org.apache.iceberg.spark.SparkSchemaUtil; import org.apache.iceberg.spark.data.AvroDataTest; import org.apache.iceberg.spark.data.RandomData; diff --git a/spark/src/test/java/org/apache/iceberg/spark/source/TestDataSourceOptions.java b/spark/src/test/java/org/apache/iceberg/spark/source/TestDataSourceOptions.java index 802ac2027d0e..fd6290a4ae72 100644 --- a/spark/src/test/java/org/apache/iceberg/spark/source/TestDataSourceOptions.java +++ b/spark/src/test/java/org/apache/iceberg/spark/source/TestDataSourceOptions.java @@ -19,8 +19,6 @@ package org.apache.iceberg.spark.source; -import com.google.common.collect.Lists; -import com.google.common.collect.Maps; import java.io.IOException; import java.util.List; import java.util.Map; @@ -35,6 +33,8 @@ import org.apache.iceberg.TableProperties; import org.apache.iceberg.hadoop.HadoopTables; import org.apache.iceberg.io.CloseableIterable; +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.SnapshotUtil; import org.apache.spark.sql.Dataset; diff --git a/spark/src/test/java/org/apache/iceberg/spark/source/TestFilteredScan.java b/spark/src/test/java/org/apache/iceberg/spark/source/TestFilteredScan.java index 8844b38cbbaa..c0d676ec8aa9 100644 --- a/spark/src/test/java/org/apache/iceberg/spark/source/TestFilteredScan.java +++ b/spark/src/test/java/org/apache/iceberg/spark/source/TestFilteredScan.java @@ -19,8 +19,6 @@ package org.apache.iceberg.spark.source; -import com.google.common.collect.ImmutableMap; -import com.google.common.collect.Lists; import java.io.File; import java.io.IOException; import java.sql.Timestamp; @@ -46,6 +44,8 @@ import org.apache.iceberg.io.FileAppender; import org.apache.iceberg.orc.ORC; import org.apache.iceberg.parquet.Parquet; +import org.apache.iceberg.relocated.com.google.common.collect.ImmutableMap; +import org.apache.iceberg.relocated.com.google.common.collect.Lists; import org.apache.iceberg.spark.data.GenericsHelpers; import org.apache.iceberg.transforms.Transform; import org.apache.iceberg.transforms.Transforms; diff --git a/spark/src/test/java/org/apache/iceberg/spark/source/TestForwardCompatibility.java b/spark/src/test/java/org/apache/iceberg/spark/source/TestForwardCompatibility.java index 1dc91adc728a..b7a1cdfcecca 100644 --- a/spark/src/test/java/org/apache/iceberg/spark/source/TestForwardCompatibility.java +++ b/spark/src/test/java/org/apache/iceberg/spark/source/TestForwardCompatibility.java @@ -19,7 +19,6 @@ package org.apache.iceberg.spark.source; -import com.google.common.collect.Lists; import java.io.File; import java.io.IOException; import java.util.List; @@ -41,6 +40,7 @@ import org.apache.iceberg.io.FileAppender; import org.apache.iceberg.io.OutputFile; import org.apache.iceberg.parquet.Parquet; +import org.apache.iceberg.relocated.com.google.common.collect.Lists; import org.apache.iceberg.spark.data.RandomData; import org.apache.iceberg.spark.data.TestHelpers; import org.apache.iceberg.types.Types; diff --git a/spark/src/test/java/org/apache/iceberg/spark/source/TestIcebergSourceTablesBase.java b/spark/src/test/java/org/apache/iceberg/spark/source/TestIcebergSourceTablesBase.java index e993256fc63e..bbd2a1b537de 100644 --- a/spark/src/test/java/org/apache/iceberg/spark/source/TestIcebergSourceTablesBase.java +++ b/spark/src/test/java/org/apache/iceberg/spark/source/TestIcebergSourceTablesBase.java @@ -19,9 +19,6 @@ package org.apache.iceberg.spark.source; -import com.google.common.collect.ImmutableMap; -import com.google.common.collect.Iterables; -import com.google.common.collect.Lists; import java.util.Comparator; import java.util.List; import org.apache.avro.generic.GenericData; @@ -40,6 +37,9 @@ import org.apache.iceberg.expressions.Expressions; import org.apache.iceberg.io.CloseableIterable; import org.apache.iceberg.io.InputFile; +import org.apache.iceberg.relocated.com.google.common.collect.ImmutableMap; +import org.apache.iceberg.relocated.com.google.common.collect.Iterables; +import org.apache.iceberg.relocated.com.google.common.collect.Lists; import org.apache.iceberg.spark.SparkTableUtil; import org.apache.iceberg.spark.data.TestHelpers; import org.apache.iceberg.types.Types; diff --git a/spark/src/test/java/org/apache/iceberg/spark/source/TestIdentityPartitionData.java b/spark/src/test/java/org/apache/iceberg/spark/source/TestIdentityPartitionData.java index 0ee2450e24d0..24fd7b2dc81f 100644 --- a/spark/src/test/java/org/apache/iceberg/spark/source/TestIdentityPartitionData.java +++ b/spark/src/test/java/org/apache/iceberg/spark/source/TestIdentityPartitionData.java @@ -19,8 +19,6 @@ package org.apache.iceberg.spark.source; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableMap; import java.io.File; import java.util.Arrays; import java.util.List; @@ -31,6 +29,8 @@ 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.ImmutableList; +import org.apache.iceberg.relocated.com.google.common.collect.ImmutableMap; import org.apache.iceberg.types.Types; import org.apache.spark.sql.Dataset; import org.apache.spark.sql.Row; @@ -159,4 +159,3 @@ public void testProjections() { } } } - diff --git a/spark/src/test/java/org/apache/iceberg/spark/source/TestPartitionValues.java b/spark/src/test/java/org/apache/iceberg/spark/source/TestPartitionValues.java index e6c7621de2b0..0b430db59e6a 100644 --- a/spark/src/test/java/org/apache/iceberg/spark/source/TestPartitionValues.java +++ b/spark/src/test/java/org/apache/iceberg/spark/source/TestPartitionValues.java @@ -19,7 +19,6 @@ package org.apache.iceberg.spark.source; -import com.google.common.collect.Lists; import java.io.File; import java.util.List; import org.apache.avro.generic.GenericData; @@ -32,6 +31,7 @@ import org.apache.iceberg.avro.Avro; import org.apache.iceberg.hadoop.HadoopTables; import org.apache.iceberg.io.FileAppender; +import org.apache.iceberg.relocated.com.google.common.collect.Lists; import org.apache.iceberg.spark.data.RandomData; import org.apache.iceberg.spark.data.TestHelpers; import org.apache.iceberg.types.Types; diff --git a/spark/src/test/java/org/apache/iceberg/spark/source/TestReadProjection.java b/spark/src/test/java/org/apache/iceberg/spark/source/TestReadProjection.java index 4f955a7d1ee5..8d65b64cab6d 100644 --- a/spark/src/test/java/org/apache/iceberg/spark/source/TestReadProjection.java +++ b/spark/src/test/java/org/apache/iceberg/spark/source/TestReadProjection.java @@ -19,17 +19,17 @@ package org.apache.iceberg.spark.source; -import com.google.common.base.Preconditions; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableMap; -import com.google.common.collect.Maps; -import com.google.common.collect.Sets; import java.io.IOException; import java.util.List; import java.util.Map; import org.apache.iceberg.Schema; import org.apache.iceberg.data.GenericRecord; import org.apache.iceberg.data.Record; +import org.apache.iceberg.relocated.com.google.common.base.Preconditions; +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.Maps; +import org.apache.iceberg.relocated.com.google.common.collect.Sets; import org.apache.iceberg.types.Comparators; import org.apache.iceberg.types.Types; import org.junit.Assert; diff --git a/spark/src/test/java/org/apache/iceberg/spark/source/TestSnapshotSelection.java b/spark/src/test/java/org/apache/iceberg/spark/source/TestSnapshotSelection.java index 051b379033a7..4a5b521b7ad0 100644 --- a/spark/src/test/java/org/apache/iceberg/spark/source/TestSnapshotSelection.java +++ b/spark/src/test/java/org/apache/iceberg/spark/source/TestSnapshotSelection.java @@ -19,8 +19,6 @@ package org.apache.iceberg.spark.source; -import com.google.common.collect.Iterables; -import com.google.common.collect.Lists; import java.io.IOException; import java.util.List; import org.apache.hadoop.conf.Configuration; @@ -29,6 +27,8 @@ import org.apache.iceberg.Snapshot; import org.apache.iceberg.Table; import org.apache.iceberg.hadoop.HadoopTables; +import org.apache.iceberg.relocated.com.google.common.collect.Iterables; +import org.apache.iceberg.relocated.com.google.common.collect.Lists; import org.apache.iceberg.types.Types; import org.apache.spark.sql.Dataset; import org.apache.spark.sql.Encoders; diff --git a/spark/src/test/java/org/apache/iceberg/spark/source/TestSparkDataWrite.java b/spark/src/test/java/org/apache/iceberg/spark/source/TestSparkDataWrite.java index eafe23e52dbb..8a51a7af2f91 100644 --- a/spark/src/test/java/org/apache/iceberg/spark/source/TestSparkDataWrite.java +++ b/spark/src/test/java/org/apache/iceberg/spark/source/TestSparkDataWrite.java @@ -19,7 +19,6 @@ package org.apache.iceberg.spark.source; -import com.google.common.collect.Lists; import java.io.File; import java.io.IOException; import java.util.List; @@ -34,6 +33,7 @@ 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.Lists; import org.apache.iceberg.types.Types; import org.apache.spark.sql.Dataset; import org.apache.spark.sql.Encoders; diff --git a/spark/src/test/java/org/apache/iceberg/spark/source/TestSparkReadProjection.java b/spark/src/test/java/org/apache/iceberg/spark/source/TestSparkReadProjection.java index 9abfe63f56b3..41b00918e18c 100644 --- a/spark/src/test/java/org/apache/iceberg/spark/source/TestSparkReadProjection.java +++ b/spark/src/test/java/org/apache/iceberg/spark/source/TestSparkReadProjection.java @@ -19,8 +19,6 @@ package org.apache.iceberg.spark.source; -import com.google.common.collect.Lists; -import com.google.common.collect.Maps; import java.io.File; import java.io.IOException; import java.util.List; @@ -41,6 +39,8 @@ import org.apache.iceberg.io.FileAppender; import org.apache.iceberg.orc.ORC; import org.apache.iceberg.parquet.Parquet; +import org.apache.iceberg.relocated.com.google.common.collect.Lists; +import org.apache.iceberg.relocated.com.google.common.collect.Maps; import org.apache.iceberg.spark.SparkValueConverter; import org.apache.iceberg.types.Type; import org.apache.iceberg.types.TypeUtil; diff --git a/spark/src/test/java/org/apache/iceberg/spark/source/TestSparkSchema.java b/spark/src/test/java/org/apache/iceberg/spark/source/TestSparkSchema.java index bc52bce04658..d3c5cc4371bc 100644 --- a/spark/src/test/java/org/apache/iceberg/spark/source/TestSparkSchema.java +++ b/spark/src/test/java/org/apache/iceberg/spark/source/TestSparkSchema.java @@ -19,7 +19,6 @@ package org.apache.iceberg.spark.source; -import com.google.common.collect.Lists; import java.io.IOException; import java.util.List; import org.apache.hadoop.conf.Configuration; @@ -27,6 +26,7 @@ import org.apache.iceberg.PartitionSpec; import org.apache.iceberg.Schema; import org.apache.iceberg.hadoop.HadoopTables; +import org.apache.iceberg.relocated.com.google.common.collect.Lists; import org.apache.iceberg.types.Types; import org.apache.spark.sql.Dataset; import org.apache.spark.sql.Row; diff --git a/spark/src/test/java/org/apache/iceberg/spark/source/TestSparkTableUtil.java b/spark/src/test/java/org/apache/iceberg/spark/source/TestSparkTableUtil.java index c935bfc49ec6..d7a2b527d3b9 100644 --- a/spark/src/test/java/org/apache/iceberg/spark/source/TestSparkTableUtil.java +++ b/spark/src/test/java/org/apache/iceberg/spark/source/TestSparkTableUtil.java @@ -19,8 +19,6 @@ package org.apache.iceberg.spark.source; -import com.google.common.collect.ImmutableMap; -import com.google.common.collect.Lists; import java.io.File; import java.io.IOException; import java.util.List; @@ -30,6 +28,8 @@ import org.apache.iceberg.Table; import org.apache.iceberg.hadoop.HadoopTables; import org.apache.iceberg.hive.HiveTableBaseTest; +import org.apache.iceberg.relocated.com.google.common.collect.ImmutableMap; +import org.apache.iceberg.relocated.com.google.common.collect.Lists; import org.apache.iceberg.spark.SparkSchemaUtil; import org.apache.iceberg.spark.SparkTableUtil; import org.apache.iceberg.spark.SparkTableUtil.SparkPartition; diff --git a/spark/src/test/java/org/apache/iceberg/spark/source/TestSparkTableUtilWithInMemoryCatalog.java b/spark/src/test/java/org/apache/iceberg/spark/source/TestSparkTableUtilWithInMemoryCatalog.java index 80918e727699..f3f7e53dfb48 100644 --- a/spark/src/test/java/org/apache/iceberg/spark/source/TestSparkTableUtilWithInMemoryCatalog.java +++ b/spark/src/test/java/org/apache/iceberg/spark/source/TestSparkTableUtilWithInMemoryCatalog.java @@ -19,8 +19,6 @@ package org.apache.iceberg.spark.source; -import com.google.common.collect.Lists; -import com.google.common.collect.Maps; import java.io.File; import java.io.IOException; import java.util.List; @@ -31,6 +29,8 @@ 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.Lists; +import org.apache.iceberg.relocated.com.google.common.collect.Maps; import org.apache.iceberg.spark.SparkTableUtil; import org.apache.iceberg.spark.SparkTableUtil.SparkPartition; import org.apache.iceberg.types.Types; diff --git a/spark/src/test/java/org/apache/iceberg/spark/source/TestStructuredStreaming.java b/spark/src/test/java/org/apache/iceberg/spark/source/TestStructuredStreaming.java index caade7247d27..72eeab5a283b 100644 --- a/spark/src/test/java/org/apache/iceberg/spark/source/TestStructuredStreaming.java +++ b/spark/src/test/java/org/apache/iceberg/spark/source/TestStructuredStreaming.java @@ -19,8 +19,6 @@ package org.apache.iceberg.spark.source; -import com.google.common.collect.Iterables; -import com.google.common.collect.Lists; import java.io.File; import java.io.IOException; import java.util.List; @@ -29,6 +27,8 @@ import org.apache.iceberg.Schema; import org.apache.iceberg.Table; import org.apache.iceberg.hadoop.HadoopTables; +import org.apache.iceberg.relocated.com.google.common.collect.Iterables; +import org.apache.iceberg.relocated.com.google.common.collect.Lists; import org.apache.iceberg.types.Types; import org.apache.spark.sql.Dataset; import org.apache.spark.sql.Encoders; diff --git a/spark/src/test/java/org/apache/iceberg/spark/source/TestTables.java b/spark/src/test/java/org/apache/iceberg/spark/source/TestTables.java index b9d6c9c6d125..e61d6ffb9e5e 100644 --- a/spark/src/test/java/org/apache/iceberg/spark/source/TestTables.java +++ b/spark/src/test/java/org/apache/iceberg/spark/source/TestTables.java @@ -19,9 +19,6 @@ package org.apache.iceberg.spark.source; -import com.google.common.base.Preconditions; -import com.google.common.collect.ImmutableMap; -import com.google.common.collect.Maps; import java.io.File; import java.util.Map; import org.apache.iceberg.BaseTable; @@ -39,6 +36,9 @@ import org.apache.iceberg.io.InputFile; import org.apache.iceberg.io.LocationProvider; import org.apache.iceberg.io.OutputFile; +import org.apache.iceberg.relocated.com.google.common.base.Preconditions; +import org.apache.iceberg.relocated.com.google.common.collect.ImmutableMap; +import org.apache.iceberg.relocated.com.google.common.collect.Maps; // TODO: Use the copy of this from core. class TestTables { diff --git a/spark/src/test/java/org/apache/iceberg/spark/source/TestWriteMetricsConfig.java b/spark/src/test/java/org/apache/iceberg/spark/source/TestWriteMetricsConfig.java index 1eaf341764e3..efa48804646e 100644 --- a/spark/src/test/java/org/apache/iceberg/spark/source/TestWriteMetricsConfig.java +++ b/spark/src/test/java/org/apache/iceberg/spark/source/TestWriteMetricsConfig.java @@ -19,8 +19,6 @@ package org.apache.iceberg.spark.source; -import com.google.common.collect.Lists; -import com.google.common.collect.Maps; import java.io.IOException; import java.nio.ByteBuffer; import java.util.List; @@ -33,6 +31,8 @@ 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.Lists; +import org.apache.iceberg.relocated.com.google.common.collect.Maps; import org.apache.iceberg.spark.data.RandomData; import org.apache.iceberg.types.Types; import org.apache.iceberg.util.ByteBuffers; From 61b6662e023a337dadf1adace09916c91d2472de Mon Sep 17 00:00:00 2001 From: awoodhead Date: Mon, 18 May 2020 18:13:05 +0100 Subject: [PATCH 12/16] relocated --- .../main/java/org/apache/iceberg/BaseManifestReader.java | 8 ++++---- .../iceberg/spark/data/AvroWithSparkSchemaVisitor.java | 4 ++-- .../iceberg/spark/data/ParquetWithSparkSchemaVisitor.java | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/core/src/main/java/org/apache/iceberg/BaseManifestReader.java b/core/src/main/java/org/apache/iceberg/BaseManifestReader.java index 2d72b62afcd0..d253555a5afd 100644 --- a/core/src/main/java/org/apache/iceberg/BaseManifestReader.java +++ b/core/src/main/java/org/apache/iceberg/BaseManifestReader.java @@ -19,10 +19,6 @@ package org.apache.iceberg; -import com.google.common.base.Preconditions; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.Lists; -import com.google.common.collect.Sets; import java.io.IOException; import java.util.Collection; import java.util.List; @@ -40,6 +36,10 @@ import org.apache.iceberg.io.CloseableIterable; import org.apache.iceberg.io.CloseableIterator; import org.apache.iceberg.io.InputFile; +import org.apache.iceberg.relocated.com.google.common.base.Preconditions; +import org.apache.iceberg.relocated.com.google.common.collect.ImmutableList; +import org.apache.iceberg.relocated.com.google.common.collect.Lists; +import org.apache.iceberg.relocated.com.google.common.collect.Sets; import org.apache.iceberg.types.Types; import static org.apache.iceberg.expressions.Expressions.alwaysTrue; diff --git a/spark/src/main/java/org/apache/iceberg/spark/data/AvroWithSparkSchemaVisitor.java b/spark/src/main/java/org/apache/iceberg/spark/data/AvroWithSparkSchemaVisitor.java index 7f01e10d2969..9e3cb805a65e 100644 --- a/spark/src/main/java/org/apache/iceberg/spark/data/AvroWithSparkSchemaVisitor.java +++ b/spark/src/main/java/org/apache/iceberg/spark/data/AvroWithSparkSchemaVisitor.java @@ -19,13 +19,13 @@ package org.apache.iceberg.spark.data; -import com.google.common.base.Preconditions; -import com.google.common.collect.Lists; import java.util.Deque; import java.util.List; import org.apache.avro.Schema; import org.apache.iceberg.avro.AvroSchemaUtil; import org.apache.iceberg.avro.LogicalMap; +import org.apache.iceberg.relocated.com.google.common.base.Preconditions; +import org.apache.iceberg.relocated.com.google.common.collect.Lists; import org.apache.spark.sql.types.ArrayType; import org.apache.spark.sql.types.DataType; import org.apache.spark.sql.types.DataTypes; diff --git a/spark/src/main/java/org/apache/iceberg/spark/data/ParquetWithSparkSchemaVisitor.java b/spark/src/main/java/org/apache/iceberg/spark/data/ParquetWithSparkSchemaVisitor.java index 111356dbc479..924cc3e2325a 100644 --- a/spark/src/main/java/org/apache/iceberg/spark/data/ParquetWithSparkSchemaVisitor.java +++ b/spark/src/main/java/org/apache/iceberg/spark/data/ParquetWithSparkSchemaVisitor.java @@ -19,11 +19,11 @@ package org.apache.iceberg.spark.data; -import com.google.common.base.Preconditions; -import com.google.common.collect.Lists; import java.util.Deque; import java.util.List; import org.apache.iceberg.avro.AvroSchemaUtil; +import org.apache.iceberg.relocated.com.google.common.base.Preconditions; +import org.apache.iceberg.relocated.com.google.common.collect.Lists; import org.apache.parquet.schema.GroupType; import org.apache.parquet.schema.MessageType; import org.apache.parquet.schema.OriginalType; From fa32ad2dbe2e7b762ff1b1de9a462d5c50b6d316 Mon Sep 17 00:00:00 2001 From: awoodhead Date: Thu, 21 May 2020 15:09:31 +0100 Subject: [PATCH 13/16] changes suggested by @rdblue --- build.gradle | 8 ++++++-- bundled-guava/NOTICE | 12 ++++++++++++ .../main/java/org/apache/iceberg/GuavaClasses.java | 2 +- 3 files changed, 19 insertions(+), 3 deletions(-) create mode 100644 bundled-guava/NOTICE diff --git a/build.gradle b/build.gradle index 3690e7d99b63..226e3761cf9b 100644 --- a/build.gradle +++ b/build.gradle @@ -107,8 +107,6 @@ apply from: 'jmh.gradle' project(':iceberg-bundled-guava') { apply plugin: 'com.github.johnrengelman.shadow' - tasks.javadoc.enabled = false - tasks.javadocJar.enabled = false tasks.assemble.dependsOn tasks.shadowJar tasks.install.dependsOn tasks.shadowJar @@ -121,6 +119,11 @@ project(':iceberg-bundled-guava') { } } + jar { + classifier 'empty' + enabled = false + } + shadowJar { configurations = [project.configurations.compileOnly] zip64 true @@ -128,6 +131,7 @@ project(':iceberg-bundled-guava') { // include the LICENSE and NOTICE files for the shaded Jar from(projectDir) { include 'LICENSE' + include 'NOTICE' } dependencies { diff --git a/bundled-guava/NOTICE b/bundled-guava/NOTICE new file mode 100644 index 000000000000..cefcafb2c4c1 --- /dev/null +++ b/bundled-guava/NOTICE @@ -0,0 +1,12 @@ + +Apache Iceberg (incubating) +Copyright 2017-2020 The Apache Software Foundation + +This product includes software developed at +The Apache Software Foundation (http://www.apache.org/). + +-------------------------------------------------------------------------------- +| This product includes software from Google Guava (Apache 2.0) +| * Copyright (C) 2007 The Guava Authors +| * https://github.com/google/guava +-------------------------------------------------------------------------------- diff --git a/bundled-guava/src/main/java/org/apache/iceberg/GuavaClasses.java b/bundled-guava/src/main/java/org/apache/iceberg/GuavaClasses.java index 46662962f03b..82bfa7bf3528 100644 --- a/bundled-guava/src/main/java/org/apache/iceberg/GuavaClasses.java +++ b/bundled-guava/src/main/java/org/apache/iceberg/GuavaClasses.java @@ -52,7 +52,7 @@ import com.google.common.util.concurrent.ThreadFactoryBuilder; //inspired in part by https://github.com/apache/avro/blob/release-1.8.2/lang/java/guava/src/main/java/org/apache/avro/GuavaClasses.java -class GuavaClasses { +public class GuavaClasses { /* * Referencing Guava classes here includes them in the minimized and relocated Guava jar From 0e7169ac1a78408a633de7986c3ff271dbc80f8e Mon Sep 17 00:00:00 2001 From: awoodhead Date: Fri, 22 May 2020 16:17:23 +0100 Subject: [PATCH 14/16] replace default jar with shaded version --- build.gradle | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 226e3761cf9b..73816571ffef 100644 --- a/build.gradle +++ b/build.gradle @@ -120,11 +120,12 @@ project(':iceberg-bundled-guava') { } jar { - classifier 'empty' enabled = false } shadowJar { + baseName = 'iceberg-bundled-guava' + classifier = '' configurations = [project.configurations.compileOnly] zip64 true From 6cc49aac84c921d64f40366f3b81a4970272ce85 Mon Sep 17 00:00:00 2001 From: awoodhead Date: Fri, 22 May 2020 16:33:01 +0100 Subject: [PATCH 15/16] improved empty classifier on shadowJar --- build.gradle | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 73816571ffef..67ea9f5a6d08 100644 --- a/build.gradle +++ b/build.gradle @@ -124,8 +124,7 @@ project(':iceberg-bundled-guava') { } shadowJar { - baseName = 'iceberg-bundled-guava' - classifier = '' + classifier = null configurations = [project.configurations.compileOnly] zip64 true From 73fab7a0c4abc16687c848cdd428014990960684 Mon Sep 17 00:00:00 2001 From: Ryan Blue Date: Tue, 26 May 2020 09:24:33 -0700 Subject: [PATCH 16/16] Updates (#10) Merge master, tidy up, fix shadow jar publishing --- .gitignore | 3 + build.gradle | 49 ++++---- bundled-guava/LICENSE | 1 - bundled-guava/NOTICE | 5 - .../org/apache/iceberg/TableTestBase.java | 69 ++++++++++- .../org/apache/iceberg/TestFastAppend.java | 54 ++++++--- .../data/parquet/GenericParquetReaders.java | 13 ++ deploy.gradle | 6 +- python/iceberg/api/partition_field.py | 8 +- python/iceberg/api/partition_spec.py | 45 +++++-- python/iceberg/api/transforms/bucket.py | 12 +- python/iceberg/api/transforms/dates.py | 4 +- python/iceberg/api/transforms/timestamps.py | 2 +- python/iceberg/api/transforms/transforms.py | 16 +-- python/iceberg/api/transforms/truncate.py | 2 +- python/iceberg/api/types/type_util.py | 10 +- python/iceberg/core/base_table_scan.py | 4 +- python/iceberg/core/manifest_reader.py | 4 +- python/iceberg/core/partition_spec_parser.py | 49 ++++---- python/tests/core/test_partition_spec.py | 111 ++++++++++++++++++ .../tests/core/test_partition_spec_parser.py | 88 ++++++++++++-- python/tox.ini | 13 +- .../actions/RemoveOrphanFilesAction.java | 17 ++- .../actions/TestRemoveOrphanFilesAction.java | 53 ++++++++- 24 files changed, 516 insertions(+), 122 deletions(-) create mode 100644 python/tests/core/test_partition_spec.py diff --git a/.gitignore b/.gitignore index 13767d622f82..f1e459c8cb0a 100644 --- a/.gitignore +++ b/.gitignore @@ -38,3 +38,6 @@ bin/ # Hive/metastore files metastore_db/ + +# Python stuff +python/.mypy_cache/ diff --git a/build.gradle b/build.gradle index 67ea9f5a6d08..1bd68a574309 100644 --- a/build.gradle +++ b/build.gradle @@ -99,17 +99,11 @@ subprojects { } } -apply from: 'baseline.gradle' -apply from: 'deploy.gradle' -apply from: 'tasks.gradle' -apply from: 'jmh.gradle' - project(':iceberg-bundled-guava') { apply plugin: 'com.github.johnrengelman.shadow' - - tasks.assemble.dependsOn tasks.shadowJar - tasks.install.dependsOn tasks.shadowJar - + + tasks.jar.dependsOn tasks.shadowJar + dependencies { compileOnly('com.google.guava:guava') { exclude group: 'com.google.code.findbugs' @@ -118,13 +112,9 @@ project(':iceberg-bundled-guava') { exclude group: 'com.google.j2objc' } } - - jar { - enabled = false - } - + shadowJar { - classifier = null + classifier null configurations = [project.configurations.compileOnly] zip64 true @@ -144,6 +134,10 @@ project(':iceberg-bundled-guava') { minimize() } + + jar { + classifier 'empty' + } } project(':iceberg-api') { @@ -428,12 +422,11 @@ project(':iceberg-pig') { project(':iceberg-spark-runtime') { apply plugin: 'com.github.johnrengelman.shadow' - tasks.assemble.dependsOn tasks.shadowJar - tasks.install.dependsOn tasks.shadowJar - tasks.javadocJar.dependsOn tasks.shadowJar + tasks.jar.dependsOn tasks.shadowJar configurations { - compileOnly { + compile { + exclude group: 'org.apache.spark' // included in Spark exclude group: 'org.slf4j' exclude group: 'org.apache.commons' @@ -446,12 +439,12 @@ project(':iceberg-spark-runtime') { } dependencies { - compileOnly project(':iceberg-spark') + compile project(':iceberg-spark') + compile 'org.apache.spark:spark-hive_2.11' } shadowJar { - // shade compileOnly dependencies to avoid including in transitive dependencies - configurations = [project.configurations.compileOnly] + configurations = [project.configurations.compile] zip64 true @@ -481,7 +474,11 @@ project(':iceberg-spark-runtime') { relocate 'org.apache.arrow', 'org.apache.iceberg.shaded.org.apache.arrow' relocate 'com.carrotsearch', 'org.apache.iceberg.shaded.com.carrotsearch' - archiveName = "iceberg-spark-runtime-${version}.${extension}" + classifier null + } + + jar { + classifier = 'empty' } } @@ -519,3 +516,9 @@ String getJavadocVersion() { throw new Exception("Neither version.txt nor git version exists") } } + +apply from: 'baseline.gradle' +apply from: 'deploy.gradle' +apply from: 'tasks.gradle' +apply from: 'jmh.gradle' + diff --git a/bundled-guava/LICENSE b/bundled-guava/LICENSE index 13464a315a90..597de019cdd7 100644 --- a/bundled-guava/LICENSE +++ b/bundled-guava/LICENSE @@ -209,4 +209,3 @@ Copyright: 2006-2019 The Guava Authors Home page: https://github.com/google/guava License: http://www.apache.org/licenses/LICENSE-2.0 --------------------------------------------------------------------------------- diff --git a/bundled-guava/NOTICE b/bundled-guava/NOTICE index cefcafb2c4c1..0f0fa79e5924 100644 --- a/bundled-guava/NOTICE +++ b/bundled-guava/NOTICE @@ -5,8 +5,3 @@ Copyright 2017-2020 The Apache Software Foundation This product includes software developed at The Apache Software Foundation (http://www.apache.org/). --------------------------------------------------------------------------------- -| This product includes software from Google Guava (Apache 2.0) -| * Copyright (C) 2007 The Guava Authors -| * https://github.com/google/guava --------------------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/iceberg/TableTestBase.java b/core/src/test/java/org/apache/iceberg/TableTestBase.java index 4dae4155bb8b..e2c73782bf12 100644 --- a/core/src/test/java/org/apache/iceberg/TableTestBase.java +++ b/core/src/test/java/org/apache/iceberg/TableTestBase.java @@ -24,6 +24,7 @@ import java.util.Iterator; import java.util.List; import java.util.Set; +import java.util.stream.LongStream; import org.apache.iceberg.io.FileIO; import org.apache.iceberg.io.OutputFile; import org.apache.iceberg.relocated.com.google.common.collect.ImmutableList; @@ -87,9 +88,15 @@ public class TableTestBase { public TestTables.TestTable table = null; protected final int formatVersion; + @SuppressWarnings("checkstyle:MemberName") + protected final Assertions V1Assert; + @SuppressWarnings("checkstyle:MemberName") + protected final Assertions V2Assert; public TableTestBase(int formatVersion) { this.formatVersion = formatVersion; + this.V1Assert = new Assertions(1, formatVersion); + this.V2Assert = new Assertions(2, formatVersion); } @Before @@ -209,6 +216,14 @@ ManifestEntry manifestEntry(ManifestEntry.Status status, Long snapshotId, DataFi } void validateSnapshot(Snapshot old, Snapshot snap, DataFile... newFiles) { + validateSnapshot(old, snap, null, newFiles); + } + + void validateSnapshot(Snapshot old, Snapshot snap, long sequenceNumber, DataFile... newFiles) { + validateSnapshot(old, snap, (Long) sequenceNumber, newFiles); + } + + void validateSnapshot(Snapshot old, Snapshot snap, Long sequenceNumber, DataFile... newFiles) { List oldManifests = old != null ? old.manifests() : ImmutableList.of(); // copy the manifests to a modifiable list and remove the existing manifests @@ -227,6 +242,10 @@ void validateSnapshot(Snapshot old, Snapshot snap, DataFile... newFiles) { for (ManifestEntry entry : ManifestFiles.read(manifest, FILE_IO).entries()) { DataFile file = entry.file(); + if (sequenceNumber != null) { + V1Assert.assertEquals("Sequence number should default to 0", 0, entry.sequenceNumber().longValue()); + V2Assert.assertEquals("Sequence number should match expected", sequenceNumber, entry.sequenceNumber()); + } Assert.assertEquals("Path should match expected", newPaths.next(), file.path().toString()); Assert.assertEquals("File's snapshot ID should match", id, (long) entry.snapshotId()); } @@ -254,12 +273,23 @@ List paths(DataFile... dataFiles) { return paths; } - static void validateManifest(ManifestFile manifest, - Iterator ids, - Iterator expectedFiles) { + void validateManifest(ManifestFile manifest, + Iterator ids, + Iterator expectedFiles) { + validateManifest(manifest, null, ids, expectedFiles); + } + + void validateManifest(ManifestFile manifest, + Iterator seqs, + Iterator ids, + Iterator expectedFiles) { for (ManifestEntry entry : ManifestFiles.read(manifest, FILE_IO).entries()) { DataFile file = entry.file(); DataFile expected = expectedFiles.next(); + if (seqs != null) { + V1Assert.assertEquals("Sequence number should default to 0", 0, entry.sequenceNumber().longValue()); + V2Assert.assertEquals("Sequence number should match expected", seqs.next(), entry.sequenceNumber()); + } Assert.assertEquals("Path should match expected", expected.path().toString(), file.path().toString()); Assert.assertEquals("Snapshot ID should match expected ID", @@ -292,6 +322,10 @@ static Iterator statuses(ManifestEntry.Status... statuses) return Iterators.forArray(statuses); } + static Iterator seqs(long... seqs) { + return LongStream.of(seqs).iterator(); + } + static Iterator ids(Long... ids) { return Iterators.forArray(ids); } @@ -303,4 +337,33 @@ static Iterator files(DataFile... files) { static Iterator files(ManifestFile manifest) { return ManifestFiles.read(manifest, FILE_IO).iterator(); } + + /** + * Used for assertions that only apply if the table version is v2. + */ + protected static class Assertions { + private final boolean enabled; + + private Assertions(int validForVersion, int formatVersion) { + this.enabled = validForVersion == formatVersion; + } + + void assertEquals(String context, int expected, int actual) { + if (enabled) { + Assert.assertEquals(context, expected, actual); + } + } + + void assertEquals(String context, long expected, long actual) { + if (enabled) { + Assert.assertEquals(context, expected, actual); + } + } + + void assertEquals(String context, Object expected, Object actual) { + if (enabled) { + Assert.assertEquals(context, expected, actual); + } + } + } } diff --git a/core/src/test/java/org/apache/iceberg/TestFastAppend.java b/core/src/test/java/org/apache/iceberg/TestFastAppend.java index 2bda21dccd29..1cc478d11ffe 100644 --- a/core/src/test/java/org/apache/iceberg/TestFastAppend.java +++ b/core/src/test/java/org/apache/iceberg/TestFastAppend.java @@ -52,13 +52,21 @@ public void testEmptyTableAppend() { TableMetadata base = readMetadata(); Assert.assertNull("Should not have a current snapshot", base.currentSnapshot()); + Assert.assertEquals("Table should start with last-sequence-number 0", 0, base.lastSequenceNumber()); - Snapshot pending = table.newFastAppend() + table.newFastAppend() .appendFile(FILE_A) .appendFile(FILE_B) - .apply(); + .commit(); + + Snapshot snap = table.currentSnapshot(); + + validateSnapshot(base.currentSnapshot(), snap, 1, FILE_A, FILE_B); - validateSnapshot(base.currentSnapshot(), pending, FILE_A, FILE_B); + V2Assert.assertEquals("Snapshot sequence number should be 1", 1, snap.sequenceNumber()); + V2Assert.assertEquals("Last sequence number should be 1", 1, readMetadata().lastSequenceNumber()); + + V1Assert.assertEquals("Table should end with last-sequence-number 0", 0, base.lastSequenceNumber()); } @Test @@ -67,17 +75,25 @@ public void testEmptyTableAppendManifest() throws IOException { TableMetadata base = readMetadata(); Assert.assertNull("Should not have a current snapshot", base.currentSnapshot()); + Assert.assertEquals("Table should start with last-sequence-number 0", 0, base.lastSequenceNumber()); ManifestFile manifest = writeManifest(FILE_A, FILE_B); - Snapshot pending = table.newFastAppend() + table.newFastAppend() .appendManifest(manifest) - .apply(); + .commit(); - validateSnapshot(base.currentSnapshot(), pending, FILE_A, FILE_B); + Snapshot snap = table.currentSnapshot(); + + validateSnapshot(base.currentSnapshot(), snap, 1, FILE_A, FILE_B); // validate that the metadata summary is correct when using appendManifest Assert.assertEquals("Summary metadata should include 2 added files", - "2", pending.summary().get("added-data-files")); + "2", snap.summary().get("added-data-files")); + + V2Assert.assertEquals("Snapshot sequence number should be 1", 1, snap.sequenceNumber()); + V2Assert.assertEquals("Last sequence number should be 1", 1, readMetadata().lastSequenceNumber()); + + V1Assert.assertEquals("Table should end with last-sequence-number 0", 0, base.lastSequenceNumber()); } @Test @@ -86,22 +102,32 @@ public void testEmptyTableAppendFilesAndManifest() throws IOException { TableMetadata base = readMetadata(); Assert.assertNull("Should not have a current snapshot", base.currentSnapshot()); + Assert.assertEquals("Table should start with last-sequence-number 0", 0, base.lastSequenceNumber()); ManifestFile manifest = writeManifest(FILE_A, FILE_B); - Snapshot pending = table.newFastAppend() + table.newFastAppend() .appendFile(FILE_C) .appendFile(FILE_D) .appendManifest(manifest) - .apply(); + .commit(); + + Snapshot snap = table.currentSnapshot(); - long pendingId = pending.snapshotId(); + long commitId = snap.snapshotId(); - validateManifest(pending.manifests().get(0), - ids(pendingId, pendingId), + validateManifest(snap.manifests().get(0), + seqs(1, 1), + ids(commitId, commitId), files(FILE_C, FILE_D)); - validateManifest(pending.manifests().get(1), - ids(pendingId, pendingId), + validateManifest(snap.manifests().get(1), + seqs(1, 1), + ids(commitId, commitId), files(FILE_A, FILE_B)); + + V2Assert.assertEquals("Snapshot sequence number should be 1", 1, snap.sequenceNumber()); + V2Assert.assertEquals("Last sequence number should be 1", 1, readMetadata().lastSequenceNumber()); + + V1Assert.assertEquals("Table should end with last-sequence-number 0", 0, base.lastSequenceNumber()); } @Test diff --git a/data/src/main/java/org/apache/iceberg/data/parquet/GenericParquetReaders.java b/data/src/main/java/org/apache/iceberg/data/parquet/GenericParquetReaders.java index 2f6f3b07933d..07419d57df8d 100644 --- a/data/src/main/java/org/apache/iceberg/data/parquet/GenericParquetReaders.java +++ b/data/src/main/java/org/apache/iceberg/data/parquet/GenericParquetReaders.java @@ -245,6 +245,8 @@ public ParquetValueReader primitive(org.apache.iceberg.types.Type.PrimitiveTy } case TIME_MICROS: return new TimeReader(desc); + case TIME_MILLIS: + return new TimeMillisReader(desc); case DECIMAL: DecimalMetadata decimal = primitive.getDecimalMetadata(); switch (primitive.getPrimitiveTypeName()) { @@ -356,6 +358,17 @@ public OffsetDateTime read(OffsetDateTime reuse) { } } + private static class TimeMillisReader extends PrimitiveReader { + private TimeMillisReader(ColumnDescriptor desc) { + super(desc); + } + + @Override + public LocalTime read(LocalTime reuse) { + return LocalTime.ofNanoOfDay(column.nextLong() * 1000000L); + } + } + private static class TimeReader extends PrimitiveReader { private TimeReader(ColumnDescriptor desc) { super(desc); diff --git a/deploy.gradle b/deploy.gradle index 29e5a1f21231..82d91c26f865 100644 --- a/deploy.gradle +++ b/deploy.gradle @@ -57,7 +57,11 @@ subprojects { publishing { publications { apache(MavenPublication) { - from components.java + if (tasks.matching({task -> task.name == 'shadowJar'}).isEmpty()) { + from components.java + } else { + project.shadow.component(it) + } artifact sourceJar artifact javadocJar diff --git a/python/iceberg/api/partition_field.py b/python/iceberg/api/partition_field.py index adaca2894370..8e789a10897b 100644 --- a/python/iceberg/api/partition_field.py +++ b/python/iceberg/api/partition_field.py @@ -18,8 +18,9 @@ class PartitionField(object): - def __init__(self, source_id, name, transform): + def __init__(self, source_id, field_id, name, transform): self.source_id = source_id + self.field_id = field_id self.name = name self.transform = transform @@ -29,7 +30,8 @@ def __eq__(self, other): elif other is None or not isinstance(other, PartitionField): return False - return self.source_id == other.source_id and self.name == other.name and self.transform == other.transform + return self.source_id == other.source_id and self.field_id == other.field_id and \ + self.name == other.name and self.transform == other.transform def __ne__(self, other): return not self.__eq__(other) @@ -38,4 +40,4 @@ def __hash__(self): return hash(self.__key()) def __key(self): - return PartitionField.__class__, self.source_id, self.name, self.transform + return PartitionField.__class__, self.source_id, self.field_id, self.name, self.transform diff --git a/python/iceberg/api/partition_spec.py b/python/iceberg/api/partition_spec.py index 95cce0e6a679..1451fbfe617b 100644 --- a/python/iceberg/api/partition_spec.py +++ b/python/iceberg/api/partition_spec.py @@ -32,13 +32,13 @@ class PartitionSpec(object): @staticmethod def UNPARTITIONED_SPEC(): - return PartitionSpec(Schema(), 0, []) + return PartitionSpec(Schema(), 0, [], PartitionSpec.PARTITION_DATA_ID_START - 1) @staticmethod def unpartitioned(): return PartitionSpec.UNPARTITIONED_SPEC() - def __init__(self, schema, spec_id, fields): + def __init__(self, schema, spec_id, fields, last_assigned_field_id): self.fields_by_source_id = None self.fields_by_name = None self.__java_classes = None @@ -49,6 +49,7 @@ def __init__(self, schema, spec_id, fields): self.__fields = list() for field in fields: self.__fields.append(field) + self.last_assigned_field_id = last_assigned_field_id @property def fields(self): @@ -70,10 +71,10 @@ def get_field_by_source_id(self, field_id): def partition_type(self): struct_fields = list() - for i, field in enumerate(self.__fields): + for _i, field in enumerate(self.__fields): source_type = self.schema.find_type(field.source_id) result_type = field.transform.get_result_type(source_type) - struct_fields.append(NestedField.optional(PartitionSpec.PARTITION_DATA_ID_START + i, + struct_fields.append(NestedField.optional(field.field_id, field.name, result_type)) @@ -170,9 +171,10 @@ def __repr__(self): sb = ["["] for field in self.__fields: - sb.append("\n {name}: {transform}({source_id})".format(name=field.name, - transform=str(field.transform), - source_id=field.source_id)) + sb.append("\n {field_id}: {name}: {transform}({source_id})".format(field_id=field.field_id, + name=field.name, + transform=str(field.transform), + source_id=field.source_id)) if len(self.__fields) > 0: sb.append("\n") @@ -201,6 +203,11 @@ def __init__(self, schema): self.fields = list() self.partition_names = set() self.spec_id = 0 + self.last_assigned_field_id = PartitionSpec.PARTITION_DATA_ID_START - 1 + + def __next_field_id(self): + self.last_assigned_field_id = self.last_assigned_field_id + 1 + return self.last_assigned_field_id def with_spec_id(self, spec_id): self.spec_id = spec_id @@ -226,6 +233,7 @@ def identity(self, source_name): self.check_and_add_partition_name(source_name) source_column = self.find_source_column(source_name) self.fields.append(PartitionField(source_column.field_id, + self.__next_field_id(), source_name, Transforms.identity(source_column.type))) return self @@ -235,8 +243,9 @@ def year(self, source_name): self.check_and_add_partition_name(name) source_column = self.find_source_column(source_name) self.fields.append(PartitionField(source_column.field_id, + self.__next_field_id(), name, - Transforms.year(source_column.types))) + Transforms.year(source_column.type))) return self def month(self, source_name): @@ -244,8 +253,9 @@ def month(self, source_name): self.check_and_add_partition_name(name) source_column = self.find_source_column(source_name) self.fields.append(PartitionField(source_column.field_id, + self.__next_field_id(), name, - Transforms.month(source_column.types))) + Transforms.month(source_column.type))) return self def day(self, source_name): @@ -253,8 +263,9 @@ def day(self, source_name): self.check_and_add_partition_name(name) source_column = self.find_source_column(source_name) self.fields.append(PartitionField(source_column.field_id, + self.__next_field_id(), name, - Transforms.day(source_column.types))) + Transforms.day(source_column.type))) return self def hour(self, source_name): @@ -262,6 +273,7 @@ def hour(self, source_name): self.check_and_add_partition_name(name) source_column = self.find_source_column(source_name) self.fields.append(PartitionField(source_column.field_id, + self.__next_field_id(), name, Transforms.hour(source_column.type))) return self @@ -271,6 +283,7 @@ def bucket(self, source_name, num_buckets): self.check_and_add_partition_name(name) source_column = self.find_source_column(source_name) self.fields.append(PartitionField(source_column.field_id, + self.__next_field_id(), name, Transforms.bucket(source_column.type, num_buckets))) return self @@ -280,11 +293,15 @@ def truncate(self, source_name, width): self.check_and_add_partition_name(name) source_column = self.find_source_column(source_name) self.fields.append(PartitionField(source_column.field_id, + self.__next_field_id(), name, - Transforms.truncate(source_column.types, width))) + Transforms.truncate(source_column.type, width))) return self - def add(self, source_id, name, transform): + def add_without_field_id(self, source_id, name, transform): + return self.add(source_id, self.__next_field_id(), name, transform) + + def add(self, source_id, field_id, name, transform): self.check_and_add_partition_name(name) column = self.schema.find_field(source_id) if column is None: @@ -292,12 +309,14 @@ def add(self, source_id, name, transform): transform_obj = Transforms.from_string(column.type, transform) field = PartitionField(source_id, + field_id, name, transform_obj) self.fields.append(field) + self.last_assigned_field_id = max(self.last_assigned_field_id, field_id) return self def build(self): - spec = PartitionSpec(self.schema, self.spec_id, self.fields) + spec = PartitionSpec(self.schema, self.spec_id, self.fields, self.last_assigned_field_id) PartitionSpec.check_compatibility(spec, self.schema) return spec diff --git a/python/iceberg/api/transforms/bucket.py b/python/iceberg/api/transforms/bucket.py index c1672da4a4eb..64db7122089e 100644 --- a/python/iceberg/api/transforms/bucket.py +++ b/python/iceberg/api/transforms/bucket.py @@ -101,7 +101,7 @@ def hash(self, value): return Bucket.MURMUR3.hash(struct.pack("q", value)) def can_transform(self, type_var): - return type_var.type_id() in [TypeID.INTEGER, TypeID.DATE] + return type_var.type_id in [TypeID.INTEGER, TypeID.DATE] class BucketLong(Bucket): @@ -112,9 +112,9 @@ def hash(self, value): return Bucket.MURMUR3.hash(struct.pack("q", value)) def can_transform(self, type_var): - return type_var.type_id() in [TypeID.LONG, - TypeID.TIME, - TypeID.TIMESTAMP] + return type_var.type_id in [TypeID.LONG, + TypeID.TIME, + TypeID.TIMESTAMP] class BucketFloat(Bucket): @@ -125,7 +125,7 @@ def hash(self, value): return Bucket.MURMUR3.hash(struct.pack("d", value)) def can_transform(self, type_var): - return type_var.type_id() == TypeID.FLOAT + return type_var.type_id == TypeID.FLOAT class BucketDouble(Bucket): @@ -136,7 +136,7 @@ def hash(self, value): return Bucket.MURMUR3.hash(struct.pack("d", value)) def can_transform(self, type_var): - return type_var.type_id() == TypeID.DOUBLE + return type_var.type_id == TypeID.DOUBLE class BucketDecimal(Bucket): diff --git a/python/iceberg/api/transforms/dates.py b/python/iceberg/api/transforms/dates.py index 628281b20b81..474b986f696d 100644 --- a/python/iceberg/api/transforms/dates.py +++ b/python/iceberg/api/transforms/dates.py @@ -52,7 +52,7 @@ def apply(self, days): return apply_func(datetime.datetime.utcfromtimestamp(days * Dates.SECONDS_IN_DAY), Dates.EPOCH) def can_transform(self, type): - return type.type_id() == TypeID.DATE + return type.type_id == TypeID.DATE def get_result_type(self, source_type): return IntegerType.get() @@ -73,4 +73,4 @@ def to_human_string(self, value): return Dates.HUMAN_FUNCS[self.granularity](value) def __str__(self): - return "%s" % self + return self.name diff --git a/python/iceberg/api/transforms/timestamps.py b/python/iceberg/api/transforms/timestamps.py index 697cec67e594..25c4439bc179 100644 --- a/python/iceberg/api/transforms/timestamps.py +++ b/python/iceberg/api/transforms/timestamps.py @@ -50,7 +50,7 @@ def apply(self, value): return apply_func(datetime.datetime.utcfromtimestamp(value / 1000000), Timestamps.EPOCH) def can_transform(self, type_var): - return type_var == TypeID.TIMESTAMP + return type_var.type_id == TypeID.TIMESTAMP def get_result_type(self, source_type): return IntegerType.get() diff --git a/python/iceberg/api/transforms/transforms.py b/python/iceberg/api/transforms/transforms.py index c14d84930f6b..0cf243e0f912 100644 --- a/python/iceberg/api/transforms/transforms.py +++ b/python/iceberg/api/transforms/transforms.py @@ -42,22 +42,22 @@ def __init__(self): pass @staticmethod - def from_string(type, transform): + def from_string(type_var, transform): match = Transforms.HAS_WIDTH.match(transform) if match is not None: name = match.group(1) - w = match.group(2) + w = int(match.group(2)) if name.lower() == "truncate": - return Truncate.get(type, w) + return Truncate.get(type_var, w) elif name.lower() == "bucket": - return Bucket.get(type, w) + return Bucket.get(type_var, w) if transform.lower() == "identity": - return Identity.get(type) - elif type.type_id() == TypeID.TIMESTAMP: + return Identity.get(type_var) + elif type_var.type_id == TypeID.TIMESTAMP: return Timestamps(transform.lower(), transform.lower()) - elif type.type_id() == TypeID.DATE: + elif type_var.type_id == TypeID.DATE: return Dates(transform.lower(), transform.lower()) raise RuntimeError("Unknown transform: %s" % transform) @@ -108,4 +108,4 @@ def bucket(type_var, num_buckets): @staticmethod def truncate(type_var, width): - return Truncate.get(type, width) + return Truncate.get(type_var, width) diff --git a/python/iceberg/api/transforms/truncate.py b/python/iceberg/api/transforms/truncate.py index cd001ad44eac..b37e6f0b06dd 100644 --- a/python/iceberg/api/transforms/truncate.py +++ b/python/iceberg/api/transforms/truncate.py @@ -32,7 +32,7 @@ def get(type_var, width): if type_var.type_id == TypeID.INTEGER: return TruncateInteger(width) elif type_var.type_id == TypeID.LONG: - return TruncateInteger(width) + return TruncateLong(width) elif type_var.type_id == TypeID.DECIMAL: return TruncateDecimal(width) elif type_var.type_id == TypeID.STRING: diff --git a/python/iceberg/api/types/type_util.py b/python/iceberg/api/types/type_util.py index ca52a7db9c6f..68f0f595acf3 100644 --- a/python/iceberg/api/types/type_util.py +++ b/python/iceberg/api/types/type_util.py @@ -16,6 +16,7 @@ # under the License. import math +from typing import List from .type import (Type, TypeID) @@ -238,7 +239,6 @@ def get(self): return self.visitor.field(self.field, VisitFuture(self.field.type, self.visitor).get) -@staticmethod def decimal_required_bytes(precision): if precision < 0 or precision > 40: raise RuntimeError("Unsupported decimal precision: %s" % precision) @@ -451,11 +451,11 @@ def write_compatibility_errors(read_schema, write_schema): def read_compatibility_errors(read_schema, write_schema): visit(write_schema, CheckCompatibility(read_schema, False)) - NO_ERRORS = [] + NO_ERRORS: List[str] = [] def __init__(self, schema, check_ordering): self.schema = schema - self.check_ordering + self.check_ordering = check_ordering self.current_type = None def schema(self, schema, struct_result): @@ -498,10 +498,10 @@ def struct(self, struct, field_results): return errors - def field(self, field, field_result): + def field(self, field, field_result) -> List[str]: struct = self.current_type.as_struct_type() curr_field = struct.field(field.field_id) - errors = list() + errors = [] if curr_field is None: if not field.is_optional: diff --git a/python/iceberg/core/base_table_scan.py b/python/iceberg/core/base_table_scan.py index d205364aad15..e64038d3136a 100644 --- a/python/iceberg/core/base_table_scan.py +++ b/python/iceberg/core/base_table_scan.py @@ -34,9 +34,9 @@ class BaseTableScan(CloseableGroup, TableScan): DATE_FORMAT = "%Y-%m-%d %H:%M:%S.%f" - SNAPSHOT_COLUMNS = ["snapshot_id", "file_path", "file_ordinal", "file_format", "block_size_in_bytes", + SNAPSHOT_COLUMNS = ("snapshot_id", "file_path", "file_ordinal", "file_format", "block_size_in_bytes", "file_size_in_bytes", "record_count", "partition", "value_counts", "null_value_counts", - "lower_bounds", "upper_bounds"] + "lower_bounds", "upper_bounds") def new_refined_scan(self, ops, table, schema, snapshot_id, row_filter, case_sensitive, selected_columns, options, minused_cols): diff --git a/python/iceberg/core/manifest_reader.py b/python/iceberg/core/manifest_reader.py index 6a4581293a6f..e648684f29fe 100644 --- a/python/iceberg/core/manifest_reader.py +++ b/python/iceberg/core/manifest_reader.py @@ -33,8 +33,8 @@ class ManifestReader(CloseableGroup, Filterable): - ALL_COLUMNS = ["*"] - CHANGE_COLUMNS = ["file_path", "file_format", "partition", "record_count", "file_size_in_bytes"] + ALL_COLUMNS = ("*",) + CHANGE_COLUMNS = ("file_path", "file_format", "partition", "record_count", "file_size_in_bytes") @staticmethod def read(file, spec_lookup=None): diff --git a/python/iceberg/core/partition_spec_parser.py b/python/iceberg/core/partition_spec_parser.py index 600904d53af1..ab57079c55b1 100644 --- a/python/iceberg/core/partition_spec_parser.py +++ b/python/iceberg/core/partition_spec_parser.py @@ -25,6 +25,7 @@ class PartitionSpecParser(object): SPEC_ID = "spec-id" FIELDS = "fields" SOURCE_ID = "source-id" + FIELD_ID = "field-id" TRANSFORM = "transform" NAME = "name" @@ -41,7 +42,8 @@ def to_dict(spec): def to_json_fields(spec): return [{PartitionSpecParser.NAME: field.name, PartitionSpecParser.TRANSFORM: str(field.transform), - PartitionSpecParser.SOURCE_ID: field.source_id} + PartitionSpecParser.SOURCE_ID: field.source_id, + PartitionSpecParser.FIELD_ID: field.field_id} for field in spec.fields] @staticmethod @@ -56,18 +58,8 @@ def from_json(schema, json_obj): builder = PartitionSpec.builder_for(schema).with_spec_id(spec_id) fields = json_obj.get(PartitionSpecParser.FIELDS) - if not isinstance(fields, (list, tuple)): - raise RuntimeError("Cannot parse partition spec fields, not an array: %s" % fields) - for element in fields: - if not isinstance(element, dict): - raise RuntimeError("Cannot parse partition field, not an object: %s" % element) - - builder.add(element.get(PartitionSpecParser.SOURCE_ID), - element.get(PartitionSpecParser.NAME), - element.get(PartitionSpecParser.TRANSFORM)) - - return builder.build() + return PartitionSpecParser.__build_from_json_fields(builder, fields) @staticmethod def from_json_fields(schema, spec_id, json_obj): @@ -76,14 +68,31 @@ def from_json_fields(schema, spec_id, json_obj): if isinstance(json_obj, str): json_obj = json.loads(json_obj) - if not isinstance(json_obj, list): - raise RuntimeError("Cannot parse partition spec fields, not an array: %s" % json_obj) + return PartitionSpecParser.__build_from_json_fields(builder, json_obj) + + @staticmethod + def __build_from_json_fields(builder, json_fields): + if not isinstance(json_fields, (list, tuple)): + raise RuntimeError("Cannot parse partition spec fields, not an array: %s" % json_fields) + + field_id_count = 0 + for element in json_fields: + if not isinstance(element, dict): + raise RuntimeError("Cannot parse partition field, not an object: %s" % element) - for item in json_obj: - if not isinstance(item, dict): - raise RuntimeError("Cannot parse partition field, not an object: %s" % json_obj) - builder.add(item.get(PartitionSpecParser.SOURCE_ID), - item.get(PartitionSpecParser.NAME), - item.get(PartitionSpecParser.TRANSFORM)) + if element.get(PartitionSpecParser.FIELD_ID) is not None: + builder.add(element.get(PartitionSpecParser.SOURCE_ID), + element.get(PartitionSpecParser.FIELD_ID), + element.get(PartitionSpecParser.NAME), + element.get(PartitionSpecParser.TRANSFORM)) + field_id_count = field_id_count + 1 + else: + builder.add_without_field_id(element.get(PartitionSpecParser.SOURCE_ID), + element.get(PartitionSpecParser.NAME), + element.get(PartitionSpecParser.TRANSFORM)) + + if field_id_count > 0 and field_id_count != len(json_fields): + raise RuntimeError("Cannot parse spec with missing field IDs: %s missing of %s fields." % + (len(json_fields) - field_id_count, len(json_fields))) return builder.build() diff --git a/python/tests/core/test_partition_spec.py b/python/tests/core/test_partition_spec.py new file mode 100644 index 000000000000..f0f3b9b01a43 --- /dev/null +++ b/python/tests/core/test_partition_spec.py @@ -0,0 +1,111 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +from iceberg.api import PartitionSpec, Schema +from iceberg.api.types import (BinaryType, + DateType, + DecimalType, + FixedType, + IntegerType, + LongType, + NestedField, + StringType, + TimestampType, + TimeType, + UUIDType) + + +def test_to_json_conversion(): + spec_schema = Schema(NestedField.required(1, "i", IntegerType.get()), + NestedField.required(2, "l", LongType.get()), + NestedField.required(3, "d", DateType.get()), + NestedField.required(4, "t", TimeType.get()), + NestedField.required(5, "ts", TimestampType.without_timezone()), + NestedField.required(6, "dec", DecimalType.of(9, 2)), + NestedField.required(7, "s", StringType.get()), + NestedField.required(8, "u", UUIDType.get()), + NestedField.required(9, "f", FixedType.of_length(3)), + NestedField.required(10, "b", BinaryType.get())) + + specs = [ + PartitionSpec.builder_for(spec_schema).identity("i").build(), + PartitionSpec.builder_for(spec_schema).identity("l").build(), + PartitionSpec.builder_for(spec_schema).identity("d").build(), + PartitionSpec.builder_for(spec_schema).identity("t").build(), + PartitionSpec.builder_for(spec_schema).identity("ts").build(), + PartitionSpec.builder_for(spec_schema).identity("dec").build(), + PartitionSpec.builder_for(spec_schema).identity("s").build(), + PartitionSpec.builder_for(spec_schema).identity("u").build(), + PartitionSpec.builder_for(spec_schema).identity("f").build(), + PartitionSpec.builder_for(spec_schema).identity("b").build(), + PartitionSpec.builder_for(spec_schema).bucket("i", 128).build(), + PartitionSpec.builder_for(spec_schema).bucket("l", 128).build(), + PartitionSpec.builder_for(spec_schema).bucket("d", 128).build(), + PartitionSpec.builder_for(spec_schema).bucket("t", 128).build(), + PartitionSpec.builder_for(spec_schema).bucket("ts", 128).build(), + PartitionSpec.builder_for(spec_schema).bucket("dec", 128).build(), + PartitionSpec.builder_for(spec_schema).bucket("s", 128).build(), + PartitionSpec.builder_for(spec_schema).year("d").build(), + PartitionSpec.builder_for(spec_schema).month("d").build(), + PartitionSpec.builder_for(spec_schema).day("d").build(), + PartitionSpec.builder_for(spec_schema).year("ts").build(), + PartitionSpec.builder_for(spec_schema).month("ts").build(), + PartitionSpec.builder_for(spec_schema).day("ts").build(), + PartitionSpec.builder_for(spec_schema).hour("ts").build(), + PartitionSpec.builder_for(spec_schema).truncate("i", 10).build(), + PartitionSpec.builder_for(spec_schema).truncate("l", 10).build(), + PartitionSpec.builder_for(spec_schema).truncate("dec", 10).build(), + PartitionSpec.builder_for(spec_schema).truncate("s", 10).build(), + PartitionSpec.builder_for(spec_schema).add_without_field_id(6, "dec_bucket", "bucket[16]").build(), + PartitionSpec.builder_for(spec_schema).add(6, 1011, "dec_bucket", "bucket[16]").build(), + ] + + expected_spec_strs = [ + "[\n 1000: i: identity(1)\n]", + "[\n 1000: l: identity(2)\n]", + "[\n 1000: d: identity(3)\n]", + "[\n 1000: t: identity(4)\n]", + "[\n 1000: ts: identity(5)\n]", + "[\n 1000: dec: identity(6)\n]", + "[\n 1000: s: identity(7)\n]", + "[\n 1000: u: identity(8)\n]", + "[\n 1000: f: identity(9)\n]", + "[\n 1000: b: identity(10)\n]", + "[\n 1000: i_bucket: bucket[128](1)\n]", + "[\n 1000: l_bucket: bucket[128](2)\n]", + "[\n 1000: d_bucket: bucket[128](3)\n]", + "[\n 1000: t_bucket: bucket[128](4)\n]", + "[\n 1000: ts_bucket: bucket[128](5)\n]", + "[\n 1000: dec_bucket: bucket[128](6)\n]", + "[\n 1000: s_bucket: bucket[128](7)\n]", + "[\n 1000: d_year: year(3)\n]", + "[\n 1000: d_month: month(3)\n]", + "[\n 1000: d_day: day(3)\n]", + "[\n 1000: ts_year: year(5)\n]", + "[\n 1000: ts_month: month(5)\n]", + "[\n 1000: ts_day: day(5)\n]", + "[\n 1000: ts_hour: hour(5)\n]", + "[\n 1000: i_truncate: truncate[10](1)\n]", + "[\n 1000: l_truncate: truncate[10](2)\n]", + "[\n 1000: dec_truncate: truncate[10](6)\n]", + "[\n 1000: s_truncate: truncate[10](7)\n]", + "[\n 1000: dec_bucket: bucket[16](6)\n]", + "[\n 1011: dec_bucket: bucket[16](6)\n]", + ] + + for (spec, expected_spec_str) in zip(specs, expected_spec_strs): + assert str(spec) == expected_spec_str diff --git a/python/tests/core/test_partition_spec_parser.py b/python/tests/core/test_partition_spec_parser.py index 53285362f6cd..256186cb84c2 100644 --- a/python/tests/core/test_partition_spec_parser.py +++ b/python/tests/core/test_partition_spec_parser.py @@ -16,21 +16,95 @@ # under the License. from iceberg.api import PartitionSpec, Schema -from iceberg.api.types import IntegerType, NestedField, StringType +from iceberg.api.types import DecimalType, IntegerType, NestedField, StringType from iceberg.core import PartitionSpecParser +import pytest def test_to_json_conversion(): spec_schema = Schema(NestedField.required(1, "id", IntegerType.get()), - NestedField.required(2, "data", StringType.get())) + NestedField.required(2, "data", StringType.get()), + NestedField.required(3, "num", DecimalType.of(9, 2))) - spec = PartitionSpec\ + spec = PartitionSpec \ .builder_for(spec_schema) \ - .identity("id")\ - .bucket("data", 16)\ + .identity("id") \ + .bucket("data", 16) \ + .add_without_field_id(2, "data1", "bucket[16]") \ + .add(2, 1010, "data2", "bucket[8]") \ + .bucket("num", 8) \ .build() expected = '{"spec-id": 0, "fields": [' \ - '{"name": "id", "transform": "identity", "source-id": 1}, ' \ - '{"name": "data_bucket", "transform": "bucket[16]", "source-id": 2}]}' + '{"name": "id", "transform": "identity", "source-id": 1, "field-id": 1000}, ' \ + '{"name": "data_bucket", "transform": "bucket[16]", "source-id": 2, "field-id": 1001}, ' \ + '{"name": "data1", "transform": "bucket[16]", "source-id": 2, "field-id": 1002}, ' \ + '{"name": "data2", "transform": "bucket[8]", "source-id": 2, "field-id": 1010}, ' \ + '{"name": "num_bucket", "transform": "bucket[8]", "source-id": 3, "field-id": 1011}]}' assert expected == PartitionSpecParser.to_json(spec) + + +def test_from_json_conversion_with_field_ids(): + spec_schema = Schema(NestedField.required(1, "id", IntegerType.get()), + NestedField.required(2, "data", StringType.get()), + NestedField.required(3, "num", DecimalType.of(9, 2))) + + spec_string = '{"spec-id": 0, "fields": [' \ + '{"name": "id", "transform": "identity", "source-id": 1, "field-id": 1000}, ' \ + '{"name": "data_bucket", "transform": "bucket[16]", "source-id": 2, "field-id": 1001}, ' \ + '{"name": "data1", "transform": "bucket[16]", "source-id": 2, "field-id": 1002}, ' \ + '{"name": "data2", "transform": "bucket[8]", "source-id": 2, "field-id": 1010}, ' \ + '{"name": "num_bucket", "transform": "bucket[8]", "source-id": 3, "field-id": 1011}]}' + + spec = PartitionSpecParser.from_json(spec_schema, spec_string) + + expected_spec = PartitionSpec \ + .builder_for(spec_schema) \ + .identity("id") \ + .bucket("data", 16) \ + .add_without_field_id(2, "data1", "bucket[16]") \ + .add(2, 1010, "data2", "bucket[8]") \ + .bucket("num", 8) \ + .build() + assert expected_spec == spec + + +def test_from_json_conversion_without_field_ids(): + spec_schema = Schema(NestedField.required(1, "id", IntegerType.get()), + NestedField.required(2, "data", StringType.get()), + NestedField.required(3, "num", DecimalType.of(9, 2))) + + spec_string = '{"spec-id": 0, "fields": [' \ + '{"name": "id", "transform": "identity", "source-id": 1}, ' \ + '{"name": "data_bucket", "transform": "bucket[16]", "source-id": 2}, ' \ + '{"name": "data1", "transform": "bucket[16]", "source-id": 2}, ' \ + '{"name": "data2", "transform": "bucket[8]", "source-id": 2}, ' \ + '{"name": "num_bucket", "transform": "bucket[8]", "source-id": 3}]}' + + spec = PartitionSpecParser.from_json(spec_schema, spec_string) + + expected_spec = PartitionSpec \ + .builder_for(spec_schema) \ + .identity("id") \ + .bucket("data", 16) \ + .add_without_field_id(2, "data1", "bucket[16]") \ + .add(2, 1003, "data2", "bucket[8]") \ + .bucket("num", 8) \ + .build() + assert expected_spec == spec + + +def test_raise_exception_with_invalid_json(): + spec_schema = Schema(NestedField.required(1, "id", IntegerType.get()), + NestedField.required(2, "data", StringType.get()), + NestedField.required(3, "num", DecimalType.of(9, 2))) + + spec_string = '{"spec-id": 0, "fields": [' \ + '{"name": "id", "transform": "identity", "source-id": 1, "field-id": 1000}, ' \ + '{"name": "data_bucket", "transform": "bucket[16]", "source-id": 2, "field-id": 1001}, ' \ + '{"name": "data1", "transform": "bucket[16]", "source-id": 2}, ' \ + '{"name": "data2", "transform": "bucket[8]", "source-id": 2}, ' \ + '{"name": "num_bucket", "transform": "bucket[8]", "source-id": 3}]}' + + with pytest.raises(RuntimeError): + PartitionSpecParser.from_json(spec_schema, spec_string) diff --git a/python/tox.ini b/python/tox.ini index 9c49b0bd33cc..b011511130b2 100644 --- a/python/tox.ini +++ b/python/tox.ini @@ -39,9 +39,11 @@ deps = . {[testenv:flake8]deps} {[testenv:bandit]deps} + {[testenv:mypy]deps} commands = {[testenv:flake8]commands} {[testenv:bandit]commands} + {[testenv:mypy]commands} [testenv:flake8] basepython = python3 @@ -53,6 +55,14 @@ deps = commands = flake8 iceberg setup.py tests +[testenv:mypy] +basepython = python3 +skip_install = true +deps = + mypy +commands = + mypy --ignore-missing-imports iceberg/ + [testenv:bandit] basepython = python3 skip_install = true @@ -77,9 +87,6 @@ commands = # commands = # python -m http.server {posargs} -[bandit] -skips = B104 - [flake8] ignore = E501,W503 exclude = diff --git a/spark/src/main/java/org/apache/iceberg/actions/RemoveOrphanFilesAction.java b/spark/src/main/java/org/apache/iceberg/actions/RemoveOrphanFilesAction.java index 7909c4302b46..e32636414f56 100644 --- a/spark/src/main/java/org/apache/iceberg/actions/RemoveOrphanFilesAction.java +++ b/spark/src/main/java/org/apache/iceberg/actions/RemoveOrphanFilesAction.java @@ -19,6 +19,7 @@ package org.apache.iceberg.actions; +import java.io.File; import java.io.IOException; import java.util.Iterator; import java.util.List; @@ -48,6 +49,9 @@ import org.apache.spark.sql.Encoders; import org.apache.spark.sql.Row; import org.apache.spark.sql.SparkSession; +import org.apache.spark.sql.expressions.UserDefinedFunction; +import org.apache.spark.sql.functions; +import org.apache.spark.sql.types.DataTypes; import org.apache.spark.util.SerializableConfiguration; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -69,6 +73,14 @@ public class RemoveOrphanFilesAction extends BaseAction> { private static final Logger LOG = LoggerFactory.getLogger(RemoveOrphanFilesAction.class); + private static final UserDefinedFunction filename = functions.udf((String path) -> { + int lastIndex = path.lastIndexOf(File.separator); + if (lastIndex == -1) { + return path; + } else { + return path.substring(lastIndex + 1); + } + }, DataTypes.StringType); private final SparkSession spark; private final JavaSparkContext sparkContext; @@ -141,7 +153,10 @@ public List execute() { Dataset validFileDF = validDataFileDF.union(validMetadataFileDF); Dataset actualFileDF = buildActualFileDF(); - Column joinCond = validFileDF.col("file_path").equalTo(actualFileDF.col("file_path")); + Column nameEqual = filename.apply(actualFileDF.col("file_path")) + .equalTo(filename.apply(validFileDF.col("file_path"))); + Column actualContains = actualFileDF.col("file_path").contains(validFileDF.col("file_path")); + Column joinCond = nameEqual.and(actualContains); List orphanFiles = actualFileDF.join(validFileDF, joinCond, "leftanti") .as(Encoders.STRING()) .collectAsList(); diff --git a/spark/src/test/java/org/apache/iceberg/actions/TestRemoveOrphanFilesAction.java b/spark/src/test/java/org/apache/iceberg/actions/TestRemoveOrphanFilesAction.java index b28ff145efa9..8e71b0e287f6 100644 --- a/spark/src/test/java/org/apache/iceberg/actions/TestRemoveOrphanFilesAction.java +++ b/spark/src/test/java/org/apache/iceberg/actions/TestRemoveOrphanFilesAction.java @@ -85,11 +85,12 @@ public static void stopSpark() { @Rule public TemporaryFolder temp = new TemporaryFolder(); + private File tableDir = null; private String tableLocation = null; @Before public void setupTableLocation() throws Exception { - File tableDir = temp.newFolder(); + this.tableDir = temp.newFolder(); this.tableLocation = tableDir.toURI().toString(); } @@ -491,4 +492,54 @@ private List snapshotFiles(long snapshotId) { .as(Encoders.STRING()) .collectAsList(); } + + @Test + public void testRemoveOrphanFilesWithRelativeFilePath() throws IOException, InterruptedException { + Table table = TABLES.create(SCHEMA, PartitionSpec.unpartitioned(), Maps.newHashMap(), tableDir.getAbsolutePath()); + + List records = Lists.newArrayList( + new ThreeColumnRecord(1, "AAAAAAAAAA", "AAAA") + ); + + Dataset df = spark.createDataFrame(records, ThreeColumnRecord.class).coalesce(1); + + df.select("c1", "c2", "c3") + .write() + .format("iceberg") + .mode("append") + .save(tableDir.getAbsolutePath()); + + List validFiles = spark.read().format("iceberg") + .load(tableLocation + "#files") + .select("file_path") + .as(Encoders.STRING()) + .collectAsList(); + Assert.assertEquals("Should be 1 valid files", 1, validFiles.size()); + String validFile = validFiles.get(0); + + df.write().mode("append").parquet(tableLocation + "/data"); + + Path dataPath = new Path(tableLocation + "/data"); + FileSystem fs = dataPath.getFileSystem(spark.sessionState().newHadoopConf()); + List allFiles = Arrays.stream(fs.listStatus(dataPath, HiddenPathFilter.get())) + .filter(FileStatus::isFile) + .map(file -> file.getPath().toString()) + .collect(Collectors.toList()); + Assert.assertEquals("Should be 2 files", 2, allFiles.size()); + + List invalidFiles = Lists.newArrayList(allFiles); + invalidFiles.removeIf(file -> file.contains(validFile)); + Assert.assertEquals("Should be 1 invalid file", 1, invalidFiles.size()); + + // sleep for 1 second to unsure files will be old enough + Thread.sleep(1000); + + Actions actions = Actions.forTable(table); + List result = actions.removeOrphanFiles() + .olderThan(System.currentTimeMillis()) + .deleteWith(s -> { }) + .execute(); + Assert.assertEquals("Action should find 1 file", invalidFiles, result); + Assert.assertTrue("Invalid file should be present", fs.exists(new Path(invalidFiles.get(0)))); + } }