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 efd24eea5b96fa87197e58a477bb0d90c9d89fe5 Author: Jark Wu <[email protected]> AuthorDate: Mon Aug 25 14:25:37 2025 +0800 WIP --- .../java/org/apache/fluss/cluster/Cluster.java | 4 +++- .../org/apache/fluss/memory/MemorySegmentPool.java | 8 ++++++-- .../java/org/apache/fluss/predicate/Predicate.java | 4 ---- .../fluss/record/DefaultValueRecordBatch.java | 4 +++- .../fluss/record/send/SendWritableOutput.java | 4 +++- .../org/apache/fluss/remote/RemoteLogSegment.java | 8 ++++++-- .../java/org/apache/fluss/utils/types/Either.java | 8 ++++++-- .../fluss/predicate/PredicateBuilderTest.java | 23 +++++++++++---------- .../org/apache/fluss/predicate/PredicateTest.java | 23 +++++++++++---------- .../security/auth/AuthenticationFactoryTest.java | 6 ++++-- .../fluss/fs/gs/GSFileSystemBehaviorITCase.java | 9 ++++---- .../org/apache/fluss/fs/obs/OBSFileSystem.java | 23 +++++++++++---------- .../apache/fluss/fs/obs/OBSFileSystemPlugin.java | 23 +++++++++++---------- .../DynamicTemporaryOBSCredentialsProvider.java | 23 +++++++++++---------- .../fs/obs/token/OBSSecurityTokenProvider.java | 23 +++++++++++---------- .../s3/model/transform/XmlResponsesSaxParser.java | 20 +++++++++++++----- .../fluss/flink/lake/LakeSplitGenerator.java | 3 ++- .../flink/lake/LakeSplitStateInitializer.java | 3 ++- .../flink/lake/state/LakeSnapshotSplitState.java | 3 ++- .../flink/lake/reader/SortMergeReaderTest.java | 24 ++++++++++++---------- .../lake/paimon/utils/PaimonRowAsFlussRow.java | 20 +++++++----------- .../org/apache/fluss/rpc/netty/NettyUtils.java | 4 +++- .../org/apache/fluss/server/log/LogSegments.java | 16 +++++++++++---- .../fluss/testutils/common/FlussAssertions.java | 4 +++- pom.xml | 2 +- 25 files changed, 167 insertions(+), 125 deletions(-) diff --git a/fluss-common/src/main/java/org/apache/fluss/cluster/Cluster.java b/fluss-common/src/main/java/org/apache/fluss/cluster/Cluster.java index eee883fb2..c5528c8f2 100644 --- a/fluss-common/src/main/java/org/apache/fluss/cluster/Cluster.java +++ b/fluss-common/src/main/java/org/apache/fluss/cluster/Cluster.java @@ -147,7 +147,9 @@ public final class Cluster { return coordinatorServer; } - /** @return The known set of alive tablet servers. */ + /** + * @return The known set of alive tablet servers. + */ public Map<Integer, ServerNode> getAliveTabletServers() { return aliveTabletServersById; } diff --git a/fluss-common/src/main/java/org/apache/fluss/memory/MemorySegmentPool.java b/fluss-common/src/main/java/org/apache/fluss/memory/MemorySegmentPool.java index c3bf2d158..c36e44c53 100644 --- a/fluss-common/src/main/java/org/apache/fluss/memory/MemorySegmentPool.java +++ b/fluss-common/src/main/java/org/apache/fluss/memory/MemorySegmentPool.java @@ -66,10 +66,14 @@ public interface MemorySegmentPool { */ void returnAll(List<MemorySegment> memory); - /** @return Free page number. */ + /** + * @return Free page number. + */ int freePages(); - /** @return the available memory size in bytes. */ + /** + * @return the available memory size in bytes. + */ long availableMemory(); void close(); 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 cb3e8e720..2d67f7f32 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 @@ -23,10 +23,6 @@ import org.apache.fluss.row.InternalRow; import java.io.Serializable; import java.util.Optional; -/* This file is based on source code of Apache Paimon Project (https://paimon.apache.org/), licensed by the Apache - * Software Foundation (ASF) under the Apache License, Version 2.0. See the NOTICE file distributed with this work for - * additional information regarding copyright ownership. */ - /** * Predicate which returns Boolean and provides testing by stats. * diff --git a/fluss-common/src/main/java/org/apache/fluss/record/DefaultValueRecordBatch.java b/fluss-common/src/main/java/org/apache/fluss/record/DefaultValueRecordBatch.java index 1490d97a9..b8aefc75b 100644 --- a/fluss-common/src/main/java/org/apache/fluss/record/DefaultValueRecordBatch.java +++ b/fluss-common/src/main/java/org/apache/fluss/record/DefaultValueRecordBatch.java @@ -257,7 +257,9 @@ public class DefaultValueRecordBatch implements ValueRecordBatch { currentRecordNumber++; } - /** @param valueBytes consisted of schema id and the row encoded in the value bytes */ + /** + * @param valueBytes consisted of schema id and the row encoded in the value bytes + */ public void append(byte[] valueBytes) throws IOException { if (isClosed) { throw new IllegalStateException( diff --git a/fluss-common/src/main/java/org/apache/fluss/record/send/SendWritableOutput.java b/fluss-common/src/main/java/org/apache/fluss/record/send/SendWritableOutput.java index f38822c93..c799fe4ec 100644 --- a/fluss-common/src/main/java/org/apache/fluss/record/send/SendWritableOutput.java +++ b/fluss-common/src/main/java/org/apache/fluss/record/send/SendWritableOutput.java @@ -34,7 +34,9 @@ public class SendWritableOutput extends ByteBufWritableOutput { /** The current reader index of the underlying {@link #buf} for building next {@link Send}. */ private int currentReaderIndex = 0; - /** @param buf The ByteBuf that has capacity of data size excluding zero-copy. */ + /** + * @param buf The ByteBuf that has capacity of data size excluding zero-copy. + */ public SendWritableOutput(ByteBuf buf) { super(buf); this.sends = new ArrayDeque<>(1); diff --git a/fluss-common/src/main/java/org/apache/fluss/remote/RemoteLogSegment.java b/fluss-common/src/main/java/org/apache/fluss/remote/RemoteLogSegment.java index 3022a23b2..39480e4d1 100644 --- a/fluss-common/src/main/java/org/apache/fluss/remote/RemoteLogSegment.java +++ b/fluss-common/src/main/java/org/apache/fluss/remote/RemoteLogSegment.java @@ -93,12 +93,16 @@ public class RemoteLogSegment { return remoteLogSegmentId; } - /** @return Remote log start offset of this segment (inclusive). */ + /** + * @return Remote log start offset of this segment (inclusive). + */ public long remoteLogStartOffset() { return remoteLogStartOffset; } - /** @return Remote log end offset of this segment (inclusive). */ + /** + * @return Remote log end offset of this segment (inclusive). + */ public long remoteLogEndOffset() { return remoteLogEndOffset; } diff --git a/fluss-common/src/main/java/org/apache/fluss/utils/types/Either.java b/fluss-common/src/main/java/org/apache/fluss/utils/types/Either.java index 801401d33..39f1c5260 100644 --- a/fluss-common/src/main/java/org/apache/fluss/utils/types/Either.java +++ b/fluss-common/src/main/java/org/apache/fluss/utils/types/Either.java @@ -60,12 +60,16 @@ public abstract class Either<L, R> { */ public abstract R right() throws IllegalStateException; - /** @return true if this is a Left value, false if this is a Right value */ + /** + * @return true if this is a Left value, false if this is a Right value + */ public final boolean isLeft() { return getClass() == Left.class; } - /** @return true if this is a Right value, false if this is a Left value */ + /** + * @return true if this is a Right value, false if this is a Left value + */ public final boolean isRight() { return getClass() == Right.class; } 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 19a317f6c..3c5013407 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 @@ -1,17 +1,18 @@ /* - * Copyright (c) 2025 Alibaba Group Holding Ltd. + * 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 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, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package org.apache.fluss.predicate; 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 ee8f680bc..b116e4283 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 @@ -1,17 +1,18 @@ /* - * Copyright (c) 2025 Alibaba Group Holding Ltd. + * 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 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, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package org.apache.fluss.predicate; diff --git a/fluss-common/src/test/java/org/apache/fluss/security/auth/AuthenticationFactoryTest.java b/fluss-common/src/test/java/org/apache/fluss/security/auth/AuthenticationFactoryTest.java index 7bc19d6df..c71edeca0 100644 --- a/fluss-common/src/test/java/org/apache/fluss/security/auth/AuthenticationFactoryTest.java +++ b/fluss-common/src/test/java/org/apache/fluss/security/auth/AuthenticationFactoryTest.java @@ -80,7 +80,8 @@ public class AuthenticationFactoryTest { .isInstanceOf(TestIdentifierClientAuthenticator.class); assertThat( AuthenticationFactory.loadServerAuthenticatorSuppliers(configuration) - .values().stream() + .values() + .stream() .findAny() .get() .get()) @@ -93,7 +94,8 @@ public class AuthenticationFactoryTest { .isInstanceOf(TestIdentifierClientAuthenticator.class); assertThat( AuthenticationFactory.loadServerAuthenticatorSuppliers(configuration) - .values().stream() + .values() + .stream() .findAny() .get() .get()) 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 58298c1fd..7ab04195b 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,16 +17,15 @@ 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; 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 bf19c0dcf..145ece1ab 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 @@ -1,17 +1,18 @@ /* - * Copyright (c) 2025 Alibaba Group Holding Ltd. + * 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 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, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package org.apache.fluss.fs.obs; 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 33fb41875..0750472a6 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 @@ -1,17 +1,18 @@ /* - * Copyright (c) 2025 Alibaba Group Holding Ltd. + * 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 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, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package org.apache.fluss.fs.obs; 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 2d966eef6..f6e830d1f 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 @@ -1,17 +1,18 @@ /* - * Copyright (c) 2025 Alibaba Group Holding Ltd. + * 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 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, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package org.apache.fluss.fs.obs.token; 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 765c5f691..236764a22 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 @@ -1,17 +1,18 @@ /* - * Copyright (c) 2025 Alibaba Group Holding Ltd. + * 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 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, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package org.apache.fluss.fs.obs.token; diff --git a/fluss-filesystems/fluss-fs-s3/src/main/java/com/amazonaws/services/s3/model/transform/XmlResponsesSaxParser.java b/fluss-filesystems/fluss-fs-s3/src/main/java/com/amazonaws/services/s3/model/transform/XmlResponsesSaxParser.java index 9502cf04c..6decac572 100644 --- a/fluss-filesystems/fluss-fs-s3/src/main/java/com/amazonaws/services/s3/model/transform/XmlResponsesSaxParser.java +++ b/fluss-filesystems/fluss-fs-s3/src/main/java/com/amazonaws/services/s3/model/transform/XmlResponsesSaxParser.java @@ -924,12 +924,16 @@ public class XmlResponsesSaxParser { private Bucket currentBucket = null; - /** @return the buckets listed in the document. */ + /** + * @return the buckets listed in the document. + */ public List<Bucket> getBuckets() { return buckets; } - /** @return the owner of the buckets. */ + /** + * @return the owner of the buckets. + */ public Owner getOwner() { return bucketsOwner; } @@ -986,7 +990,9 @@ public class XmlResponsesSaxParser { private Grantee currentGrantee = null; private Permission currentPermission = null; - /** @return an object representing the ACL document. */ + /** + * @return an object representing the ACL document. + */ public AccessControlList getAccessControlList() { return accessControlList; } @@ -1067,7 +1073,9 @@ public class XmlResponsesSaxParser { private final BucketLoggingConfiguration bucketLoggingConfiguration = new BucketLoggingConfiguration(); - /** @return an object representing the bucket's LoggingStatus document. */ + /** + * @return an object representing the bucket's LoggingStatus document. + */ public BucketLoggingConfiguration getBucketLoggingConfiguration() { return bucketLoggingConfiguration; } @@ -1097,7 +1105,9 @@ public class XmlResponsesSaxParser { private String location = null; - /** @return the bucket's location. */ + /** + * @return the bucket's location. + */ public String getLocation() { return location; } diff --git a/fluss-flink/fluss-flink-common/src/main/java/org/apache/fluss/flink/lake/LakeSplitGenerator.java b/fluss-flink/fluss-flink-common/src/main/java/org/apache/fluss/flink/lake/LakeSplitGenerator.java index 915d1f076..1854fd26f 100644 --- a/fluss-flink/fluss-flink-common/src/main/java/org/apache/fluss/flink/lake/LakeSplitGenerator.java +++ b/fluss-flink/fluss-flink-common/src/main/java/org/apache/fluss/flink/lake/LakeSplitGenerator.java @@ -15,6 +15,8 @@ * limitations under the License. */ +package org.apache.fluss.flink.lake; + import org.apache.fluss.client.admin.Admin; import org.apache.fluss.client.metadata.LakeSnapshot; import org.apache.fluss.flink.lake.split.LakeSnapshotAndFlussLogSplit; @@ -43,7 +45,6 @@ import java.util.stream.IntStream; import static org.apache.fluss.client.table.scanner.log.LogScanner.EARLIEST_OFFSET; import static org.apache.fluss.metadata.ResolvedPartitionSpec.PARTITION_SPEC_SEPARATOR; ->>>>>>>> c4d07399 ([INFRA] The project package name updated to org.apache.fluss.):fluss-flink/fluss-flink-common/src/main/java/org/apache/fluss/flink/lakehouse/LakeSplitGenerator.java /** A generator for lake splits. */ public class LakeSplitGenerator { diff --git a/fluss-flink/fluss-flink-common/src/main/java/org/apache/fluss/flink/lake/LakeSplitStateInitializer.java b/fluss-flink/fluss-flink-common/src/main/java/org/apache/fluss/flink/lake/LakeSplitStateInitializer.java index 0333d1366..4a14b7037 100644 --- a/fluss-flink/fluss-flink-common/src/main/java/org/apache/fluss/flink/lake/LakeSplitStateInitializer.java +++ b/fluss-flink/fluss-flink-common/src/main/java/org/apache/fluss/flink/lake/LakeSplitStateInitializer.java @@ -15,13 +15,14 @@ * limitations under the License. */ +package org.apache.fluss.flink.lake; + import org.apache.fluss.flink.lake.split.LakeSnapshotAndFlussLogSplit; import org.apache.fluss.flink.lake.split.LakeSnapshotSplit; import org.apache.fluss.flink.lake.state.LakeSnapshotAndFlussLogSplitState; import org.apache.fluss.flink.lake.state.LakeSnapshotSplitState; import org.apache.fluss.flink.source.split.SourceSplitBase; import org.apache.fluss.flink.source.split.SourceSplitState; ->>>>>>>> c4d07399 ([INFRA] The project package name updated to org.apache.fluss.):fluss-flink/fluss-flink-common/src/main/java/org/apache/fluss/flink/lakehouse/LakeSplitStateInitializer.java /** The state initializer for lake split. */ public class LakeSplitStateInitializer { diff --git a/fluss-flink/fluss-flink-common/src/main/java/org/apache/fluss/flink/lake/state/LakeSnapshotSplitState.java b/fluss-flink/fluss-flink-common/src/main/java/org/apache/fluss/flink/lake/state/LakeSnapshotSplitState.java index 9d976ad64..e81358eae 100644 --- a/fluss-flink/fluss-flink-common/src/main/java/org/apache/fluss/flink/lake/state/LakeSnapshotSplitState.java +++ b/fluss-flink/fluss-flink-common/src/main/java/org/apache/fluss/flink/lake/state/LakeSnapshotSplitState.java @@ -15,10 +15,11 @@ * limitations under the License. */ +package org.apache.fluss.flink.lake.state; + import org.apache.fluss.flink.lake.split.LakeSnapshotSplit; import org.apache.fluss.flink.source.split.SourceSplitBase; import org.apache.fluss.flink.source.split.SourceSplitState; ->>>>>>>> c4d07399 ([INFRA] The project package name updated to org.apache.fluss.):fluss-flink/fluss-flink-common/src/main/java/org/apache/fluss/flink/lakehouse/paimon/split/PaimonSnapshotAndFlussLogSplitState.java /** The state of {@link LakeSnapshotSplit}. */ public class LakeSnapshotSplitState extends SourceSplitState { diff --git a/fluss-flink/fluss-flink-common/src/test/java/org/apache/fluss/flink/lake/reader/SortMergeReaderTest.java b/fluss-flink/fluss-flink-common/src/test/java/org/apache/fluss/flink/lake/reader/SortMergeReaderTest.java index 2bd02cd05..edeee5829 100644 --- a/fluss-flink/fluss-flink-common/src/test/java/org/apache/fluss/flink/lake/reader/SortMergeReaderTest.java +++ b/fluss-flink/fluss-flink-common/src/test/java/org/apache/fluss/flink/lake/reader/SortMergeReaderTest.java @@ -1,17 +1,18 @@ /* - * Copyright (c) 2025 Alibaba Group Holding Ltd. + * 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 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, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package org.apache.fluss.flink.lake.reader; @@ -27,6 +28,7 @@ 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.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.ValueSource; 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 e4351eab2..f9ba409d1 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 @@ -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, @@ -16,18 +15,13 @@ * limitations under the License. */ -<<<<<<<< HEAD:fluss-lake/fluss-lake-paimon/src/main/java/org/apache/fluss/lake/paimon/utils/PaimonRowAsFlussRow.java package org.apache.fluss.lake.paimon.utils; -======== -package org.apache.fluss.flink.lakehouse.paimon.reader; ->>>>>>>> c4d07399 ([INFRA] The project package name updated to org.apache.fluss.):fluss-flink/fluss-flink-common/src/main/java/org/apache/fluss/flink/lakehouse/paimon/reader/PaimonRowWrapper.java import org.apache.fluss.row.BinaryString; 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-rpc/src/main/java/org/apache/fluss/rpc/netty/NettyUtils.java b/fluss-rpc/src/main/java/org/apache/fluss/rpc/netty/NettyUtils.java index 40ab37711..b6418e6dc 100644 --- a/fluss-rpc/src/main/java/org/apache/fluss/rpc/netty/NettyUtils.java +++ b/fluss-rpc/src/main/java/org/apache/fluss/rpc/netty/NettyUtils.java @@ -36,7 +36,9 @@ import java.util.concurrent.CompletableFuture; /** Utils of netty. */ public class NettyUtils { - /** @return an EventLoopGroup suitable for the current platform */ + /** + * @return an EventLoopGroup suitable for the current platform + */ public static EventLoopGroup newEventLoopGroup(int nThreads, String threadNamePrefix) { if (Epoll.isAvailable()) { // Regular Epoll based event loop diff --git a/fluss-server/src/main/java/org/apache/fluss/server/log/LogSegments.java b/fluss-server/src/main/java/org/apache/fluss/server/log/LogSegments.java index fa1c9a384..1a0c9a187 100644 --- a/fluss-server/src/main/java/org/apache/fluss/server/log/LogSegments.java +++ b/fluss-server/src/main/java/org/apache/fluss/server/log/LogSegments.java @@ -175,22 +175,30 @@ public final class LogSegments { return floorEntry(offset).map(Map.Entry::getValue); } - /** @return the entry associated with the greatest offset, if it exists. */ + /** + * @return the entry associated with the greatest offset, if it exists. + */ public Optional<Map.Entry<Long, LogSegment>> lastEntry() { return Optional.ofNullable(segments.lastEntry()); } - /** @return the log segment with the greatest offset, if it exists. */ + /** + * @return the log segment with the greatest offset, if it exists. + */ public Optional<LogSegment> lastSegment() { return Optional.ofNullable(segments.lastEntry()).map(Map.Entry::getValue); } - /** @return the entry associated with the greatest offset, if it exists. */ + /** + * @return the entry associated with the greatest offset, if it exists. + */ public Optional<Map.Entry<Long, LogSegment>> firstEntry() { return Optional.ofNullable(segments.firstEntry()); } - /** @return the log segment with the greatest offset, if it exists. */ + /** + * @return the log segment with the greatest offset, if it exists. + */ public Optional<LogSegment> firstSegment() { return Optional.ofNullable(segments.firstEntry()).map(Map.Entry::getValue); } diff --git a/fluss-test-utils/src/main/java/org/apache/fluss/testutils/common/FlussAssertions.java b/fluss-test-utils/src/main/java/org/apache/fluss/testutils/common/FlussAssertions.java index 27a17125d..f9de9002d 100644 --- a/fluss-test-utils/src/main/java/org/apache/fluss/testutils/common/FlussAssertions.java +++ b/fluss-test-utils/src/main/java/org/apache/fluss/testutils/common/FlussAssertions.java @@ -35,7 +35,9 @@ public class FlussAssertions { private FlussAssertions() {} - /** @see #chainOfCauses(Throwable) */ + /** + * @see #chainOfCauses(Throwable) + */ @SuppressWarnings({"rawtypes", "unused"}) public static final InstanceOfAssertFactory<Stream, ListAssert<Throwable>> STREAM_THROWABLE = new InstanceOfAssertFactory<>(Stream.class, Assertions::<Throwable>assertThat); diff --git a/pom.xml b/pom.xml index 17ebb3849..42529dcc5 100644 --- a/pom.xml +++ b/pom.xml @@ -989,7 +989,7 @@ <configuration> <java> <googleJavaFormat> - <version>1.15</version> + <version>1.15.0</version> <style>AOSP</style> </googleJavaFormat>
