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 15df98387542956642fb7c52b92d9913d44bf37d Author: Jark Wu <[email protected]> AuthorDate: Mon Aug 25 19:18:21 2025 +0800 fix --- .../client/table/scanner/RemoteFileDownloader.java | 20 +++--- .../table/scanner/log/RemoteLogDownloader.java | 38 +++++------ .../table/scanner/log/RemoteLogDownloaderTest.java | 44 ++++++------- .../tiering/FlussRecordAsIcebergRecord.java | 63 +++++++++--------- .../testutils/FlinkIcebergTieringTestBase.java | 77 +++++++++++----------- .../lake/iceberg/tiering/IcebergTieringITCase.java | 51 +++++++------- .../apache/fluss/lake/lance/LanceLakeCatalog.java | 16 ++--- .../apache/fluss/lake/lance/LanceLakeStorage.java | 18 ++--- .../fluss/lake/lance/tiering/ArrowWriter.java | 10 +-- .../fluss/lake/lance/tiering/LanceArrowWriter.java | 10 +-- .../lance/tiering/LanceCommittableSerializer.java | 4 +- .../lake/lance/tiering/LanceLakeCommitter.java | 26 ++++---- .../lance/tiering/LanceLakeTieringFactory.java | 18 ++--- .../fluss/lake/lance/tiering/LanceLakeWriter.java | 14 ++-- .../lance/tiering/LanceWriteResultSerializer.java | 4 +- .../fluss/lake/lance/utils/LanceArrowUtils.java | 74 ++++++++++----------- .../lake/lance/utils/LanceDatasetAdapter.java | 8 +-- .../lake/lance/writers/ArrowBigIntWriter.java | 4 +- .../lake/lance/writers/ArrowBinaryWriter.java | 4 +- .../lake/lance/writers/ArrowBooleanWriter.java | 4 +- .../fluss/lake/lance/writers/ArrowDateWriter.java | 4 +- .../lake/lance/writers/ArrowDecimalWriter.java | 6 +- .../lake/lance/writers/ArrowDoubleWriter.java | 4 +- .../fluss/lake/lance/writers/ArrowFieldWriter.java | 4 +- .../fluss/lake/lance/writers/ArrowFloatWriter.java | 4 +- .../fluss/lake/lance/writers/ArrowIntWriter.java | 4 +- .../lake/lance/writers/ArrowSmallIntWriter.java | 4 +- .../fluss/lake/lance/writers/ArrowTimeWriter.java | 6 +- .../lance/writers/ArrowTimestampLtzWriter.java | 8 +-- .../lance/writers/ArrowTimestampNtzWriter.java | 8 +-- .../lake/lance/writers/ArrowTinyIntWriter.java | 4 +- .../lake/lance/writers/ArrowVarBinaryWriter.java | 4 +- .../lake/lance/writers/ArrowVarCharWriter.java | 6 +- .../lance/testutils/FlinkLanceTieringTestBase.java | 50 +++++++------- .../lake/lance/tiering/LanceTieringITCase.java | 20 +++--- .../fluss/lake/lance/tiering/LanceTieringTest.java | 44 ++++++------- .../lake/lance/LakeEnabledTableCreateITCase.java | 32 ++++----- 37 files changed, 357 insertions(+), 362 deletions(-) diff --git a/fluss-client/src/main/java/org/apache/fluss/client/table/scanner/RemoteFileDownloader.java b/fluss-client/src/main/java/org/apache/fluss/client/table/scanner/RemoteFileDownloader.java index bcde64769..9034da551 100644 --- a/fluss-client/src/main/java/org/apache/fluss/client/table/scanner/RemoteFileDownloader.java +++ b/fluss-client/src/main/java/org/apache/fluss/client/table/scanner/RemoteFileDownloader.java @@ -15,17 +15,17 @@ * limitations under the License. */ -package com.alibaba.fluss.client.table.scanner; +package org.apache.fluss.client.table.scanner; -import com.alibaba.fluss.fs.FSDataInputStream; -import com.alibaba.fluss.fs.FileSystem; -import com.alibaba.fluss.fs.FsPath; -import com.alibaba.fluss.fs.FsPathAndFileName; -import com.alibaba.fluss.fs.utils.FileDownloadSpec; -import com.alibaba.fluss.fs.utils.FileDownloadUtils; -import com.alibaba.fluss.utils.CloseableRegistry; -import com.alibaba.fluss.utils.IOUtils; -import com.alibaba.fluss.utils.concurrent.ExecutorThreadFactory; +import org.apache.fluss.fs.FSDataInputStream; +import org.apache.fluss.fs.FileSystem; +import org.apache.fluss.fs.FsPath; +import org.apache.fluss.fs.FsPathAndFileName; +import org.apache.fluss.fs.utils.FileDownloadSpec; +import org.apache.fluss.fs.utils.FileDownloadUtils; +import org.apache.fluss.utils.CloseableRegistry; +import org.apache.fluss.utils.IOUtils; +import org.apache.fluss.utils.concurrent.ExecutorThreadFactory; import java.io.Closeable; import java.io.IOException; diff --git a/fluss-client/src/main/java/org/apache/fluss/client/table/scanner/log/RemoteLogDownloader.java b/fluss-client/src/main/java/org/apache/fluss/client/table/scanner/log/RemoteLogDownloader.java index c3f357eac..20b5ca5b8 100644 --- a/fluss-client/src/main/java/org/apache/fluss/client/table/scanner/log/RemoteLogDownloader.java +++ b/fluss-client/src/main/java/org/apache/fluss/client/table/scanner/log/RemoteLogDownloader.java @@ -15,21 +15,21 @@ * limitations under the License. */ -package com.alibaba.fluss.client.table.scanner.log; - -import com.alibaba.fluss.annotation.Internal; -import com.alibaba.fluss.annotation.VisibleForTesting; -import com.alibaba.fluss.client.metrics.ScannerMetricGroup; -import com.alibaba.fluss.client.table.scanner.RemoteFileDownloader; -import com.alibaba.fluss.config.ConfigOptions; -import com.alibaba.fluss.config.Configuration; -import com.alibaba.fluss.fs.FsPath; -import com.alibaba.fluss.fs.FsPathAndFileName; -import com.alibaba.fluss.metadata.TablePath; -import com.alibaba.fluss.remote.RemoteLogSegment; -import com.alibaba.fluss.utils.ExceptionUtils; -import com.alibaba.fluss.utils.FlussPaths; -import com.alibaba.fluss.utils.concurrent.ShutdownableThread; +package org.apache.fluss.client.table.scanner.log; + +import org.apache.fluss.annotation.Internal; +import org.apache.fluss.annotation.VisibleForTesting; +import org.apache.fluss.client.metrics.ScannerMetricGroup; +import org.apache.fluss.client.table.scanner.RemoteFileDownloader; +import org.apache.fluss.config.ConfigOptions; +import org.apache.fluss.config.Configuration; +import org.apache.fluss.fs.FsPath; +import org.apache.fluss.fs.FsPathAndFileName; +import org.apache.fluss.metadata.TablePath; +import org.apache.fluss.remote.RemoteLogSegment; +import org.apache.fluss.utils.ExceptionUtils; +import org.apache.fluss.utils.FlussPaths; +import org.apache.fluss.utils.concurrent.ShutdownableThread; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -50,10 +50,10 @@ import java.util.concurrent.PriorityBlockingQueue; import java.util.concurrent.Semaphore; import java.util.concurrent.TimeUnit; -import static com.alibaba.fluss.utils.FileUtils.deleteDirectoryQuietly; -import static com.alibaba.fluss.utils.FlussPaths.LOG_FILE_SUFFIX; -import static com.alibaba.fluss.utils.FlussPaths.remoteLogSegmentDir; -import static com.alibaba.fluss.utils.FlussPaths.remoteLogSegmentFile; +import static org.apache.fluss.utils.FileUtils.deleteDirectoryQuietly; +import static org.apache.fluss.utils.FlussPaths.LOG_FILE_SUFFIX; +import static org.apache.fluss.utils.FlussPaths.remoteLogSegmentDir; +import static org.apache.fluss.utils.FlussPaths.remoteLogSegmentFile; /** Downloader to read remote log files to local disk. */ @ThreadSafe diff --git a/fluss-client/src/test/java/org/apache/fluss/client/table/scanner/log/RemoteLogDownloaderTest.java b/fluss-client/src/test/java/org/apache/fluss/client/table/scanner/log/RemoteLogDownloaderTest.java index 61e649d3f..407756a7e 100644 --- a/fluss-client/src/test/java/org/apache/fluss/client/table/scanner/log/RemoteLogDownloaderTest.java +++ b/fluss-client/src/test/java/org/apache/fluss/client/table/scanner/log/RemoteLogDownloaderTest.java @@ -15,20 +15,20 @@ * limitations under the License. */ -package com.alibaba.fluss.client.table.scanner.log; - -import com.alibaba.fluss.client.metrics.ScannerMetricGroup; -import com.alibaba.fluss.client.metrics.TestingScannerMetricGroup; -import com.alibaba.fluss.client.table.scanner.RemoteFileDownloader; -import com.alibaba.fluss.client.table.scanner.log.RemoteLogDownloader.RemoteLogDownloadRequest; -import com.alibaba.fluss.config.ConfigOptions; -import com.alibaba.fluss.config.Configuration; -import com.alibaba.fluss.fs.FsPath; -import com.alibaba.fluss.metadata.PhysicalTablePath; -import com.alibaba.fluss.metadata.TableBucket; -import com.alibaba.fluss.remote.RemoteLogSegment; -import com.alibaba.fluss.utils.FileUtils; -import com.alibaba.fluss.utils.IOUtils; +package org.apache.fluss.client.table.scanner.log; + +import org.apache.fluss.client.metrics.ScannerMetricGroup; +import org.apache.fluss.client.metrics.TestingScannerMetricGroup; +import org.apache.fluss.client.table.scanner.RemoteFileDownloader; +import org.apache.fluss.client.table.scanner.log.RemoteLogDownloader.RemoteLogDownloadRequest; +import org.apache.fluss.config.ConfigOptions; +import org.apache.fluss.config.Configuration; +import org.apache.fluss.fs.FsPath; +import org.apache.fluss.metadata.PhysicalTablePath; +import org.apache.fluss.metadata.TableBucket; +import org.apache.fluss.remote.RemoteLogSegment; +import org.apache.fluss.utils.FileUtils; +import org.apache.fluss.utils.IOUtils; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -50,14 +50,14 @@ import java.util.Set; import java.util.UUID; import java.util.stream.Collectors; -import static com.alibaba.fluss.record.TestData.DATA1_PHYSICAL_TABLE_PATH; -import static com.alibaba.fluss.record.TestData.DATA1_TABLE_ID; -import static com.alibaba.fluss.record.TestData.DATA1_TABLE_PATH; -import static com.alibaba.fluss.testutils.DataTestUtils.genRemoteLogSegmentFile; -import static com.alibaba.fluss.testutils.common.CommonTestUtils.retry; -import static com.alibaba.fluss.testutils.common.CommonTestUtils.waitUntil; -import static com.alibaba.fluss.utils.FlussPaths.remoteLogDir; -import static com.alibaba.fluss.utils.FlussPaths.remoteLogTabletDir; +import static org.apache.fluss.record.TestData.DATA1_PHYSICAL_TABLE_PATH; +import static org.apache.fluss.record.TestData.DATA1_TABLE_ID; +import static org.apache.fluss.record.TestData.DATA1_TABLE_PATH; +import static org.apache.fluss.testutils.DataTestUtils.genRemoteLogSegmentFile; +import static org.apache.fluss.testutils.common.CommonTestUtils.retry; +import static org.apache.fluss.testutils.common.CommonTestUtils.waitUntil; +import static org.apache.fluss.utils.FlussPaths.remoteLogDir; +import static org.apache.fluss.utils.FlussPaths.remoteLogTabletDir; import static org.assertj.core.api.Assertions.assertThat; /** Tests for {@link RemoteLogDownloader}. */ 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 a28378d0b..0748c89c3 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 @@ -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,29 +15,29 @@ * limitations under the License. */ -package com.alibaba.fluss.lake.iceberg.tiering; - -import com.alibaba.fluss.record.LogRecord; -import com.alibaba.fluss.row.InternalRow; -import com.alibaba.fluss.types.BigIntType; -import com.alibaba.fluss.types.BinaryType; -import com.alibaba.fluss.types.BooleanType; -import com.alibaba.fluss.types.BytesType; -import com.alibaba.fluss.types.CharType; -import com.alibaba.fluss.types.DataType; -import com.alibaba.fluss.types.DateType; -import com.alibaba.fluss.types.DecimalType; -import com.alibaba.fluss.types.DoubleType; -import com.alibaba.fluss.types.FloatType; -import com.alibaba.fluss.types.IntType; -import com.alibaba.fluss.types.LocalZonedTimestampType; -import com.alibaba.fluss.types.RowType; -import com.alibaba.fluss.types.SmallIntType; -import com.alibaba.fluss.types.StringType; -import com.alibaba.fluss.types.TimeType; -import com.alibaba.fluss.types.TimestampType; -import com.alibaba.fluss.types.TinyIntType; -import com.alibaba.fluss.utils.DateTimeUtils; +package org.apache.fluss.lake.iceberg.tiering; + +import org.apache.fluss.record.LogRecord; +import org.apache.fluss.row.InternalRow; +import org.apache.fluss.types.BigIntType; +import org.apache.fluss.types.BinaryType; +import org.apache.fluss.types.BooleanType; +import org.apache.fluss.types.BytesType; +import org.apache.fluss.types.CharType; +import org.apache.fluss.types.DataType; +import org.apache.fluss.types.DateType; +import org.apache.fluss.types.DecimalType; +import org.apache.fluss.types.DoubleType; +import org.apache.fluss.types.FloatType; +import org.apache.fluss.types.IntType; +import org.apache.fluss.types.LocalZonedTimestampType; +import org.apache.fluss.types.RowType; +import org.apache.fluss.types.SmallIntType; +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.fluss.utils.DateTimeUtils; import org.apache.iceberg.Schema; import org.apache.iceberg.data.Record; @@ -50,7 +49,7 @@ import java.time.OffsetDateTime; import java.time.ZoneOffset; import java.util.Map; -import static com.alibaba.fluss.utils.Preconditions.checkState; +import static org.apache.fluss.utils.Preconditions.checkState; /** * Wrap Fluss {@link LogRecord} as Iceberg {@link Record}. 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 26de89e09..5eafb47e8 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 @@ -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,31 +15,31 @@ * limitations under the License. */ -package com.alibaba.fluss.lake.iceberg.testutils; - -import com.alibaba.fluss.client.Connection; -import com.alibaba.fluss.client.ConnectionFactory; -import com.alibaba.fluss.client.admin.Admin; -import com.alibaba.fluss.client.table.Table; -import com.alibaba.fluss.client.table.writer.AppendWriter; -import com.alibaba.fluss.client.table.writer.TableWriter; -import com.alibaba.fluss.client.table.writer.UpsertWriter; -import com.alibaba.fluss.config.AutoPartitionTimeUnit; -import com.alibaba.fluss.config.ConfigOptions; -import com.alibaba.fluss.config.Configuration; -import com.alibaba.fluss.exception.FlussRuntimeException; -import com.alibaba.fluss.flink.tiering.LakeTieringJobBuilder; -import com.alibaba.fluss.metadata.DataLakeFormat; -import com.alibaba.fluss.metadata.Schema; -import com.alibaba.fluss.metadata.TableBucket; -import com.alibaba.fluss.metadata.TableDescriptor; -import com.alibaba.fluss.metadata.TablePath; -import com.alibaba.fluss.row.InternalRow; -import com.alibaba.fluss.server.replica.Replica; -import com.alibaba.fluss.server.testutils.FlussClusterExtension; -import com.alibaba.fluss.server.zk.ZooKeeperClient; -import com.alibaba.fluss.types.DataTypes; -import com.alibaba.fluss.utils.DateTimeUtils; +package org.apache.fluss.lake.iceberg.testutils; + +import org.apache.fluss.client.Connection; +import org.apache.fluss.client.ConnectionFactory; +import org.apache.fluss.client.admin.Admin; +import org.apache.fluss.client.table.Table; +import org.apache.fluss.client.table.writer.AppendWriter; +import org.apache.fluss.client.table.writer.TableWriter; +import org.apache.fluss.client.table.writer.UpsertWriter; +import org.apache.fluss.config.AutoPartitionTimeUnit; +import org.apache.fluss.config.ConfigOptions; +import org.apache.fluss.config.Configuration; +import org.apache.fluss.exception.FlussRuntimeException; +import org.apache.fluss.flink.tiering.LakeTieringJobBuilder; +import org.apache.fluss.metadata.DataLakeFormat; +import org.apache.fluss.metadata.Schema; +import org.apache.fluss.metadata.TableBucket; +import org.apache.fluss.metadata.TableDescriptor; +import org.apache.fluss.metadata.TablePath; +import org.apache.fluss.row.InternalRow; +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.fluss.utils.DateTimeUtils; import org.apache.flink.api.common.RuntimeExecutionMode; import org.apache.flink.core.execution.JobClient; @@ -80,12 +79,12 @@ import java.util.Optional; import java.util.SortedSet; import java.util.TreeSet; -import static com.alibaba.fluss.flink.tiering.source.TieringSourceOptions.POLL_TIERING_TABLE_INTERVAL; -import static com.alibaba.fluss.lake.iceberg.utils.IcebergConversions.toIceberg; -import static com.alibaba.fluss.metadata.TableDescriptor.OFFSET_COLUMN_NAME; -import static com.alibaba.fluss.testutils.DataTestUtils.row; -import static com.alibaba.fluss.testutils.common.CommonTestUtils.retry; -import static com.alibaba.fluss.testutils.common.CommonTestUtils.waitValue; +import static org.apache.fluss.flink.tiering.source.TieringSourceOptions.POLL_TIERING_TABLE_INTERVAL; +import static org.apache.fluss.lake.iceberg.utils.IcebergConversions.toIceberg; +import static org.apache.fluss.metadata.TableDescriptor.OFFSET_COLUMN_NAME; +import static org.apache.fluss.testutils.DataTestUtils.row; +import static org.apache.fluss.testutils.common.CommonTestUtils.retry; +import static org.apache.fluss.testutils.common.CommonTestUtils.waitValue; import static org.apache.iceberg.expressions.Expressions.equal; import static org.assertj.core.api.Assertions.assertThat; 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 c0b831f82..9561c3a71 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 @@ -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,23 +15,23 @@ * limitations under the License. */ -package com.alibaba.fluss.lake.iceberg.tiering; +package org.apache.fluss.lake.iceberg.tiering; -import com.alibaba.fluss.config.AutoPartitionTimeUnit; -import com.alibaba.fluss.config.ConfigOptions; -import com.alibaba.fluss.lake.iceberg.testutils.FlinkIcebergTieringTestBase; -import com.alibaba.fluss.metadata.Schema; -import com.alibaba.fluss.metadata.TableBucket; -import com.alibaba.fluss.metadata.TableDescriptor; -import com.alibaba.fluss.metadata.TablePath; -import com.alibaba.fluss.row.BinaryString; -import com.alibaba.fluss.row.Decimal; -import com.alibaba.fluss.row.InternalRow; -import com.alibaba.fluss.row.TimestampLtz; -import com.alibaba.fluss.row.TimestampNtz; -import com.alibaba.fluss.types.DataTypes; -import com.alibaba.fluss.utils.TypeUtils; -import com.alibaba.fluss.utils.types.Tuple2; +import org.apache.fluss.config.AutoPartitionTimeUnit; +import org.apache.fluss.config.ConfigOptions; +import org.apache.fluss.lake.iceberg.testutils.FlinkIcebergTieringTestBase; +import org.apache.fluss.metadata.Schema; +import org.apache.fluss.metadata.TableBucket; +import org.apache.fluss.metadata.TableDescriptor; +import org.apache.fluss.metadata.TablePath; +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.fluss.types.DataTypes; +import org.apache.fluss.utils.TypeUtils; +import org.apache.fluss.utils.types.Tuple2; import org.apache.flink.core.execution.JobClient; import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment; @@ -47,8 +46,8 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import static com.alibaba.fluss.lake.committer.BucketOffset.FLUSS_LAKE_SNAP_BUCKET_OFFSET_PROPERTY; -import static com.alibaba.fluss.testutils.DataTestUtils.row; +import static org.apache.fluss.lake.committer.BucketOffset.FLUSS_LAKE_SNAP_BUCKET_OFFSET_PROPERTY; +import static org.apache.fluss.testutils.DataTestUtils.row; /** The ITCase for tiering into iceberg. */ class IcebergTieringITCase extends FlinkIcebergTieringTestBase { 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 bb2df9389..16a063499 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 @@ -15,15 +15,15 @@ * limitations under the License. */ -package com.alibaba.fluss.lake.lance; +package org.apache.fluss.lake.lance; -import com.alibaba.fluss.config.Configuration; -import com.alibaba.fluss.exception.InvalidTableException; -import com.alibaba.fluss.lake.lakestorage.LakeCatalog; -import com.alibaba.fluss.lake.lance.utils.LanceArrowUtils; -import com.alibaba.fluss.lake.lance.utils.LanceDatasetAdapter; -import com.alibaba.fluss.metadata.TableDescriptor; -import com.alibaba.fluss.metadata.TablePath; +import org.apache.fluss.config.Configuration; +import org.apache.fluss.exception.InvalidTableException; +import org.apache.fluss.lake.lakestorage.LakeCatalog; +import org.apache.fluss.lake.lance.utils.LanceArrowUtils; +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.pojo.Field; diff --git a/fluss-lake/fluss-lake-lance/src/main/java/org/apache/fluss/lake/lance/LanceLakeStorage.java b/fluss-lake/fluss-lake-lance/src/main/java/org/apache/fluss/lake/lance/LanceLakeStorage.java index c4b51cd9c..3cadec74a 100644 --- a/fluss-lake/fluss-lake-lance/src/main/java/org/apache/fluss/lake/lance/LanceLakeStorage.java +++ b/fluss-lake/fluss-lake-lance/src/main/java/org/apache/fluss/lake/lance/LanceLakeStorage.java @@ -15,16 +15,16 @@ * limitations under the License. */ -package com.alibaba.fluss.lake.lance; +package org.apache.fluss.lake.lance; -import com.alibaba.fluss.config.Configuration; -import com.alibaba.fluss.lake.lakestorage.LakeStorage; -import com.alibaba.fluss.lake.lance.tiering.LanceCommittable; -import com.alibaba.fluss.lake.lance.tiering.LanceLakeTieringFactory; -import com.alibaba.fluss.lake.lance.tiering.LanceWriteResult; -import com.alibaba.fluss.lake.source.LakeSource; -import com.alibaba.fluss.lake.writer.LakeTieringFactory; -import com.alibaba.fluss.metadata.TablePath; +import org.apache.fluss.config.Configuration; +import org.apache.fluss.lake.lakestorage.LakeStorage; +import org.apache.fluss.lake.lance.tiering.LanceCommittable; +import org.apache.fluss.lake.lance.tiering.LanceLakeTieringFactory; +import org.apache.fluss.lake.lance.tiering.LanceWriteResult; +import org.apache.fluss.lake.source.LakeSource; +import org.apache.fluss.lake.writer.LakeTieringFactory; +import org.apache.fluss.metadata.TablePath; /** Lance implementation of {@link LakeStorage}. */ public class LanceLakeStorage implements LakeStorage { diff --git a/fluss-lake/fluss-lake-lance/src/main/java/org/apache/fluss/lake/lance/tiering/ArrowWriter.java b/fluss-lake/fluss-lake-lance/src/main/java/org/apache/fluss/lake/lance/tiering/ArrowWriter.java index 053b348b3..928a33e3c 100644 --- a/fluss-lake/fluss-lake-lance/src/main/java/org/apache/fluss/lake/lance/tiering/ArrowWriter.java +++ b/fluss-lake/fluss-lake-lance/src/main/java/org/apache/fluss/lake/lance/tiering/ArrowWriter.java @@ -15,12 +15,12 @@ * limitations under the License. */ -package com.alibaba.fluss.lake.lance.tiering; +package org.apache.fluss.lake.lance.tiering; -import com.alibaba.fluss.lake.lance.utils.LanceArrowUtils; -import com.alibaba.fluss.lake.lance.writers.ArrowFieldWriter; -import com.alibaba.fluss.row.InternalRow; -import com.alibaba.fluss.types.RowType; +import org.apache.fluss.lake.lance.utils.LanceArrowUtils; +import org.apache.fluss.lake.lance.writers.ArrowFieldWriter; +import org.apache.fluss.row.InternalRow; +import org.apache.fluss.types.RowType; import org.apache.arrow.vector.FieldVector; import org.apache.arrow.vector.VectorSchemaRoot; diff --git a/fluss-lake/fluss-lake-lance/src/main/java/org/apache/fluss/lake/lance/tiering/LanceArrowWriter.java b/fluss-lake/fluss-lake-lance/src/main/java/org/apache/fluss/lake/lance/tiering/LanceArrowWriter.java index e2d0f4944..e164f82ae 100644 --- a/fluss-lake/fluss-lake-lance/src/main/java/org/apache/fluss/lake/lance/tiering/LanceArrowWriter.java +++ b/fluss-lake/fluss-lake-lance/src/main/java/org/apache/fluss/lake/lance/tiering/LanceArrowWriter.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package com.alibaba.fluss.lake.lance.tiering; +package org.apache.fluss.lake.lance.tiering; -import com.alibaba.fluss.record.LogRecord; -import com.alibaba.fluss.types.RowType; +import org.apache.fluss.record.LogRecord; +import org.apache.fluss.types.RowType; import org.apache.arrow.memory.BufferAllocator; import org.apache.arrow.vector.ipc.ArrowReader; @@ -29,8 +29,8 @@ import java.util.concurrent.Semaphore; import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicLong; -import static com.alibaba.fluss.utils.Preconditions.checkArgument; -import static com.alibaba.fluss.utils.Preconditions.checkNotNull; +import static org.apache.fluss.utils.Preconditions.checkArgument; +import static org.apache.fluss.utils.Preconditions.checkNotNull; /** A custom arrow reader that supports writes Fluss internal rows while reading data in batches. */ public class LanceArrowWriter extends ArrowReader { diff --git a/fluss-lake/fluss-lake-lance/src/main/java/org/apache/fluss/lake/lance/tiering/LanceCommittableSerializer.java b/fluss-lake/fluss-lake-lance/src/main/java/org/apache/fluss/lake/lance/tiering/LanceCommittableSerializer.java index abe7efc83..d128acdc1 100644 --- a/fluss-lake/fluss-lake-lance/src/main/java/org/apache/fluss/lake/lance/tiering/LanceCommittableSerializer.java +++ b/fluss-lake/fluss-lake-lance/src/main/java/org/apache/fluss/lake/lance/tiering/LanceCommittableSerializer.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package com.alibaba.fluss.lake.lance.tiering; +package org.apache.fluss.lake.lance.tiering; -import com.alibaba.fluss.lake.serializer.SimpleVersionedSerializer; +import org.apache.fluss.lake.serializer.SimpleVersionedSerializer; import com.lancedb.lance.FragmentMetadata; diff --git a/fluss-lake/fluss-lake-lance/src/main/java/org/apache/fluss/lake/lance/tiering/LanceLakeCommitter.java b/fluss-lake/fluss-lake-lance/src/main/java/org/apache/fluss/lake/lance/tiering/LanceLakeCommitter.java index 808eb41e8..1bca63242 100644 --- a/fluss-lake/fluss-lake-lance/src/main/java/org/apache/fluss/lake/lance/tiering/LanceLakeCommitter.java +++ b/fluss-lake/fluss-lake-lance/src/main/java/org/apache/fluss/lake/lance/tiering/LanceLakeCommitter.java @@ -15,17 +15,17 @@ * limitations under the License. */ -package com.alibaba.fluss.lake.lance.tiering; - -import com.alibaba.fluss.config.Configuration; -import com.alibaba.fluss.lake.committer.BucketOffset; -import com.alibaba.fluss.lake.committer.CommittedLakeSnapshot; -import com.alibaba.fluss.lake.committer.LakeCommitter; -import com.alibaba.fluss.lake.lance.LanceConfig; -import com.alibaba.fluss.lake.lance.utils.LanceDatasetAdapter; -import com.alibaba.fluss.metadata.TablePath; -import com.alibaba.fluss.utils.json.BucketOffsetJsonSerde; -import com.alibaba.fluss.utils.types.Tuple2; +package org.apache.fluss.lake.lance.tiering; + +import org.apache.fluss.config.Configuration; +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.lake.lance.LanceConfig; +import org.apache.fluss.lake.lance.utils.LanceDatasetAdapter; +import org.apache.fluss.metadata.TablePath; +import org.apache.fluss.utils.json.BucketOffsetJsonSerde; +import org.apache.fluss.utils.types.Tuple2; import com.lancedb.lance.Dataset; import com.lancedb.lance.FragmentMetadata; @@ -45,8 +45,8 @@ import java.util.List; import java.util.Map; import java.util.stream.Collectors; -import static com.alibaba.fluss.lake.committer.BucketOffset.FLUSS_LAKE_SNAP_BUCKET_OFFSET_PROPERTY; -import static com.alibaba.fluss.lake.writer.LakeTieringFactory.FLUSS_LAKE_TIERING_COMMIT_USER; +import static org.apache.fluss.lake.committer.BucketOffset.FLUSS_LAKE_SNAP_BUCKET_OFFSET_PROPERTY; +import static org.apache.fluss.lake.writer.LakeTieringFactory.FLUSS_LAKE_TIERING_COMMIT_USER; /** Implementation of {@link LakeCommitter} for Lance. */ public class LanceLakeCommitter implements LakeCommitter<LanceWriteResult, LanceCommittable> { diff --git a/fluss-lake/fluss-lake-lance/src/main/java/org/apache/fluss/lake/lance/tiering/LanceLakeTieringFactory.java b/fluss-lake/fluss-lake-lance/src/main/java/org/apache/fluss/lake/lance/tiering/LanceLakeTieringFactory.java index 1bd0894b2..1c704cd8a 100644 --- a/fluss-lake/fluss-lake-lance/src/main/java/org/apache/fluss/lake/lance/tiering/LanceLakeTieringFactory.java +++ b/fluss-lake/fluss-lake-lance/src/main/java/org/apache/fluss/lake/lance/tiering/LanceLakeTieringFactory.java @@ -15,15 +15,15 @@ * limitations under the License. */ -package com.alibaba.fluss.lake.lance.tiering; - -import com.alibaba.fluss.config.Configuration; -import com.alibaba.fluss.lake.committer.CommitterInitContext; -import com.alibaba.fluss.lake.committer.LakeCommitter; -import com.alibaba.fluss.lake.serializer.SimpleVersionedSerializer; -import com.alibaba.fluss.lake.writer.LakeTieringFactory; -import com.alibaba.fluss.lake.writer.LakeWriter; -import com.alibaba.fluss.lake.writer.WriterInitContext; +package org.apache.fluss.lake.lance.tiering; + +import org.apache.fluss.config.Configuration; +import org.apache.fluss.lake.committer.CommitterInitContext; +import org.apache.fluss.lake.committer.LakeCommitter; +import org.apache.fluss.lake.serializer.SimpleVersionedSerializer; +import org.apache.fluss.lake.writer.LakeTieringFactory; +import org.apache.fluss.lake.writer.LakeWriter; +import org.apache.fluss.lake.writer.WriterInitContext; import java.io.IOException; diff --git a/fluss-lake/fluss-lake-lance/src/main/java/org/apache/fluss/lake/lance/tiering/LanceLakeWriter.java b/fluss-lake/fluss-lake-lance/src/main/java/org/apache/fluss/lake/lance/tiering/LanceLakeWriter.java index 73c0fdfdb..e3f3e9b40 100644 --- a/fluss-lake/fluss-lake-lance/src/main/java/org/apache/fluss/lake/lance/tiering/LanceLakeWriter.java +++ b/fluss-lake/fluss-lake-lance/src/main/java/org/apache/fluss/lake/lance/tiering/LanceLakeWriter.java @@ -15,14 +15,14 @@ * limitations under the License. */ -package com.alibaba.fluss.lake.lance.tiering; +package org.apache.fluss.lake.lance.tiering; -import com.alibaba.fluss.config.Configuration; -import com.alibaba.fluss.lake.lance.LanceConfig; -import com.alibaba.fluss.lake.lance.utils.LanceDatasetAdapter; -import com.alibaba.fluss.lake.writer.LakeWriter; -import com.alibaba.fluss.lake.writer.WriterInitContext; -import com.alibaba.fluss.record.LogRecord; +import org.apache.fluss.config.Configuration; +import org.apache.fluss.lake.lance.LanceConfig; +import org.apache.fluss.lake.lance.utils.LanceDatasetAdapter; +import org.apache.fluss.lake.writer.LakeWriter; +import org.apache.fluss.lake.writer.WriterInitContext; +import org.apache.fluss.record.LogRecord; import com.lancedb.lance.FragmentMetadata; import com.lancedb.lance.WriteParams; diff --git a/fluss-lake/fluss-lake-lance/src/main/java/org/apache/fluss/lake/lance/tiering/LanceWriteResultSerializer.java b/fluss-lake/fluss-lake-lance/src/main/java/org/apache/fluss/lake/lance/tiering/LanceWriteResultSerializer.java index 81c1b8450..228f2215b 100644 --- a/fluss-lake/fluss-lake-lance/src/main/java/org/apache/fluss/lake/lance/tiering/LanceWriteResultSerializer.java +++ b/fluss-lake/fluss-lake-lance/src/main/java/org/apache/fluss/lake/lance/tiering/LanceWriteResultSerializer.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package com.alibaba.fluss.lake.lance.tiering; +package org.apache.fluss.lake.lance.tiering; -import com.alibaba.fluss.lake.serializer.SimpleVersionedSerializer; +import org.apache.fluss.lake.serializer.SimpleVersionedSerializer; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; 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 4de499ffe..6b4da804f 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 @@ -15,44 +15,44 @@ * limitations under the License. */ -package com.alibaba.fluss.lake.lance.utils; +package org.apache.fluss.lake.lance.utils; -import com.alibaba.fluss.lake.lance.writers.ArrowBigIntWriter; -import com.alibaba.fluss.lake.lance.writers.ArrowBinaryWriter; -import com.alibaba.fluss.lake.lance.writers.ArrowBooleanWriter; -import com.alibaba.fluss.lake.lance.writers.ArrowDateWriter; -import com.alibaba.fluss.lake.lance.writers.ArrowDecimalWriter; -import com.alibaba.fluss.lake.lance.writers.ArrowDoubleWriter; -import com.alibaba.fluss.lake.lance.writers.ArrowFieldWriter; -import com.alibaba.fluss.lake.lance.writers.ArrowFloatWriter; -import com.alibaba.fluss.lake.lance.writers.ArrowIntWriter; -import com.alibaba.fluss.lake.lance.writers.ArrowSmallIntWriter; -import com.alibaba.fluss.lake.lance.writers.ArrowTimeWriter; -import com.alibaba.fluss.lake.lance.writers.ArrowTimestampLtzWriter; -import com.alibaba.fluss.lake.lance.writers.ArrowTimestampNtzWriter; -import com.alibaba.fluss.lake.lance.writers.ArrowTinyIntWriter; -import com.alibaba.fluss.lake.lance.writers.ArrowVarBinaryWriter; -import com.alibaba.fluss.lake.lance.writers.ArrowVarCharWriter; -import com.alibaba.fluss.row.InternalRow; -import com.alibaba.fluss.types.BigIntType; -import com.alibaba.fluss.types.BinaryType; -import com.alibaba.fluss.types.BooleanType; -import com.alibaba.fluss.types.BytesType; -import com.alibaba.fluss.types.CharType; -import com.alibaba.fluss.types.DataType; -import com.alibaba.fluss.types.DataTypeDefaultVisitor; -import com.alibaba.fluss.types.DateType; -import com.alibaba.fluss.types.DecimalType; -import com.alibaba.fluss.types.DoubleType; -import com.alibaba.fluss.types.FloatType; -import com.alibaba.fluss.types.IntType; -import com.alibaba.fluss.types.LocalZonedTimestampType; -import com.alibaba.fluss.types.RowType; -import com.alibaba.fluss.types.SmallIntType; -import com.alibaba.fluss.types.StringType; -import com.alibaba.fluss.types.TimeType; -import com.alibaba.fluss.types.TimestampType; -import com.alibaba.fluss.types.TinyIntType; +import org.apache.fluss.lake.lance.writers.ArrowBigIntWriter; +import org.apache.fluss.lake.lance.writers.ArrowBinaryWriter; +import org.apache.fluss.lake.lance.writers.ArrowBooleanWriter; +import org.apache.fluss.lake.lance.writers.ArrowDateWriter; +import org.apache.fluss.lake.lance.writers.ArrowDecimalWriter; +import org.apache.fluss.lake.lance.writers.ArrowDoubleWriter; +import org.apache.fluss.lake.lance.writers.ArrowFieldWriter; +import org.apache.fluss.lake.lance.writers.ArrowFloatWriter; +import org.apache.fluss.lake.lance.writers.ArrowIntWriter; +import org.apache.fluss.lake.lance.writers.ArrowSmallIntWriter; +import org.apache.fluss.lake.lance.writers.ArrowTimeWriter; +import org.apache.fluss.lake.lance.writers.ArrowTimestampLtzWriter; +import org.apache.fluss.lake.lance.writers.ArrowTimestampNtzWriter; +import org.apache.fluss.lake.lance.writers.ArrowTinyIntWriter; +import org.apache.fluss.lake.lance.writers.ArrowVarBinaryWriter; +import org.apache.fluss.lake.lance.writers.ArrowVarCharWriter; +import org.apache.fluss.row.InternalRow; +import org.apache.fluss.types.BigIntType; +import org.apache.fluss.types.BinaryType; +import org.apache.fluss.types.BooleanType; +import org.apache.fluss.types.BytesType; +import org.apache.fluss.types.CharType; +import org.apache.fluss.types.DataType; +import org.apache.fluss.types.DataTypeDefaultVisitor; +import org.apache.fluss.types.DateType; +import org.apache.fluss.types.DecimalType; +import org.apache.fluss.types.DoubleType; +import org.apache.fluss.types.FloatType; +import org.apache.fluss.types.IntType; +import org.apache.fluss.types.LocalZonedTimestampType; +import org.apache.fluss.types.RowType; +import org.apache.fluss.types.SmallIntType; +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.arrow.vector.BigIntVector; import org.apache.arrow.vector.BitVector; 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 1ffd94565..5d98da77f 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 @@ -15,13 +15,11 @@ * limitations under the License. */ -package com.alibaba.fluss.lake.lance.utils; - -import com.alibaba.fluss.lake.lance.LanceConfig; -import com.alibaba.fluss.lake.lance.tiering.LanceArrowWriter; -import com.alibaba.fluss.types.RowType; +package org.apache.fluss.lake.lance.utils; import org.apache.fluss.lake.lance.LanceConfig; +import org.apache.fluss.lake.lance.tiering.LanceArrowWriter; +import org.apache.fluss.types.RowType; import com.lancedb.lance.Dataset; import com.lancedb.lance.Fragment; diff --git a/fluss-lake/fluss-lake-lance/src/main/java/com/alibaba/fluss/lake/lance/writers/ArrowBigIntWriter.java b/fluss-lake/fluss-lake-lance/src/main/java/org/apache/fluss/lake/lance/writers/ArrowBigIntWriter.java similarity index 95% rename from fluss-lake/fluss-lake-lance/src/main/java/com/alibaba/fluss/lake/lance/writers/ArrowBigIntWriter.java rename to fluss-lake/fluss-lake-lance/src/main/java/org/apache/fluss/lake/lance/writers/ArrowBigIntWriter.java index 55026de5b..4cc124bec 100644 --- a/fluss-lake/fluss-lake-lance/src/main/java/com/alibaba/fluss/lake/lance/writers/ArrowBigIntWriter.java +++ b/fluss-lake/fluss-lake-lance/src/main/java/org/apache/fluss/lake/lance/writers/ArrowBigIntWriter.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package com.alibaba.fluss.lake.lance.writers; +package org.apache.fluss.lake.lance.writers; -import com.alibaba.fluss.row.InternalRow; +import org.apache.fluss.row.InternalRow; import org.apache.arrow.vector.BigIntVector; diff --git a/fluss-lake/fluss-lake-lance/src/main/java/com/alibaba/fluss/lake/lance/writers/ArrowBinaryWriter.java b/fluss-lake/fluss-lake-lance/src/main/java/org/apache/fluss/lake/lance/writers/ArrowBinaryWriter.java similarity index 95% rename from fluss-lake/fluss-lake-lance/src/main/java/com/alibaba/fluss/lake/lance/writers/ArrowBinaryWriter.java rename to fluss-lake/fluss-lake-lance/src/main/java/org/apache/fluss/lake/lance/writers/ArrowBinaryWriter.java index b33fd83f4..75fa16d76 100644 --- a/fluss-lake/fluss-lake-lance/src/main/java/com/alibaba/fluss/lake/lance/writers/ArrowBinaryWriter.java +++ b/fluss-lake/fluss-lake-lance/src/main/java/org/apache/fluss/lake/lance/writers/ArrowBinaryWriter.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package com.alibaba.fluss.lake.lance.writers; +package org.apache.fluss.lake.lance.writers; -import com.alibaba.fluss.row.InternalRow; +import org.apache.fluss.row.InternalRow; import org.apache.arrow.vector.FixedSizeBinaryVector; diff --git a/fluss-lake/fluss-lake-lance/src/main/java/com/alibaba/fluss/lake/lance/writers/ArrowBooleanWriter.java b/fluss-lake/fluss-lake-lance/src/main/java/org/apache/fluss/lake/lance/writers/ArrowBooleanWriter.java similarity index 95% rename from fluss-lake/fluss-lake-lance/src/main/java/com/alibaba/fluss/lake/lance/writers/ArrowBooleanWriter.java rename to fluss-lake/fluss-lake-lance/src/main/java/org/apache/fluss/lake/lance/writers/ArrowBooleanWriter.java index 80b8e79d8..85c9b7b38 100644 --- a/fluss-lake/fluss-lake-lance/src/main/java/com/alibaba/fluss/lake/lance/writers/ArrowBooleanWriter.java +++ b/fluss-lake/fluss-lake-lance/src/main/java/org/apache/fluss/lake/lance/writers/ArrowBooleanWriter.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package com.alibaba.fluss.lake.lance.writers; +package org.apache.fluss.lake.lance.writers; -import com.alibaba.fluss.row.InternalRow; +import org.apache.fluss.row.InternalRow; import org.apache.arrow.vector.BitVector; diff --git a/fluss-lake/fluss-lake-lance/src/main/java/com/alibaba/fluss/lake/lance/writers/ArrowDateWriter.java b/fluss-lake/fluss-lake-lance/src/main/java/org/apache/fluss/lake/lance/writers/ArrowDateWriter.java similarity index 95% rename from fluss-lake/fluss-lake-lance/src/main/java/com/alibaba/fluss/lake/lance/writers/ArrowDateWriter.java rename to fluss-lake/fluss-lake-lance/src/main/java/org/apache/fluss/lake/lance/writers/ArrowDateWriter.java index 141df39a8..8aa2ec7bd 100644 --- a/fluss-lake/fluss-lake-lance/src/main/java/com/alibaba/fluss/lake/lance/writers/ArrowDateWriter.java +++ b/fluss-lake/fluss-lake-lance/src/main/java/org/apache/fluss/lake/lance/writers/ArrowDateWriter.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package com.alibaba.fluss.lake.lance.writers; +package org.apache.fluss.lake.lance.writers; -import com.alibaba.fluss.row.InternalRow; +import org.apache.fluss.row.InternalRow; import org.apache.arrow.vector.DateDayVector; diff --git a/fluss-lake/fluss-lake-lance/src/main/java/com/alibaba/fluss/lake/lance/writers/ArrowDecimalWriter.java b/fluss-lake/fluss-lake-lance/src/main/java/org/apache/fluss/lake/lance/writers/ArrowDecimalWriter.java similarity index 94% rename from fluss-lake/fluss-lake-lance/src/main/java/com/alibaba/fluss/lake/lance/writers/ArrowDecimalWriter.java rename to fluss-lake/fluss-lake-lance/src/main/java/org/apache/fluss/lake/lance/writers/ArrowDecimalWriter.java index f4e2e4ab9..0a9d01c4e 100644 --- a/fluss-lake/fluss-lake-lance/src/main/java/com/alibaba/fluss/lake/lance/writers/ArrowDecimalWriter.java +++ b/fluss-lake/fluss-lake-lance/src/main/java/org/apache/fluss/lake/lance/writers/ArrowDecimalWriter.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package com.alibaba.fluss.lake.lance.writers; +package org.apache.fluss.lake.lance.writers; -import com.alibaba.fluss.row.Decimal; -import com.alibaba.fluss.row.InternalRow; +import org.apache.fluss.row.Decimal; +import org.apache.fluss.row.InternalRow; import org.apache.arrow.vector.DecimalVector; diff --git a/fluss-lake/fluss-lake-lance/src/main/java/com/alibaba/fluss/lake/lance/writers/ArrowDoubleWriter.java b/fluss-lake/fluss-lake-lance/src/main/java/org/apache/fluss/lake/lance/writers/ArrowDoubleWriter.java similarity index 95% rename from fluss-lake/fluss-lake-lance/src/main/java/com/alibaba/fluss/lake/lance/writers/ArrowDoubleWriter.java rename to fluss-lake/fluss-lake-lance/src/main/java/org/apache/fluss/lake/lance/writers/ArrowDoubleWriter.java index f3d54bdf3..459d1ac86 100644 --- a/fluss-lake/fluss-lake-lance/src/main/java/com/alibaba/fluss/lake/lance/writers/ArrowDoubleWriter.java +++ b/fluss-lake/fluss-lake-lance/src/main/java/org/apache/fluss/lake/lance/writers/ArrowDoubleWriter.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package com.alibaba.fluss.lake.lance.writers; +package org.apache.fluss.lake.lance.writers; -import com.alibaba.fluss.row.InternalRow; +import org.apache.fluss.row.InternalRow; import org.apache.arrow.vector.Float8Vector; diff --git a/fluss-lake/fluss-lake-lance/src/main/java/com/alibaba/fluss/lake/lance/writers/ArrowFieldWriter.java b/fluss-lake/fluss-lake-lance/src/main/java/org/apache/fluss/lake/lance/writers/ArrowFieldWriter.java similarity index 94% rename from fluss-lake/fluss-lake-lance/src/main/java/com/alibaba/fluss/lake/lance/writers/ArrowFieldWriter.java rename to fluss-lake/fluss-lake-lance/src/main/java/org/apache/fluss/lake/lance/writers/ArrowFieldWriter.java index 0278d2b29..15a56fc55 100644 --- a/fluss-lake/fluss-lake-lance/src/main/java/com/alibaba/fluss/lake/lance/writers/ArrowFieldWriter.java +++ b/fluss-lake/fluss-lake-lance/src/main/java/org/apache/fluss/lake/lance/writers/ArrowFieldWriter.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package com.alibaba.fluss.lake.lance.writers; +package org.apache.fluss.lake.lance.writers; import org.apache.arrow.vector.ValueVector; -import static com.alibaba.fluss.utils.Preconditions.checkNotNull; +import static org.apache.fluss.utils.Preconditions.checkNotNull; /** * Base class for arrow field writer which is used to convert a field to an Arrow format. diff --git a/fluss-lake/fluss-lake-lance/src/main/java/com/alibaba/fluss/lake/lance/writers/ArrowFloatWriter.java b/fluss-lake/fluss-lake-lance/src/main/java/org/apache/fluss/lake/lance/writers/ArrowFloatWriter.java similarity index 95% rename from fluss-lake/fluss-lake-lance/src/main/java/com/alibaba/fluss/lake/lance/writers/ArrowFloatWriter.java rename to fluss-lake/fluss-lake-lance/src/main/java/org/apache/fluss/lake/lance/writers/ArrowFloatWriter.java index e971e7735..c5528580a 100644 --- a/fluss-lake/fluss-lake-lance/src/main/java/com/alibaba/fluss/lake/lance/writers/ArrowFloatWriter.java +++ b/fluss-lake/fluss-lake-lance/src/main/java/org/apache/fluss/lake/lance/writers/ArrowFloatWriter.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package com.alibaba.fluss.lake.lance.writers; +package org.apache.fluss.lake.lance.writers; -import com.alibaba.fluss.row.InternalRow; +import org.apache.fluss.row.InternalRow; import org.apache.arrow.vector.Float4Vector; diff --git a/fluss-lake/fluss-lake-lance/src/main/java/com/alibaba/fluss/lake/lance/writers/ArrowIntWriter.java b/fluss-lake/fluss-lake-lance/src/main/java/org/apache/fluss/lake/lance/writers/ArrowIntWriter.java similarity index 95% rename from fluss-lake/fluss-lake-lance/src/main/java/com/alibaba/fluss/lake/lance/writers/ArrowIntWriter.java rename to fluss-lake/fluss-lake-lance/src/main/java/org/apache/fluss/lake/lance/writers/ArrowIntWriter.java index 06f397b8e..6b5ee8588 100644 --- a/fluss-lake/fluss-lake-lance/src/main/java/com/alibaba/fluss/lake/lance/writers/ArrowIntWriter.java +++ b/fluss-lake/fluss-lake-lance/src/main/java/org/apache/fluss/lake/lance/writers/ArrowIntWriter.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package com.alibaba.fluss.lake.lance.writers; +package org.apache.fluss.lake.lance.writers; -import com.alibaba.fluss.row.InternalRow; +import org.apache.fluss.row.InternalRow; import org.apache.arrow.vector.IntVector; diff --git a/fluss-lake/fluss-lake-lance/src/main/java/com/alibaba/fluss/lake/lance/writers/ArrowSmallIntWriter.java b/fluss-lake/fluss-lake-lance/src/main/java/org/apache/fluss/lake/lance/writers/ArrowSmallIntWriter.java similarity index 95% rename from fluss-lake/fluss-lake-lance/src/main/java/com/alibaba/fluss/lake/lance/writers/ArrowSmallIntWriter.java rename to fluss-lake/fluss-lake-lance/src/main/java/org/apache/fluss/lake/lance/writers/ArrowSmallIntWriter.java index 3b410ed6a..aab41753b 100644 --- a/fluss-lake/fluss-lake-lance/src/main/java/com/alibaba/fluss/lake/lance/writers/ArrowSmallIntWriter.java +++ b/fluss-lake/fluss-lake-lance/src/main/java/org/apache/fluss/lake/lance/writers/ArrowSmallIntWriter.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package com.alibaba.fluss.lake.lance.writers; +package org.apache.fluss.lake.lance.writers; -import com.alibaba.fluss.row.InternalRow; +import org.apache.fluss.row.InternalRow; import org.apache.arrow.vector.SmallIntVector; diff --git a/fluss-lake/fluss-lake-lance/src/main/java/com/alibaba/fluss/lake/lance/writers/ArrowTimeWriter.java b/fluss-lake/fluss-lake-lance/src/main/java/org/apache/fluss/lake/lance/writers/ArrowTimeWriter.java similarity index 95% rename from fluss-lake/fluss-lake-lance/src/main/java/com/alibaba/fluss/lake/lance/writers/ArrowTimeWriter.java rename to fluss-lake/fluss-lake-lance/src/main/java/org/apache/fluss/lake/lance/writers/ArrowTimeWriter.java index fcfe9fecb..bf1e1e901 100644 --- a/fluss-lake/fluss-lake-lance/src/main/java/com/alibaba/fluss/lake/lance/writers/ArrowTimeWriter.java +++ b/fluss-lake/fluss-lake-lance/src/main/java/org/apache/fluss/lake/lance/writers/ArrowTimeWriter.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package com.alibaba.fluss.lake.lance.writers; +package org.apache.fluss.lake.lance.writers; -import com.alibaba.fluss.row.InternalRow; +import org.apache.fluss.row.InternalRow; import org.apache.arrow.vector.BaseFixedWidthVector; import org.apache.arrow.vector.TimeMicroVector; @@ -26,7 +26,7 @@ import org.apache.arrow.vector.TimeNanoVector; import org.apache.arrow.vector.TimeSecVector; import org.apache.arrow.vector.ValueVector; -import static com.alibaba.fluss.utils.Preconditions.checkState; +import static org.apache.fluss.utils.Preconditions.checkState; /** {@link ArrowFieldWriter} for Time. */ public class ArrowTimeWriter extends ArrowFieldWriter<InternalRow> { diff --git a/fluss-lake/fluss-lake-lance/src/main/java/com/alibaba/fluss/lake/lance/writers/ArrowTimestampLtzWriter.java b/fluss-lake/fluss-lake-lance/src/main/java/org/apache/fluss/lake/lance/writers/ArrowTimestampLtzWriter.java similarity index 95% rename from fluss-lake/fluss-lake-lance/src/main/java/com/alibaba/fluss/lake/lance/writers/ArrowTimestampLtzWriter.java rename to fluss-lake/fluss-lake-lance/src/main/java/org/apache/fluss/lake/lance/writers/ArrowTimestampLtzWriter.java index 3ea10d399..a9333c000 100644 --- a/fluss-lake/fluss-lake-lance/src/main/java/com/alibaba/fluss/lake/lance/writers/ArrowTimestampLtzWriter.java +++ b/fluss-lake/fluss-lake-lance/src/main/java/org/apache/fluss/lake/lance/writers/ArrowTimestampLtzWriter.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package com.alibaba.fluss.lake.lance.writers; +package org.apache.fluss.lake.lance.writers; -import com.alibaba.fluss.row.InternalRow; -import com.alibaba.fluss.row.TimestampLtz; +import org.apache.fluss.row.InternalRow; +import org.apache.fluss.row.TimestampLtz; import org.apache.arrow.vector.TimeStampMicroVector; import org.apache.arrow.vector.TimeStampMilliVector; @@ -27,7 +27,7 @@ import org.apache.arrow.vector.TimeStampVector; import org.apache.arrow.vector.ValueVector; import org.apache.arrow.vector.types.pojo.ArrowType; -import static com.alibaba.fluss.utils.Preconditions.checkState; +import static org.apache.fluss.utils.Preconditions.checkState; /** {@link ArrowFieldWriter} for TimestampLtz. */ public class ArrowTimestampLtzWriter extends ArrowFieldWriter<InternalRow> { diff --git a/fluss-lake/fluss-lake-lance/src/main/java/com/alibaba/fluss/lake/lance/writers/ArrowTimestampNtzWriter.java b/fluss-lake/fluss-lake-lance/src/main/java/org/apache/fluss/lake/lance/writers/ArrowTimestampNtzWriter.java similarity index 95% rename from fluss-lake/fluss-lake-lance/src/main/java/com/alibaba/fluss/lake/lance/writers/ArrowTimestampNtzWriter.java rename to fluss-lake/fluss-lake-lance/src/main/java/org/apache/fluss/lake/lance/writers/ArrowTimestampNtzWriter.java index 3d129be98..c57a30eb2 100644 --- a/fluss-lake/fluss-lake-lance/src/main/java/com/alibaba/fluss/lake/lance/writers/ArrowTimestampNtzWriter.java +++ b/fluss-lake/fluss-lake-lance/src/main/java/org/apache/fluss/lake/lance/writers/ArrowTimestampNtzWriter.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package com.alibaba.fluss.lake.lance.writers; +package org.apache.fluss.lake.lance.writers; -import com.alibaba.fluss.row.InternalRow; -import com.alibaba.fluss.row.TimestampNtz; +import org.apache.fluss.row.InternalRow; +import org.apache.fluss.row.TimestampNtz; import org.apache.arrow.vector.TimeStampMicroVector; import org.apache.arrow.vector.TimeStampMilliVector; @@ -27,7 +27,7 @@ import org.apache.arrow.vector.TimeStampVector; import org.apache.arrow.vector.ValueVector; import org.apache.arrow.vector.types.pojo.ArrowType; -import static com.alibaba.fluss.utils.Preconditions.checkState; +import static org.apache.fluss.utils.Preconditions.checkState; /** {@link ArrowFieldWriter} for TimestampNtz. */ public class ArrowTimestampNtzWriter extends ArrowFieldWriter<InternalRow> { diff --git a/fluss-lake/fluss-lake-lance/src/main/java/com/alibaba/fluss/lake/lance/writers/ArrowTinyIntWriter.java b/fluss-lake/fluss-lake-lance/src/main/java/org/apache/fluss/lake/lance/writers/ArrowTinyIntWriter.java similarity index 95% rename from fluss-lake/fluss-lake-lance/src/main/java/com/alibaba/fluss/lake/lance/writers/ArrowTinyIntWriter.java rename to fluss-lake/fluss-lake-lance/src/main/java/org/apache/fluss/lake/lance/writers/ArrowTinyIntWriter.java index 805d24afe..0be03aac7 100644 --- a/fluss-lake/fluss-lake-lance/src/main/java/com/alibaba/fluss/lake/lance/writers/ArrowTinyIntWriter.java +++ b/fluss-lake/fluss-lake-lance/src/main/java/org/apache/fluss/lake/lance/writers/ArrowTinyIntWriter.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package com.alibaba.fluss.lake.lance.writers; +package org.apache.fluss.lake.lance.writers; -import com.alibaba.fluss.row.InternalRow; +import org.apache.fluss.row.InternalRow; import org.apache.arrow.vector.TinyIntVector; diff --git a/fluss-lake/fluss-lake-lance/src/main/java/com/alibaba/fluss/lake/lance/writers/ArrowVarBinaryWriter.java b/fluss-lake/fluss-lake-lance/src/main/java/org/apache/fluss/lake/lance/writers/ArrowVarBinaryWriter.java similarity index 95% rename from fluss-lake/fluss-lake-lance/src/main/java/com/alibaba/fluss/lake/lance/writers/ArrowVarBinaryWriter.java rename to fluss-lake/fluss-lake-lance/src/main/java/org/apache/fluss/lake/lance/writers/ArrowVarBinaryWriter.java index d3be0a653..3c9668a3c 100644 --- a/fluss-lake/fluss-lake-lance/src/main/java/com/alibaba/fluss/lake/lance/writers/ArrowVarBinaryWriter.java +++ b/fluss-lake/fluss-lake-lance/src/main/java/org/apache/fluss/lake/lance/writers/ArrowVarBinaryWriter.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package com.alibaba.fluss.lake.lance.writers; +package org.apache.fluss.lake.lance.writers; -import com.alibaba.fluss.row.InternalRow; +import org.apache.fluss.row.InternalRow; import org.apache.arrow.vector.VarBinaryVector; diff --git a/fluss-lake/fluss-lake-lance/src/main/java/com/alibaba/fluss/lake/lance/writers/ArrowVarCharWriter.java b/fluss-lake/fluss-lake-lance/src/main/java/org/apache/fluss/lake/lance/writers/ArrowVarCharWriter.java similarity index 93% rename from fluss-lake/fluss-lake-lance/src/main/java/com/alibaba/fluss/lake/lance/writers/ArrowVarCharWriter.java rename to fluss-lake/fluss-lake-lance/src/main/java/org/apache/fluss/lake/lance/writers/ArrowVarCharWriter.java index 05b2d442c..72a401785 100644 --- a/fluss-lake/fluss-lake-lance/src/main/java/com/alibaba/fluss/lake/lance/writers/ArrowVarCharWriter.java +++ b/fluss-lake/fluss-lake-lance/src/main/java/org/apache/fluss/lake/lance/writers/ArrowVarCharWriter.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package com.alibaba.fluss.lake.lance.writers; +package org.apache.fluss.lake.lance.writers; -import com.alibaba.fluss.row.BinaryString; -import com.alibaba.fluss.row.InternalRow; +import org.apache.fluss.row.BinaryString; +import org.apache.fluss.row.InternalRow; import org.apache.arrow.vector.VarCharVector; diff --git a/fluss-lake/fluss-lake-lance/src/test/java/com/alibaba/fluss/lake/lance/testutils/FlinkLanceTieringTestBase.java b/fluss-lake/fluss-lake-lance/src/test/java/com/alibaba/fluss/lake/lance/testutils/FlinkLanceTieringTestBase.java index 728e4a8a9..a548e3558 100644 --- a/fluss-lake/fluss-lake-lance/src/test/java/com/alibaba/fluss/lake/lance/testutils/FlinkLanceTieringTestBase.java +++ b/fluss-lake/fluss-lake-lance/src/test/java/com/alibaba/fluss/lake/lance/testutils/FlinkLanceTieringTestBase.java @@ -15,29 +15,29 @@ * limitations under the License. */ -package com.alibaba.fluss.lake.lance.testutils; - -import com.alibaba.fluss.client.Connection; -import com.alibaba.fluss.client.ConnectionFactory; -import com.alibaba.fluss.client.admin.Admin; -import com.alibaba.fluss.client.table.Table; -import com.alibaba.fluss.client.table.writer.AppendWriter; -import com.alibaba.fluss.client.table.writer.TableWriter; -import com.alibaba.fluss.client.table.writer.UpsertWriter; -import com.alibaba.fluss.config.AutoPartitionTimeUnit; -import com.alibaba.fluss.config.ConfigOptions; -import com.alibaba.fluss.config.Configuration; -import com.alibaba.fluss.exception.FlussRuntimeException; -import com.alibaba.fluss.flink.tiering.LakeTieringJobBuilder; -import com.alibaba.fluss.metadata.DataLakeFormat; -import com.alibaba.fluss.metadata.Schema; -import com.alibaba.fluss.metadata.TableBucket; -import com.alibaba.fluss.metadata.TableDescriptor; -import com.alibaba.fluss.metadata.TablePath; -import com.alibaba.fluss.row.InternalRow; -import com.alibaba.fluss.server.replica.Replica; -import com.alibaba.fluss.server.testutils.FlussClusterExtension; -import com.alibaba.fluss.types.DataTypes; +package org.apache.fluss.lake.lance.testutils; + +import org.apache.fluss.client.Connection; +import org.apache.fluss.client.ConnectionFactory; +import org.apache.fluss.client.admin.Admin; +import org.apache.fluss.client.table.Table; +import org.apache.fluss.client.table.writer.AppendWriter; +import org.apache.fluss.client.table.writer.TableWriter; +import org.apache.fluss.client.table.writer.UpsertWriter; +import org.apache.fluss.config.AutoPartitionTimeUnit; +import org.apache.fluss.config.ConfigOptions; +import org.apache.fluss.config.Configuration; +import org.apache.fluss.exception.FlussRuntimeException; +import org.apache.fluss.flink.tiering.LakeTieringJobBuilder; +import org.apache.fluss.metadata.DataLakeFormat; +import org.apache.fluss.metadata.Schema; +import org.apache.fluss.metadata.TableBucket; +import org.apache.fluss.metadata.TableDescriptor; +import org.apache.fluss.metadata.TablePath; +import org.apache.fluss.row.InternalRow; +import org.apache.fluss.server.replica.Replica; +import org.apache.fluss.server.testutils.FlussClusterExtension; +import org.apache.fluss.types.DataTypes; import org.apache.flink.api.common.RuntimeExecutionMode; import org.apache.flink.core.execution.JobClient; @@ -53,8 +53,8 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import static com.alibaba.fluss.flink.tiering.source.TieringSourceOptions.POLL_TIERING_TABLE_INTERVAL; -import static com.alibaba.fluss.testutils.common.CommonTestUtils.retry; +import static org.apache.fluss.flink.tiering.source.TieringSourceOptions.POLL_TIERING_TABLE_INTERVAL; +import static org.apache.fluss.testutils.common.CommonTestUtils.retry; import static org.assertj.core.api.Assertions.assertThat; /** Test base for sync to lance by Flink. */ diff --git a/fluss-lake/fluss-lake-lance/src/test/java/com/alibaba/fluss/lake/lance/tiering/LanceTieringITCase.java b/fluss-lake/fluss-lake-lance/src/test/java/com/alibaba/fluss/lake/lance/tiering/LanceTieringITCase.java index ee54dfd92..f2475cd1d 100644 --- a/fluss-lake/fluss-lake-lance/src/test/java/com/alibaba/fluss/lake/lance/tiering/LanceTieringITCase.java +++ b/fluss-lake/fluss-lake-lance/src/test/java/com/alibaba/fluss/lake/lance/tiering/LanceTieringITCase.java @@ -15,14 +15,14 @@ * limitations under the License. */ -package com.alibaba.fluss.lake.lance.tiering; +package org.apache.fluss.lake.lance.tiering; -import com.alibaba.fluss.config.Configuration; -import com.alibaba.fluss.lake.lance.LanceConfig; -import com.alibaba.fluss.lake.lance.testutils.FlinkLanceTieringTestBase; -import com.alibaba.fluss.metadata.TableBucket; -import com.alibaba.fluss.metadata.TablePath; -import com.alibaba.fluss.row.InternalRow; +import org.apache.fluss.config.Configuration; +import org.apache.fluss.lake.lance.LanceConfig; +import org.apache.fluss.lake.lance.testutils.FlinkLanceTieringTestBase; +import org.apache.fluss.metadata.TableBucket; +import org.apache.fluss.metadata.TablePath; +import org.apache.fluss.row.InternalRow; import com.lancedb.lance.Dataset; import com.lancedb.lance.ReadOptions; @@ -44,9 +44,9 @@ import java.util.Iterator; import java.util.List; import java.util.Map; -import static com.alibaba.fluss.lake.committer.BucketOffset.FLUSS_LAKE_SNAP_BUCKET_OFFSET_PROPERTY; -import static com.alibaba.fluss.lake.writer.LakeTieringFactory.FLUSS_LAKE_TIERING_COMMIT_USER; -import static com.alibaba.fluss.testutils.DataTestUtils.row; +import static org.apache.fluss.lake.committer.BucketOffset.FLUSS_LAKE_SNAP_BUCKET_OFFSET_PROPERTY; +import static org.apache.fluss.lake.writer.LakeTieringFactory.FLUSS_LAKE_TIERING_COMMIT_USER; +import static org.apache.fluss.testutils.DataTestUtils.row; import static org.assertj.core.api.Assertions.assertThat; /** IT case for tiering tables to lance. */ diff --git a/fluss-lake/fluss-lake-lance/src/test/java/com/alibaba/fluss/lake/lance/tiering/LanceTieringTest.java b/fluss-lake/fluss-lake-lance/src/test/java/com/alibaba/fluss/lake/lance/tiering/LanceTieringTest.java index 60b7a330e..3017d38c2 100644 --- a/fluss-lake/fluss-lake-lance/src/test/java/com/alibaba/fluss/lake/lance/tiering/LanceTieringTest.java +++ b/fluss-lake/fluss-lake-lance/src/test/java/com/alibaba/fluss/lake/lance/tiering/LanceTieringTest.java @@ -15,27 +15,27 @@ * limitations under the License. */ -package com.alibaba.fluss.lake.lance.tiering; +package org.apache.fluss.lake.lance.tiering; -import com.alibaba.fluss.config.Configuration; -import com.alibaba.fluss.lake.committer.CommittedLakeSnapshot; -import com.alibaba.fluss.lake.committer.LakeCommitter; -import com.alibaba.fluss.lake.lance.LanceConfig; -import com.alibaba.fluss.lake.lance.utils.LanceArrowUtils; -import com.alibaba.fluss.lake.lance.utils.LanceDatasetAdapter; -import com.alibaba.fluss.lake.serializer.SimpleVersionedSerializer; -import com.alibaba.fluss.lake.writer.LakeWriter; -import com.alibaba.fluss.lake.writer.WriterInitContext; -import com.alibaba.fluss.metadata.Schema; -import com.alibaba.fluss.metadata.TableBucket; -import com.alibaba.fluss.metadata.TablePath; -import com.alibaba.fluss.record.ChangeType; -import com.alibaba.fluss.record.GenericRecord; -import com.alibaba.fluss.record.LogRecord; -import com.alibaba.fluss.row.BinaryString; -import com.alibaba.fluss.row.GenericRow; -import com.alibaba.fluss.types.DataTypes; -import com.alibaba.fluss.utils.types.Tuple2; +import org.apache.fluss.config.Configuration; +import org.apache.fluss.lake.committer.CommittedLakeSnapshot; +import org.apache.fluss.lake.committer.LakeCommitter; +import org.apache.fluss.lake.lance.LanceConfig; +import org.apache.fluss.lake.lance.utils.LanceArrowUtils; +import org.apache.fluss.lake.lance.utils.LanceDatasetAdapter; +import org.apache.fluss.lake.serializer.SimpleVersionedSerializer; +import org.apache.fluss.lake.writer.LakeWriter; +import org.apache.fluss.lake.writer.WriterInitContext; +import org.apache.fluss.metadata.Schema; +import org.apache.fluss.metadata.TableBucket; +import org.apache.fluss.metadata.TablePath; +import org.apache.fluss.record.ChangeType; +import org.apache.fluss.record.GenericRecord; +import org.apache.fluss.record.LogRecord; +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 com.lancedb.lance.Dataset; import com.lancedb.lance.WriteParams; @@ -61,7 +61,7 @@ import java.util.List; import java.util.Map; import java.util.stream.Stream; -import static com.alibaba.fluss.flink.tiering.committer.TieringCommitOperator.toBucketOffsetsProperty; +import static org.apache.fluss.flink.tiering.committer.TieringCommitOperator.toBucketOffsetsProperty; import static org.assertj.core.api.Assertions.assertThat; /** The UT for tiering to Lance via {@link LanceLakeTieringFactory}. */ @@ -265,7 +265,7 @@ class LanceTieringTest { } @Override - public com.alibaba.fluss.metadata.Schema schema() { + public org.apache.fluss.metadata.Schema schema() { return schema; } 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 2be42fff4..eeab99b99 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 @@ -15,22 +15,22 @@ * limitations under the License. */ -package com.alibaba.fluss.lake.lance; - -import com.alibaba.fluss.client.Connection; -import com.alibaba.fluss.client.ConnectionFactory; -import com.alibaba.fluss.client.admin.Admin; -import com.alibaba.fluss.config.ConfigOptions; -import com.alibaba.fluss.config.Configuration; -import com.alibaba.fluss.exception.FlussRuntimeException; -import com.alibaba.fluss.exception.InvalidTableException; -import com.alibaba.fluss.lake.lance.utils.LanceDatasetAdapter; -import com.alibaba.fluss.metadata.DataLakeFormat; -import com.alibaba.fluss.metadata.Schema; -import com.alibaba.fluss.metadata.TableDescriptor; -import com.alibaba.fluss.metadata.TablePath; -import com.alibaba.fluss.server.testutils.FlussClusterExtension; -import com.alibaba.fluss.types.DataTypes; +package org.apache.fluss.lake.lance; + +import org.apache.fluss.client.Connection; +import org.apache.fluss.client.ConnectionFactory; +import org.apache.fluss.client.admin.Admin; +import org.apache.fluss.config.ConfigOptions; +import org.apache.fluss.config.Configuration; +import org.apache.fluss.exception.FlussRuntimeException; +import org.apache.fluss.exception.InvalidTableException; +import org.apache.fluss.lake.lance.utils.LanceDatasetAdapter; +import org.apache.fluss.metadata.DataLakeFormat; +import org.apache.fluss.metadata.Schema; +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;
