Skip to content
This repository was archived by the owner on Jun 15, 2021. It is now read-only.

Swap to shaded guava in common and core modules #8

Merged
massdosage merged 2 commits into from
Apr 29, 2020
Merged

Swap to shaded guava in common and core modules #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f0df2d9
Swap to shaded guava in common and core modules
cmathiesen Apr 29, 2020
e109dd3
Shade in arrow module
cmathiesen Apr 29, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions arrow/src/main/java/org/apache/iceberg/arrow/ArrowSchemaUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion arrow/src/main/java/org/apache/iceberg/arrow/vectorized/VectorizedArrowReader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...n/java/org/apache/iceberg/arrow/vectorized/parquet/BaseVectorizedParquetValuesReader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...w/src/main/java/org/apache/iceberg/arrow/vectorized/parquet/VectorizedColumnIterator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
14 changes: 12 additions & 2 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,8 +131,14 @@ project(':iceberg-relocate-external-dependencies') {
include 'NOTICE'
}

dependencies {
exclude(dependency('com.github.stephenc.findbugs:findbugs-annotations'))
Copy link

@massdosage massdosage Apr 29, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you move these up into the section starting on line 115 so they are all in the same place?

Copy link
Author

@cmathiesen cmathiesen Apr 29, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure this can be moved, I think this exclude(dependency(..)) thing is part of the shadowJar plugin, so it needs to happen here rather than in the module dependencies section

Copy link

@massdosage massdosage Apr 29, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, you're right, sorry, I missed that.

exclude(dependency('org.slf4j:slf4j-api'))
exclude(dependency('org.checkerframework:checker-qual'))
}

relocate 'com.google.common', 'com.google.common.shaded'

minimize()
}
}
Expand All @@ -145,7 +151,11 @@ project(':iceberg-api') {
}
}

project(':iceberg-common') {}
project(':iceberg-common') {
Copy link

@massdosage massdosage Apr 29, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do you not also need to do this for iceberg-arrow? Or does it get the relocate-external-dependencies transitively?

Copy link
Author

@cmathiesen cmathiesen Apr 29, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yeah, it can get them transitively here

Copy link

@massdosage massdosage Apr 29, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK, I don't like the fact that this is how it works, I prefer declaring what I know I need but let's not change it for now.

dependencies {
compile project(path: ':iceberg-relocate-external-dependencies', configuration: 'shadow')
}
}

project(':iceberg-core') {
dependencies {
Expand Down
2 changes: 1 addition & 1 deletion common/src/main/java/org/apache/iceberg/common/DynClasses.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
4 changes: 2 additions & 2 deletions common/src/main/java/org/apache/iceberg/common/DynConstructors.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
11 changes: 6 additions & 5 deletions common/src/main/java/org/apache/iceberg/common/DynFields.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions common/src/main/java/org/apache/iceberg/common/DynMethods.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
6 changes: 3 additions & 3 deletions core/src/main/java/org/apache/iceberg/AllDataFilesTable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions core/src/main/java/org/apache/iceberg/AllEntriesTable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
6 changes: 3 additions & 3 deletions core/src/main/java/org/apache/iceberg/AllManifestsTable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/java/org/apache/iceberg/BaseAllMetadataTableScan.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
6 changes: 3 additions & 3 deletions core/src/main/java/org/apache/iceberg/BaseCombinedScanTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
6 changes: 3 additions & 3 deletions core/src/main/java/org/apache/iceberg/BaseFileScanTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/java/org/apache/iceberg/BaseMetadataTable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
10 changes: 5 additions & 5 deletions core/src/main/java/org/apache/iceberg/BaseSnapshot.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
10 changes: 5 additions & 5 deletions core/src/main/java/org/apache/iceberg/BaseTableScan.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
6 changes: 3 additions & 3 deletions core/src/main/java/org/apache/iceberg/DataFilesTable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
6 changes: 3 additions & 3 deletions core/src/main/java/org/apache/iceberg/DataTableScan.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
8 changes: 4 additions & 4 deletions core/src/main/java/org/apache/iceberg/GenericDataFile.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/java/org/apache/iceberg/GenericManifestEntry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
6 changes: 3 additions & 3 deletions core/src/main/java/org/apache/iceberg/GenericManifestFile.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/java/org/apache/iceberg/GenericPartitionFieldSummary.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
12 changes: 6 additions & 6 deletions core/src/main/java/org/apache/iceberg/IncrementalDataTableScan.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
6 changes: 3 additions & 3 deletions core/src/main/java/org/apache/iceberg/ManifestEntriesTable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/java/org/apache/iceberg/StaticTableScan.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
18 changes: 9 additions & 9 deletions core/src/main/java/org/apache/iceberg/TableMetadata.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions core/src/test/java/org/apache/iceberg/TestWapWorkflow.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down