Use only guava Preconditions (apache#911)

Co-authored-by: Luan <[email protected]>
dujl · Apr 10, 2020 · d8dfb27 · d8dfb27
1 parent 45a44f4
commit d8dfb27
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/...n/java/org/apache/iceberg/arrow/vectorized/parquet/BaseVectorizedParquetValuesReader.java b/...n/java/org/apache/iceberg/arrow/vectorized/parquet/BaseVectorizedParquetValuesReader.java
@@ -19,9 +19,9 @@
 
 package org.apache.iceberg.arrow.vectorized.parquet;
 
+import com.google.common.base.Preconditions;
 import java.io.IOException;
 import java.nio.ByteBuffer;
-import org.apache.parquet.Preconditions;
 import org.apache.parquet.bytes.ByteBufferInputStream;
 import org.apache.parquet.bytes.BytesUtils;
 import org.apache.parquet.column.values.ValuesReader;

diff --git a/...w/src/main/java/org/apache/iceberg/arrow/vectorized/parquet/VectorizedColumnIterator.java b/...w/src/main/java/org/apache/iceberg/arrow/vectorized/parquet/VectorizedColumnIterator.java
@@ -19,7 +19,7 @@
 
 package org.apache.iceberg.arrow.vectorized.parquet;
 
-import org.apache.arrow.util.Preconditions;
+import com.google.common.base.Preconditions;
 import org.apache.arrow.vector.FieldVector;
 import org.apache.arrow.vector.IntVector;
 import org.apache.iceberg.arrow.vectorized.NullabilityHolder;

diff --git a/parquet/src/main/java/org/apache/iceberg/parquet/MessageTypeToType.java b/parquet/src/main/java/org/apache/iceberg/parquet/MessageTypeToType.java
@@ -20,13 +20,13 @@
 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.types.Type;
 import org.apache.iceberg.types.Types;
-import org.apache.parquet.Preconditions;
 import org.apache.parquet.schema.DecimalMetadata;
 import org.apache.parquet.schema.GroupType;
 import org.apache.parquet.schema.MessageType;
@@ -71,7 +71,7 @@ public Type struct(GroupType struct, List<Type> fieldTypes) {
 
       Preconditions.checkArgument(
           !field.isRepetition(Repetition.REPEATED),
-          "Fields cannot have repetition REPEATED: {}", field);
+          "Fields cannot have repetition REPEATED: %s", field);
 
       int fieldId = getId(field);
 
@@ -94,7 +94,7 @@ public Type list(GroupType array, Type elementType) {
 
     Preconditions.checkArgument(
         !element.isRepetition(Repetition.REPEATED),
-        "Elements cannot have repetition REPEATED: {}", element);
+        "Elements cannot have repetition REPEATED: %s", element);
 
     int elementFieldId = getId(element);
 
@@ -115,7 +115,7 @@ public Type map(GroupType map, Type keyType, Type valueType) {
 
     Preconditions.checkArgument(
         !value.isRepetition(Repetition.REPEATED),
-        "Values cannot have repetition REPEATED: {}", value);
+        "Values cannot have repetition REPEATED: %s", value);
 
     int keyFieldId = getId(key);
     int valueFieldId = getId(value);

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
@@ -19,14 +19,14 @@
 
 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;
 import java.util.Iterator;
 import java.util.Map;
-import org.apache.arrow.util.Preconditions;
 import org.apache.iceberg.CombinedScanTask;
 import org.apache.iceberg.FileScanTask;
 import org.apache.iceberg.encryption.EncryptedFiles;