Skip to content

Commit 7b58965

Browse files
committed
format
1 parent 6b4a47d commit 7b58965

16 files changed

Lines changed: 26 additions & 35 deletions

common/src/main/java/org/apache/arrow/c/AbstractCometSchemaImporter.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@
1919

2020
package org.apache.arrow.c;
2121

22-
import org.apache.comet.IcebergApi;
23-
2422
import org.apache.arrow.memory.BufferAllocator;
2523
import org.apache.arrow.vector.FieldVector;
2624
import org.apache.arrow.vector.types.pojo.Field;
2725

26+
import org.apache.comet.IcebergApi;
27+
2828
/** This is a simple wrapper around SchemaImporter to make it accessible from Java Arrow. */
2929
public abstract class AbstractCometSchemaImporter {
3030
private final BufferAllocator allocator;

common/src/main/java/org/apache/comet/IcebergApi.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@
2929
* Indicates that the annotated element is part of the public API used by Apache Iceberg.
3030
*
3131
* <p>This annotation marks classes, methods, constructors, and fields that form the contract
32-
* between Comet and Iceberg. Changes to these APIs may break Iceberg's Comet integration,
33-
* so contributors should exercise caution and consider backward compatibility when modifying
34-
* annotated elements.
32+
* between Comet and Iceberg. Changes to these APIs may break Iceberg's Comet integration, so
33+
* contributors should exercise caution and consider backward compatibility when modifying annotated
34+
* elements.
3535
*
3636
* <p>The Iceberg integration uses Comet's native Parquet reader for accelerated vectorized reads.
3737
* See the contributor guide documentation for details on how Iceberg uses these APIs.

common/src/main/java/org/apache/comet/parquet/AbstractColumnReader.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@
1919

2020
package org.apache.comet.parquet;
2121

22-
import org.apache.comet.IcebergApi;
23-
2422
import org.slf4j.Logger;
2523
import org.slf4j.LoggerFactory;
2624

@@ -30,6 +28,7 @@
3028
import org.apache.spark.sql.types.TimestampNTZType$;
3129

3230
import org.apache.comet.CometConf;
31+
import org.apache.comet.IcebergApi;
3332
import org.apache.comet.vector.CometVector;
3433

3534
/** Base class for Comet Parquet column reader implementations. */
@@ -64,8 +63,7 @@ public abstract class AbstractColumnReader implements AutoCloseable {
6463
protected int batchSize;
6564

6665
/** A pointer to the native implementation of ColumnReader. */
67-
@IcebergApi
68-
protected long nativeHandle;
66+
@IcebergApi protected long nativeHandle;
6967

7068
AbstractColumnReader(
7169
DataType type,

common/src/main/java/org/apache/comet/parquet/BatchReader.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@
1919

2020
package org.apache.comet.parquet;
2121

22-
import org.apache.comet.IcebergApi;
23-
2422
import java.io.Closeable;
2523
import java.io.IOException;
2624
import java.net.URI;
@@ -67,6 +65,7 @@
6765

6866
import org.apache.comet.CometConf;
6967
import org.apache.comet.CometSchemaImporter;
68+
import org.apache.comet.IcebergApi;
7069
import org.apache.comet.shims.ShimBatchReader;
7170
import org.apache.comet.shims.ShimFileFormat;
7271
import org.apache.comet.vector.CometVector;

common/src/main/java/org/apache/comet/parquet/ColumnReader.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@
1919

2020
package org.apache.comet.parquet;
2121

22-
import org.apache.comet.IcebergApi;
23-
2422
import java.io.IOException;
2523
import java.nio.ByteBuffer;
2624

@@ -46,6 +44,7 @@
4644

4745
import org.apache.comet.CometConf;
4846
import org.apache.comet.CometSchemaImporter;
47+
import org.apache.comet.IcebergApi;
4948
import org.apache.comet.vector.CometDecodedVector;
5049
import org.apache.comet.vector.CometDictionary;
5150
import org.apache.comet.vector.CometDictionaryVector;

common/src/main/java/org/apache/comet/parquet/ConstantColumnReader.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@
1919

2020
package org.apache.comet.parquet;
2121

22-
import org.apache.comet.IcebergApi;
23-
2422
import java.math.BigInteger;
2523

2624
import org.apache.parquet.column.ColumnDescriptor;
@@ -29,6 +27,8 @@
2927
import org.apache.spark.sql.types.*;
3028
import org.apache.spark.unsafe.types.UTF8String;
3129

30+
import org.apache.comet.IcebergApi;
31+
3232
/**
3333
* A column reader that always return constant vectors. Used for reading partition columns, for
3434
* instance.

common/src/main/java/org/apache/comet/parquet/FileReader.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@
1919

2020
package org.apache.comet.parquet;
2121

22-
import org.apache.comet.IcebergApi;
23-
2422
import java.io.Closeable;
2523
import java.io.IOException;
2624
import java.io.InputStream;
@@ -92,6 +90,8 @@
9290
import org.apache.parquet.schema.PrimitiveType;
9391
import org.apache.spark.sql.execution.metric.SQLMetric;
9492

93+
import org.apache.comet.IcebergApi;
94+
9595
import static org.apache.parquet.hadoop.ParquetFileWriter.EFMAGIC;
9696
import static org.apache.parquet.hadoop.ParquetFileWriter.MAGIC;
9797

common/src/main/java/org/apache/comet/parquet/MetadataColumnReader.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@
1919

2020
package org.apache.comet.parquet;
2121

22-
import org.apache.comet.IcebergApi;
23-
2422
import org.apache.arrow.c.ArrowArray;
2523
import org.apache.arrow.c.ArrowSchema;
2624
import org.apache.arrow.c.Data;
@@ -30,6 +28,7 @@
3028
import org.apache.parquet.column.ColumnDescriptor;
3129
import org.apache.spark.sql.types.DataType;
3230

31+
import org.apache.comet.IcebergApi;
3332
import org.apache.comet.vector.CometPlainVector;
3433
import org.apache.comet.vector.CometVector;
3534

common/src/main/java/org/apache/comet/parquet/Native.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,10 @@
1919

2020
package org.apache.comet.parquet;
2121

22-
import org.apache.comet.IcebergApi;
23-
2422
import java.nio.ByteBuffer;
2523
import java.util.Map;
2624

25+
import org.apache.comet.IcebergApi;
2726
import org.apache.comet.NativeBase;
2827

2928
public final class Native extends NativeBase {

common/src/main/java/org/apache/comet/parquet/ParquetColumnSpec.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@
1919

2020
package org.apache.comet.parquet;
2121

22-
import org.apache.comet.IcebergApi;
23-
2422
import java.util.Map;
2523

24+
import org.apache.comet.IcebergApi;
25+
2626
/**
2727
* Parquet ColumnSpec encapsulates the information withing a Parquet ColumnDescriptor. Utility
2828
* methods can convert from and to a ColumnDescriptor The only purpose of this class is to allow

0 commit comments

Comments
 (0)