This is an automated email from the ASF dual-hosted git repository. jark pushed a commit to branch ci-rename-to-apache in repository https://gitbox.apache.org/repos/asf/fluss.git
commit 44cc0eb523f6ed7c2b015138efc0b4be6d5fd94a Author: Jark Wu <[email protected]> AuthorDate: Mon Aug 25 14:48:20 2025 +0800 spotless --- .../main/java/org/apache/fluss/predicate/Predicate.java | 4 +++- .../org/apache/fluss/predicate/PredicateBuilderTest.java | 1 + .../java/org/apache/fluss/predicate/PredicateTest.java | 1 + .../apache/fluss/fs/gs/GSFileSystemBehaviorITCase.java | 12 ++++++------ .../main/java/org/apache/fluss/fs/obs/OBSFileSystem.java | 1 + .../org/apache/fluss/fs/obs/OBSFileSystemPlugin.java | 1 + .../token/DynamicTemporaryOBSCredentialsProvider.java | 3 ++- .../fluss/fs/obs/token/OBSSecurityTokenProvider.java | 7 ++++--- .../java/org/apache/flink/api/connector/sink2/Sink.java | 4 +++- .../apache/fluss/flink/lake/LakeRecordRecordEmitter.java | 3 ++- .../org/apache/fluss/flink/lake/LakeSplitSerializer.java | 5 +++-- .../apache/fluss/jmh/ArrowReadableChannelBenchmark.java | 3 ++- .../apache/fluss/jmh/ArrowWritableChannelBenchmark.java | 3 ++- .../java/org/apache/fluss/jmh/LogScannerBenchmark.java | 1 + .../org/apache/fluss/kafka/KafkaChannelInitializer.java | 1 - .../java/org/apache/fluss/kafka/KafkaCommandDecoder.java | 4 ++-- .../java/org/apache/fluss/kafka/KafkaProtocolPlugin.java | 1 - .../main/java/org/apache/fluss/kafka/KafkaRequest.java | 2 +- .../org/apache/fluss/kafka/KafkaRequestHandlerTest.java | 2 +- .../lake/iceberg/FlussDataTypeToIcebergDataType.java | 1 + .../apache/fluss/lake/iceberg/IcebergLakeCatalog.java | 1 + .../org/apache/fluss/lake/iceberg/conf/HadoopUtils.java | 1 + .../fluss/lake/iceberg/conf/IcebergConfiguration.java | 1 + .../lake/iceberg/tiering/FlussRecordAsIcebergRecord.java | 1 + .../lake/iceberg/tiering/IcebergCatalogProvider.java | 1 + .../fluss/lake/iceberg/tiering/IcebergLakeCommitter.java | 1 + .../fluss/lake/iceberg/tiering/IcebergLakeWriter.java | 1 + .../iceberg/tiering/IcebergWriteResultSerializer.java | 1 + .../apache/fluss/lake/iceberg/tiering/RecordWriter.java | 1 + .../iceberg/tiering/writer/AppendOnlyTaskWriter.java | 1 + .../lake/iceberg/tiering/writer/DeltaTaskWriter.java | 1 + .../tiering/writer/GenericRecordAppendOnlyWriter.java | 1 + .../iceberg/tiering/writer/GenericRecordDeltaWriter.java | 1 + .../fluss/lake/iceberg/utils/IcebergConversions.java | 1 + .../fluss/lake/iceberg/IcebergLakeCatalogTest.java | 1 + .../iceberg/testutils/FlinkIcebergTieringTestBase.java | 7 ++++--- .../fluss/lake/iceberg/tiering/IcebergTieringITCase.java | 5 +++-- .../fluss/lake/iceberg/tiering/IcebergTieringTest.java | 1 + .../fluss/lake/iceberg/utils/IcebergConversionsTest.java | 4 +++- .../org/apache/fluss/lake/lance/LanceLakeCatalog.java | 11 ++++++----- .../apache/fluss/lake/lance/utils/LanceArrowUtils.java | 15 ++++++++------- .../fluss/lake/lance/utils/LanceDatasetAdapter.java | 3 ++- .../fluss/lake/lance/LakeEnabledTableCreateITCase.java | 13 +++++++------ .../fluss/lake/paimon/source/FlussRowAsPaimonRow.java | 1 + .../lake/paimon/source/PaimonSortedRecordReader.java | 16 ++++++++-------- .../fluss/lake/paimon/tiering/PaimonLakeCommitter.java | 4 ++-- .../paimon/utils/FlussToPaimonPredicateConverter.java | 1 + .../fluss/lake/paimon/utils/PaimonRowAsFlussRow.java | 1 + .../fluss/lake/paimon/source/PaimonLakeSourceTest.java | 3 ++- .../fluss/lake/paimon/source/PaimonRecordReaderTest.java | 9 ++++----- .../lake/paimon/source/PaimonSortedRecordReaderTest.java | 7 +++---- .../fluss/lake/paimon/source/PaimonSourceTestBase.java | 3 ++- .../fluss/lake/paimon/tiering/PaimonTieringTest.java | 1 + .../apache/fluss/protogen/benchmark/ProtoBenchmark.java | 3 ++- .../apache/fluss/protogen/benchmark/SimpleBenchmark.java | 3 ++- .../protogen/benchmark/StringEncodingBenchmark.java | 1 + .../org/apache/fluss/protogen/tests/AddressBookTest.java | 3 ++- .../java/org/apache/fluss/protogen/tests/BytesTest.java | 11 +++++------ .../java/org/apache/fluss/protogen/tests/EnumsTest.java | 3 ++- .../org/apache/fluss/protogen/tests/MessagesTest.java | 3 ++- .../org/apache/fluss/protogen/tests/NumbersTest.java | 3 ++- .../apache/fluss/protogen/tests/RepeatedNumbersTest.java | 3 ++- .../org/apache/fluss/protogen/tests/RequiredTest.java | 3 ++- .../org/apache/fluss/protogen/tests/StringsTest.java | 6 +++--- .../fluss/tools/ci/licensecheck/NoticeFileChecker.java | 3 ++- .../apache/fluss/tools/ci/utils/deploy/DeployParser.java | 3 ++- 66 files changed, 140 insertions(+), 88 deletions(-) diff --git a/fluss-common/src/main/java/org/apache/fluss/predicate/Predicate.java b/fluss-common/src/main/java/org/apache/fluss/predicate/Predicate.java index 2d67f7f32..e08c8347b 100644 --- a/fluss-common/src/main/java/org/apache/fluss/predicate/Predicate.java +++ b/fluss-common/src/main/java/org/apache/fluss/predicate/Predicate.java @@ -47,7 +47,9 @@ public interface Predicate extends Serializable { */ boolean test(long rowCount, InternalRow minValues, InternalRow maxValues, Long[] nullCounts); - /** @return the negation predicate of this predicate if possible. */ + /** + * @return the negation predicate of this predicate if possible. + */ Optional<Predicate> negate(); <T> T visit(PredicateVisitor<T> visitor); diff --git a/fluss-common/src/test/java/org/apache/fluss/predicate/PredicateBuilderTest.java b/fluss-common/src/test/java/org/apache/fluss/predicate/PredicateBuilderTest.java index 3c5013407..600d72be9 100644 --- a/fluss-common/src/test/java/org/apache/fluss/predicate/PredicateBuilderTest.java +++ b/fluss-common/src/test/java/org/apache/fluss/predicate/PredicateBuilderTest.java @@ -19,6 +19,7 @@ package org.apache.fluss.predicate; import org.apache.fluss.types.IntType; import org.apache.fluss.types.RowType; + import org.junit.jupiter.api.Test; import javax.annotation.Nullable; diff --git a/fluss-common/src/test/java/org/apache/fluss/predicate/PredicateTest.java b/fluss-common/src/test/java/org/apache/fluss/predicate/PredicateTest.java index b116e4283..ad04985d7 100644 --- a/fluss-common/src/test/java/org/apache/fluss/predicate/PredicateTest.java +++ b/fluss-common/src/test/java/org/apache/fluss/predicate/PredicateTest.java @@ -21,6 +21,7 @@ import org.apache.fluss.row.GenericRow; import org.apache.fluss.types.IntType; import org.apache.fluss.types.RowType; import org.apache.fluss.types.StringType; + import org.junit.jupiter.api.Test; import java.util.ArrayList; diff --git a/fluss-filesystems/fluss-fs-gs/src/test/java/org/apache/fluss/fs/gs/GSFileSystemBehaviorITCase.java b/fluss-filesystems/fluss-fs-gs/src/test/java/org/apache/fluss/fs/gs/GSFileSystemBehaviorITCase.java index 7ab04195b..b1902c2bb 100644 --- a/fluss-filesystems/fluss-fs-gs/src/test/java/org/apache/fluss/fs/gs/GSFileSystemBehaviorITCase.java +++ b/fluss-filesystems/fluss-fs-gs/src/test/java/org/apache/fluss/fs/gs/GSFileSystemBehaviorITCase.java @@ -17,15 +17,16 @@ package org.apache.fluss.fs.gs; -import com.google.cloud.hadoop.gcsio.GoogleCloudStorageFileSystem; -import com.google.cloud.hadoop.gcsio.GoogleCloudStorageFileSystemOptions; -import com.google.cloud.hadoop.gcsio.testing.InMemoryGoogleCloudStorage; -import org.apache.commons.lang3.reflect.FieldUtils; import org.apache.fluss.config.Configuration; import org.apache.fluss.fs.FileSystem; import org.apache.fluss.fs.FileSystemBehaviorTestSuite; import org.apache.fluss.fs.FsPath; import org.apache.fluss.testutils.common.CommonTestUtils; + +import com.google.cloud.hadoop.gcsio.GoogleCloudStorageFileSystem; +import com.google.cloud.hadoop.gcsio.GoogleCloudStorageFileSystemOptions; +import com.google.cloud.hadoop.gcsio.testing.InMemoryGoogleCloudStorage; +import org.apache.commons.lang3.reflect.FieldUtils; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; @@ -92,8 +93,7 @@ class GSFileSystemBehaviorITCase extends FileSystemBehaviorTestSuite { GoogleCloudStorageFileSystem googleCloudStorageFileSystem = new GoogleCloudStorageFileSystem( googleCloudStorageOptions -> inMemoryGoogleCloudStorage, - GoogleCloudStorageFileSystemOptions.DEFAULT - .toBuilder() + GoogleCloudStorageFileSystemOptions.DEFAULT.toBuilder() .setCloudStorageOptions(inMemoryGoogleCloudStorage.getOptions()) .build()); diff --git a/fluss-filesystems/fluss-fs-obs/src/main/java/org/apache/fluss/fs/obs/OBSFileSystem.java b/fluss-filesystems/fluss-fs-obs/src/main/java/org/apache/fluss/fs/obs/OBSFileSystem.java index 145ece1ab..8396c66b7 100644 --- a/fluss-filesystems/fluss-fs-obs/src/main/java/org/apache/fluss/fs/obs/OBSFileSystem.java +++ b/fluss-filesystems/fluss-fs-obs/src/main/java/org/apache/fluss/fs/obs/OBSFileSystem.java @@ -20,6 +20,7 @@ package org.apache.fluss.fs.obs; import org.apache.fluss.fs.hdfs.HadoopFileSystem; import org.apache.fluss.fs.obs.token.OBSSecurityTokenProvider; import org.apache.fluss.fs.token.ObtainedSecurityToken; + import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileSystem; diff --git a/fluss-filesystems/fluss-fs-obs/src/main/java/org/apache/fluss/fs/obs/OBSFileSystemPlugin.java b/fluss-filesystems/fluss-fs-obs/src/main/java/org/apache/fluss/fs/obs/OBSFileSystemPlugin.java index 0750472a6..815b36ab0 100644 --- a/fluss-filesystems/fluss-fs-obs/src/main/java/org/apache/fluss/fs/obs/OBSFileSystemPlugin.java +++ b/fluss-filesystems/fluss-fs-obs/src/main/java/org/apache/fluss/fs/obs/OBSFileSystemPlugin.java @@ -23,6 +23,7 @@ import org.apache.fluss.config.Configuration; import org.apache.fluss.fs.FileSystem; import org.apache.fluss.fs.FileSystemPlugin; import org.apache.fluss.fs.obs.token.OBSSecurityTokenReceiver; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/fluss-filesystems/fluss-fs-obs/src/main/java/org/apache/fluss/fs/obs/token/DynamicTemporaryOBSCredentialsProvider.java b/fluss-filesystems/fluss-fs-obs/src/main/java/org/apache/fluss/fs/obs/token/DynamicTemporaryOBSCredentialsProvider.java index f6e830d1f..207ad3b71 100644 --- a/fluss-filesystems/fluss-fs-obs/src/main/java/org/apache/fluss/fs/obs/token/DynamicTemporaryOBSCredentialsProvider.java +++ b/fluss-filesystems/fluss-fs-obs/src/main/java/org/apache/fluss/fs/obs/token/DynamicTemporaryOBSCredentialsProvider.java @@ -17,10 +17,11 @@ package org.apache.fluss.fs.obs.token; +import org.apache.fluss.annotation.Internal; + import com.obs.services.IObsCredentialsProvider; import com.obs.services.internal.security.BasicSecurityKey; import com.obs.services.model.ISecurityKey; -import org.apache.fluss.annotation.Internal; import org.apache.hadoop.fs.obs.OBSFileSystem; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/fluss-filesystems/fluss-fs-obs/src/main/java/org/apache/fluss/fs/obs/token/OBSSecurityTokenProvider.java b/fluss-filesystems/fluss-fs-obs/src/main/java/org/apache/fluss/fs/obs/token/OBSSecurityTokenProvider.java index 236764a22..9f87a3fdd 100644 --- a/fluss-filesystems/fluss-fs-obs/src/main/java/org/apache/fluss/fs/obs/token/OBSSecurityTokenProvider.java +++ b/fluss-filesystems/fluss-fs-obs/src/main/java/org/apache/fluss/fs/obs/token/OBSSecurityTokenProvider.java @@ -17,6 +17,10 @@ package org.apache.fluss.fs.obs.token; +import org.apache.fluss.fs.token.Credentials; +import org.apache.fluss.fs.token.CredentialsJsonSerde; +import org.apache.fluss.fs.token.ObtainedSecurityToken; + import com.huaweicloud.sdk.core.auth.GlobalCredentials; import com.huaweicloud.sdk.core.auth.ICredential; import com.huaweicloud.sdk.iam.v3.IamClient; @@ -28,9 +32,6 @@ import com.huaweicloud.sdk.iam.v3.model.IdentityToken; import com.huaweicloud.sdk.iam.v3.model.TokenAuth; import com.huaweicloud.sdk.iam.v3.model.TokenAuthIdentity; import com.huaweicloud.sdk.iam.v3.region.IamRegion; -import org.apache.fluss.fs.token.Credentials; -import org.apache.fluss.fs.token.CredentialsJsonSerde; -import org.apache.fluss.fs.token.ObtainedSecurityToken; import org.apache.hadoop.conf.Configuration; import java.time.Instant; diff --git a/fluss-flink/fluss-flink-2.1/src/main/java/org/apache/flink/api/connector/sink2/Sink.java b/fluss-flink/fluss-flink-2.1/src/main/java/org/apache/flink/api/connector/sink2/Sink.java index 5dfc628ac..8cab1cb53 100644 --- a/fluss-flink/fluss-flink-2.1/src/main/java/org/apache/flink/api/connector/sink2/Sink.java +++ b/fluss-flink/fluss-flink-2.1/src/main/java/org/apache/flink/api/connector/sink2/Sink.java @@ -53,7 +53,9 @@ public interface Sink<InputT> extends Serializable { */ MailboxExecutor getMailboxExecutor(); - /** @return The metric group this writer belongs to. */ + /** + * @return The metric group this writer belongs to. + */ SinkWriterMetricGroup metricGroup(); } } diff --git a/fluss-flink/fluss-flink-common/src/main/java/org/apache/fluss/flink/lake/LakeRecordRecordEmitter.java b/fluss-flink/fluss-flink-common/src/main/java/org/apache/fluss/flink/lake/LakeRecordRecordEmitter.java index 58a14b207..147043fdc 100644 --- a/fluss-flink/fluss-flink-common/src/main/java/org/apache/fluss/flink/lake/LakeRecordRecordEmitter.java +++ b/fluss-flink/fluss-flink-common/src/main/java/org/apache/fluss/flink/lake/LakeRecordRecordEmitter.java @@ -17,13 +17,14 @@ package org.apache.fluss.flink.lake; -import org.apache.flink.api.connector.source.SourceOutput; import org.apache.fluss.client.table.scanner.ScanRecord; import org.apache.fluss.flink.lake.state.LakeSnapshotAndFlussLogSplitState; import org.apache.fluss.flink.lake.state.LakeSnapshotSplitState; import org.apache.fluss.flink.source.reader.RecordAndPos; import org.apache.fluss.flink.source.split.SourceSplitState; +import org.apache.flink.api.connector.source.SourceOutput; + import java.util.function.BiConsumer; /** The emitter to emit record from lake split. */ diff --git a/fluss-flink/fluss-flink-common/src/main/java/org/apache/fluss/flink/lake/LakeSplitSerializer.java b/fluss-flink/fluss-flink-common/src/main/java/org/apache/fluss/flink/lake/LakeSplitSerializer.java index 9407cb749..88c4e6db8 100644 --- a/fluss-flink/fluss-flink-common/src/main/java/org/apache/fluss/flink/lake/LakeSplitSerializer.java +++ b/fluss-flink/fluss-flink-common/src/main/java/org/apache/fluss/flink/lake/LakeSplitSerializer.java @@ -17,8 +17,6 @@ package org.apache.fluss.flink.lake; -import org.apache.flink.core.memory.DataInputDeserializer; -import org.apache.flink.core.memory.DataOutputSerializer; import org.apache.fluss.flink.lake.split.LakeSnapshotAndFlussLogSplit; import org.apache.fluss.flink.lake.split.LakeSnapshotSplit; import org.apache.fluss.flink.source.split.LogSplit; @@ -27,6 +25,9 @@ import org.apache.fluss.lake.serializer.SimpleVersionedSerializer; import org.apache.fluss.lake.source.LakeSplit; import org.apache.fluss.metadata.TableBucket; +import org.apache.flink.core.memory.DataInputDeserializer; +import org.apache.flink.core.memory.DataOutputSerializer; + import javax.annotation.Nullable; import java.io.IOException; diff --git a/fluss-jmh/src/test/java/org/apache/fluss/jmh/ArrowReadableChannelBenchmark.java b/fluss-jmh/src/test/java/org/apache/fluss/jmh/ArrowReadableChannelBenchmark.java index 793fbeb04..55bc62ba7 100644 --- a/fluss-jmh/src/test/java/org/apache/fluss/jmh/ArrowReadableChannelBenchmark.java +++ b/fluss-jmh/src/test/java/org/apache/fluss/jmh/ArrowReadableChannelBenchmark.java @@ -17,7 +17,6 @@ package org.apache.fluss.jmh; -import org.apache.commons.lang3.RandomUtils; import org.apache.fluss.shaded.arrow.org.apache.arrow.memory.BufferAllocator; import org.apache.fluss.shaded.arrow.org.apache.arrow.memory.RootAllocator; import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.IntVector; @@ -36,6 +35,8 @@ import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.types.pojo.FieldTyp import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.types.pojo.Schema; import org.apache.fluss.shaded.zookeeper3.org.apache.zookeeper.server.ByteBufferInputStream; import org.apache.fluss.utils.ByteBufferReadableChannel; + +import org.apache.commons.lang3.RandomUtils; import org.openjdk.jmh.annotations.Benchmark; import org.openjdk.jmh.annotations.Fork; import org.openjdk.jmh.annotations.Level; diff --git a/fluss-jmh/src/test/java/org/apache/fluss/jmh/ArrowWritableChannelBenchmark.java b/fluss-jmh/src/test/java/org/apache/fluss/jmh/ArrowWritableChannelBenchmark.java index 5d7ac7a4f..a15f52a4b 100644 --- a/fluss-jmh/src/test/java/org/apache/fluss/jmh/ArrowWritableChannelBenchmark.java +++ b/fluss-jmh/src/test/java/org/apache/fluss/jmh/ArrowWritableChannelBenchmark.java @@ -17,7 +17,6 @@ package org.apache.fluss.jmh; -import org.apache.commons.lang3.RandomUtils; import org.apache.fluss.memory.MemorySegment; import org.apache.fluss.shaded.arrow.org.apache.arrow.memory.BufferAllocator; import org.apache.fluss.shaded.arrow.org.apache.arrow.memory.RootAllocator; @@ -34,6 +33,8 @@ import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.types.pojo.Field; import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.types.pojo.FieldType; import org.apache.fluss.shaded.arrow.org.apache.arrow.vector.types.pojo.Schema; import org.apache.fluss.utils.MemorySegmentWritableChannel; + +import org.apache.commons.lang3.RandomUtils; import org.openjdk.jmh.annotations.Benchmark; import org.openjdk.jmh.annotations.Fork; import org.openjdk.jmh.annotations.Level; diff --git a/fluss-jmh/src/test/java/org/apache/fluss/jmh/LogScannerBenchmark.java b/fluss-jmh/src/test/java/org/apache/fluss/jmh/LogScannerBenchmark.java index 372b11a28..cd5ff67f2 100644 --- a/fluss-jmh/src/test/java/org/apache/fluss/jmh/LogScannerBenchmark.java +++ b/fluss-jmh/src/test/java/org/apache/fluss/jmh/LogScannerBenchmark.java @@ -32,6 +32,7 @@ import org.apache.fluss.metadata.TablePath; import org.apache.fluss.row.GenericRow; import org.apache.fluss.server.testutils.FlussClusterExtension; import org.apache.fluss.types.DataTypes; + import org.openjdk.jmh.annotations.Benchmark; import org.openjdk.jmh.annotations.Fork; import org.openjdk.jmh.annotations.Level; diff --git a/fluss-kafka/src/main/java/org/apache/fluss/kafka/KafkaChannelInitializer.java b/fluss-kafka/src/main/java/org/apache/fluss/kafka/KafkaChannelInitializer.java index a96efebfc..bf57ea0d5 100644 --- a/fluss-kafka/src/main/java/org/apache/fluss/kafka/KafkaChannelInitializer.java +++ b/fluss-kafka/src/main/java/org/apache/fluss/kafka/KafkaChannelInitializer.java @@ -19,7 +19,6 @@ package org.apache.fluss.kafka; import org.apache.fluss.rpc.netty.NettyChannelInitializer; import org.apache.fluss.rpc.netty.server.RequestChannel; - import org.apache.fluss.shaded.netty4.io.netty.channel.ChannelInitializer; import org.apache.fluss.shaded.netty4.io.netty.channel.socket.SocketChannel; import org.apache.fluss.shaded.netty4.io.netty.handler.codec.LengthFieldPrepender; diff --git a/fluss-kafka/src/main/java/org/apache/fluss/kafka/KafkaCommandDecoder.java b/fluss-kafka/src/main/java/org/apache/fluss/kafka/KafkaCommandDecoder.java index 3bbe1a0c5..43a0533b2 100644 --- a/fluss-kafka/src/main/java/org/apache/fluss/kafka/KafkaCommandDecoder.java +++ b/fluss-kafka/src/main/java/org/apache/fluss/kafka/KafkaCommandDecoder.java @@ -18,14 +18,14 @@ package org.apache.fluss.kafka; import org.apache.fluss.rpc.netty.server.RequestChannel; -import org.apache.fluss.utils.MathUtils; - import org.apache.fluss.shaded.netty4.io.netty.buffer.ByteBuf; import org.apache.fluss.shaded.netty4.io.netty.channel.ChannelHandlerContext; import org.apache.fluss.shaded.netty4.io.netty.channel.SimpleChannelInboundHandler; import org.apache.fluss.shaded.netty4.io.netty.handler.timeout.IdleState; import org.apache.fluss.shaded.netty4.io.netty.handler.timeout.IdleStateEvent; import org.apache.fluss.shaded.netty4.io.netty.util.ReferenceCountUtil; +import org.apache.fluss.utils.MathUtils; + import org.apache.kafka.common.errors.LeaderNotAvailableException; import org.apache.kafka.common.protocol.ApiKeys; import org.apache.kafka.common.requests.AbstractRequest; diff --git a/fluss-kafka/src/main/java/org/apache/fluss/kafka/KafkaProtocolPlugin.java b/fluss-kafka/src/main/java/org/apache/fluss/kafka/KafkaProtocolPlugin.java index 5c07f5f16..076641759 100644 --- a/fluss-kafka/src/main/java/org/apache/fluss/kafka/KafkaProtocolPlugin.java +++ b/fluss-kafka/src/main/java/org/apache/fluss/kafka/KafkaProtocolPlugin.java @@ -24,7 +24,6 @@ import org.apache.fluss.rpc.gateway.TabletServerGateway; import org.apache.fluss.rpc.netty.server.RequestChannel; import org.apache.fluss.rpc.netty.server.RequestHandler; import org.apache.fluss.rpc.protocol.NetworkProtocolPlugin; - import org.apache.fluss.shaded.netty4.io.netty.channel.ChannelHandler; import java.util.List; diff --git a/fluss-kafka/src/main/java/org/apache/fluss/kafka/KafkaRequest.java b/fluss-kafka/src/main/java/org/apache/fluss/kafka/KafkaRequest.java index 2e2e99df8..25e409a74 100644 --- a/fluss-kafka/src/main/java/org/apache/fluss/kafka/KafkaRequest.java +++ b/fluss-kafka/src/main/java/org/apache/fluss/kafka/KafkaRequest.java @@ -19,10 +19,10 @@ package org.apache.fluss.kafka; import org.apache.fluss.rpc.netty.server.RpcRequest; import org.apache.fluss.rpc.protocol.RequestType; - import org.apache.fluss.shaded.netty4.io.netty.buffer.ByteBuf; import org.apache.fluss.shaded.netty4.io.netty.channel.ChannelHandlerContext; import org.apache.fluss.shaded.netty4.io.netty.util.ReferenceCountUtil; + import org.apache.kafka.common.protocol.ApiKeys; import org.apache.kafka.common.protocol.ApiMessage; import org.apache.kafka.common.protocol.ByteBufferAccessor; diff --git a/fluss-kafka/src/test/java/org/apache/fluss/kafka/KafkaRequestHandlerTest.java b/fluss-kafka/src/test/java/org/apache/fluss/kafka/KafkaRequestHandlerTest.java index 90775e3b7..24e4ce8a6 100644 --- a/fluss-kafka/src/test/java/org/apache/fluss/kafka/KafkaRequestHandlerTest.java +++ b/fluss-kafka/src/test/java/org/apache/fluss/kafka/KafkaRequestHandlerTest.java @@ -18,10 +18,10 @@ package org.apache.fluss.kafka; import org.apache.fluss.rpc.TestingTabletGatewayService; - import org.apache.fluss.shaded.netty4.io.netty.buffer.ByteBuf; import org.apache.fluss.shaded.netty4.io.netty.buffer.ByteBufAllocator; import org.apache.fluss.shaded.netty4.io.netty.channel.ChannelHandlerContext; + import org.apache.kafka.common.protocol.ApiKeys; import org.apache.kafka.common.protocol.Errors; import org.apache.kafka.common.requests.AbstractResponse; diff --git a/fluss-lake/fluss-lake-iceberg/src/main/java/org/apache/fluss/lake/iceberg/FlussDataTypeToIcebergDataType.java b/fluss-lake/fluss-lake-iceberg/src/main/java/org/apache/fluss/lake/iceberg/FlussDataTypeToIcebergDataType.java index 2ae0fcff6..aa1a97b44 100644 --- a/fluss-lake/fluss-lake-iceberg/src/main/java/org/apache/fluss/lake/iceberg/FlussDataTypeToIcebergDataType.java +++ b/fluss-lake/fluss-lake-iceberg/src/main/java/org/apache/fluss/lake/iceberg/FlussDataTypeToIcebergDataType.java @@ -37,6 +37,7 @@ import org.apache.fluss.types.StringType; import org.apache.fluss.types.TimeType; import org.apache.fluss.types.TimestampType; import org.apache.fluss.types.TinyIntType; + import org.apache.iceberg.types.Type; import org.apache.iceberg.types.Types; diff --git a/fluss-lake/fluss-lake-iceberg/src/main/java/org/apache/fluss/lake/iceberg/IcebergLakeCatalog.java b/fluss-lake/fluss-lake-iceberg/src/main/java/org/apache/fluss/lake/iceberg/IcebergLakeCatalog.java index a3a2e9eef..25b101608 100644 --- a/fluss-lake/fluss-lake-iceberg/src/main/java/org/apache/fluss/lake/iceberg/IcebergLakeCatalog.java +++ b/fluss-lake/fluss-lake-iceberg/src/main/java/org/apache/fluss/lake/iceberg/IcebergLakeCatalog.java @@ -25,6 +25,7 @@ import org.apache.fluss.lake.lakestorage.LakeCatalog; import org.apache.fluss.metadata.TableDescriptor; import org.apache.fluss.metadata.TablePath; import org.apache.fluss.utils.IOUtils; + import org.apache.iceberg.PartitionSpec; import org.apache.iceberg.Schema; import org.apache.iceberg.SortOrder; diff --git a/fluss-lake/fluss-lake-iceberg/src/main/java/org/apache/fluss/lake/iceberg/conf/HadoopUtils.java b/fluss-lake/fluss-lake-iceberg/src/main/java/org/apache/fluss/lake/iceberg/conf/HadoopUtils.java index 8b6145d2c..5aad1d5bf 100644 --- a/fluss-lake/fluss-lake-iceberg/src/main/java/org/apache/fluss/lake/iceberg/conf/HadoopUtils.java +++ b/fluss-lake/fluss-lake-iceberg/src/main/java/org/apache/fluss/lake/iceberg/conf/HadoopUtils.java @@ -18,6 +18,7 @@ package org.apache.fluss.lake.iceberg.conf; import org.apache.fluss.config.ConfigBuilder; + import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hdfs.HdfsConfiguration; import org.slf4j.Logger; diff --git a/fluss-lake/fluss-lake-iceberg/src/main/java/org/apache/fluss/lake/iceberg/conf/IcebergConfiguration.java b/fluss-lake/fluss-lake-iceberg/src/main/java/org/apache/fluss/lake/iceberg/conf/IcebergConfiguration.java index 40f65f6a2..285febb43 100644 --- a/fluss-lake/fluss-lake-iceberg/src/main/java/org/apache/fluss/lake/iceberg/conf/IcebergConfiguration.java +++ b/fluss-lake/fluss-lake-iceberg/src/main/java/org/apache/fluss/lake/iceberg/conf/IcebergConfiguration.java @@ -19,6 +19,7 @@ package org.apache.fluss.lake.iceberg.conf; import org.apache.fluss.annotation.VisibleForTesting; import org.apache.fluss.config.Configuration; + import org.apache.iceberg.common.DynClasses; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/fluss-lake/fluss-lake-iceberg/src/main/java/org/apache/fluss/lake/iceberg/tiering/FlussRecordAsIcebergRecord.java b/fluss-lake/fluss-lake-iceberg/src/main/java/org/apache/fluss/lake/iceberg/tiering/FlussRecordAsIcebergRecord.java index 8bd7fa5a2..2244bd5b0 100644 --- a/fluss-lake/fluss-lake-iceberg/src/main/java/org/apache/fluss/lake/iceberg/tiering/FlussRecordAsIcebergRecord.java +++ b/fluss-lake/fluss-lake-iceberg/src/main/java/org/apache/fluss/lake/iceberg/tiering/FlussRecordAsIcebergRecord.java @@ -37,6 +37,7 @@ import org.apache.fluss.types.TimeType; import org.apache.fluss.types.TimestampType; import org.apache.fluss.types.TinyIntType; import org.apache.fluss.utils.DateTimeUtils; + import org.apache.iceberg.Schema; import org.apache.iceberg.data.Record; import org.apache.iceberg.types.Types; diff --git a/fluss-lake/fluss-lake-iceberg/src/main/java/org/apache/fluss/lake/iceberg/tiering/IcebergCatalogProvider.java b/fluss-lake/fluss-lake-iceberg/src/main/java/org/apache/fluss/lake/iceberg/tiering/IcebergCatalogProvider.java index 30ad7302d..3c53918ec 100644 --- a/fluss-lake/fluss-lake-iceberg/src/main/java/org/apache/fluss/lake/iceberg/tiering/IcebergCatalogProvider.java +++ b/fluss-lake/fluss-lake-iceberg/src/main/java/org/apache/fluss/lake/iceberg/tiering/IcebergCatalogProvider.java @@ -19,6 +19,7 @@ package org.apache.fluss.lake.iceberg.tiering; import org.apache.fluss.config.Configuration; import org.apache.fluss.lake.iceberg.conf.IcebergConfiguration; + import org.apache.iceberg.catalog.Catalog; import java.io.Serializable; diff --git a/fluss-lake/fluss-lake-iceberg/src/main/java/org/apache/fluss/lake/iceberg/tiering/IcebergLakeCommitter.java b/fluss-lake/fluss-lake-iceberg/src/main/java/org/apache/fluss/lake/iceberg/tiering/IcebergLakeCommitter.java index 300c047eb..2df44d3de 100644 --- a/fluss-lake/fluss-lake-iceberg/src/main/java/org/apache/fluss/lake/iceberg/tiering/IcebergLakeCommitter.java +++ b/fluss-lake/fluss-lake-iceberg/src/main/java/org/apache/fluss/lake/iceberg/tiering/IcebergLakeCommitter.java @@ -24,6 +24,7 @@ import org.apache.fluss.metadata.TablePath; import org.apache.fluss.shaded.jackson2.com.fasterxml.jackson.databind.JsonNode; import org.apache.fluss.shaded.jackson2.com.fasterxml.jackson.databind.ObjectMapper; import org.apache.fluss.utils.json.BucketOffsetJsonSerde; + import org.apache.iceberg.AppendFiles; import org.apache.iceberg.CatalogUtil; import org.apache.iceberg.DataFile; diff --git a/fluss-lake/fluss-lake-iceberg/src/main/java/org/apache/fluss/lake/iceberg/tiering/IcebergLakeWriter.java b/fluss-lake/fluss-lake-iceberg/src/main/java/org/apache/fluss/lake/iceberg/tiering/IcebergLakeWriter.java index d82f9a364..c5765b7d1 100644 --- a/fluss-lake/fluss-lake-iceberg/src/main/java/org/apache/fluss/lake/iceberg/tiering/IcebergLakeWriter.java +++ b/fluss-lake/fluss-lake-iceberg/src/main/java/org/apache/fluss/lake/iceberg/tiering/IcebergLakeWriter.java @@ -23,6 +23,7 @@ import org.apache.fluss.lake.writer.LakeWriter; import org.apache.fluss.lake.writer.WriterInitContext; import org.apache.fluss.metadata.TablePath; import org.apache.fluss.record.LogRecord; + import org.apache.iceberg.FileFormat; import org.apache.iceberg.Schema; import org.apache.iceberg.Table; diff --git a/fluss-lake/fluss-lake-iceberg/src/main/java/org/apache/fluss/lake/iceberg/tiering/IcebergWriteResultSerializer.java b/fluss-lake/fluss-lake-iceberg/src/main/java/org/apache/fluss/lake/iceberg/tiering/IcebergWriteResultSerializer.java index 6f1562837..26bb02a77 100644 --- a/fluss-lake/fluss-lake-iceberg/src/main/java/org/apache/fluss/lake/iceberg/tiering/IcebergWriteResultSerializer.java +++ b/fluss-lake/fluss-lake-iceberg/src/main/java/org/apache/fluss/lake/iceberg/tiering/IcebergWriteResultSerializer.java @@ -20,6 +20,7 @@ package org.apache.fluss.lake.iceberg.tiering; import org.apache.fluss.lake.serializer.SimpleVersionedSerializer; import org.apache.fluss.utils.InstantiationUtils; + import org.apache.iceberg.io.WriteResult; import java.io.IOException; diff --git a/fluss-lake/fluss-lake-iceberg/src/main/java/org/apache/fluss/lake/iceberg/tiering/RecordWriter.java b/fluss-lake/fluss-lake-iceberg/src/main/java/org/apache/fluss/lake/iceberg/tiering/RecordWriter.java index df81f63a0..6a78cec15 100644 --- a/fluss-lake/fluss-lake-iceberg/src/main/java/org/apache/fluss/lake/iceberg/tiering/RecordWriter.java +++ b/fluss-lake/fluss-lake-iceberg/src/main/java/org/apache/fluss/lake/iceberg/tiering/RecordWriter.java @@ -20,6 +20,7 @@ package org.apache.fluss.lake.iceberg.tiering; import org.apache.fluss.metadata.TableBucket; import org.apache.fluss.record.LogRecord; import org.apache.fluss.types.RowType; + import org.apache.iceberg.Schema; import org.apache.iceberg.data.Record; import org.apache.iceberg.io.TaskWriter; diff --git a/fluss-lake/fluss-lake-iceberg/src/main/java/org/apache/fluss/lake/iceberg/tiering/writer/AppendOnlyTaskWriter.java b/fluss-lake/fluss-lake-iceberg/src/main/java/org/apache/fluss/lake/iceberg/tiering/writer/AppendOnlyTaskWriter.java index b7d15d7c5..6f204ca30 100644 --- a/fluss-lake/fluss-lake-iceberg/src/main/java/org/apache/fluss/lake/iceberg/tiering/writer/AppendOnlyTaskWriter.java +++ b/fluss-lake/fluss-lake-iceberg/src/main/java/org/apache/fluss/lake/iceberg/tiering/writer/AppendOnlyTaskWriter.java @@ -20,6 +20,7 @@ package org.apache.fluss.lake.iceberg.tiering.writer; import org.apache.fluss.lake.iceberg.tiering.RecordWriter; import org.apache.fluss.lake.writer.WriterInitContext; import org.apache.fluss.record.LogRecord; + import org.apache.iceberg.FileFormat; import org.apache.iceberg.Table; import org.apache.iceberg.data.GenericAppenderFactory; diff --git a/fluss-lake/fluss-lake-iceberg/src/main/java/org/apache/fluss/lake/iceberg/tiering/writer/DeltaTaskWriter.java b/fluss-lake/fluss-lake-iceberg/src/main/java/org/apache/fluss/lake/iceberg/tiering/writer/DeltaTaskWriter.java index 6ea718a5b..677ae1e67 100644 --- a/fluss-lake/fluss-lake-iceberg/src/main/java/org/apache/fluss/lake/iceberg/tiering/writer/DeltaTaskWriter.java +++ b/fluss-lake/fluss-lake-iceberg/src/main/java/org/apache/fluss/lake/iceberg/tiering/writer/DeltaTaskWriter.java @@ -20,6 +20,7 @@ package org.apache.fluss.lake.iceberg.tiering.writer; import org.apache.fluss.lake.iceberg.tiering.RecordWriter; import org.apache.fluss.lake.writer.WriterInitContext; import org.apache.fluss.record.LogRecord; + import org.apache.iceberg.FileFormat; import org.apache.iceberg.Schema; import org.apache.iceberg.Table; diff --git a/fluss-lake/fluss-lake-iceberg/src/main/java/org/apache/fluss/lake/iceberg/tiering/writer/GenericRecordAppendOnlyWriter.java b/fluss-lake/fluss-lake-iceberg/src/main/java/org/apache/fluss/lake/iceberg/tiering/writer/GenericRecordAppendOnlyWriter.java index f31c37b89..8d5130304 100644 --- a/fluss-lake/fluss-lake-iceberg/src/main/java/org/apache/fluss/lake/iceberg/tiering/writer/GenericRecordAppendOnlyWriter.java +++ b/fluss-lake/fluss-lake-iceberg/src/main/java/org/apache/fluss/lake/iceberg/tiering/writer/GenericRecordAppendOnlyWriter.java @@ -19,6 +19,7 @@ package org.apache.fluss.lake.iceberg.tiering.writer; import org.apache.fluss.lake.writer.WriterInitContext; + import org.apache.iceberg.FileFormat; import org.apache.iceberg.Table; import org.apache.iceberg.data.Record; diff --git a/fluss-lake/fluss-lake-iceberg/src/main/java/org/apache/fluss/lake/iceberg/tiering/writer/GenericRecordDeltaWriter.java b/fluss-lake/fluss-lake-iceberg/src/main/java/org/apache/fluss/lake/iceberg/tiering/writer/GenericRecordDeltaWriter.java index 0ff13a0fc..d327ef176 100644 --- a/fluss-lake/fluss-lake-iceberg/src/main/java/org/apache/fluss/lake/iceberg/tiering/writer/GenericRecordDeltaWriter.java +++ b/fluss-lake/fluss-lake-iceberg/src/main/java/org/apache/fluss/lake/iceberg/tiering/writer/GenericRecordDeltaWriter.java @@ -18,6 +18,7 @@ package org.apache.fluss.lake.iceberg.tiering.writer; import org.apache.fluss.lake.writer.WriterInitContext; + import org.apache.iceberg.FileFormat; import org.apache.iceberg.PartitionKey; import org.apache.iceberg.Schema; diff --git a/fluss-lake/fluss-lake-iceberg/src/main/java/org/apache/fluss/lake/iceberg/utils/IcebergConversions.java b/fluss-lake/fluss-lake-iceberg/src/main/java/org/apache/fluss/lake/iceberg/utils/IcebergConversions.java index 9d020db7d..2b53fe7a3 100644 --- a/fluss-lake/fluss-lake-iceberg/src/main/java/org/apache/fluss/lake/iceberg/utils/IcebergConversions.java +++ b/fluss-lake/fluss-lake-iceberg/src/main/java/org/apache/fluss/lake/iceberg/utils/IcebergConversions.java @@ -18,6 +18,7 @@ package org.apache.fluss.lake.iceberg.utils; import org.apache.fluss.metadata.TablePath; + import org.apache.iceberg.PartitionKey; import org.apache.iceberg.PartitionSpec; import org.apache.iceberg.Schema; diff --git a/fluss-lake/fluss-lake-iceberg/src/test/java/org/apache/fluss/lake/iceberg/IcebergLakeCatalogTest.java b/fluss-lake/fluss-lake-iceberg/src/test/java/org/apache/fluss/lake/iceberg/IcebergLakeCatalogTest.java index 59d643a93..ef6bdb45e 100644 --- a/fluss-lake/fluss-lake-iceberg/src/test/java/org/apache/fluss/lake/iceberg/IcebergLakeCatalogTest.java +++ b/fluss-lake/fluss-lake-iceberg/src/test/java/org/apache/fluss/lake/iceberg/IcebergLakeCatalogTest.java @@ -22,6 +22,7 @@ import org.apache.fluss.metadata.Schema; import org.apache.fluss.metadata.TableDescriptor; import org.apache.fluss.metadata.TablePath; import org.apache.fluss.types.DataTypes; + import org.apache.iceberg.PartitionField; import org.apache.iceberg.SortDirection; import org.apache.iceberg.SortField; diff --git a/fluss-lake/fluss-lake-iceberg/src/test/java/org/apache/fluss/lake/iceberg/testutils/FlinkIcebergTieringTestBase.java b/fluss-lake/fluss-lake-iceberg/src/test/java/org/apache/fluss/lake/iceberg/testutils/FlinkIcebergTieringTestBase.java index 736abcb0b..b257ea9d8 100644 --- a/fluss-lake/fluss-lake-iceberg/src/test/java/org/apache/fluss/lake/iceberg/testutils/FlinkIcebergTieringTestBase.java +++ b/fluss-lake/fluss-lake-iceberg/src/test/java/org/apache/fluss/lake/iceberg/testutils/FlinkIcebergTieringTestBase.java @@ -18,9 +18,6 @@ package org.apache.fluss.lake.iceberg.testutils; -import org.apache.flink.api.common.RuntimeExecutionMode; -import org.apache.flink.core.execution.JobClient; -import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment; import org.apache.fluss.client.Connection; import org.apache.fluss.client.ConnectionFactory; import org.apache.fluss.client.admin.Admin; @@ -43,6 +40,10 @@ import org.apache.fluss.server.replica.Replica; import org.apache.fluss.server.testutils.FlussClusterExtension; import org.apache.fluss.server.zk.ZooKeeperClient; import org.apache.fluss.types.DataTypes; + +import org.apache.flink.api.common.RuntimeExecutionMode; +import org.apache.flink.core.execution.JobClient; +import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment; import org.apache.iceberg.DataFile; import org.apache.iceberg.Snapshot; import org.apache.iceberg.TableScan; diff --git a/fluss-lake/fluss-lake-iceberg/src/test/java/org/apache/fluss/lake/iceberg/tiering/IcebergTieringITCase.java b/fluss-lake/fluss-lake-iceberg/src/test/java/org/apache/fluss/lake/iceberg/tiering/IcebergTieringITCase.java index be2cd6065..e75121e4b 100644 --- a/fluss-lake/fluss-lake-iceberg/src/test/java/org/apache/fluss/lake/iceberg/tiering/IcebergTieringITCase.java +++ b/fluss-lake/fluss-lake-iceberg/src/test/java/org/apache/fluss/lake/iceberg/tiering/IcebergTieringITCase.java @@ -18,8 +18,6 @@ package org.apache.fluss.lake.iceberg.tiering; -import org.apache.flink.core.execution.JobClient; -import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment; import org.apache.fluss.config.AutoPartitionTimeUnit; import org.apache.fluss.config.ConfigOptions; import org.apache.fluss.lake.iceberg.testutils.FlinkIcebergTieringTestBase; @@ -30,6 +28,9 @@ import org.apache.fluss.metadata.TablePath; import org.apache.fluss.row.InternalRow; import org.apache.fluss.types.DataTypes; import org.apache.fluss.utils.types.Tuple2; + +import org.apache.flink.core.execution.JobClient; +import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/fluss-lake/fluss-lake-iceberg/src/test/java/org/apache/fluss/lake/iceberg/tiering/IcebergTieringTest.java b/fluss-lake/fluss-lake-iceberg/src/test/java/org/apache/fluss/lake/iceberg/tiering/IcebergTieringTest.java index d0227ca1d..0e3600fab 100644 --- a/fluss-lake/fluss-lake-iceberg/src/test/java/org/apache/fluss/lake/iceberg/tiering/IcebergTieringTest.java +++ b/fluss-lake/fluss-lake-iceberg/src/test/java/org/apache/fluss/lake/iceberg/tiering/IcebergTieringTest.java @@ -31,6 +31,7 @@ import org.apache.fluss.row.BinaryString; import org.apache.fluss.row.GenericRow; import org.apache.fluss.types.DataTypes; import org.apache.fluss.utils.types.Tuple2; + import org.apache.iceberg.PartitionSpec; import org.apache.iceberg.Snapshot; import org.apache.iceberg.Table; diff --git a/fluss-lake/fluss-lake-iceberg/src/test/java/org/apache/fluss/lake/iceberg/utils/IcebergConversionsTest.java b/fluss-lake/fluss-lake-iceberg/src/test/java/org/apache/fluss/lake/iceberg/utils/IcebergConversionsTest.java index 0facb2783..9d18e9d5c 100644 --- a/fluss-lake/fluss-lake-iceberg/src/test/java/org/apache/fluss/lake/iceberg/utils/IcebergConversionsTest.java +++ b/fluss-lake/fluss-lake-iceberg/src/test/java/org/apache/fluss/lake/iceberg/utils/IcebergConversionsTest.java @@ -21,6 +21,7 @@ package org.apache.fluss.lake.iceberg.utils; import org.apache.fluss.config.Configuration; import org.apache.fluss.lake.iceberg.conf.IcebergConfiguration; import org.apache.fluss.metadata.TablePath; + import org.apache.iceberg.PartitionKey; import org.apache.iceberg.PartitionSpec; import org.apache.iceberg.Schema; @@ -43,7 +44,8 @@ import static org.apache.iceberg.types.Types.NestedField.required; import static org.assertj.core.api.Assertions.assertThat; /** UT for {@link IcebergConversions}. */ -class IcebergConversionsTest {; +class IcebergConversionsTest { + ; @Test void testToPartition(@TempDir File tempWarehouseDir) { diff --git a/fluss-lake/fluss-lake-lance/src/main/java/org/apache/fluss/lake/lance/LanceLakeCatalog.java b/fluss-lake/fluss-lake-lance/src/main/java/org/apache/fluss/lake/lance/LanceLakeCatalog.java index 7e7ed75a1..b0c095c1c 100644 --- a/fluss-lake/fluss-lake-lance/src/main/java/org/apache/fluss/lake/lance/LanceLakeCatalog.java +++ b/fluss-lake/fluss-lake-lance/src/main/java/org/apache/fluss/lake/lance/LanceLakeCatalog.java @@ -17,11 +17,6 @@ package org.apache.fluss.lake.lance; -import com.lancedb.lance.WriteParams; -import org.apache.arrow.vector.types.TimeUnit; -import org.apache.arrow.vector.types.pojo.ArrowType; -import org.apache.arrow.vector.types.pojo.Field; -import org.apache.arrow.vector.types.pojo.Schema; import org.apache.fluss.config.Configuration; import org.apache.fluss.exception.InvalidTableException; import org.apache.fluss.lake.lakestorage.LakeCatalog; @@ -30,6 +25,12 @@ import org.apache.fluss.lake.lance.utils.LanceDatasetAdapter; import org.apache.fluss.metadata.TableDescriptor; import org.apache.fluss.metadata.TablePath; +import com.lancedb.lance.WriteParams; +import org.apache.arrow.vector.types.TimeUnit; +import org.apache.arrow.vector.types.pojo.ArrowType; +import org.apache.arrow.vector.types.pojo.Field; +import org.apache.arrow.vector.types.pojo.Schema; + import java.util.ArrayList; import java.util.List; diff --git a/fluss-lake/fluss-lake-lance/src/main/java/org/apache/fluss/lake/lance/utils/LanceArrowUtils.java b/fluss-lake/fluss-lake-lance/src/main/java/org/apache/fluss/lake/lance/utils/LanceArrowUtils.java index 21425a284..d8fea7d6a 100644 --- a/fluss-lake/fluss-lake-lance/src/main/java/org/apache/fluss/lake/lance/utils/LanceArrowUtils.java +++ b/fluss-lake/fluss-lake-lance/src/main/java/org/apache/fluss/lake/lance/utils/LanceArrowUtils.java @@ -17,13 +17,6 @@ package org.apache.fluss.lake.lance.utils; -import org.apache.arrow.vector.types.DateUnit; -import org.apache.arrow.vector.types.FloatingPointPrecision; -import org.apache.arrow.vector.types.TimeUnit; -import org.apache.arrow.vector.types.pojo.ArrowType; -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.fluss.types.BigIntType; import org.apache.fluss.types.BinaryType; import org.apache.fluss.types.BooleanType; @@ -44,6 +37,14 @@ import org.apache.fluss.types.TimeType; import org.apache.fluss.types.TimestampType; import org.apache.fluss.types.TinyIntType; +import org.apache.arrow.vector.types.DateUnit; +import org.apache.arrow.vector.types.FloatingPointPrecision; +import org.apache.arrow.vector.types.TimeUnit; +import org.apache.arrow.vector.types.pojo.ArrowType; +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 java.util.List; import java.util.stream.Collectors; diff --git a/fluss-lake/fluss-lake-lance/src/main/java/org/apache/fluss/lake/lance/utils/LanceDatasetAdapter.java b/fluss-lake/fluss-lake-lance/src/main/java/org/apache/fluss/lake/lance/utils/LanceDatasetAdapter.java index c960860f9..d0ee8ec78 100644 --- a/fluss-lake/fluss-lake-lance/src/main/java/org/apache/fluss/lake/lance/utils/LanceDatasetAdapter.java +++ b/fluss-lake/fluss-lake-lance/src/main/java/org/apache/fluss/lake/lance/utils/LanceDatasetAdapter.java @@ -17,13 +17,14 @@ package org.apache.fluss.lake.lance.utils; +import org.apache.fluss.lake.lance.LanceConfig; + import com.lancedb.lance.Dataset; import com.lancedb.lance.ReadOptions; import com.lancedb.lance.WriteParams; import org.apache.arrow.memory.BufferAllocator; import org.apache.arrow.memory.RootAllocator; import org.apache.arrow.vector.types.pojo.Schema; -import org.apache.fluss.lake.lance.LanceConfig; import java.util.Optional; diff --git a/fluss-lake/fluss-lake-lance/src/test/java/org/apache/fluss/lake/lance/LakeEnabledTableCreateITCase.java b/fluss-lake/fluss-lake-lance/src/test/java/org/apache/fluss/lake/lance/LakeEnabledTableCreateITCase.java index 670843bc7..6e37b7671 100644 --- a/fluss-lake/fluss-lake-lance/src/test/java/org/apache/fluss/lake/lance/LakeEnabledTableCreateITCase.java +++ b/fluss-lake/fluss-lake-lance/src/test/java/org/apache/fluss/lake/lance/LakeEnabledTableCreateITCase.java @@ -17,12 +17,6 @@ package org.apache.fluss.lake.lance; -import org.apache.arrow.vector.types.DateUnit; -import org.apache.arrow.vector.types.FloatingPointPrecision; -import org.apache.arrow.vector.types.TimeUnit; -import org.apache.arrow.vector.types.pojo.ArrowType; -import org.apache.arrow.vector.types.pojo.Field; -import org.apache.arrow.vector.types.pojo.FieldType; import org.apache.fluss.client.Connection; import org.apache.fluss.client.ConnectionFactory; import org.apache.fluss.client.admin.Admin; @@ -37,6 +31,13 @@ import org.apache.fluss.metadata.TableDescriptor; import org.apache.fluss.metadata.TablePath; import org.apache.fluss.server.testutils.FlussClusterExtension; import org.apache.fluss.types.DataTypes; + +import org.apache.arrow.vector.types.DateUnit; +import org.apache.arrow.vector.types.FloatingPointPrecision; +import org.apache.arrow.vector.types.TimeUnit; +import org.apache.arrow.vector.types.pojo.ArrowType; +import org.apache.arrow.vector.types.pojo.Field; +import org.apache.arrow.vector.types.pojo.FieldType; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/fluss-lake/fluss-lake-paimon/src/main/java/org/apache/fluss/lake/paimon/source/FlussRowAsPaimonRow.java b/fluss-lake/fluss-lake-paimon/src/main/java/org/apache/fluss/lake/paimon/source/FlussRowAsPaimonRow.java index 6260fd9aa..52994569a 100644 --- a/fluss-lake/fluss-lake-paimon/src/main/java/org/apache/fluss/lake/paimon/source/FlussRowAsPaimonRow.java +++ b/fluss-lake/fluss-lake-paimon/src/main/java/org/apache/fluss/lake/paimon/source/FlussRowAsPaimonRow.java @@ -19,6 +19,7 @@ package org.apache.fluss.lake.paimon.source; import org.apache.fluss.row.TimestampLtz; import org.apache.fluss.row.TimestampNtz; + import org.apache.paimon.data.BinaryString; import org.apache.paimon.data.Decimal; import org.apache.paimon.data.InternalArray; diff --git a/fluss-lake/fluss-lake-paimon/src/main/java/org/apache/fluss/lake/paimon/source/PaimonSortedRecordReader.java b/fluss-lake/fluss-lake-paimon/src/main/java/org/apache/fluss/lake/paimon/source/PaimonSortedRecordReader.java index 78568e1db..0131788fb 100644 --- a/fluss-lake/fluss-lake-paimon/src/main/java/org/apache/fluss/lake/paimon/source/PaimonSortedRecordReader.java +++ b/fluss-lake/fluss-lake-paimon/src/main/java/org/apache/fluss/lake/paimon/source/PaimonSortedRecordReader.java @@ -1,13 +1,12 @@ /* - * 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 + * 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 + * 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, @@ -20,6 +19,7 @@ package org.apache.fluss.lake.paimon.source; import org.apache.fluss.lake.source.SortedRecordReader; import org.apache.fluss.row.InternalRow; + import org.apache.paimon.KeyValueFileStore; import org.apache.paimon.predicate.Predicate; import org.apache.paimon.table.FileStoreTable; diff --git a/fluss-lake/fluss-lake-paimon/src/main/java/org/apache/fluss/lake/paimon/tiering/PaimonLakeCommitter.java b/fluss-lake/fluss-lake-paimon/src/main/java/org/apache/fluss/lake/paimon/tiering/PaimonLakeCommitter.java index 9c07eacbe..6408e4a81 100644 --- a/fluss-lake/fluss-lake-paimon/src/main/java/org/apache/fluss/lake/paimon/tiering/PaimonLakeCommitter.java +++ b/fluss-lake/fluss-lake-paimon/src/main/java/org/apache/fluss/lake/paimon/tiering/PaimonLakeCommitter.java @@ -21,10 +21,10 @@ import org.apache.fluss.lake.committer.BucketOffset; import org.apache.fluss.lake.committer.CommittedLakeSnapshot; import org.apache.fluss.lake.committer.LakeCommitter; import org.apache.fluss.metadata.TablePath; -import org.apache.fluss.utils.json.BucketOffsetJsonSerde; - import org.apache.fluss.shaded.jackson2.com.fasterxml.jackson.databind.JsonNode; import org.apache.fluss.shaded.jackson2.com.fasterxml.jackson.databind.ObjectMapper; +import org.apache.fluss.utils.json.BucketOffsetJsonSerde; + import org.apache.paimon.CoreOptions; import org.apache.paimon.Snapshot; import org.apache.paimon.catalog.Catalog; diff --git a/fluss-lake/fluss-lake-paimon/src/main/java/org/apache/fluss/lake/paimon/utils/FlussToPaimonPredicateConverter.java b/fluss-lake/fluss-lake-paimon/src/main/java/org/apache/fluss/lake/paimon/utils/FlussToPaimonPredicateConverter.java index 9c10ab1d9..b4fff750d 100644 --- a/fluss-lake/fluss-lake-paimon/src/main/java/org/apache/fluss/lake/paimon/utils/FlussToPaimonPredicateConverter.java +++ b/fluss-lake/fluss-lake-paimon/src/main/java/org/apache/fluss/lake/paimon/utils/FlussToPaimonPredicateConverter.java @@ -25,6 +25,7 @@ import org.apache.fluss.predicate.FunctionVisitor; import org.apache.fluss.predicate.LeafPredicate; import org.apache.fluss.predicate.Or; import org.apache.fluss.predicate.PredicateVisitor; + import org.apache.paimon.predicate.Predicate; import org.apache.paimon.predicate.PredicateBuilder; import org.apache.paimon.types.RowType; diff --git a/fluss-lake/fluss-lake-paimon/src/main/java/org/apache/fluss/lake/paimon/utils/PaimonRowAsFlussRow.java b/fluss-lake/fluss-lake-paimon/src/main/java/org/apache/fluss/lake/paimon/utils/PaimonRowAsFlussRow.java index f9ba409d1..5c66fb3eb 100644 --- a/fluss-lake/fluss-lake-paimon/src/main/java/org/apache/fluss/lake/paimon/utils/PaimonRowAsFlussRow.java +++ b/fluss-lake/fluss-lake-paimon/src/main/java/org/apache/fluss/lake/paimon/utils/PaimonRowAsFlussRow.java @@ -22,6 +22,7 @@ import org.apache.fluss.row.Decimal; import org.apache.fluss.row.InternalRow; import org.apache.fluss.row.TimestampLtz; import org.apache.fluss.row.TimestampNtz; + import org.apache.paimon.data.Timestamp; /** Adapter for paimon row as fluss row. */ diff --git a/fluss-lake/fluss-lake-paimon/src/test/java/org/apache/fluss/lake/paimon/source/PaimonLakeSourceTest.java b/fluss-lake/fluss-lake-paimon/src/test/java/org/apache/fluss/lake/paimon/source/PaimonLakeSourceTest.java index 9cbe5b9f9..55dedbeb0 100644 --- a/fluss-lake/fluss-lake-paimon/src/test/java/org/apache/fluss/lake/paimon/source/PaimonLakeSourceTest.java +++ b/fluss-lake/fluss-lake-paimon/src/test/java/org/apache/fluss/lake/paimon/source/PaimonLakeSourceTest.java @@ -18,7 +18,6 @@ package org.apache.fluss.lake.paimon.source; -import org.apache.flink.types.Row; import org.apache.fluss.lake.source.LakeSource; import org.apache.fluss.lake.source.RecordReader; import org.apache.fluss.metadata.TablePath; @@ -35,6 +34,8 @@ import org.apache.fluss.types.IntType; import org.apache.fluss.types.RowType; import org.apache.fluss.types.StringType; import org.apache.fluss.utils.CloseableIterator; + +import org.apache.flink.types.Row; import org.apache.paimon.CoreOptions; import org.apache.paimon.data.BinaryString; import org.apache.paimon.data.GenericRow; diff --git a/fluss-lake/fluss-lake-paimon/src/test/java/org/apache/fluss/lake/paimon/source/PaimonRecordReaderTest.java b/fluss-lake/fluss-lake-paimon/src/test/java/org/apache/fluss/lake/paimon/source/PaimonRecordReaderTest.java index d3446a47a..3d37c1692 100644 --- a/fluss-lake/fluss-lake-paimon/src/test/java/org/apache/fluss/lake/paimon/source/PaimonRecordReaderTest.java +++ b/fluss-lake/fluss-lake-paimon/src/test/java/org/apache/fluss/lake/paimon/source/PaimonRecordReaderTest.java @@ -18,7 +18,6 @@ package org.apache.fluss.lake.paimon.source; -import org.apache.flink.types.Row; import org.apache.fluss.lake.paimon.utils.PaimonRowAsFlussRow; import org.apache.fluss.lake.source.LakeSource; import org.apache.fluss.lake.source.RecordReader; @@ -42,6 +41,8 @@ import org.apache.fluss.types.StringType; import org.apache.fluss.types.TimestampType; import org.apache.fluss.types.TinyIntType; import org.apache.fluss.utils.CloseableIterator; + +import org.apache.flink.types.Row; import org.apache.paimon.CoreOptions; import org.apache.paimon.Snapshot; import org.apache.paimon.schema.Schema; @@ -255,8 +256,7 @@ class PaimonRecordReaderTest extends PaimonSourceTestBase { i + 400L, 500.1f, 600.0d, - org.apache.fluss.row.BinaryString.fromString( - "another_string_" + i), + org.apache.fluss.row.BinaryString.fromString("another_string_" + i), Decimal.fromUnscaledLong(900, 5, 2), Decimal.fromBigDecimal(new java.math.BigDecimal(1000), 20, 0), TimestampLtz.fromEpochMillis(1698235273400L), @@ -279,8 +279,7 @@ class PaimonRecordReaderTest extends PaimonSourceTestBase { i + 400L, 500.1f, 600.0d, - org.apache.fluss.row.BinaryString.fromString( - "another_string_" + i), + org.apache.fluss.row.BinaryString.fromString("another_string_" + i), Decimal.fromUnscaledLong(900, 5, 2), Decimal.fromBigDecimal(new java.math.BigDecimal(1000), 20, 0), TimestampLtz.fromEpochMillis(1698235273400L), diff --git a/fluss-lake/fluss-lake-paimon/src/test/java/org/apache/fluss/lake/paimon/source/PaimonSortedRecordReaderTest.java b/fluss-lake/fluss-lake-paimon/src/test/java/org/apache/fluss/lake/paimon/source/PaimonSortedRecordReaderTest.java index 997735124..49749bf4e 100644 --- a/fluss-lake/fluss-lake-paimon/src/test/java/org/apache/fluss/lake/paimon/source/PaimonSortedRecordReaderTest.java +++ b/fluss-lake/fluss-lake-paimon/src/test/java/org/apache/fluss/lake/paimon/source/PaimonSortedRecordReaderTest.java @@ -30,6 +30,7 @@ import org.apache.fluss.row.InternalRow; import org.apache.fluss.row.TimestampLtz; import org.apache.fluss.row.TimestampNtz; import org.apache.fluss.utils.CloseableIterator; + import org.apache.paimon.CoreOptions; import org.apache.paimon.Snapshot; import org.apache.paimon.schema.Schema; @@ -164,8 +165,7 @@ class PaimonSortedRecordReaderTest extends PaimonSourceTestBase { 400L, 500.1f, 600.0d, - org.apache.fluss.row.BinaryString.fromString( - "another_string_" + i), + org.apache.fluss.row.BinaryString.fromString("another_string_" + i), Decimal.fromUnscaledLong(900, 5, 2), Decimal.fromBigDecimal(new java.math.BigDecimal(1000), 20, 0), TimestampLtz.fromEpochMillis(1698235273400L), @@ -188,8 +188,7 @@ class PaimonSortedRecordReaderTest extends PaimonSourceTestBase { 400L, 500.1f, 600.0d, - org.apache.fluss.row.BinaryString.fromString( - "another_string_" + i), + org.apache.fluss.row.BinaryString.fromString("another_string_" + i), Decimal.fromUnscaledLong(900, 5, 2), Decimal.fromBigDecimal(new java.math.BigDecimal(1000), 20, 0), TimestampLtz.fromEpochMillis(1698235273400L), diff --git a/fluss-lake/fluss-lake-paimon/src/test/java/org/apache/fluss/lake/paimon/source/PaimonSourceTestBase.java b/fluss-lake/fluss-lake-paimon/src/test/java/org/apache/fluss/lake/paimon/source/PaimonSourceTestBase.java index cad90c706..9155a0d3b 100644 --- a/fluss-lake/fluss-lake-paimon/src/test/java/org/apache/fluss/lake/paimon/source/PaimonSourceTestBase.java +++ b/fluss-lake/fluss-lake-paimon/src/test/java/org/apache/fluss/lake/paimon/source/PaimonSourceTestBase.java @@ -18,11 +18,12 @@ package org.apache.fluss.lake.paimon.source; -import org.apache.flink.types.Row; import org.apache.fluss.config.Configuration; import org.apache.fluss.lake.paimon.PaimonLakeStorage; import org.apache.fluss.metadata.TablePath; import org.apache.fluss.utils.CloseableIterator; + +import org.apache.flink.types.Row; import org.apache.paimon.catalog.Catalog; import org.apache.paimon.catalog.CatalogContext; import org.apache.paimon.catalog.CatalogFactory; diff --git a/fluss-lake/fluss-lake-paimon/src/test/java/org/apache/fluss/lake/paimon/tiering/PaimonTieringTest.java b/fluss-lake/fluss-lake-paimon/src/test/java/org/apache/fluss/lake/paimon/tiering/PaimonTieringTest.java index 92f491e82..fdbd1eb31 100644 --- a/fluss-lake/fluss-lake-paimon/src/test/java/org/apache/fluss/lake/paimon/tiering/PaimonTieringTest.java +++ b/fluss-lake/fluss-lake-paimon/src/test/java/org/apache/fluss/lake/paimon/tiering/PaimonTieringTest.java @@ -31,6 +31,7 @@ import org.apache.fluss.record.LogRecord; import org.apache.fluss.row.BinaryString; import org.apache.fluss.row.GenericRow; import org.apache.fluss.utils.types.Tuple2; + import org.apache.paimon.CoreOptions; import org.apache.paimon.catalog.Catalog; import org.apache.paimon.catalog.CatalogContext; diff --git a/fluss-protogen/fluss-protogen-tests/src/main/java/org/apache/fluss/protogen/benchmark/ProtoBenchmark.java b/fluss-protogen/fluss-protogen-tests/src/main/java/org/apache/fluss/protogen/benchmark/ProtoBenchmark.java index e119fe16c..fe1ca3c91 100644 --- a/fluss-protogen/fluss-protogen-tests/src/main/java/org/apache/fluss/protogen/benchmark/ProtoBenchmark.java +++ b/fluss-protogen/fluss-protogen-tests/src/main/java/org/apache/fluss/protogen/benchmark/ProtoBenchmark.java @@ -17,13 +17,14 @@ package org.apache.fluss.protogen.benchmark; -import com.google.protobuf.CodedOutputStream; import org.apache.fluss.protogen.tests.AddressBook; import org.apache.fluss.protogen.tests.AddressBookProtos; import org.apache.fluss.protogen.tests.Person; import org.apache.fluss.shaded.netty4.io.netty.buffer.ByteBuf; import org.apache.fluss.shaded.netty4.io.netty.buffer.PooledByteBufAllocator; import org.apache.fluss.shaded.netty4.io.netty.buffer.Unpooled; + +import com.google.protobuf.CodedOutputStream; import org.openjdk.jmh.annotations.Benchmark; import org.openjdk.jmh.annotations.Fork; import org.openjdk.jmh.annotations.Measurement; diff --git a/fluss-protogen/fluss-protogen-tests/src/main/java/org/apache/fluss/protogen/benchmark/SimpleBenchmark.java b/fluss-protogen/fluss-protogen-tests/src/main/java/org/apache/fluss/protogen/benchmark/SimpleBenchmark.java index 2b28ef650..abb9eae56 100644 --- a/fluss-protogen/fluss-protogen-tests/src/main/java/org/apache/fluss/protogen/benchmark/SimpleBenchmark.java +++ b/fluss-protogen/fluss-protogen-tests/src/main/java/org/apache/fluss/protogen/benchmark/SimpleBenchmark.java @@ -17,13 +17,14 @@ package org.apache.fluss.protogen.benchmark; -import com.google.protobuf.CodedOutputStream; import org.apache.fluss.protogen.tests.Frame; import org.apache.fluss.protogen.tests.Point; import org.apache.fluss.protogen.tests.PointFrame; import org.apache.fluss.shaded.netty4.io.netty.buffer.ByteBuf; import org.apache.fluss.shaded.netty4.io.netty.buffer.PooledByteBufAllocator; import org.apache.fluss.shaded.netty4.io.netty.buffer.Unpooled; + +import com.google.protobuf.CodedOutputStream; import org.openjdk.jmh.annotations.Benchmark; import org.openjdk.jmh.annotations.Fork; import org.openjdk.jmh.annotations.Measurement; diff --git a/fluss-protogen/fluss-protogen-tests/src/main/java/org/apache/fluss/protogen/benchmark/StringEncodingBenchmark.java b/fluss-protogen/fluss-protogen-tests/src/main/java/org/apache/fluss/protogen/benchmark/StringEncodingBenchmark.java index 1dccd1865..90ba2101f 100644 --- a/fluss-protogen/fluss-protogen-tests/src/main/java/org/apache/fluss/protogen/benchmark/StringEncodingBenchmark.java +++ b/fluss-protogen/fluss-protogen-tests/src/main/java/org/apache/fluss/protogen/benchmark/StringEncodingBenchmark.java @@ -20,6 +20,7 @@ package org.apache.fluss.protogen.benchmark; import org.apache.fluss.shaded.netty4.io.netty.buffer.ByteBuf; import org.apache.fluss.shaded.netty4.io.netty.buffer.ByteBufAllocator; import org.apache.fluss.shaded.netty4.io.netty.buffer.ByteBufUtil; + import org.openjdk.jmh.annotations.Benchmark; import org.openjdk.jmh.annotations.Fork; import org.openjdk.jmh.annotations.Measurement; diff --git a/fluss-protogen/fluss-protogen-tests/src/test/java/org/apache/fluss/protogen/tests/AddressBookTest.java b/fluss-protogen/fluss-protogen-tests/src/test/java/org/apache/fluss/protogen/tests/AddressBookTest.java index 235743b22..87182ac2c 100644 --- a/fluss-protogen/fluss-protogen-tests/src/test/java/org/apache/fluss/protogen/tests/AddressBookTest.java +++ b/fluss-protogen/fluss-protogen-tests/src/test/java/org/apache/fluss/protogen/tests/AddressBookTest.java @@ -17,9 +17,10 @@ package org.apache.fluss.protogen.tests; -import com.google.protobuf.CodedOutputStream; import org.apache.fluss.shaded.netty4.io.netty.buffer.ByteBuf; import org.apache.fluss.shaded.netty4.io.netty.buffer.Unpooled; + +import com.google.protobuf.CodedOutputStream; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/fluss-protogen/fluss-protogen-tests/src/test/java/org/apache/fluss/protogen/tests/BytesTest.java b/fluss-protogen/fluss-protogen-tests/src/test/java/org/apache/fluss/protogen/tests/BytesTest.java index df844ba53..b2ccc1187 100644 --- a/fluss-protogen/fluss-protogen-tests/src/test/java/org/apache/fluss/protogen/tests/BytesTest.java +++ b/fluss-protogen/fluss-protogen-tests/src/test/java/org/apache/fluss/protogen/tests/BytesTest.java @@ -17,14 +17,15 @@ package org.apache.fluss.protogen.tests; -import com.google.protobuf.ByteString; -import com.google.protobuf.CodedOutputStream; import org.apache.fluss.memory.MemorySegment; import org.apache.fluss.record.bytesview.MultiBytesView; import org.apache.fluss.record.send.Send; import org.apache.fluss.record.send.SendWritableOutput; import org.apache.fluss.shaded.netty4.io.netty.buffer.ByteBuf; import org.apache.fluss.shaded.netty4.io.netty.buffer.Unpooled; + +import com.google.protobuf.ByteString; +import com.google.protobuf.CodedOutputStream; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.io.TempDir; @@ -61,8 +62,7 @@ public class BytesTest { // test binary equals to protobuf Bytes.B pbb = - Bytes.B - .newBuilder() + Bytes.B.newBuilder() .setPayload(ByteString.copyFrom(new byte[] {1, 2, 3, 4, 5})) .build(); @@ -254,8 +254,7 @@ public class BytesTest { assertThat(lpb.getExtraItemAt(1)).isEqualTo(new byte[] {4, 5, 6, 7}); Bytes.B pbb = - Bytes.B - .newBuilder() + Bytes.B.newBuilder() .addExtraItems(ByteString.copyFrom(new byte[] {1, 2, 3})) .addExtraItems(ByteString.copyFrom(new byte[] {4, 5, 6, 7})) .build(); diff --git a/fluss-protogen/fluss-protogen-tests/src/test/java/org/apache/fluss/protogen/tests/EnumsTest.java b/fluss-protogen/fluss-protogen-tests/src/test/java/org/apache/fluss/protogen/tests/EnumsTest.java index e789f0285..968f4e2ff 100644 --- a/fluss-protogen/fluss-protogen-tests/src/test/java/org/apache/fluss/protogen/tests/EnumsTest.java +++ b/fluss-protogen/fluss-protogen-tests/src/test/java/org/apache/fluss/protogen/tests/EnumsTest.java @@ -17,9 +17,10 @@ package org.apache.fluss.protogen.tests; -import com.google.protobuf.CodedOutputStream; import org.apache.fluss.shaded.netty4.io.netty.buffer.ByteBuf; import org.apache.fluss.shaded.netty4.io.netty.buffer.Unpooled; + +import com.google.protobuf.CodedOutputStream; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/fluss-protogen/fluss-protogen-tests/src/test/java/org/apache/fluss/protogen/tests/MessagesTest.java b/fluss-protogen/fluss-protogen-tests/src/test/java/org/apache/fluss/protogen/tests/MessagesTest.java index b9dcac76d..a9704144e 100644 --- a/fluss-protogen/fluss-protogen-tests/src/test/java/org/apache/fluss/protogen/tests/MessagesTest.java +++ b/fluss-protogen/fluss-protogen-tests/src/test/java/org/apache/fluss/protogen/tests/MessagesTest.java @@ -17,11 +17,12 @@ package org.apache.fluss.protogen.tests; -import com.google.protobuf.CodedOutputStream; import org.apache.fluss.rpc.messages.ApiMessage; import org.apache.fluss.rpc.messages.ErrorMessage; import org.apache.fluss.shaded.netty4.io.netty.buffer.ByteBuf; import org.apache.fluss.shaded.netty4.io.netty.buffer.Unpooled; + +import com.google.protobuf.CodedOutputStream; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/fluss-protogen/fluss-protogen-tests/src/test/java/org/apache/fluss/protogen/tests/NumbersTest.java b/fluss-protogen/fluss-protogen-tests/src/test/java/org/apache/fluss/protogen/tests/NumbersTest.java index 93a3c6a86..0074f39e4 100644 --- a/fluss-protogen/fluss-protogen-tests/src/test/java/org/apache/fluss/protogen/tests/NumbersTest.java +++ b/fluss-protogen/fluss-protogen-tests/src/test/java/org/apache/fluss/protogen/tests/NumbersTest.java @@ -17,9 +17,10 @@ package org.apache.fluss.protogen.tests; -import com.google.protobuf.CodedOutputStream; import org.apache.fluss.shaded.netty4.io.netty.buffer.ByteBuf; import org.apache.fluss.shaded.netty4.io.netty.buffer.Unpooled; + +import com.google.protobuf.CodedOutputStream; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/fluss-protogen/fluss-protogen-tests/src/test/java/org/apache/fluss/protogen/tests/RepeatedNumbersTest.java b/fluss-protogen/fluss-protogen-tests/src/test/java/org/apache/fluss/protogen/tests/RepeatedNumbersTest.java index c2e4361d5..7fbfc6ff2 100644 --- a/fluss-protogen/fluss-protogen-tests/src/test/java/org/apache/fluss/protogen/tests/RepeatedNumbersTest.java +++ b/fluss-protogen/fluss-protogen-tests/src/test/java/org/apache/fluss/protogen/tests/RepeatedNumbersTest.java @@ -17,9 +17,10 @@ package org.apache.fluss.protogen.tests; -import com.google.protobuf.CodedOutputStream; import org.apache.fluss.shaded.netty4.io.netty.buffer.ByteBuf; import org.apache.fluss.shaded.netty4.io.netty.buffer.Unpooled; + +import com.google.protobuf.CodedOutputStream; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/fluss-protogen/fluss-protogen-tests/src/test/java/org/apache/fluss/protogen/tests/RequiredTest.java b/fluss-protogen/fluss-protogen-tests/src/test/java/org/apache/fluss/protogen/tests/RequiredTest.java index 7d6dceb2b..d5c598d59 100644 --- a/fluss-protogen/fluss-protogen-tests/src/test/java/org/apache/fluss/protogen/tests/RequiredTest.java +++ b/fluss-protogen/fluss-protogen-tests/src/test/java/org/apache/fluss/protogen/tests/RequiredTest.java @@ -17,9 +17,10 @@ package org.apache.fluss.protogen.tests; -import com.google.protobuf.CodedOutputStream; import org.apache.fluss.shaded.netty4.io.netty.buffer.ByteBuf; import org.apache.fluss.shaded.netty4.io.netty.buffer.Unpooled; + +import com.google.protobuf.CodedOutputStream; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/fluss-protogen/fluss-protogen-tests/src/test/java/org/apache/fluss/protogen/tests/StringsTest.java b/fluss-protogen/fluss-protogen-tests/src/test/java/org/apache/fluss/protogen/tests/StringsTest.java index 7e722b4d2..b93590e1a 100644 --- a/fluss-protogen/fluss-protogen-tests/src/test/java/org/apache/fluss/protogen/tests/StringsTest.java +++ b/fluss-protogen/fluss-protogen-tests/src/test/java/org/apache/fluss/protogen/tests/StringsTest.java @@ -17,9 +17,10 @@ package org.apache.fluss.protogen.tests; -import com.google.protobuf.CodedOutputStream; import org.apache.fluss.shaded.netty4.io.netty.buffer.ByteBuf; import org.apache.fluss.shaded.netty4.io.netty.buffer.Unpooled; + +import com.google.protobuf.CodedOutputStream; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -57,8 +58,7 @@ public class StringsTest { assertThat(lps.getNameAt(2)).isEqualTo("c"); Strings.S pbs = - Strings.S - .newBuilder() + Strings.S.newBuilder() .setId("id") .addNames("a") .addNames("b") diff --git a/tools/ci/fluss-ci-tools/src/main/java/org/apache/fluss/tools/ci/licensecheck/NoticeFileChecker.java b/tools/ci/fluss-ci-tools/src/main/java/org/apache/fluss/tools/ci/licensecheck/NoticeFileChecker.java index a896dbb59..051a50718 100644 --- a/tools/ci/fluss-ci-tools/src/main/java/org/apache/fluss/tools/ci/licensecheck/NoticeFileChecker.java +++ b/tools/ci/fluss-ci-tools/src/main/java/org/apache/fluss/tools/ci/licensecheck/NoticeFileChecker.java @@ -304,7 +304,8 @@ public class NoticeFileChecker { // find all dependencies missing from NOTICE file Collection<Dependency> expectedDependencies = - modulesWithShadedDependencies.getOrDefault(moduleName, Collections.emptySet()) + modulesWithShadedDependencies + .getOrDefault(moduleName, Collections.emptySet()) .stream() .filter( dependency -> diff --git a/tools/ci/fluss-ci-tools/src/main/java/org/apache/fluss/tools/ci/utils/deploy/DeployParser.java b/tools/ci/fluss-ci-tools/src/main/java/org/apache/fluss/tools/ci/utils/deploy/DeployParser.java index bdf0fc164..db013715e 100644 --- a/tools/ci/fluss-ci-tools/src/main/java/org/apache/fluss/tools/ci/utils/deploy/DeployParser.java +++ b/tools/ci/fluss-ci-tools/src/main/java/org/apache/fluss/tools/ci/utils/deploy/DeployParser.java @@ -58,7 +58,8 @@ public class DeployParser { static Set<String> parseDeployOutput(Stream<String> lines) { return ParserUtils.parsePluginOutput( lines, DEPLOY_MODULE_PATTERN, DeployParser::parseDeployBlock) - .entrySet().stream() + .entrySet() + .stream() .filter(Map.Entry::getValue) .map(Map.Entry::getKey) .collect(Collectors.toSet());
