This is an automated email from the ASF dual-hosted git repository. lzljs3620320 pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-paimon.git
commit c3bc8a7baa39fb6a8c273c57bee6f1162f0e5f3e Author: JingsongLi <[email protected]> AuthorDate: Fri Mar 17 14:19:24 2023 +0800 [core] Rename paimon CoreOptions --- .../apache/{flink/table/store => paimon}/CoreOptions.java | 2 +- .../java/org/apache/paimon/file/AbstractFileStore.java | 2 +- .../java/org/apache/paimon/file/AppendOnlyFileStore.java | 2 +- .../src/main/java/org/apache/paimon/file/FileStore.java | 2 +- .../java/org/apache/paimon/file/KeyValueFileStore.java | 2 +- .../org/apache/paimon/file/compact/NoopCompactManager.java | 2 +- .../main/java/org/apache/paimon/file/io/DataFileMeta.java | 2 +- .../org/apache/paimon/file/mergetree/MergeTreeWriter.java | 2 +- .../paimon/file/operation/AppendOnlyFileStoreWrite.java | 2 +- .../paimon/file/operation/KeyValueFileStoreWrite.java | 4 ++-- .../apache/paimon/file/operation/MemoryFileStoreWrite.java | 4 ++-- .../java/org/apache/paimon/file/schema/SchemaManager.java | 2 +- .../org/apache/paimon/file/schema/SchemaValidation.java | 12 ++++++------ .../java/org/apache/paimon/file/schema/TableSchema.java | 2 +- .../org/apache/paimon/file/utils/FileStorePathFactory.java | 2 +- .../java/org/apache/paimon/format/FileFormatDiscover.java | 2 +- .../org/apache/paimon/table/AbstractFileStoreTable.java | 4 ++-- .../org/apache/paimon/table/AppendOnlyFileStoreTable.java | 2 +- .../paimon/table/ChangelogValueCountFileStoreTable.java | 2 +- .../paimon/table/ChangelogWithKeyFileStoreTable.java | 4 ++-- .../src/main/java/org/apache/paimon/table/DataTable.java | 2 +- .../org/apache/paimon/table/FileStoreTableFactory.java | 4 ++-- .../java/org/apache/paimon/table/sink/BucketComputer.java | 2 +- .../apache/paimon/table/source/AbstractDataTableScan.java | 2 +- .../apache/paimon/table/source/BatchDataTableScanImpl.java | 2 +- .../apache/paimon/table/source/StreamDataTableScan.java | 2 +- .../paimon/table/source/StreamDataTableScanImpl.java | 2 +- .../table/source/snapshot/CompactedStartingScanner.java | 2 +- .../snapshot/CompactionChangelogFollowUpScanner.java | 2 +- .../snapshot/ContinuousFromSnapshotStartingScanner.java | 2 +- .../snapshot/ContinuousFromTimestampStartingScanner.java | 2 +- .../source/snapshot/ContinuousLatestStartingScanner.java | 2 +- .../paimon/table/source/snapshot/DeltaFollowUpScanner.java | 2 +- .../paimon/table/source/snapshot/FullStartingScanner.java | 2 +- .../source/snapshot/InputChangelogFollowUpScanner.java | 2 +- .../table/source/snapshot/SnapshotSplitReaderImpl.java | 2 +- .../source/snapshot/StaticFromSnapshotStartingScanner.java | 2 +- .../snapshot/StaticFromTimestampStartingScanner.java | 2 +- .../java/org/apache/paimon/table/system/AuditLogTable.java | 2 +- .../java/org/apache/paimon/table/system/BucketsTable.java | 2 +- .../{flink/table/store => paimon}/CoreOptionsTest.java | 3 ++- .../test/java/org/apache/paimon/file/FileFormatTest.java | 2 +- .../test/java/org/apache/paimon/file/TestFileStore.java | 2 +- .../apache/paimon/file/append/AppendOnlyWriterTest.java | 2 +- .../org/apache/paimon/file/io/DataFilePathFactoryTest.java | 2 +- .../apache/paimon/file/io/KeyValueFileReadWriteTest.java | 2 +- .../org/apache/paimon/file/io/RollingFileWriterTest.java | 2 +- .../apache/paimon/file/manifest/ManifestFileMetaTest.java | 2 +- .../org/apache/paimon/file/manifest/ManifestFileTest.java | 2 +- .../org/apache/paimon/file/manifest/ManifestListTest.java | 2 +- .../org/apache/paimon/file/mergetree/LookupLevelsTest.java | 2 +- .../org/apache/paimon/file/mergetree/MergeTreeTest.java | 4 ++-- .../apache/paimon/file/operation/FileStoreCommitTest.java | 2 +- .../paimon/file/operation/FileStoreExpireTestBase.java | 2 +- .../apache/paimon/file/operation/PartitionExpireTest.java | 6 +++--- .../org/apache/paimon/file/schema/SchemaManagerTest.java | 2 +- .../java/org/apache/paimon/file/schema/SchemaUtils.java | 2 +- .../apache/paimon/file/utils/FileStorePathFactoryTest.java | 2 +- .../apache/paimon/table/AppendOnlyFileStoreTableTest.java | 2 +- .../table/AppendOnlyTableColumnTypeFileDataTest.java | 2 +- .../table/AppendOnlyTableColumnTypeFileMetaTest.java | 2 +- .../paimon/table/AppendOnlyTableFileMetaFilterTest.java | 2 +- .../table/ChangelogValueCountColumnTypeFileDataTest.java | 2 +- .../table/ChangelogValueCountColumnTypeFileMetaTest.java | 2 +- .../paimon/table/ChangelogValueCountFileDataTableTest.java | 2 +- .../table/ChangelogValueCountFileMetaFilterTest.java | 2 +- .../table/ChangelogValueCountFileStoreTableTest.java | 2 +- .../table/ChangelogWithKeyColumnTypeFileDataTest.java | 2 +- .../paimon/table/ChangelogWithKeyFileDataTableTest.java | 2 +- .../paimon/table/ChangelogWithKeyFileMetaFilterTest.java | 2 +- .../paimon/table/ChangelogWithKeyFileStoreTableTest.java | 4 ++-- .../table/ChangelogWithKeyTableColumnTypeFileMetaTest.java | 2 +- .../apache/paimon/table/ColumnTypeFileDataTestBase.java | 2 +- .../apache/paimon/table/ColumnTypeFileMetaTestBase.java | 2 +- .../org/apache/paimon/table/FileStoreTableTestBase.java | 14 +++++++------- .../apache/paimon/table/SchemaEvolutionTableTestBase.java | 2 +- .../org/apache/paimon/table/WritePreemptMemoryTest.java | 2 +- .../apache/paimon/table/sink/SinkRecordConverterTest.java | 4 ++-- .../java/org/apache/paimon/table/sink/TableWriteTest.java | 2 +- .../paimon/table/source/StreamDataTableScanTest.java | 2 +- .../snapshot/CompactionChangelogFollowUpScannerTest.java | 2 +- .../source/snapshot/InputChangelogFollowUpScannerTest.java | 2 +- .../java/org/apache/paimon/benchmark/TableBenchmark.java | 2 +- .../org/apache/paimon/benchmark/TableWriterBenchmark.java | 2 +- .../org/apache/paimon/connector/BatchFileStoreITCase.java | 2 +- .../org/apache/paimon/connector/BatchFileStoreITCase.java | 2 +- .../apache/paimon/connector/AbstractTableStoreFactory.java | 8 ++++---- .../java/org/apache/paimon/connector/FlinkCatalog.java | 2 +- .../org/apache/paimon/connector/FlinkConnectorOptions.java | 2 +- .../paimon/connector/TableStoreConnectorFactory.java | 4 ++-- .../org/apache/paimon/connector/action/CompactAction.java | 2 +- .../connector/kafka/KafkaLogSerializationSchema.java | 2 +- .../paimon/connector/kafka/KafkaLogSinkProvider.java | 4 ++-- .../paimon/connector/kafka/KafkaLogSourceProvider.java | 4 ++-- .../paimon/connector/kafka/KafkaLogStoreFactory.java | 10 +++++----- .../apache/paimon/connector/log/LogStoreTableFactory.java | 4 ++-- .../paimon/connector/lookup/FileStoreLookupFunction.java | 2 +- .../paimon/connector/sink/FullChangelogStoreSinkWrite.java | 2 +- .../connector/sink/LookupChangelogStoreSinkWrite.java | 2 +- .../apache/paimon/connector/sink/StoreCompactOperator.java | 2 +- .../org/apache/paimon/connector/sink/TableStoreSink.java | 12 ++++++------ .../apache/paimon/connector/source/FlinkSourceBuilder.java | 4 ++-- .../apache/paimon/connector/source/TableStoreSource.java | 14 +++++++------- .../org/apache/paimon/connector/BatchFileStoreITCase.java | 2 +- .../org/apache/paimon/connector/ChangelogModeTest.java | 2 +- .../java/org/apache/paimon/connector/FileStoreITCase.java | 8 ++++---- .../org/apache/paimon/connector/ForceCompactionITCase.java | 2 +- .../org/apache/paimon/connector/ReadWriteTableITCase.java | 2 +- .../org/apache/paimon/connector/RescaleBucketITCase.java | 2 +- .../StreamingReadWriteTableWithKafkaLogITCase.java | 6 +++--- .../paimon/connector/action/CompactActionITCase.java | 2 +- .../paimon/connector/action/MergeIntoActionITCase.java | 4 ++-- .../paimon/connector/kafka/KafkaLogSerializationTest.java | 2 +- .../apache/paimon/connector/kafka/KafkaLogTestUtils.java | 8 ++++---- .../paimon/connector/sink/CommitterOperatorTestBase.java | 2 +- .../connector/source/TestChangelogDataReadWrite.java | 2 +- .../paimon/connector/util/ReadWriteTableTestUtil.java | 4 ++-- .../src/main/java/org/apache/paimon/hive/HiveSchema.java | 2 +- .../apache/paimon/hive/mapred/TableStoreInputFormat.java | 2 +- .../java/org/apache/paimon/hive/FileStoreTestUtils.java | 4 ++-- .../paimon/hive/TableStoreHiveStorageHandlerITCase.java | 2 +- .../paimon/hive/mapred/TableStoreRecordReaderTest.java | 2 +- .../org/apache/paimon/spark/SimpleTableTestHelper.java | 2 +- 123 files changed, 179 insertions(+), 178 deletions(-) diff --git a/flink-table-store-core/src/main/java/org/apache/flink/table/store/CoreOptions.java b/flink-table-store-core/src/main/java/org/apache/paimon/CoreOptions.java similarity index 99% rename from flink-table-store-core/src/main/java/org/apache/flink/table/store/CoreOptions.java rename to flink-table-store-core/src/main/java/org/apache/paimon/CoreOptions.java index e003edda6..e98e29277 100644 --- a/flink-table-store-core/src/main/java/org/apache/flink/table/store/CoreOptions.java +++ b/flink-table-store-core/src/main/java/org/apache/paimon/CoreOptions.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.flink.table.store; +package org.apache.paimon; import org.apache.paimon.file.WriteMode; import org.apache.paimon.fs.Path; diff --git a/flink-table-store-core/src/main/java/org/apache/paimon/file/AbstractFileStore.java b/flink-table-store-core/src/main/java/org/apache/paimon/file/AbstractFileStore.java index 5b52cc48a..40cf363ab 100644 --- a/flink-table-store-core/src/main/java/org/apache/paimon/file/AbstractFileStore.java +++ b/flink-table-store-core/src/main/java/org/apache/paimon/file/AbstractFileStore.java @@ -18,7 +18,7 @@ package org.apache.paimon.file; -import org.apache.flink.table.store.CoreOptions; +import org.apache.paimon.CoreOptions; import org.apache.paimon.file.manifest.ManifestFile; import org.apache.paimon.file.manifest.ManifestList; import org.apache.paimon.file.operation.FileStoreCommitImpl; diff --git a/flink-table-store-core/src/main/java/org/apache/paimon/file/AppendOnlyFileStore.java b/flink-table-store-core/src/main/java/org/apache/paimon/file/AppendOnlyFileStore.java index a62f59aa4..fa80f3a5d 100644 --- a/flink-table-store-core/src/main/java/org/apache/paimon/file/AppendOnlyFileStore.java +++ b/flink-table-store-core/src/main/java/org/apache/paimon/file/AppendOnlyFileStore.java @@ -18,7 +18,7 @@ package org.apache.paimon.file; -import org.apache.flink.table.store.CoreOptions; +import org.apache.paimon.CoreOptions; import org.apache.paimon.file.operation.AppendOnlyFileStoreRead; import org.apache.paimon.file.operation.AppendOnlyFileStoreScan; import org.apache.paimon.file.operation.AppendOnlyFileStoreWrite; diff --git a/flink-table-store-core/src/main/java/org/apache/paimon/file/FileStore.java b/flink-table-store-core/src/main/java/org/apache/paimon/file/FileStore.java index 4c032ddcc..ff7d5ac91 100644 --- a/flink-table-store-core/src/main/java/org/apache/paimon/file/FileStore.java +++ b/flink-table-store-core/src/main/java/org/apache/paimon/file/FileStore.java @@ -18,7 +18,7 @@ package org.apache.paimon.file; -import org.apache.flink.table.store.CoreOptions; +import org.apache.paimon.CoreOptions; import org.apache.paimon.file.operation.FileStoreCommit; import org.apache.paimon.file.operation.FileStoreExpire; import org.apache.paimon.file.operation.FileStoreRead; diff --git a/flink-table-store-core/src/main/java/org/apache/paimon/file/KeyValueFileStore.java b/flink-table-store-core/src/main/java/org/apache/paimon/file/KeyValueFileStore.java index b8165e177..b5022ee9f 100644 --- a/flink-table-store-core/src/main/java/org/apache/paimon/file/KeyValueFileStore.java +++ b/flink-table-store-core/src/main/java/org/apache/paimon/file/KeyValueFileStore.java @@ -18,7 +18,7 @@ package org.apache.paimon.file; -import org.apache.flink.table.store.CoreOptions; +import org.apache.paimon.CoreOptions; import org.apache.paimon.file.mergetree.compact.MergeFunctionFactory; import org.apache.paimon.file.operation.KeyValueFileStoreRead; import org.apache.paimon.file.operation.KeyValueFileStoreScan; diff --git a/flink-table-store-core/src/main/java/org/apache/paimon/file/compact/NoopCompactManager.java b/flink-table-store-core/src/main/java/org/apache/paimon/file/compact/NoopCompactManager.java index d072fb52b..dae33fe10 100644 --- a/flink-table-store-core/src/main/java/org/apache/paimon/file/compact/NoopCompactManager.java +++ b/flink-table-store-core/src/main/java/org/apache/paimon/file/compact/NoopCompactManager.java @@ -18,7 +18,7 @@ package org.apache.paimon.file.compact; -import org.apache.flink.table.store.CoreOptions; +import org.apache.paimon.CoreOptions; import org.apache.paimon.file.io.DataFileMeta; import org.apache.paimon.utils.Preconditions; diff --git a/flink-table-store-core/src/main/java/org/apache/paimon/file/io/DataFileMeta.java b/flink-table-store-core/src/main/java/org/apache/paimon/file/io/DataFileMeta.java index 9e52c4703..0937af438 100644 --- a/flink-table-store-core/src/main/java/org/apache/paimon/file/io/DataFileMeta.java +++ b/flink-table-store-core/src/main/java/org/apache/paimon/file/io/DataFileMeta.java @@ -18,7 +18,7 @@ package org.apache.paimon.file.io; -import org.apache.flink.table.store.CoreOptions; +import org.apache.paimon.CoreOptions; import org.apache.paimon.file.stats.BinaryTableStats; import org.apache.paimon.file.stats.FieldStatsArraySerializer; import org.apache.paimon.types.ArrayType; diff --git a/flink-table-store-core/src/main/java/org/apache/paimon/file/mergetree/MergeTreeWriter.java b/flink-table-store-core/src/main/java/org/apache/paimon/file/mergetree/MergeTreeWriter.java index 90d426ca1..425ea680c 100644 --- a/flink-table-store-core/src/main/java/org/apache/paimon/file/mergetree/MergeTreeWriter.java +++ b/flink-table-store-core/src/main/java/org/apache/paimon/file/mergetree/MergeTreeWriter.java @@ -18,7 +18,7 @@ package org.apache.paimon.file.mergetree; -import org.apache.flink.table.store.CoreOptions.ChangelogProducer; +import org.apache.paimon.CoreOptions.ChangelogProducer; import org.apache.paimon.file.KeyValue; import org.apache.paimon.file.compact.CompactManager; import org.apache.paimon.file.compact.CompactResult; diff --git a/flink-table-store-core/src/main/java/org/apache/paimon/file/operation/AppendOnlyFileStoreWrite.java b/flink-table-store-core/src/main/java/org/apache/paimon/file/operation/AppendOnlyFileStoreWrite.java index 48e4e225e..503a06cbd 100644 --- a/flink-table-store-core/src/main/java/org/apache/paimon/file/operation/AppendOnlyFileStoreWrite.java +++ b/flink-table-store-core/src/main/java/org/apache/paimon/file/operation/AppendOnlyFileStoreWrite.java @@ -18,7 +18,7 @@ package org.apache.paimon.file.operation; -import org.apache.flink.table.store.CoreOptions; +import org.apache.paimon.CoreOptions; import org.apache.paimon.file.append.AppendOnlyCompactManager; import org.apache.paimon.file.append.AppendOnlyWriter; import org.apache.paimon.file.compact.CompactManager; diff --git a/flink-table-store-core/src/main/java/org/apache/paimon/file/operation/KeyValueFileStoreWrite.java b/flink-table-store-core/src/main/java/org/apache/paimon/file/operation/KeyValueFileStoreWrite.java index 90e14f1bb..e9bc98378 100644 --- a/flink-table-store-core/src/main/java/org/apache/paimon/file/operation/KeyValueFileStoreWrite.java +++ b/flink-table-store-core/src/main/java/org/apache/paimon/file/operation/KeyValueFileStoreWrite.java @@ -18,8 +18,8 @@ package org.apache.paimon.file.operation; -import org.apache.flink.table.store.CoreOptions; -import org.apache.flink.table.store.CoreOptions.ChangelogProducer; +import org.apache.paimon.CoreOptions; +import org.apache.paimon.CoreOptions.ChangelogProducer; import org.apache.paimon.file.KeyValue; import org.apache.paimon.file.compact.CompactManager; import org.apache.paimon.file.compact.NoopCompactManager; diff --git a/flink-table-store-core/src/main/java/org/apache/paimon/file/operation/MemoryFileStoreWrite.java b/flink-table-store-core/src/main/java/org/apache/paimon/file/operation/MemoryFileStoreWrite.java index 46efcc0f7..010d32b08 100644 --- a/flink-table-store-core/src/main/java/org/apache/paimon/file/operation/MemoryFileStoreWrite.java +++ b/flink-table-store-core/src/main/java/org/apache/paimon/file/operation/MemoryFileStoreWrite.java @@ -18,7 +18,7 @@ package org.apache.paimon.file.operation; -import org.apache.flink.table.store.CoreOptions; +import org.apache.paimon.CoreOptions; import org.apache.paimon.file.memory.HeapMemorySegmentPool; import org.apache.paimon.file.memory.MemoryOwner; import org.apache.paimon.file.memory.MemoryPoolFactory; @@ -31,7 +31,7 @@ import org.apache.flink.shaded.guava30.com.google.common.collect.Iterators; import java.util.Iterator; import java.util.Map; -import static org.apache.flink.table.store.CoreOptions.LOOKUP_CACHE_MAX_MEMORY_SIZE; +import static org.apache.paimon.CoreOptions.LOOKUP_CACHE_MAX_MEMORY_SIZE; /** * Base {@link FileStoreWrite} implementation which supports using shared memory and preempting diff --git a/flink-table-store-core/src/main/java/org/apache/paimon/file/schema/SchemaManager.java b/flink-table-store-core/src/main/java/org/apache/paimon/file/schema/SchemaManager.java index a3bc887c0..62d8ff3ba 100644 --- a/flink-table-store-core/src/main/java/org/apache/paimon/file/schema/SchemaManager.java +++ b/flink-table-store-core/src/main/java/org/apache/paimon/file/schema/SchemaManager.java @@ -18,7 +18,7 @@ package org.apache.paimon.file.schema; -import org.apache.flink.table.store.CoreOptions; +import org.apache.paimon.CoreOptions; import org.apache.paimon.file.casting.CastExecutors; import org.apache.paimon.file.operation.Lock; import org.apache.paimon.file.schema.SchemaChange.AddColumn; diff --git a/flink-table-store-core/src/main/java/org/apache/paimon/file/schema/SchemaValidation.java b/flink-table-store-core/src/main/java/org/apache/paimon/file/schema/SchemaValidation.java index bf436280c..a3d9072a2 100644 --- a/flink-table-store-core/src/main/java/org/apache/paimon/file/schema/SchemaValidation.java +++ b/flink-table-store-core/src/main/java/org/apache/paimon/file/schema/SchemaValidation.java @@ -18,7 +18,7 @@ package org.apache.paimon.file.schema; -import org.apache.flink.table.store.CoreOptions; +import org.apache.paimon.CoreOptions; import org.apache.paimon.file.WriteMode; import org.apache.paimon.options.ConfigOption; import org.apache.paimon.types.ArrayType; @@ -35,11 +35,11 @@ import java.util.Map; import java.util.Objects; import java.util.Optional; -import static org.apache.flink.table.store.CoreOptions.SCAN_MODE; -import static org.apache.flink.table.store.CoreOptions.SCAN_SNAPSHOT_ID; -import static org.apache.flink.table.store.CoreOptions.SCAN_TIMESTAMP_MILLIS; -import static org.apache.flink.table.store.CoreOptions.SNAPSHOT_NUM_RETAINED_MAX; -import static org.apache.flink.table.store.CoreOptions.SNAPSHOT_NUM_RETAINED_MIN; +import static org.apache.paimon.CoreOptions.SCAN_MODE; +import static org.apache.paimon.CoreOptions.SCAN_SNAPSHOT_ID; +import static org.apache.paimon.CoreOptions.SCAN_TIMESTAMP_MILLIS; +import static org.apache.paimon.CoreOptions.SNAPSHOT_NUM_RETAINED_MAX; +import static org.apache.paimon.CoreOptions.SNAPSHOT_NUM_RETAINED_MIN; import static org.apache.paimon.file.WriteMode.APPEND_ONLY; import static org.apache.paimon.file.schema.SystemColumns.KEY_FIELD_PREFIX; import static org.apache.paimon.file.schema.SystemColumns.SYSTEM_FIELD_NAMES; diff --git a/flink-table-store-core/src/main/java/org/apache/paimon/file/schema/TableSchema.java b/flink-table-store-core/src/main/java/org/apache/paimon/file/schema/TableSchema.java index 89cff4b89..88be03940 100644 --- a/flink-table-store-core/src/main/java/org/apache/paimon/file/schema/TableSchema.java +++ b/flink-table-store-core/src/main/java/org/apache/paimon/file/schema/TableSchema.java @@ -33,7 +33,7 @@ import java.util.Map; import java.util.Objects; import java.util.stream.Collectors; -import static org.apache.flink.table.store.CoreOptions.BUCKET_KEY; +import static org.apache.paimon.CoreOptions.BUCKET_KEY; /** * Schema of a table. Unlike schema, it has more information than {@link Schema}, including schemaId diff --git a/flink-table-store-core/src/main/java/org/apache/paimon/file/utils/FileStorePathFactory.java b/flink-table-store-core/src/main/java/org/apache/paimon/file/utils/FileStorePathFactory.java index 8848c3a4b..7de1faf98 100644 --- a/flink-table-store-core/src/main/java/org/apache/paimon/file/utils/FileStorePathFactory.java +++ b/flink-table-store-core/src/main/java/org/apache/paimon/file/utils/FileStorePathFactory.java @@ -18,7 +18,7 @@ package org.apache.paimon.file.utils; -import org.apache.flink.table.store.CoreOptions; +import org.apache.paimon.CoreOptions; import org.apache.paimon.file.io.DataFilePathFactory; import org.apache.paimon.fs.Path; import org.apache.paimon.options.ConfigOption; diff --git a/flink-table-store-core/src/main/java/org/apache/paimon/format/FileFormatDiscover.java b/flink-table-store-core/src/main/java/org/apache/paimon/format/FileFormatDiscover.java index 1900e1f1b..4d762e89c 100644 --- a/flink-table-store-core/src/main/java/org/apache/paimon/format/FileFormatDiscover.java +++ b/flink-table-store-core/src/main/java/org/apache/paimon/format/FileFormatDiscover.java @@ -18,7 +18,7 @@ package org.apache.paimon.format; -import org.apache.flink.table.store.CoreOptions; +import org.apache.paimon.CoreOptions; import java.util.HashMap; import java.util.Map; diff --git a/flink-table-store-core/src/main/java/org/apache/paimon/table/AbstractFileStoreTable.java b/flink-table-store-core/src/main/java/org/apache/paimon/table/AbstractFileStoreTable.java index 963d00666..5019c838e 100644 --- a/flink-table-store-core/src/main/java/org/apache/paimon/table/AbstractFileStoreTable.java +++ b/flink-table-store-core/src/main/java/org/apache/paimon/table/AbstractFileStoreTable.java @@ -18,7 +18,7 @@ package org.apache.paimon.table; -import org.apache.flink.table.store.CoreOptions; +import org.apache.paimon.CoreOptions; import org.apache.paimon.file.FileStore; import org.apache.paimon.file.operation.FileStoreScan; import org.apache.paimon.file.predicate.Predicate; @@ -45,7 +45,7 @@ import java.util.Objects; import java.util.Optional; import java.util.function.BiConsumer; -import static org.apache.flink.table.store.CoreOptions.PATH; +import static org.apache.paimon.CoreOptions.PATH; /** Abstract {@link FileStoreTable}. */ public abstract class AbstractFileStoreTable implements FileStoreTable { diff --git a/flink-table-store-core/src/main/java/org/apache/paimon/table/AppendOnlyFileStoreTable.java b/flink-table-store-core/src/main/java/org/apache/paimon/table/AppendOnlyFileStoreTable.java index 5a5a3d82a..309983835 100644 --- a/flink-table-store-core/src/main/java/org/apache/paimon/table/AppendOnlyFileStoreTable.java +++ b/flink-table-store-core/src/main/java/org/apache/paimon/table/AppendOnlyFileStoreTable.java @@ -18,7 +18,7 @@ package org.apache.paimon.table; -import org.apache.flink.table.store.CoreOptions; +import org.apache.paimon.CoreOptions; import org.apache.paimon.file.AppendOnlyFileStore; import org.apache.paimon.file.WriteMode; import org.apache.paimon.file.operation.AppendOnlyFileStoreRead; diff --git a/flink-table-store-core/src/main/java/org/apache/paimon/table/ChangelogValueCountFileStoreTable.java b/flink-table-store-core/src/main/java/org/apache/paimon/table/ChangelogValueCountFileStoreTable.java index 43a1841b8..1482b947f 100644 --- a/flink-table-store-core/src/main/java/org/apache/paimon/table/ChangelogValueCountFileStoreTable.java +++ b/flink-table-store-core/src/main/java/org/apache/paimon/table/ChangelogValueCountFileStoreTable.java @@ -18,7 +18,7 @@ package org.apache.paimon.table; -import org.apache.flink.table.store.CoreOptions; +import org.apache.paimon.CoreOptions; import org.apache.paimon.file.KeyValue; import org.apache.paimon.file.KeyValueFileStore; import org.apache.paimon.file.WriteMode; diff --git a/flink-table-store-core/src/main/java/org/apache/paimon/table/ChangelogWithKeyFileStoreTable.java b/flink-table-store-core/src/main/java/org/apache/paimon/table/ChangelogWithKeyFileStoreTable.java index 88cb33984..65ac2302e 100644 --- a/flink-table-store-core/src/main/java/org/apache/paimon/table/ChangelogWithKeyFileStoreTable.java +++ b/flink-table-store-core/src/main/java/org/apache/paimon/table/ChangelogWithKeyFileStoreTable.java @@ -18,8 +18,8 @@ package org.apache.paimon.table; -import org.apache.flink.table.store.CoreOptions; -import org.apache.flink.table.store.CoreOptions.ChangelogProducer; +import org.apache.paimon.CoreOptions; +import org.apache.paimon.CoreOptions.ChangelogProducer; import org.apache.paimon.file.KeyValue; import org.apache.paimon.file.KeyValueFileStore; import org.apache.paimon.file.WriteMode; diff --git a/flink-table-store-core/src/main/java/org/apache/paimon/table/DataTable.java b/flink-table-store-core/src/main/java/org/apache/paimon/table/DataTable.java index d2a4aeb80..8f210638c 100644 --- a/flink-table-store-core/src/main/java/org/apache/paimon/table/DataTable.java +++ b/flink-table-store-core/src/main/java/org/apache/paimon/table/DataTable.java @@ -18,7 +18,7 @@ package org.apache.paimon.table; -import org.apache.flink.table.store.CoreOptions; +import org.apache.paimon.CoreOptions; import org.apache.paimon.file.utils.SnapshotManager; import org.apache.paimon.fs.FileIO; import org.apache.paimon.fs.Path; diff --git a/flink-table-store-core/src/main/java/org/apache/paimon/table/FileStoreTableFactory.java b/flink-table-store-core/src/main/java/org/apache/paimon/table/FileStoreTableFactory.java index 9acf5ce2a..85c65ad8b 100644 --- a/flink-table-store-core/src/main/java/org/apache/paimon/table/FileStoreTableFactory.java +++ b/flink-table-store-core/src/main/java/org/apache/paimon/table/FileStoreTableFactory.java @@ -18,7 +18,7 @@ package org.apache.paimon.table; -import org.apache.flink.table.store.CoreOptions; +import org.apache.paimon.CoreOptions; import org.apache.flink.table.store.catalog.CatalogContext; import org.apache.paimon.file.WriteMode; import org.apache.paimon.file.schema.SchemaManager; @@ -30,7 +30,7 @@ import org.apache.paimon.options.Options; import java.io.IOException; import java.io.UncheckedIOException; -import static org.apache.flink.table.store.CoreOptions.PATH; +import static org.apache.paimon.CoreOptions.PATH; /** Factory to create {@link FileStoreTable}. */ public class FileStoreTableFactory { diff --git a/flink-table-store-core/src/main/java/org/apache/paimon/table/sink/BucketComputer.java b/flink-table-store-core/src/main/java/org/apache/paimon/table/sink/BucketComputer.java index dc01f32f5..aa78fcb88 100644 --- a/flink-table-store-core/src/main/java/org/apache/paimon/table/sink/BucketComputer.java +++ b/flink-table-store-core/src/main/java/org/apache/paimon/table/sink/BucketComputer.java @@ -18,7 +18,7 @@ package org.apache.paimon.table.sink; -import org.apache.flink.table.store.CoreOptions; +import org.apache.paimon.CoreOptions; import org.apache.flink.table.store.codegen.CodeGenUtils; import org.apache.flink.table.store.codegen.Projection; import org.apache.paimon.file.schema.TableSchema; diff --git a/flink-table-store-core/src/main/java/org/apache/paimon/table/source/AbstractDataTableScan.java b/flink-table-store-core/src/main/java/org/apache/paimon/table/source/AbstractDataTableScan.java index f0e89828e..dc5dcb8cb 100644 --- a/flink-table-store-core/src/main/java/org/apache/paimon/table/source/AbstractDataTableScan.java +++ b/flink-table-store-core/src/main/java/org/apache/paimon/table/source/AbstractDataTableScan.java @@ -18,7 +18,7 @@ package org.apache.paimon.table.source; -import org.apache.flink.table.store.CoreOptions; +import org.apache.paimon.CoreOptions; import org.apache.paimon.file.operation.FileStoreScan; import org.apache.paimon.file.operation.ScanKind; import org.apache.paimon.file.predicate.Predicate; diff --git a/flink-table-store-core/src/main/java/org/apache/paimon/table/source/BatchDataTableScanImpl.java b/flink-table-store-core/src/main/java/org/apache/paimon/table/source/BatchDataTableScanImpl.java index 47dfd0e91..fc7f94ef3 100644 --- a/flink-table-store-core/src/main/java/org/apache/paimon/table/source/BatchDataTableScanImpl.java +++ b/flink-table-store-core/src/main/java/org/apache/paimon/table/source/BatchDataTableScanImpl.java @@ -18,7 +18,7 @@ package org.apache.paimon.table.source; -import org.apache.flink.table.store.CoreOptions; +import org.apache.paimon.CoreOptions; import org.apache.paimon.file.utils.SnapshotManager; import org.apache.paimon.table.source.snapshot.SnapshotSplitReader; import org.apache.paimon.table.source.snapshot.StartingScanner; diff --git a/flink-table-store-core/src/main/java/org/apache/paimon/table/source/StreamDataTableScan.java b/flink-table-store-core/src/main/java/org/apache/paimon/table/source/StreamDataTableScan.java index deba51651..413ff2a8f 100644 --- a/flink-table-store-core/src/main/java/org/apache/paimon/table/source/StreamDataTableScan.java +++ b/flink-table-store-core/src/main/java/org/apache/paimon/table/source/StreamDataTableScan.java @@ -18,7 +18,7 @@ package org.apache.paimon.table.source; -import org.apache.flink.table.store.CoreOptions; +import org.apache.paimon.CoreOptions; import org.apache.paimon.file.schema.TableSchema; import org.apache.paimon.table.DataTable; import org.apache.paimon.table.source.snapshot.FollowUpScanner; diff --git a/flink-table-store-core/src/main/java/org/apache/paimon/table/source/StreamDataTableScanImpl.java b/flink-table-store-core/src/main/java/org/apache/paimon/table/source/StreamDataTableScanImpl.java index ef9831f1d..e2d9f05c7 100644 --- a/flink-table-store-core/src/main/java/org/apache/paimon/table/source/StreamDataTableScanImpl.java +++ b/flink-table-store-core/src/main/java/org/apache/paimon/table/source/StreamDataTableScanImpl.java @@ -18,7 +18,7 @@ package org.apache.paimon.table.source; -import org.apache.flink.table.store.CoreOptions; +import org.apache.paimon.CoreOptions; import org.apache.paimon.file.Snapshot; import org.apache.paimon.file.utils.SnapshotManager; import org.apache.paimon.table.source.snapshot.BoundedWatermarkFollowUpScanner; diff --git a/flink-table-store-core/src/main/java/org/apache/paimon/table/source/snapshot/CompactedStartingScanner.java b/flink-table-store-core/src/main/java/org/apache/paimon/table/source/snapshot/CompactedStartingScanner.java index 213c60067..e81f6a719 100644 --- a/flink-table-store-core/src/main/java/org/apache/paimon/table/source/snapshot/CompactedStartingScanner.java +++ b/flink-table-store-core/src/main/java/org/apache/paimon/table/source/snapshot/CompactedStartingScanner.java @@ -18,7 +18,7 @@ package org.apache.paimon.table.source.snapshot; -import org.apache.flink.table.store.CoreOptions; +import org.apache.paimon.CoreOptions; import org.apache.paimon.file.operation.ScanKind; import org.apache.paimon.file.utils.SnapshotManager; import org.apache.paimon.table.source.DataTableScan; diff --git a/flink-table-store-core/src/main/java/org/apache/paimon/table/source/snapshot/CompactionChangelogFollowUpScanner.java b/flink-table-store-core/src/main/java/org/apache/paimon/table/source/snapshot/CompactionChangelogFollowUpScanner.java index 99d4deac6..7a8e8a52e 100644 --- a/flink-table-store-core/src/main/java/org/apache/paimon/table/source/snapshot/CompactionChangelogFollowUpScanner.java +++ b/flink-table-store-core/src/main/java/org/apache/paimon/table/source/snapshot/CompactionChangelogFollowUpScanner.java @@ -18,7 +18,7 @@ package org.apache.paimon.table.source.snapshot; -import org.apache.flink.table.store.CoreOptions; +import org.apache.paimon.CoreOptions; import org.apache.paimon.file.Snapshot; import org.apache.paimon.file.operation.ScanKind; import org.apache.paimon.table.source.DataTableScan; diff --git a/flink-table-store-core/src/main/java/org/apache/paimon/table/source/snapshot/ContinuousFromSnapshotStartingScanner.java b/flink-table-store-core/src/main/java/org/apache/paimon/table/source/snapshot/ContinuousFromSnapshotStartingScanner.java index 864f6223e..4a21074c8 100644 --- a/flink-table-store-core/src/main/java/org/apache/paimon/table/source/snapshot/ContinuousFromSnapshotStartingScanner.java +++ b/flink-table-store-core/src/main/java/org/apache/paimon/table/source/snapshot/ContinuousFromSnapshotStartingScanner.java @@ -18,7 +18,7 @@ package org.apache.paimon.table.source.snapshot; -import org.apache.flink.table.store.CoreOptions; +import org.apache.paimon.CoreOptions; import org.apache.paimon.file.utils.SnapshotManager; import org.apache.paimon.table.source.DataTableScan; diff --git a/flink-table-store-core/src/main/java/org/apache/paimon/table/source/snapshot/ContinuousFromTimestampStartingScanner.java b/flink-table-store-core/src/main/java/org/apache/paimon/table/source/snapshot/ContinuousFromTimestampStartingScanner.java index ffcc29539..83fe187e6 100644 --- a/flink-table-store-core/src/main/java/org/apache/paimon/table/source/snapshot/ContinuousFromTimestampStartingScanner.java +++ b/flink-table-store-core/src/main/java/org/apache/paimon/table/source/snapshot/ContinuousFromTimestampStartingScanner.java @@ -18,7 +18,7 @@ package org.apache.paimon.table.source.snapshot; -import org.apache.flink.table.store.CoreOptions; +import org.apache.paimon.CoreOptions; import org.apache.paimon.file.utils.SnapshotManager; import org.apache.paimon.table.source.DataTableScan; diff --git a/flink-table-store-core/src/main/java/org/apache/paimon/table/source/snapshot/ContinuousLatestStartingScanner.java b/flink-table-store-core/src/main/java/org/apache/paimon/table/source/snapshot/ContinuousLatestStartingScanner.java index 0a1882d93..cc8337d74 100644 --- a/flink-table-store-core/src/main/java/org/apache/paimon/table/source/snapshot/ContinuousLatestStartingScanner.java +++ b/flink-table-store-core/src/main/java/org/apache/paimon/table/source/snapshot/ContinuousLatestStartingScanner.java @@ -18,7 +18,7 @@ package org.apache.paimon.table.source.snapshot; -import org.apache.flink.table.store.CoreOptions; +import org.apache.paimon.CoreOptions; import org.apache.paimon.file.utils.SnapshotManager; import org.apache.paimon.table.source.DataTableScan; diff --git a/flink-table-store-core/src/main/java/org/apache/paimon/table/source/snapshot/DeltaFollowUpScanner.java b/flink-table-store-core/src/main/java/org/apache/paimon/table/source/snapshot/DeltaFollowUpScanner.java index be456313b..6274f1b9b 100644 --- a/flink-table-store-core/src/main/java/org/apache/paimon/table/source/snapshot/DeltaFollowUpScanner.java +++ b/flink-table-store-core/src/main/java/org/apache/paimon/table/source/snapshot/DeltaFollowUpScanner.java @@ -18,7 +18,7 @@ package org.apache.paimon.table.source.snapshot; -import org.apache.flink.table.store.CoreOptions; +import org.apache.paimon.CoreOptions; import org.apache.paimon.file.Snapshot; import org.apache.paimon.file.operation.ScanKind; import org.apache.paimon.table.source.DataTableScan; diff --git a/flink-table-store-core/src/main/java/org/apache/paimon/table/source/snapshot/FullStartingScanner.java b/flink-table-store-core/src/main/java/org/apache/paimon/table/source/snapshot/FullStartingScanner.java index e3741b895..4feee719d 100644 --- a/flink-table-store-core/src/main/java/org/apache/paimon/table/source/snapshot/FullStartingScanner.java +++ b/flink-table-store-core/src/main/java/org/apache/paimon/table/source/snapshot/FullStartingScanner.java @@ -18,7 +18,7 @@ package org.apache.paimon.table.source.snapshot; -import org.apache.flink.table.store.CoreOptions; +import org.apache.paimon.CoreOptions; import org.apache.paimon.file.operation.ScanKind; import org.apache.paimon.file.utils.SnapshotManager; import org.apache.paimon.table.source.DataTableScan; diff --git a/flink-table-store-core/src/main/java/org/apache/paimon/table/source/snapshot/InputChangelogFollowUpScanner.java b/flink-table-store-core/src/main/java/org/apache/paimon/table/source/snapshot/InputChangelogFollowUpScanner.java index 46198ae98..e43fa3c05 100644 --- a/flink-table-store-core/src/main/java/org/apache/paimon/table/source/snapshot/InputChangelogFollowUpScanner.java +++ b/flink-table-store-core/src/main/java/org/apache/paimon/table/source/snapshot/InputChangelogFollowUpScanner.java @@ -18,7 +18,7 @@ package org.apache.paimon.table.source.snapshot; -import org.apache.flink.table.store.CoreOptions; +import org.apache.paimon.CoreOptions; import org.apache.paimon.file.Snapshot; import org.apache.paimon.file.operation.ScanKind; import org.apache.paimon.table.source.DataTableScan; diff --git a/flink-table-store-core/src/main/java/org/apache/paimon/table/source/snapshot/SnapshotSplitReaderImpl.java b/flink-table-store-core/src/main/java/org/apache/paimon/table/source/snapshot/SnapshotSplitReaderImpl.java index abffb2567..45ab00f43 100644 --- a/flink-table-store-core/src/main/java/org/apache/paimon/table/source/snapshot/SnapshotSplitReaderImpl.java +++ b/flink-table-store-core/src/main/java/org/apache/paimon/table/source/snapshot/SnapshotSplitReaderImpl.java @@ -18,7 +18,7 @@ package org.apache.paimon.table.source.snapshot; -import org.apache.flink.table.store.CoreOptions; +import org.apache.paimon.CoreOptions; import org.apache.flink.table.store.codegen.CodeGenUtils; import org.apache.flink.table.store.codegen.RecordComparator; import org.apache.paimon.file.Snapshot; diff --git a/flink-table-store-core/src/main/java/org/apache/paimon/table/source/snapshot/StaticFromSnapshotStartingScanner.java b/flink-table-store-core/src/main/java/org/apache/paimon/table/source/snapshot/StaticFromSnapshotStartingScanner.java index 776abf60c..4d8cd09ae 100644 --- a/flink-table-store-core/src/main/java/org/apache/paimon/table/source/snapshot/StaticFromSnapshotStartingScanner.java +++ b/flink-table-store-core/src/main/java/org/apache/paimon/table/source/snapshot/StaticFromSnapshotStartingScanner.java @@ -18,7 +18,7 @@ package org.apache.paimon.table.source.snapshot; -import org.apache.flink.table.store.CoreOptions; +import org.apache.paimon.CoreOptions; import org.apache.paimon.file.operation.ScanKind; import org.apache.paimon.file.utils.SnapshotManager; import org.apache.paimon.table.source.DataTableScan; diff --git a/flink-table-store-core/src/main/java/org/apache/paimon/table/source/snapshot/StaticFromTimestampStartingScanner.java b/flink-table-store-core/src/main/java/org/apache/paimon/table/source/snapshot/StaticFromTimestampStartingScanner.java index 70c0c0cba..08e7b4f7a 100644 --- a/flink-table-store-core/src/main/java/org/apache/paimon/table/source/snapshot/StaticFromTimestampStartingScanner.java +++ b/flink-table-store-core/src/main/java/org/apache/paimon/table/source/snapshot/StaticFromTimestampStartingScanner.java @@ -18,7 +18,7 @@ package org.apache.paimon.table.source.snapshot; -import org.apache.flink.table.store.CoreOptions; +import org.apache.paimon.CoreOptions; import org.apache.paimon.file.operation.ScanKind; import org.apache.paimon.file.utils.SnapshotManager; import org.apache.paimon.table.source.DataTableScan; diff --git a/flink-table-store-core/src/main/java/org/apache/paimon/table/system/AuditLogTable.java b/flink-table-store-core/src/main/java/org/apache/paimon/table/system/AuditLogTable.java index a6d7acf7e..33ba6e03f 100644 --- a/flink-table-store-core/src/main/java/org/apache/paimon/table/system/AuditLogTable.java +++ b/flink-table-store-core/src/main/java/org/apache/paimon/table/system/AuditLogTable.java @@ -18,7 +18,7 @@ package org.apache.paimon.table.system; -import org.apache.flink.table.store.CoreOptions; +import org.apache.paimon.CoreOptions; import org.apache.paimon.file.operation.ScanKind; import org.apache.paimon.file.predicate.LeafPredicate; import org.apache.paimon.file.predicate.Predicate; diff --git a/flink-table-store-core/src/main/java/org/apache/paimon/table/system/BucketsTable.java b/flink-table-store-core/src/main/java/org/apache/paimon/table/system/BucketsTable.java index f2de5d338..b5dc50827 100644 --- a/flink-table-store-core/src/main/java/org/apache/paimon/table/system/BucketsTable.java +++ b/flink-table-store-core/src/main/java/org/apache/paimon/table/system/BucketsTable.java @@ -18,7 +18,7 @@ package org.apache.paimon.table.system; -import org.apache.flink.table.store.CoreOptions; +import org.apache.paimon.CoreOptions; import org.apache.paimon.file.io.DataFileMeta; import org.apache.paimon.file.io.DataFileMetaSerializer; import org.apache.paimon.file.predicate.Predicate; diff --git a/flink-table-store-core/src/test/java/org/apache/flink/table/store/CoreOptionsTest.java b/flink-table-store-core/src/test/java/org/apache/paimon/CoreOptionsTest.java similarity index 97% rename from flink-table-store-core/src/test/java/org/apache/flink/table/store/CoreOptionsTest.java rename to flink-table-store-core/src/test/java/org/apache/paimon/CoreOptionsTest.java index e63f71dc8..aeae2dc38 100644 --- a/flink-table-store-core/src/test/java/org/apache/flink/table/store/CoreOptionsTest.java +++ b/flink-table-store-core/src/test/java/org/apache/paimon/CoreOptionsTest.java @@ -16,8 +16,9 @@ * limitations under the License. */ -package org.apache.flink.table.store; +package org.apache.paimon; +import org.apache.paimon.CoreOptions; import org.apache.paimon.options.Options; import org.junit.jupiter.api.Test; diff --git a/flink-table-store-core/src/test/java/org/apache/paimon/file/FileFormatTest.java b/flink-table-store-core/src/test/java/org/apache/paimon/file/FileFormatTest.java index a858eb32b..55ea58840 100644 --- a/flink-table-store-core/src/test/java/org/apache/paimon/file/FileFormatTest.java +++ b/flink-table-store-core/src/test/java/org/apache/paimon/file/FileFormatTest.java @@ -18,7 +18,7 @@ package org.apache.paimon.file; -import org.apache.flink.table.store.CoreOptions; +import org.apache.paimon.CoreOptions; import org.apache.paimon.fs.Path; import org.apache.paimon.fs.PositionOutputStream; import org.apache.paimon.fs.local.LocalFileIO; diff --git a/flink-table-store-core/src/test/java/org/apache/paimon/file/TestFileStore.java b/flink-table-store-core/src/test/java/org/apache/paimon/file/TestFileStore.java index 160d865ea..be9edd2f6 100644 --- a/flink-table-store-core/src/test/java/org/apache/paimon/file/TestFileStore.java +++ b/flink-table-store-core/src/test/java/org/apache/paimon/file/TestFileStore.java @@ -18,7 +18,7 @@ package org.apache.paimon.file; -import org.apache.flink.table.store.CoreOptions; +import org.apache.paimon.CoreOptions; import org.apache.paimon.file.io.DataFileMeta; import org.apache.paimon.file.manifest.ManifestCommittable; import org.apache.paimon.file.manifest.ManifestEntry; diff --git a/flink-table-store-core/src/test/java/org/apache/paimon/file/append/AppendOnlyWriterTest.java b/flink-table-store-core/src/test/java/org/apache/paimon/file/append/AppendOnlyWriterTest.java index 90ffebc1b..a3d334b37 100644 --- a/flink-table-store-core/src/test/java/org/apache/paimon/file/append/AppendOnlyWriterTest.java +++ b/flink-table-store-core/src/test/java/org/apache/paimon/file/append/AppendOnlyWriterTest.java @@ -19,7 +19,7 @@ package org.apache.paimon.file.append; -import org.apache.flink.table.store.CoreOptions; +import org.apache.paimon.CoreOptions; import org.apache.paimon.file.io.DataFileMeta; import org.apache.paimon.file.io.DataFilePathFactory; import org.apache.paimon.file.stats.FieldStatsArraySerializer; diff --git a/flink-table-store-core/src/test/java/org/apache/paimon/file/io/DataFilePathFactoryTest.java b/flink-table-store-core/src/test/java/org/apache/paimon/file/io/DataFilePathFactoryTest.java index 9319260e7..46e3da90e 100644 --- a/flink-table-store-core/src/test/java/org/apache/paimon/file/io/DataFilePathFactoryTest.java +++ b/flink-table-store-core/src/test/java/org/apache/paimon/file/io/DataFilePathFactoryTest.java @@ -18,7 +18,7 @@ package org.apache.paimon.file.io; -import org.apache.flink.table.store.CoreOptions; +import org.apache.paimon.CoreOptions; import org.apache.paimon.fs.Path; import org.junit.jupiter.api.Test; diff --git a/flink-table-store-core/src/test/java/org/apache/paimon/file/io/KeyValueFileReadWriteTest.java b/flink-table-store-core/src/test/java/org/apache/paimon/file/io/KeyValueFileReadWriteTest.java index f410200c3..b7404f04a 100644 --- a/flink-table-store-core/src/test/java/org/apache/paimon/file/io/KeyValueFileReadWriteTest.java +++ b/flink-table-store-core/src/test/java/org/apache/paimon/file/io/KeyValueFileReadWriteTest.java @@ -18,7 +18,7 @@ package org.apache.paimon.file.io; -import org.apache.flink.table.store.CoreOptions; +import org.apache.paimon.CoreOptions; import org.apache.paimon.file.KeyValue; import org.apache.paimon.file.KeyValueSerializerTest; import org.apache.paimon.file.TestKeyValueGenerator; diff --git a/flink-table-store-core/src/test/java/org/apache/paimon/file/io/RollingFileWriterTest.java b/flink-table-store-core/src/test/java/org/apache/paimon/file/io/RollingFileWriterTest.java index 920c2b489..6dbbfad1e 100644 --- a/flink-table-store-core/src/test/java/org/apache/paimon/file/io/RollingFileWriterTest.java +++ b/flink-table-store-core/src/test/java/org/apache/paimon/file/io/RollingFileWriterTest.java @@ -18,7 +18,7 @@ package org.apache.paimon.file.io; -import org.apache.flink.table.store.CoreOptions; +import org.apache.paimon.CoreOptions; import org.apache.paimon.fs.Path; import org.apache.paimon.fs.local.LocalFileIO; import org.apache.paimon.options.Options; diff --git a/flink-table-store-core/src/test/java/org/apache/paimon/file/manifest/ManifestFileMetaTest.java b/flink-table-store-core/src/test/java/org/apache/paimon/file/manifest/ManifestFileMetaTest.java index 9556371b9..d271fd1e1 100644 --- a/flink-table-store-core/src/test/java/org/apache/paimon/file/manifest/ManifestFileMetaTest.java +++ b/flink-table-store-core/src/test/java/org/apache/paimon/file/manifest/ManifestFileMetaTest.java @@ -18,7 +18,7 @@ package org.apache.paimon.file.manifest; -import org.apache.flink.table.store.CoreOptions; +import org.apache.paimon.CoreOptions; import org.apache.paimon.file.io.DataFileMeta; import org.apache.paimon.file.schema.SchemaManager; import org.apache.paimon.file.stats.StatsTestUtils; diff --git a/flink-table-store-core/src/test/java/org/apache/paimon/file/manifest/ManifestFileTest.java b/flink-table-store-core/src/test/java/org/apache/paimon/file/manifest/ManifestFileTest.java index cc9ccea44..de32b5f42 100644 --- a/flink-table-store-core/src/test/java/org/apache/paimon/file/manifest/ManifestFileTest.java +++ b/flink-table-store-core/src/test/java/org/apache/paimon/file/manifest/ManifestFileTest.java @@ -18,7 +18,7 @@ package org.apache.paimon.file.manifest; -import org.apache.flink.table.store.CoreOptions; +import org.apache.paimon.CoreOptions; import org.apache.paimon.file.schema.SchemaManager; import org.apache.paimon.file.stats.StatsTestUtils; import org.apache.paimon.file.utils.FailingFileIO; diff --git a/flink-table-store-core/src/test/java/org/apache/paimon/file/manifest/ManifestListTest.java b/flink-table-store-core/src/test/java/org/apache/paimon/file/manifest/ManifestListTest.java index c4d77161c..72bb0a526 100644 --- a/flink-table-store-core/src/test/java/org/apache/paimon/file/manifest/ManifestListTest.java +++ b/flink-table-store-core/src/test/java/org/apache/paimon/file/manifest/ManifestListTest.java @@ -18,7 +18,7 @@ package org.apache.paimon.file.manifest; -import org.apache.flink.table.store.CoreOptions; +import org.apache.paimon.CoreOptions; import org.apache.paimon.file.TestKeyValueGenerator; import org.apache.paimon.file.utils.FailingFileIO; import org.apache.paimon.file.utils.FileStorePathFactory; diff --git a/flink-table-store-core/src/test/java/org/apache/paimon/file/mergetree/LookupLevelsTest.java b/flink-table-store-core/src/test/java/org/apache/paimon/file/mergetree/LookupLevelsTest.java index 367726f47..87723cba4 100644 --- a/flink-table-store-core/src/test/java/org/apache/paimon/file/mergetree/LookupLevelsTest.java +++ b/flink-table-store-core/src/test/java/org/apache/paimon/file/mergetree/LookupLevelsTest.java @@ -57,7 +57,7 @@ import java.util.List; import java.util.Map; import java.util.UUID; -import static org.apache.flink.table.store.CoreOptions.TARGET_FILE_SIZE; +import static org.apache.paimon.CoreOptions.TARGET_FILE_SIZE; import static org.apache.paimon.file.KeyValue.UNKNOWN_SEQUENCE; import static org.apache.paimon.file.io.DataFileTestUtils.row; import static org.assertj.core.api.Assertions.assertThat; diff --git a/flink-table-store-core/src/test/java/org/apache/paimon/file/mergetree/MergeTreeTest.java b/flink-table-store-core/src/test/java/org/apache/paimon/file/mergetree/MergeTreeTest.java index dab7d71cb..2e461c54f 100644 --- a/flink-table-store-core/src/test/java/org/apache/paimon/file/mergetree/MergeTreeTest.java +++ b/flink-table-store-core/src/test/java/org/apache/paimon/file/mergetree/MergeTreeTest.java @@ -18,8 +18,8 @@ package org.apache.paimon.file.mergetree; -import org.apache.flink.table.store.CoreOptions; -import org.apache.flink.table.store.CoreOptions.ChangelogProducer; +import org.apache.paimon.CoreOptions; +import org.apache.paimon.CoreOptions.ChangelogProducer; import org.apache.paimon.file.KeyValue; import org.apache.paimon.file.compact.CompactResult; import org.apache.paimon.file.format.FlushingFileFormat; diff --git a/flink-table-store-core/src/test/java/org/apache/paimon/file/operation/FileStoreCommitTest.java b/flink-table-store-core/src/test/java/org/apache/paimon/file/operation/FileStoreCommitTest.java index da451035d..79c55dec4 100644 --- a/flink-table-store-core/src/test/java/org/apache/paimon/file/operation/FileStoreCommitTest.java +++ b/flink-table-store-core/src/test/java/org/apache/paimon/file/operation/FileStoreCommitTest.java @@ -18,7 +18,7 @@ package org.apache.paimon.file.operation; -import org.apache.flink.table.store.CoreOptions; +import org.apache.paimon.CoreOptions; import org.apache.paimon.file.KeyValue; import org.apache.paimon.file.Snapshot; import org.apache.paimon.file.TestFileStore; diff --git a/flink-table-store-core/src/test/java/org/apache/paimon/file/operation/FileStoreExpireTestBase.java b/flink-table-store-core/src/test/java/org/apache/paimon/file/operation/FileStoreExpireTestBase.java index 70c6c980d..5931f49aa 100644 --- a/flink-table-store-core/src/test/java/org/apache/paimon/file/operation/FileStoreExpireTestBase.java +++ b/flink-table-store-core/src/test/java/org/apache/paimon/file/operation/FileStoreExpireTestBase.java @@ -18,7 +18,7 @@ package org.apache.paimon.file.operation; -import org.apache.flink.table.store.CoreOptions; +import org.apache.paimon.CoreOptions; import org.apache.paimon.file.KeyValue; import org.apache.paimon.file.Snapshot; import org.apache.paimon.file.TestFileStore; diff --git a/flink-table-store-core/src/test/java/org/apache/paimon/file/operation/PartitionExpireTest.java b/flink-table-store-core/src/test/java/org/apache/paimon/file/operation/PartitionExpireTest.java index e6b8b7381..a3cbaaa7a 100644 --- a/flink-table-store-core/src/test/java/org/apache/paimon/file/operation/PartitionExpireTest.java +++ b/flink-table-store-core/src/test/java/org/apache/paimon/file/operation/PartitionExpireTest.java @@ -18,7 +18,7 @@ package org.apache.paimon.file.operation; -import org.apache.flink.table.store.CoreOptions; +import org.apache.paimon.CoreOptions; import org.apache.paimon.file.schema.Schema; import org.apache.paimon.file.schema.SchemaManager; import org.apache.paimon.fs.Path; @@ -46,8 +46,8 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import static org.apache.flink.table.store.CoreOptions.PARTITION_EXPIRATION_TIME; -import static org.apache.flink.table.store.CoreOptions.WRITE_ONLY; +import static org.apache.paimon.CoreOptions.PARTITION_EXPIRATION_TIME; +import static org.apache.paimon.CoreOptions.WRITE_ONLY; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; diff --git a/flink-table-store-core/src/test/java/org/apache/paimon/file/schema/SchemaManagerTest.java b/flink-table-store-core/src/test/java/org/apache/paimon/file/schema/SchemaManagerTest.java index f589f5581..ec8bd74bd 100644 --- a/flink-table-store-core/src/test/java/org/apache/paimon/file/schema/SchemaManagerTest.java +++ b/flink-table-store-core/src/test/java/org/apache/paimon/file/schema/SchemaManagerTest.java @@ -18,7 +18,7 @@ package org.apache.paimon.file.schema; -import org.apache.flink.table.store.CoreOptions; +import org.apache.paimon.CoreOptions; import org.apache.paimon.file.WriteMode; import org.apache.paimon.file.utils.FailingFileIO; import org.apache.paimon.fs.FileIOFinder; diff --git a/flink-table-store-core/src/test/java/org/apache/paimon/file/schema/SchemaUtils.java b/flink-table-store-core/src/test/java/org/apache/paimon/file/schema/SchemaUtils.java index ad19b492b..fb36490e0 100644 --- a/flink-table-store-core/src/test/java/org/apache/paimon/file/schema/SchemaUtils.java +++ b/flink-table-store-core/src/test/java/org/apache/paimon/file/schema/SchemaUtils.java @@ -18,7 +18,7 @@ package org.apache.paimon.file.schema; -import org.apache.flink.table.store.CoreOptions; +import org.apache.paimon.CoreOptions; import org.apache.paimon.types.DataField; import org.apache.paimon.types.RowType; import org.apache.paimon.utils.Preconditions; diff --git a/flink-table-store-core/src/test/java/org/apache/paimon/file/utils/FileStorePathFactoryTest.java b/flink-table-store-core/src/test/java/org/apache/paimon/file/utils/FileStorePathFactoryTest.java index 688d1d8ab..ad147b6ea 100644 --- a/flink-table-store-core/src/test/java/org/apache/paimon/file/utils/FileStorePathFactoryTest.java +++ b/flink-table-store-core/src/test/java/org/apache/paimon/file/utils/FileStorePathFactoryTest.java @@ -18,7 +18,7 @@ package org.apache.paimon.file.utils; -import org.apache.flink.table.store.CoreOptions; +import org.apache.paimon.CoreOptions; import org.apache.paimon.file.io.DataFilePathFactory; import org.apache.paimon.fs.Path; import org.apache.paimon.types.DataType; diff --git a/flink-table-store-core/src/test/java/org/apache/paimon/table/AppendOnlyFileStoreTableTest.java b/flink-table-store-core/src/test/java/org/apache/paimon/table/AppendOnlyFileStoreTableTest.java index 702f5bbbb..3eb9687c3 100644 --- a/flink-table-store-core/src/test/java/org/apache/paimon/table/AppendOnlyFileStoreTableTest.java +++ b/flink-table-store-core/src/test/java/org/apache/paimon/table/AppendOnlyFileStoreTableTest.java @@ -18,7 +18,7 @@ package org.apache.paimon.table; -import org.apache.flink.table.store.CoreOptions; +import org.apache.paimon.CoreOptions; import org.apache.paimon.file.WriteMode; import org.apache.paimon.file.operation.ScanKind; import org.apache.paimon.file.predicate.Predicate; diff --git a/flink-table-store-core/src/test/java/org/apache/paimon/table/AppendOnlyTableColumnTypeFileDataTest.java b/flink-table-store-core/src/test/java/org/apache/paimon/table/AppendOnlyTableColumnTypeFileDataTest.java index 2af7faa0a..3761e68e4 100644 --- a/flink-table-store-core/src/test/java/org/apache/paimon/table/AppendOnlyTableColumnTypeFileDataTest.java +++ b/flink-table-store-core/src/test/java/org/apache/paimon/table/AppendOnlyTableColumnTypeFileDataTest.java @@ -18,7 +18,7 @@ package org.apache.paimon.table; -import org.apache.flink.table.store.CoreOptions; +import org.apache.paimon.CoreOptions; import org.apache.paimon.file.WriteMode; import org.apache.paimon.file.schema.SchemaManager; import org.apache.paimon.file.schema.TableSchema; diff --git a/flink-table-store-core/src/test/java/org/apache/paimon/table/AppendOnlyTableColumnTypeFileMetaTest.java b/flink-table-store-core/src/test/java/org/apache/paimon/table/AppendOnlyTableColumnTypeFileMetaTest.java index 5c526ed40..541ff18e2 100644 --- a/flink-table-store-core/src/test/java/org/apache/paimon/table/AppendOnlyTableColumnTypeFileMetaTest.java +++ b/flink-table-store-core/src/test/java/org/apache/paimon/table/AppendOnlyTableColumnTypeFileMetaTest.java @@ -18,7 +18,7 @@ package org.apache.paimon.table; -import org.apache.flink.table.store.CoreOptions; +import org.apache.paimon.CoreOptions; import org.apache.paimon.file.WriteMode; import org.apache.paimon.file.io.DataFileMeta; import org.apache.paimon.file.schema.SchemaManager; diff --git a/flink-table-store-core/src/test/java/org/apache/paimon/table/AppendOnlyTableFileMetaFilterTest.java b/flink-table-store-core/src/test/java/org/apache/paimon/table/AppendOnlyTableFileMetaFilterTest.java index 5b2055884..6dc8de043 100644 --- a/flink-table-store-core/src/test/java/org/apache/paimon/table/AppendOnlyTableFileMetaFilterTest.java +++ b/flink-table-store-core/src/test/java/org/apache/paimon/table/AppendOnlyTableFileMetaFilterTest.java @@ -18,7 +18,7 @@ package org.apache.paimon.table; -import org.apache.flink.table.store.CoreOptions; +import org.apache.paimon.CoreOptions; import org.apache.paimon.file.WriteMode; import org.apache.paimon.file.io.DataFileMeta; import org.apache.paimon.file.schema.SchemaManager; diff --git a/flink-table-store-core/src/test/java/org/apache/paimon/table/ChangelogValueCountColumnTypeFileDataTest.java b/flink-table-store-core/src/test/java/org/apache/paimon/table/ChangelogValueCountColumnTypeFileDataTest.java index 57c5e9c6e..c64de5cdc 100644 --- a/flink-table-store-core/src/test/java/org/apache/paimon/table/ChangelogValueCountColumnTypeFileDataTest.java +++ b/flink-table-store-core/src/test/java/org/apache/paimon/table/ChangelogValueCountColumnTypeFileDataTest.java @@ -18,7 +18,7 @@ package org.apache.paimon.table; -import org.apache.flink.table.store.CoreOptions; +import org.apache.paimon.CoreOptions; import org.apache.paimon.file.WriteMode; import org.apache.paimon.file.schema.SchemaManager; import org.apache.paimon.file.schema.TableSchema; diff --git a/flink-table-store-core/src/test/java/org/apache/paimon/table/ChangelogValueCountColumnTypeFileMetaTest.java b/flink-table-store-core/src/test/java/org/apache/paimon/table/ChangelogValueCountColumnTypeFileMetaTest.java index 8ec307aec..a21d1e285 100644 --- a/flink-table-store-core/src/test/java/org/apache/paimon/table/ChangelogValueCountColumnTypeFileMetaTest.java +++ b/flink-table-store-core/src/test/java/org/apache/paimon/table/ChangelogValueCountColumnTypeFileMetaTest.java @@ -18,7 +18,7 @@ package org.apache.paimon.table; -import org.apache.flink.table.store.CoreOptions; +import org.apache.paimon.CoreOptions; import org.apache.paimon.file.WriteMode; import org.apache.paimon.file.io.DataFileMeta; import org.apache.paimon.file.schema.SchemaManager; diff --git a/flink-table-store-core/src/test/java/org/apache/paimon/table/ChangelogValueCountFileDataTableTest.java b/flink-table-store-core/src/test/java/org/apache/paimon/table/ChangelogValueCountFileDataTableTest.java index 6be2290c6..aead380ec 100644 --- a/flink-table-store-core/src/test/java/org/apache/paimon/table/ChangelogValueCountFileDataTableTest.java +++ b/flink-table-store-core/src/test/java/org/apache/paimon/table/ChangelogValueCountFileDataTableTest.java @@ -18,7 +18,7 @@ package org.apache.paimon.table; -import org.apache.flink.table.store.CoreOptions; +import org.apache.paimon.CoreOptions; import org.apache.paimon.file.WriteMode; import org.apache.paimon.file.schema.SchemaManager; import org.apache.paimon.file.schema.TableSchema; diff --git a/flink-table-store-core/src/test/java/org/apache/paimon/table/ChangelogValueCountFileMetaFilterTest.java b/flink-table-store-core/src/test/java/org/apache/paimon/table/ChangelogValueCountFileMetaFilterTest.java index 8ae938a78..db929ab93 100644 --- a/flink-table-store-core/src/test/java/org/apache/paimon/table/ChangelogValueCountFileMetaFilterTest.java +++ b/flink-table-store-core/src/test/java/org/apache/paimon/table/ChangelogValueCountFileMetaFilterTest.java @@ -18,7 +18,7 @@ package org.apache.paimon.table; -import org.apache.flink.table.store.CoreOptions; +import org.apache.paimon.CoreOptions; import org.apache.paimon.file.WriteMode; import org.apache.paimon.file.io.DataFileMeta; import org.apache.paimon.file.schema.SchemaManager; diff --git a/flink-table-store-core/src/test/java/org/apache/paimon/table/ChangelogValueCountFileStoreTableTest.java b/flink-table-store-core/src/test/java/org/apache/paimon/table/ChangelogValueCountFileStoreTableTest.java index 16fe2758e..400c81567 100644 --- a/flink-table-store-core/src/test/java/org/apache/paimon/table/ChangelogValueCountFileStoreTableTest.java +++ b/flink-table-store-core/src/test/java/org/apache/paimon/table/ChangelogValueCountFileStoreTableTest.java @@ -18,7 +18,7 @@ package org.apache.paimon.table; -import org.apache.flink.table.store.CoreOptions; +import org.apache.paimon.CoreOptions; import org.apache.paimon.file.WriteMode; import org.apache.paimon.file.io.DataFilePathFactory; import org.apache.paimon.file.operation.ScanKind; diff --git a/flink-table-store-core/src/test/java/org/apache/paimon/table/ChangelogWithKeyColumnTypeFileDataTest.java b/flink-table-store-core/src/test/java/org/apache/paimon/table/ChangelogWithKeyColumnTypeFileDataTest.java index 70d1cb358..2c391bbfb 100644 --- a/flink-table-store-core/src/test/java/org/apache/paimon/table/ChangelogWithKeyColumnTypeFileDataTest.java +++ b/flink-table-store-core/src/test/java/org/apache/paimon/table/ChangelogWithKeyColumnTypeFileDataTest.java @@ -18,7 +18,7 @@ package org.apache.paimon.table; -import org.apache.flink.table.store.CoreOptions; +import org.apache.paimon.CoreOptions; import org.apache.paimon.file.WriteMode; import org.apache.paimon.file.predicate.Predicate; import org.apache.paimon.file.predicate.PredicateBuilder; diff --git a/flink-table-store-core/src/test/java/org/apache/paimon/table/ChangelogWithKeyFileDataTableTest.java b/flink-table-store-core/src/test/java/org/apache/paimon/table/ChangelogWithKeyFileDataTableTest.java index b817fb441..b5e229fbc 100644 --- a/flink-table-store-core/src/test/java/org/apache/paimon/table/ChangelogWithKeyFileDataTableTest.java +++ b/flink-table-store-core/src/test/java/org/apache/paimon/table/ChangelogWithKeyFileDataTableTest.java @@ -18,7 +18,7 @@ package org.apache.paimon.table; -import org.apache.flink.table.store.CoreOptions; +import org.apache.paimon.CoreOptions; import org.apache.paimon.file.WriteMode; import org.apache.paimon.file.operation.ScanKind; import org.apache.paimon.file.predicate.PredicateBuilder; diff --git a/flink-table-store-core/src/test/java/org/apache/paimon/table/ChangelogWithKeyFileMetaFilterTest.java b/flink-table-store-core/src/test/java/org/apache/paimon/table/ChangelogWithKeyFileMetaFilterTest.java index 7e6df5b47..73737358b 100644 --- a/flink-table-store-core/src/test/java/org/apache/paimon/table/ChangelogWithKeyFileMetaFilterTest.java +++ b/flink-table-store-core/src/test/java/org/apache/paimon/table/ChangelogWithKeyFileMetaFilterTest.java @@ -18,7 +18,7 @@ package org.apache.paimon.table; -import org.apache.flink.table.store.CoreOptions; +import org.apache.paimon.CoreOptions; import org.apache.paimon.file.WriteMode; import org.apache.paimon.file.io.DataFileMeta; import org.apache.paimon.file.predicate.Predicate; diff --git a/flink-table-store-core/src/test/java/org/apache/paimon/table/ChangelogWithKeyFileStoreTableTest.java b/flink-table-store-core/src/test/java/org/apache/paimon/table/ChangelogWithKeyFileStoreTableTest.java index ac3c340ef..e691d734d 100644 --- a/flink-table-store-core/src/test/java/org/apache/paimon/table/ChangelogWithKeyFileStoreTableTest.java +++ b/flink-table-store-core/src/test/java/org/apache/paimon/table/ChangelogWithKeyFileStoreTableTest.java @@ -18,8 +18,8 @@ package org.apache.paimon.table; -import org.apache.flink.table.store.CoreOptions; -import org.apache.flink.table.store.CoreOptions.ChangelogProducer; +import org.apache.paimon.CoreOptions; +import org.apache.paimon.CoreOptions.ChangelogProducer; import org.apache.paimon.file.WriteMode; import org.apache.paimon.file.operation.ScanKind; import org.apache.paimon.file.predicate.Predicate; diff --git a/flink-table-store-core/src/test/java/org/apache/paimon/table/ChangelogWithKeyTableColumnTypeFileMetaTest.java b/flink-table-store-core/src/test/java/org/apache/paimon/table/ChangelogWithKeyTableColumnTypeFileMetaTest.java index e651fb612..9a6344bb1 100644 --- a/flink-table-store-core/src/test/java/org/apache/paimon/table/ChangelogWithKeyTableColumnTypeFileMetaTest.java +++ b/flink-table-store-core/src/test/java/org/apache/paimon/table/ChangelogWithKeyTableColumnTypeFileMetaTest.java @@ -18,7 +18,7 @@ package org.apache.paimon.table; -import org.apache.flink.table.store.CoreOptions; +import org.apache.paimon.CoreOptions; import org.apache.paimon.file.WriteMode; import org.apache.paimon.file.io.DataFileMeta; import org.apache.paimon.file.predicate.Predicate; diff --git a/flink-table-store-core/src/test/java/org/apache/paimon/table/ColumnTypeFileDataTestBase.java b/flink-table-store-core/src/test/java/org/apache/paimon/table/ColumnTypeFileDataTestBase.java index d8d92c4ce..0dc98be76 100644 --- a/flink-table-store-core/src/test/java/org/apache/paimon/table/ColumnTypeFileDataTestBase.java +++ b/flink-table-store-core/src/test/java/org/apache/paimon/table/ColumnTypeFileDataTestBase.java @@ -18,7 +18,7 @@ package org.apache.paimon.table; -import org.apache.flink.table.store.CoreOptions; +import org.apache.paimon.CoreOptions; import org.apache.paimon.file.predicate.Predicate; import org.apache.paimon.file.predicate.PredicateBuilder; import org.apache.paimon.table.source.Split; diff --git a/flink-table-store-core/src/test/java/org/apache/paimon/table/ColumnTypeFileMetaTestBase.java b/flink-table-store-core/src/test/java/org/apache/paimon/table/ColumnTypeFileMetaTestBase.java index dfe969fd0..26de521ea 100644 --- a/flink-table-store-core/src/test/java/org/apache/paimon/table/ColumnTypeFileMetaTestBase.java +++ b/flink-table-store-core/src/test/java/org/apache/paimon/table/ColumnTypeFileMetaTestBase.java @@ -18,7 +18,7 @@ package org.apache.paimon.table; -import org.apache.flink.table.store.CoreOptions; +import org.apache.paimon.CoreOptions; import org.apache.paimon.file.io.DataFileMeta; import org.apache.paimon.file.predicate.Predicate; import org.apache.paimon.file.predicate.PredicateBuilder; diff --git a/flink-table-store-core/src/test/java/org/apache/paimon/table/FileStoreTableTestBase.java b/flink-table-store-core/src/test/java/org/apache/paimon/table/FileStoreTableTestBase.java index 9f3ba1455..42db70fc8 100644 --- a/flink-table-store-core/src/test/java/org/apache/paimon/table/FileStoreTableTestBase.java +++ b/flink-table-store-core/src/test/java/org/apache/paimon/table/FileStoreTableTestBase.java @@ -70,13 +70,13 @@ import java.util.function.Function; import java.util.function.Predicate; import java.util.stream.Collectors; -import static org.apache.flink.table.store.CoreOptions.BUCKET; -import static org.apache.flink.table.store.CoreOptions.BUCKET_KEY; -import static org.apache.flink.table.store.CoreOptions.COMPACTION_MAX_FILE_NUM; -import static org.apache.flink.table.store.CoreOptions.FILE_FORMAT; -import static org.apache.flink.table.store.CoreOptions.SNAPSHOT_NUM_RETAINED_MAX; -import static org.apache.flink.table.store.CoreOptions.SNAPSHOT_NUM_RETAINED_MIN; -import static org.apache.flink.table.store.CoreOptions.WRITE_ONLY; +import static org.apache.paimon.CoreOptions.BUCKET; +import static org.apache.paimon.CoreOptions.BUCKET_KEY; +import static org.apache.paimon.CoreOptions.COMPACTION_MAX_FILE_NUM; +import static org.apache.paimon.CoreOptions.FILE_FORMAT; +import static org.apache.paimon.CoreOptions.SNAPSHOT_NUM_RETAINED_MAX; +import static org.apache.paimon.CoreOptions.SNAPSHOT_NUM_RETAINED_MIN; +import static org.apache.paimon.CoreOptions.WRITE_ONLY; import static org.assertj.core.api.Assertions.assertThat; /** Base test class for {@link FileStoreTable}. */ diff --git a/flink-table-store-core/src/test/java/org/apache/paimon/table/SchemaEvolutionTableTestBase.java b/flink-table-store-core/src/test/java/org/apache/paimon/table/SchemaEvolutionTableTestBase.java index 151ccd6b7..968e1166f 100644 --- a/flink-table-store-core/src/test/java/org/apache/paimon/table/SchemaEvolutionTableTestBase.java +++ b/flink-table-store-core/src/test/java/org/apache/paimon/table/SchemaEvolutionTableTestBase.java @@ -18,7 +18,7 @@ package org.apache.paimon.table; -import org.apache.flink.table.store.CoreOptions; +import org.apache.paimon.CoreOptions; import org.apache.paimon.file.io.DataFileMeta; import org.apache.paimon.file.mergetree.compact.ConcatRecordReader; import org.apache.paimon.file.schema.Schema; diff --git a/flink-table-store-core/src/test/java/org/apache/paimon/table/WritePreemptMemoryTest.java b/flink-table-store-core/src/test/java/org/apache/paimon/table/WritePreemptMemoryTest.java index 49c733e9d..5ff6a8f0a 100644 --- a/flink-table-store-core/src/test/java/org/apache/paimon/table/WritePreemptMemoryTest.java +++ b/flink-table-store-core/src/test/java/org/apache/paimon/table/WritePreemptMemoryTest.java @@ -18,7 +18,7 @@ package org.apache.paimon.table; -import org.apache.flink.table.store.CoreOptions; +import org.apache.paimon.CoreOptions; import org.apache.paimon.file.WriteMode; import org.apache.paimon.file.schema.Schema; import org.apache.paimon.file.schema.SchemaManager; diff --git a/flink-table-store-core/src/test/java/org/apache/paimon/table/sink/SinkRecordConverterTest.java b/flink-table-store-core/src/test/java/org/apache/paimon/table/sink/SinkRecordConverterTest.java index f18076327..f3c83c4c7 100644 --- a/flink-table-store-core/src/test/java/org/apache/paimon/table/sink/SinkRecordConverterTest.java +++ b/flink-table-store-core/src/test/java/org/apache/paimon/table/sink/SinkRecordConverterTest.java @@ -33,8 +33,8 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import static org.apache.flink.table.store.CoreOptions.BUCKET; -import static org.apache.flink.table.store.CoreOptions.BUCKET_KEY; +import static org.apache.paimon.CoreOptions.BUCKET; +import static org.apache.paimon.CoreOptions.BUCKET_KEY; import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.assertj.core.api.AssertionsForClassTypes.assertThat; diff --git a/flink-table-store-core/src/test/java/org/apache/paimon/table/sink/TableWriteTest.java b/flink-table-store-core/src/test/java/org/apache/paimon/table/sink/TableWriteTest.java index 598c2e3b9..c4b35972a 100644 --- a/flink-table-store-core/src/test/java/org/apache/paimon/table/sink/TableWriteTest.java +++ b/flink-table-store-core/src/test/java/org/apache/paimon/table/sink/TableWriteTest.java @@ -18,7 +18,7 @@ package org.apache.paimon.table.sink; -import org.apache.flink.table.store.CoreOptions; +import org.apache.paimon.CoreOptions; import org.apache.paimon.file.operation.AbstractFileStoreWrite; import org.apache.paimon.file.schema.Schema; import org.apache.paimon.file.schema.SchemaManager; diff --git a/flink-table-store-core/src/test/java/org/apache/paimon/table/source/StreamDataTableScanTest.java b/flink-table-store-core/src/test/java/org/apache/paimon/table/source/StreamDataTableScanTest.java index 63f434e15..b7cebe3b5 100644 --- a/flink-table-store-core/src/test/java/org/apache/paimon/table/source/StreamDataTableScanTest.java +++ b/flink-table-store-core/src/test/java/org/apache/paimon/table/source/StreamDataTableScanTest.java @@ -18,7 +18,7 @@ package org.apache.paimon.table.source; -import org.apache.flink.table.store.CoreOptions; +import org.apache.paimon.CoreOptions; import org.apache.paimon.options.Options; import org.apache.paimon.table.sink.StreamTableCommit; import org.apache.paimon.table.sink.StreamTableWrite; diff --git a/flink-table-store-core/src/test/java/org/apache/paimon/table/source/snapshot/CompactionChangelogFollowUpScannerTest.java b/flink-table-store-core/src/test/java/org/apache/paimon/table/source/snapshot/CompactionChangelogFollowUpScannerTest.java index 76bcf29fa..53c804168 100644 --- a/flink-table-store-core/src/test/java/org/apache/paimon/table/source/snapshot/CompactionChangelogFollowUpScannerTest.java +++ b/flink-table-store-core/src/test/java/org/apache/paimon/table/source/snapshot/CompactionChangelogFollowUpScannerTest.java @@ -18,7 +18,7 @@ package org.apache.paimon.table.source.snapshot; -import org.apache.flink.table.store.CoreOptions; +import org.apache.paimon.CoreOptions; import org.apache.paimon.file.Snapshot; import org.apache.paimon.file.utils.SnapshotManager; import org.apache.paimon.options.Options; diff --git a/flink-table-store-core/src/test/java/org/apache/paimon/table/source/snapshot/InputChangelogFollowUpScannerTest.java b/flink-table-store-core/src/test/java/org/apache/paimon/table/source/snapshot/InputChangelogFollowUpScannerTest.java index 52ce68184..91da04bf8 100644 --- a/flink-table-store-core/src/test/java/org/apache/paimon/table/source/snapshot/InputChangelogFollowUpScannerTest.java +++ b/flink-table-store-core/src/test/java/org/apache/paimon/table/source/snapshot/InputChangelogFollowUpScannerTest.java @@ -18,7 +18,7 @@ package org.apache.paimon.table.source.snapshot; -import org.apache.flink.table.store.CoreOptions; +import org.apache.paimon.CoreOptions; import org.apache.paimon.file.Snapshot; import org.apache.paimon.file.utils.SnapshotManager; import org.apache.paimon.options.Options; diff --git a/paimon-benchmark/paimon-micro-benchmarks/src/test/java/org/apache/paimon/benchmark/TableBenchmark.java b/paimon-benchmark/paimon-micro-benchmarks/src/test/java/org/apache/paimon/benchmark/TableBenchmark.java index d91d7696a..701916f71 100644 --- a/paimon-benchmark/paimon-micro-benchmarks/src/test/java/org/apache/paimon/benchmark/TableBenchmark.java +++ b/paimon-benchmark/paimon-micro-benchmarks/src/test/java/org/apache/paimon/benchmark/TableBenchmark.java @@ -18,7 +18,7 @@ package org.apache.paimon.benchmark; -import org.apache.flink.table.store.CoreOptions; +import org.apache.paimon.CoreOptions; import org.apache.flink.table.store.catalog.CatalogContext; import org.apache.paimon.file.catalog.Catalog; import org.apache.paimon.file.catalog.CatalogFactory; diff --git a/paimon-benchmark/paimon-micro-benchmarks/src/test/java/org/apache/paimon/benchmark/TableWriterBenchmark.java b/paimon-benchmark/paimon-micro-benchmarks/src/test/java/org/apache/paimon/benchmark/TableWriterBenchmark.java index 1419cc368..0d1f83c5b 100644 --- a/paimon-benchmark/paimon-micro-benchmarks/src/test/java/org/apache/paimon/benchmark/TableWriterBenchmark.java +++ b/paimon-benchmark/paimon-micro-benchmarks/src/test/java/org/apache/paimon/benchmark/TableWriterBenchmark.java @@ -18,7 +18,7 @@ package org.apache.paimon.benchmark; -import org.apache.flink.table.store.CoreOptions; +import org.apache.paimon.CoreOptions; import org.apache.paimon.options.Options; import org.apache.paimon.table.sink.CommitMessage; import org.apache.paimon.table.sink.StreamTableCommit; diff --git a/paimon-flink/paimon-flink-1.14/src/test/java/org/apache/paimon/connector/BatchFileStoreITCase.java b/paimon-flink/paimon-flink-1.14/src/test/java/org/apache/paimon/connector/BatchFileStoreITCase.java index d17d68dc5..84b65f3f1 100644 --- a/paimon-flink/paimon-flink-1.14/src/test/java/org/apache/paimon/connector/BatchFileStoreITCase.java +++ b/paimon-flink/paimon-flink-1.14/src/test/java/org/apache/paimon/connector/BatchFileStoreITCase.java @@ -18,7 +18,7 @@ package org.apache.paimon.connector; -import org.apache.flink.table.store.CoreOptions; +import org.apache.paimon.CoreOptions; import org.apache.flink.types.Row; import org.junit.Test; diff --git a/paimon-flink/paimon-flink-1.15/src/test/java/org/apache/paimon/connector/BatchFileStoreITCase.java b/paimon-flink/paimon-flink-1.15/src/test/java/org/apache/paimon/connector/BatchFileStoreITCase.java index d17d68dc5..84b65f3f1 100644 --- a/paimon-flink/paimon-flink-1.15/src/test/java/org/apache/paimon/connector/BatchFileStoreITCase.java +++ b/paimon-flink/paimon-flink-1.15/src/test/java/org/apache/paimon/connector/BatchFileStoreITCase.java @@ -18,7 +18,7 @@ package org.apache.paimon.connector; -import org.apache.flink.table.store.CoreOptions; +import org.apache.paimon.CoreOptions; import org.apache.flink.types.Row; import org.junit.Test; diff --git a/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/connector/AbstractTableStoreFactory.java b/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/connector/AbstractTableStoreFactory.java index e716086b5..15210d807 100644 --- a/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/connector/AbstractTableStoreFactory.java +++ b/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/connector/AbstractTableStoreFactory.java @@ -28,8 +28,8 @@ import org.apache.flink.table.connector.source.DynamicTableSource; import org.apache.flink.table.factories.DynamicTableFactory; import org.apache.flink.table.factories.DynamicTableSinkFactory; import org.apache.flink.table.factories.DynamicTableSourceFactory; -import org.apache.flink.table.store.CoreOptions.LogChangelogMode; -import org.apache.flink.table.store.CoreOptions.LogConsistency; +import org.apache.paimon.CoreOptions.LogChangelogMode; +import org.apache.paimon.CoreOptions.LogConsistency; import org.apache.flink.table.store.catalog.CatalogContext; import org.apache.paimon.file.schema.Schema; import org.apache.paimon.file.schema.TableSchema; @@ -52,8 +52,8 @@ import java.util.Map; import java.util.Optional; import java.util.Set; -import static org.apache.flink.table.store.CoreOptions.LOG_CHANGELOG_MODE; -import static org.apache.flink.table.store.CoreOptions.LOG_CONSISTENCY; +import static org.apache.paimon.CoreOptions.LOG_CHANGELOG_MODE; +import static org.apache.paimon.CoreOptions.LOG_CONSISTENCY; import static org.apache.paimon.connector.FlinkConnectorOptions.LOG_SYSTEM; import static org.apache.paimon.connector.FlinkConnectorOptions.NONE; import static org.apache.paimon.connector.LogicalTypeConversion.toLogicalType; diff --git a/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/connector/FlinkCatalog.java b/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/connector/FlinkCatalog.java index 999a10f1e..3c9291962 100644 --- a/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/connector/FlinkCatalog.java +++ b/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/connector/FlinkCatalog.java @@ -62,7 +62,7 @@ import java.util.Optional; import static org.apache.flink.table.descriptors.Schema.SCHEMA; import static org.apache.flink.table.factories.FactoryUtil.CONNECTOR; -import static org.apache.flink.table.store.CoreOptions.PATH; +import static org.apache.paimon.CoreOptions.PATH; import static org.apache.flink.table.types.utils.TypeConversions.fromLogicalToDataType; import static org.apache.paimon.connector.LogicalTypeConversion.toDataType; import static org.apache.paimon.connector.LogicalTypeConversion.toLogicalType; diff --git a/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/connector/FlinkConnectorOptions.java b/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/connector/FlinkConnectorOptions.java index 66d34b21b..bc1b75a44 100644 --- a/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/connector/FlinkConnectorOptions.java +++ b/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/connector/FlinkConnectorOptions.java @@ -18,7 +18,7 @@ package org.apache.paimon.connector; -import org.apache.flink.table.store.CoreOptions; +import org.apache.paimon.CoreOptions; import org.apache.paimon.options.ConfigOption; import org.apache.paimon.options.ConfigOptions; import org.apache.paimon.options.description.Description; diff --git a/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/connector/TableStoreConnectorFactory.java b/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/connector/TableStoreConnectorFactory.java index 03ba38824..d81706c4f 100644 --- a/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/connector/TableStoreConnectorFactory.java +++ b/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/connector/TableStoreConnectorFactory.java @@ -23,7 +23,7 @@ import org.apache.flink.table.connector.sink.DynamicTableSink; import org.apache.flink.table.connector.source.DynamicTableSource; import org.apache.flink.table.factories.DynamicTableFactory; import org.apache.flink.table.factories.FactoryUtil; -import org.apache.flink.table.store.CoreOptions; +import org.apache.paimon.CoreOptions; import org.apache.paimon.file.catalog.CatalogLock; import org.apache.paimon.file.schema.SchemaManager; import org.apache.flink.table.store.fs.FileIO; @@ -34,7 +34,7 @@ import org.apache.paimon.connector.sink.TableStoreSink; import javax.annotation.Nullable; -import static org.apache.flink.table.store.CoreOptions.AUTO_CREATE; +import static org.apache.paimon.CoreOptions.AUTO_CREATE; import static org.apache.paimon.connector.FlinkCatalogFactory.IDENTIFIER; /** A table store {@link DynamicTableFactory} to create source and sink. */ diff --git a/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/connector/action/CompactAction.java b/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/connector/action/CompactAction.java index 72764f3a2..86dd7f30d 100644 --- a/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/connector/action/CompactAction.java +++ b/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/connector/action/CompactAction.java @@ -26,7 +26,7 @@ import org.apache.flink.configuration.ReadableConfig; import org.apache.flink.streaming.api.datastream.DataStreamSource; import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment; import org.apache.flink.table.data.RowData; -import org.apache.flink.table.store.CoreOptions; +import org.apache.paimon.CoreOptions; import org.apache.paimon.options.Options; import org.apache.paimon.table.FileStoreTable; diff --git a/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/connector/kafka/KafkaLogSerializationSchema.java b/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/connector/kafka/KafkaLogSerializationSchema.java index 26d1c332e..9571771d7 100644 --- a/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/connector/kafka/KafkaLogSerializationSchema.java +++ b/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/connector/kafka/KafkaLogSerializationSchema.java @@ -22,7 +22,7 @@ import org.apache.flink.api.common.serialization.SerializationSchema; import org.apache.flink.connector.kafka.sink.KafkaRecordSerializationSchema; import org.apache.flink.streaming.connectors.kafka.KafkaSerializationSchema; import org.apache.flink.table.data.RowData; -import org.apache.flink.table.store.CoreOptions.LogChangelogMode; +import org.apache.paimon.CoreOptions.LogChangelogMode; import org.apache.paimon.table.sink.SinkRecord; import org.apache.paimon.types.RowKind; diff --git a/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/connector/kafka/KafkaLogSinkProvider.java b/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/connector/kafka/KafkaLogSinkProvider.java index 21c1b6e9f..bfd922219 100644 --- a/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/connector/kafka/KafkaLogSinkProvider.java +++ b/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/connector/kafka/KafkaLogSinkProvider.java @@ -21,8 +21,8 @@ package org.apache.paimon.connector.kafka; import org.apache.flink.api.common.serialization.SerializationSchema; import org.apache.flink.streaming.connectors.kafka.FlinkKafkaProducer.Semantic; import org.apache.flink.table.data.RowData; -import org.apache.flink.table.store.CoreOptions.LogChangelogMode; -import org.apache.flink.table.store.CoreOptions.LogConsistency; +import org.apache.paimon.CoreOptions.LogChangelogMode; +import org.apache.paimon.CoreOptions.LogConsistency; import org.apache.paimon.annotation.VisibleForTesting; import org.apache.paimon.connector.log.LogSinkProvider; diff --git a/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/connector/kafka/KafkaLogSourceProvider.java b/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/connector/kafka/KafkaLogSourceProvider.java index 1854dd105..d76d5c463 100644 --- a/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/connector/kafka/KafkaLogSourceProvider.java +++ b/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/connector/kafka/KafkaLogSourceProvider.java @@ -23,8 +23,8 @@ import org.apache.flink.connector.kafka.source.KafkaSource; import org.apache.flink.connector.kafka.source.enumerator.initializer.OffsetsInitializer; import org.apache.flink.connector.kafka.source.reader.deserializer.KafkaRecordDeserializationSchema; import org.apache.flink.table.data.RowData; -import org.apache.flink.table.store.CoreOptions.LogConsistency; -import org.apache.flink.table.store.CoreOptions.StartupMode; +import org.apache.paimon.CoreOptions.LogConsistency; +import org.apache.paimon.CoreOptions.StartupMode; import org.apache.flink.table.types.DataType; import org.apache.kafka.common.TopicPartition; diff --git a/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/connector/kafka/KafkaLogStoreFactory.java b/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/connector/kafka/KafkaLogStoreFactory.java index 470a62798..4dca24a2f 100644 --- a/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/connector/kafka/KafkaLogStoreFactory.java +++ b/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/connector/kafka/KafkaLogStoreFactory.java @@ -29,7 +29,7 @@ import org.apache.flink.table.connector.sink.DynamicTableSink; import org.apache.flink.table.connector.source.DynamicTableSource; import org.apache.flink.table.data.RowData; import org.apache.flink.table.factories.FactoryUtil; -import org.apache.flink.table.store.CoreOptions; +import org.apache.paimon.CoreOptions; import org.apache.paimon.options.Options; import org.apache.flink.table.types.DataType; import org.apache.flink.table.types.utils.DataTypeUtils; @@ -45,10 +45,10 @@ import java.util.Properties; import java.util.Set; import static org.apache.flink.table.factories.FactoryUtil.createTableFactoryHelper; -import static org.apache.flink.table.store.CoreOptions.LOG_CHANGELOG_MODE; -import static org.apache.flink.table.store.CoreOptions.LOG_CONSISTENCY; -import static org.apache.flink.table.store.CoreOptions.LogConsistency; -import static org.apache.flink.table.store.CoreOptions.SCAN_TIMESTAMP_MILLIS; +import static org.apache.paimon.CoreOptions.LOG_CHANGELOG_MODE; +import static org.apache.paimon.CoreOptions.LOG_CONSISTENCY; +import static org.apache.paimon.CoreOptions.LogConsistency; +import static org.apache.paimon.CoreOptions.SCAN_TIMESTAMP_MILLIS; import static org.apache.kafka.clients.consumer.ConsumerConfig.ISOLATION_LEVEL_CONFIG; import static org.apache.paimon.connector.kafka.KafkaLogOptions.TOPIC; diff --git a/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/connector/log/LogStoreTableFactory.java b/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/connector/log/LogStoreTableFactory.java index 4dd8529f4..e24dbbe49 100644 --- a/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/connector/log/LogStoreTableFactory.java +++ b/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/connector/log/LogStoreTableFactory.java @@ -40,8 +40,8 @@ import org.apache.flink.types.RowKind; import javax.annotation.Nullable; -import static org.apache.flink.table.store.CoreOptions.LOG_FORMAT; -import static org.apache.flink.table.store.CoreOptions.LOG_KEY_FORMAT; +import static org.apache.paimon.CoreOptions.LOG_FORMAT; +import static org.apache.paimon.CoreOptions.LOG_KEY_FORMAT; /** * Base interface for configuring a default log table connector. The log table is used by managed diff --git a/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/connector/lookup/FileStoreLookupFunction.java b/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/connector/lookup/FileStoreLookupFunction.java index da63f9bc4..5a64280f2 100644 --- a/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/connector/lookup/FileStoreLookupFunction.java +++ b/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/connector/lookup/FileStoreLookupFunction.java @@ -22,7 +22,7 @@ import org.apache.flink.streaming.api.operators.StreamingRuntimeContext; import org.apache.flink.table.data.RowData; import org.apache.flink.table.functions.FunctionContext; import org.apache.flink.table.functions.TableFunction; -import org.apache.flink.table.store.CoreOptions; +import org.apache.paimon.CoreOptions; import org.apache.paimon.file.predicate.Predicate; import org.apache.paimon.file.predicate.PredicateFilter; import org.apache.paimon.file.schema.TableSchema; diff --git a/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/connector/sink/FullChangelogStoreSinkWrite.java b/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/connector/sink/FullChangelogStoreSinkWrite.java index c70f42073..4877f1294 100644 --- a/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/connector/sink/FullChangelogStoreSinkWrite.java +++ b/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/connector/sink/FullChangelogStoreSinkWrite.java @@ -29,7 +29,7 @@ import org.apache.flink.api.java.typeutils.runtime.TupleSerializer; import org.apache.flink.runtime.io.disk.iomanager.IOManager; import org.apache.flink.runtime.state.StateInitializationContext; import org.apache.flink.runtime.state.StateSnapshotContext; -import org.apache.flink.table.store.CoreOptions; +import org.apache.paimon.CoreOptions; import org.apache.flink.table.store.file.Snapshot; import org.apache.flink.table.store.file.utils.SnapshotManager; import org.apache.paimon.table.FileStoreTable; diff --git a/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/connector/sink/LookupChangelogStoreSinkWrite.java b/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/connector/sink/LookupChangelogStoreSinkWrite.java index 6a57b2763..390697623 100644 --- a/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/connector/sink/LookupChangelogStoreSinkWrite.java +++ b/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/connector/sink/LookupChangelogStoreSinkWrite.java @@ -20,7 +20,7 @@ package org.apache.paimon.connector.sink; import org.apache.flink.runtime.io.disk.iomanager.IOManager; import org.apache.flink.runtime.state.StateInitializationContext; -import org.apache.flink.table.store.CoreOptions; +import org.apache.paimon.CoreOptions; import org.apache.paimon.table.FileStoreTable; import java.io.IOException; diff --git a/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/connector/sink/StoreCompactOperator.java b/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/connector/sink/StoreCompactOperator.java index ec91e7625..ab85c6f13 100644 --- a/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/connector/sink/StoreCompactOperator.java +++ b/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/connector/sink/StoreCompactOperator.java @@ -21,7 +21,7 @@ package org.apache.paimon.connector.sink; import org.apache.flink.runtime.state.StateInitializationContext; import org.apache.flink.streaming.runtime.streamrecord.StreamRecord; import org.apache.flink.table.data.RowData; -import org.apache.flink.table.store.CoreOptions; +import org.apache.paimon.CoreOptions; import org.apache.flink.table.store.file.io.DataFileMeta; import org.apache.flink.table.store.file.io.DataFileMetaSerializer; import org.apache.flink.table.store.file.utils.OffsetRow; diff --git a/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/connector/sink/TableStoreSink.java b/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/connector/sink/TableStoreSink.java index f433a26b7..b44869324 100644 --- a/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/connector/sink/TableStoreSink.java +++ b/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/connector/sink/TableStoreSink.java @@ -25,9 +25,9 @@ import org.apache.flink.table.connector.sink.DynamicTableSink; import org.apache.flink.table.connector.sink.abilities.SupportsOverwrite; import org.apache.flink.table.connector.sink.abilities.SupportsPartitioning; import org.apache.flink.table.factories.DynamicTableFactory; -import org.apache.flink.table.store.CoreOptions.ChangelogProducer; -import org.apache.flink.table.store.CoreOptions.LogChangelogMode; -import org.apache.flink.table.store.CoreOptions.MergeEngine; +import org.apache.paimon.CoreOptions.ChangelogProducer; +import org.apache.paimon.CoreOptions.LogChangelogMode; +import org.apache.paimon.CoreOptions.MergeEngine; import org.apache.flink.table.store.file.catalog.CatalogLock; import org.apache.flink.table.store.file.operation.Lock; import org.apache.paimon.options.Options; @@ -48,9 +48,9 @@ import javax.annotation.Nullable; import java.util.HashMap; import java.util.Map; -import static org.apache.flink.table.store.CoreOptions.CHANGELOG_PRODUCER; -import static org.apache.flink.table.store.CoreOptions.LOG_CHANGELOG_MODE; -import static org.apache.flink.table.store.CoreOptions.MERGE_ENGINE; +import static org.apache.paimon.CoreOptions.CHANGELOG_PRODUCER; +import static org.apache.paimon.CoreOptions.LOG_CHANGELOG_MODE; +import static org.apache.paimon.CoreOptions.MERGE_ENGINE; /** Table sink to create sink. */ public class TableStoreSink implements DynamicTableSink, SupportsOverwrite, SupportsPartitioning { diff --git a/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/connector/source/FlinkSourceBuilder.java b/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/connector/source/FlinkSourceBuilder.java index 8b51d532b..450c48aca 100644 --- a/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/connector/source/FlinkSourceBuilder.java +++ b/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/connector/source/FlinkSourceBuilder.java @@ -27,8 +27,8 @@ import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment; import org.apache.flink.table.catalog.ObjectIdentifier; import org.apache.flink.table.data.RowData; import org.apache.flink.table.runtime.typeutils.InternalTypeInfo; -import org.apache.flink.table.store.CoreOptions; -import org.apache.flink.table.store.CoreOptions.StartupMode; +import org.apache.paimon.CoreOptions; +import org.apache.paimon.CoreOptions.StartupMode; import org.apache.paimon.file.predicate.Predicate; import org.apache.paimon.options.Options; import org.apache.paimon.table.FileStoreTable; diff --git a/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/connector/source/TableStoreSource.java b/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/connector/source/TableStoreSource.java index a234808fd..fcc9557dd 100644 --- a/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/connector/source/TableStoreSource.java +++ b/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/connector/source/TableStoreSource.java @@ -26,9 +26,9 @@ import org.apache.flink.table.connector.source.LookupTableSource; import org.apache.flink.table.connector.source.abilities.SupportsWatermarkPushDown; import org.apache.flink.table.data.RowData; import org.apache.flink.table.factories.DynamicTableFactory; -import org.apache.flink.table.store.CoreOptions.ChangelogProducer; -import org.apache.flink.table.store.CoreOptions.LogChangelogMode; -import org.apache.flink.table.store.CoreOptions.LogConsistency; +import org.apache.paimon.CoreOptions.ChangelogProducer; +import org.apache.paimon.CoreOptions.LogChangelogMode; +import org.apache.paimon.CoreOptions.LogConsistency; import org.apache.paimon.file.predicate.Predicate; import org.apache.paimon.options.Options; import org.apache.paimon.table.AppendOnlyFileStoreTable; @@ -48,10 +48,10 @@ import javax.annotation.Nullable; import java.util.stream.IntStream; -import static org.apache.flink.table.store.CoreOptions.CHANGELOG_PRODUCER; -import static org.apache.flink.table.store.CoreOptions.LOG_CHANGELOG_MODE; -import static org.apache.flink.table.store.CoreOptions.LOG_CONSISTENCY; -import static org.apache.flink.table.store.CoreOptions.LOG_SCAN_REMOVE_NORMALIZE; +import static org.apache.paimon.CoreOptions.CHANGELOG_PRODUCER; +import static org.apache.paimon.CoreOptions.LOG_CHANGELOG_MODE; +import static org.apache.paimon.CoreOptions.LOG_CONSISTENCY; +import static org.apache.paimon.CoreOptions.LOG_SCAN_REMOVE_NORMALIZE; /** * Table source to create {@link StaticFileStoreSource} or {@link ContinuousFileStoreSource} under diff --git a/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/connector/BatchFileStoreITCase.java b/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/connector/BatchFileStoreITCase.java index 6d6bd1766..eb6f367da 100644 --- a/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/connector/BatchFileStoreITCase.java +++ b/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/connector/BatchFileStoreITCase.java @@ -18,7 +18,7 @@ package org.apache.paimon.connector; -import org.apache.flink.table.store.CoreOptions; +import org.apache.paimon.CoreOptions; import org.apache.flink.types.Row; import org.junit.jupiter.api.Test; diff --git a/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/connector/ChangelogModeTest.java b/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/connector/ChangelogModeTest.java index 13dd540d3..7d9dc3856 100644 --- a/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/connector/ChangelogModeTest.java +++ b/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/connector/ChangelogModeTest.java @@ -20,7 +20,7 @@ package org.apache.paimon.connector; import org.apache.flink.table.catalog.ObjectIdentifier; import org.apache.flink.table.connector.ChangelogMode; -import org.apache.flink.table.store.CoreOptions; +import org.apache.paimon.CoreOptions; import org.apache.flink.table.store.file.schema.Schema; import org.apache.flink.table.store.file.schema.SchemaManager; import org.apache.flink.table.store.fs.Path; diff --git a/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/connector/FileStoreITCase.java b/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/connector/FileStoreITCase.java index 614b10607..7e871e581 100644 --- a/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/connector/FileStoreITCase.java +++ b/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/connector/FileStoreITCase.java @@ -32,7 +32,7 @@ import org.apache.flink.table.data.conversion.DataStructureConverter; import org.apache.flink.table.data.conversion.DataStructureConverters; import org.apache.flink.table.runtime.typeutils.InternalSerializers; import org.apache.flink.table.runtime.typeutils.InternalTypeInfo; -import org.apache.flink.table.store.CoreOptions; +import org.apache.paimon.CoreOptions; import org.apache.flink.table.store.file.schema.Schema; import org.apache.flink.table.store.file.schema.SchemaManager; import org.apache.flink.table.store.file.utils.BlockingIterator; @@ -73,9 +73,9 @@ import java.util.concurrent.ThreadLocalRandom; import java.util.stream.Collectors; import java.util.stream.Stream; -import static org.apache.flink.table.store.CoreOptions.BUCKET; -import static org.apache.flink.table.store.CoreOptions.FILE_FORMAT; -import static org.apache.flink.table.store.CoreOptions.PATH; +import static org.apache.paimon.CoreOptions.BUCKET; +import static org.apache.paimon.CoreOptions.FILE_FORMAT; +import static org.apache.paimon.CoreOptions.PATH; import static org.apache.flink.table.store.file.utils.FailingFileIO.retryArtificialException; import static org.apache.paimon.connector.LogicalTypeConversion.toDataType; import static org.assertj.core.api.Assertions.assertThat; diff --git a/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/connector/ForceCompactionITCase.java b/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/connector/ForceCompactionITCase.java index 044dd3c8a..335474950 100644 --- a/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/connector/ForceCompactionITCase.java +++ b/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/connector/ForceCompactionITCase.java @@ -18,7 +18,7 @@ package org.apache.paimon.connector; -import org.apache.flink.table.store.CoreOptions; +import org.apache.paimon.CoreOptions; import org.apache.flink.table.store.file.Snapshot; import org.apache.flink.table.store.file.manifest.ManifestFileMeta; import org.apache.flink.table.store.file.manifest.ManifestList; diff --git a/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/connector/ReadWriteTableITCase.java b/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/connector/ReadWriteTableITCase.java index d580e3144..9f7fd0d4c 100644 --- a/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/connector/ReadWriteTableITCase.java +++ b/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/connector/ReadWriteTableITCase.java @@ -33,7 +33,7 @@ import org.apache.flink.table.data.RowData; import org.apache.flink.table.factories.DynamicTableFactory; import org.apache.flink.table.factories.FactoryUtil; import org.apache.flink.table.runtime.connector.sink.SinkRuntimeProviderContext; -import org.apache.flink.table.store.CoreOptions; +import org.apache.paimon.CoreOptions; import org.apache.flink.table.store.file.schema.SchemaManager; import org.apache.flink.table.store.file.utils.BlockingIterator; import org.apache.flink.table.store.fs.Path; diff --git a/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/connector/RescaleBucketITCase.java b/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/connector/RescaleBucketITCase.java index 4f4e315b8..bed1a7fc6 100644 --- a/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/connector/RescaleBucketITCase.java +++ b/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/connector/RescaleBucketITCase.java @@ -36,7 +36,7 @@ import java.util.Arrays; import java.util.List; import java.util.concurrent.ExecutionException; -import static org.apache.flink.table.store.CoreOptions.BUCKET; +import static org.apache.paimon.CoreOptions.BUCKET; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; diff --git a/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/connector/StreamingReadWriteTableWithKafkaLogITCase.java b/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/connector/StreamingReadWriteTableWithKafkaLogITCase.java index 9b09442d0..324c1a677 100644 --- a/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/connector/StreamingReadWriteTableWithKafkaLogITCase.java +++ b/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/connector/StreamingReadWriteTableWithKafkaLogITCase.java @@ -18,7 +18,7 @@ package org.apache.paimon.connector; -import org.apache.flink.table.store.CoreOptions; +import org.apache.paimon.CoreOptions; import org.apache.flink.table.store.file.utils.BlockingIterator; import org.apache.flink.types.Row; @@ -34,8 +34,8 @@ import java.util.List; import java.util.Map; import static org.apache.flink.table.planner.factories.TestValuesTableFactory.changelogRow; -import static org.apache.flink.table.store.CoreOptions.SCAN_MODE; -import static org.apache.flink.table.store.CoreOptions.SCAN_TIMESTAMP_MILLIS; +import static org.apache.paimon.CoreOptions.SCAN_MODE; +import static org.apache.paimon.CoreOptions.SCAN_TIMESTAMP_MILLIS; import static org.apache.paimon.connector.util.ReadWriteTableTestUtil.SCAN_LATEST; import static org.apache.paimon.connector.util.ReadWriteTableTestUtil.assertNoMoreRecords; import static org.apache.paimon.connector.util.ReadWriteTableTestUtil.buildQuery; diff --git a/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/connector/action/CompactActionITCase.java b/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/connector/action/CompactActionITCase.java index fbd028c58..b3a8e27ea 100644 --- a/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/connector/action/CompactActionITCase.java +++ b/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/connector/action/CompactActionITCase.java @@ -22,7 +22,7 @@ import org.apache.flink.api.common.RuntimeExecutionMode; import org.apache.flink.core.execution.JobClient; import org.apache.flink.streaming.api.CheckpointingMode; import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment; -import org.apache.flink.table.store.CoreOptions; +import org.apache.paimon.CoreOptions; import org.apache.flink.table.store.file.Snapshot; import org.apache.paimon.table.FileStoreTable; import org.apache.paimon.table.source.DataSplit; diff --git a/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/connector/action/MergeIntoActionITCase.java b/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/connector/action/MergeIntoActionITCase.java index 4f448329e..e4bb583be 100644 --- a/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/connector/action/MergeIntoActionITCase.java +++ b/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/connector/action/MergeIntoActionITCase.java @@ -19,7 +19,7 @@ package org.apache.paimon.connector.action; import org.apache.flink.table.planner.factories.TestValuesTableFactory; -import org.apache.flink.table.store.CoreOptions; +import org.apache.paimon.CoreOptions; import org.apache.flink.table.store.file.utils.BlockingIterator; import org.apache.flink.types.Row; @@ -35,7 +35,7 @@ import java.util.HashMap; import java.util.List; import static org.apache.flink.table.planner.factories.TestValuesTableFactory.changelogRow; -import static org.apache.flink.table.store.CoreOptions.CHANGELOG_PRODUCER; +import static org.apache.paimon.CoreOptions.CHANGELOG_PRODUCER; import static org.apache.paimon.connector.util.ReadWriteTableTestUtil.buildDdl; import static org.apache.paimon.connector.util.ReadWriteTableTestUtil.buildSimpleQuery; import static org.apache.paimon.connector.util.ReadWriteTableTestUtil.createTable; diff --git a/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/connector/kafka/KafkaLogSerializationTest.java b/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/connector/kafka/KafkaLogSerializationTest.java index 3ecb9db4a..0ab64d246 100644 --- a/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/connector/kafka/KafkaLogSerializationTest.java +++ b/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/connector/kafka/KafkaLogSerializationTest.java @@ -21,7 +21,7 @@ package org.apache.paimon.connector.kafka; import org.apache.flink.connector.kafka.source.reader.deserializer.KafkaRecordDeserializationSchema; import org.apache.flink.table.data.RowData; import org.apache.flink.table.factories.DynamicTableFactory; -import org.apache.flink.table.store.CoreOptions.LogChangelogMode; +import org.apache.paimon.CoreOptions.LogChangelogMode; import org.apache.paimon.table.sink.SinkRecord; import org.apache.paimon.types.RowKind; import org.apache.flink.util.Collector; diff --git a/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/connector/kafka/KafkaLogTestUtils.java b/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/connector/kafka/KafkaLogTestUtils.java index c89e98e45..e73b5bf98 100644 --- a/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/connector/kafka/KafkaLogTestUtils.java +++ b/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/connector/kafka/KafkaLogTestUtils.java @@ -34,8 +34,8 @@ import org.apache.flink.table.factories.FactoryUtil; import org.apache.flink.table.runtime.connector.sink.SinkRuntimeProviderContext; import org.apache.flink.table.runtime.connector.source.ScanRuntimeProviderContext; import org.apache.flink.table.runtime.typeutils.InternalTypeInfo; -import org.apache.flink.table.store.CoreOptions.LogChangelogMode; -import org.apache.flink.table.store.CoreOptions.LogConsistency; +import org.apache.paimon.CoreOptions.LogChangelogMode; +import org.apache.paimon.CoreOptions.LogConsistency; import org.apache.paimon.table.sink.SinkRecord; import org.apache.paimon.types.RowKind; import org.apache.flink.table.types.DataType; @@ -56,8 +56,8 @@ import java.util.UUID; import java.util.stream.Collectors; import java.util.stream.IntStream; -import static org.apache.flink.table.store.CoreOptions.LOG_CHANGELOG_MODE; -import static org.apache.flink.table.store.CoreOptions.LOG_CONSISTENCY; +import static org.apache.paimon.CoreOptions.LOG_CHANGELOG_MODE; +import static org.apache.paimon.CoreOptions.LOG_CONSISTENCY; import static org.apache.flink.table.store.file.mergetree.compact.MergeTreeCompactManagerTest.row; import static org.apache.paimon.connector.kafka.KafkaLogOptions.BOOTSTRAP_SERVERS; import static org.apache.paimon.connector.kafka.KafkaLogOptions.TOPIC; diff --git a/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/connector/sink/CommitterOperatorTestBase.java b/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/connector/sink/CommitterOperatorTestBase.java index 931da1721..7578a186c 100644 --- a/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/connector/sink/CommitterOperatorTestBase.java +++ b/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/connector/sink/CommitterOperatorTestBase.java @@ -18,7 +18,7 @@ package org.apache.paimon.connector.sink; -import org.apache.flink.table.store.CoreOptions; +import org.apache.paimon.CoreOptions; import org.apache.flink.table.store.file.schema.Schema; import org.apache.flink.table.store.file.schema.SchemaManager; import org.apache.flink.table.store.fs.Path; diff --git a/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/connector/source/TestChangelogDataReadWrite.java b/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/connector/source/TestChangelogDataReadWrite.java index 743877c2e..bb7b24083 100644 --- a/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/connector/source/TestChangelogDataReadWrite.java +++ b/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/connector/source/TestChangelogDataReadWrite.java @@ -19,7 +19,7 @@ package org.apache.paimon.connector.source; import org.apache.flink.api.java.tuple.Tuple2; -import org.apache.flink.table.store.CoreOptions; +import org.apache.paimon.CoreOptions; import org.apache.flink.table.store.file.KeyValue; import org.apache.flink.table.store.file.io.DataFileMeta; import org.apache.flink.table.store.file.memory.HeapMemorySegmentPool; diff --git a/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/connector/util/ReadWriteTableTestUtil.java b/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/connector/util/ReadWriteTableTestUtil.java index a392c729b..15b091a9c 100644 --- a/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/connector/util/ReadWriteTableTestUtil.java +++ b/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/connector/util/ReadWriteTableTestUtil.java @@ -25,7 +25,7 @@ import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment; import org.apache.flink.table.api.EnvironmentSettings; import org.apache.flink.table.api.TableEnvironment; import org.apache.flink.table.api.bridge.java.StreamTableEnvironment; -import org.apache.flink.table.store.CoreOptions; +import org.apache.paimon.CoreOptions; import org.apache.flink.table.store.file.utils.BlockingIterator; import org.apache.flink.types.Row; import org.apache.flink.util.CloseableIterator; @@ -46,7 +46,7 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; import static org.apache.flink.table.planner.factories.TestValuesTableFactory.registerData; -import static org.apache.flink.table.store.CoreOptions.SCAN_MODE; +import static org.apache.paimon.CoreOptions.SCAN_MODE; import static org.apache.paimon.connector.FlinkConnectorOptions.LOG_SYSTEM; import static org.apache.paimon.connector.kafka.KafkaLogOptions.BOOTSTRAP_SERVERS; import static org.apache.paimon.connector.kafka.KafkaLogOptions.TOPIC; diff --git a/paimon-hive/paimon-hive-connector-common/src/main/java/org/apache/paimon/hive/HiveSchema.java b/paimon-hive/paimon-hive-connector-common/src/main/java/org/apache/paimon/hive/HiveSchema.java index 5b8a7fa43..7d99b3118 100644 --- a/paimon-hive/paimon-hive-connector-common/src/main/java/org/apache/paimon/hive/HiveSchema.java +++ b/paimon-hive/paimon-hive-connector-common/src/main/java/org/apache/paimon/hive/HiveSchema.java @@ -18,7 +18,7 @@ package org.apache.paimon.hive; -import org.apache.flink.table.store.CoreOptions; +import org.apache.paimon.CoreOptions; import org.apache.flink.table.store.catalog.CatalogContext; import org.apache.flink.table.store.file.schema.TableSchema; import org.apache.flink.table.store.fs.Path; diff --git a/paimon-hive/paimon-hive-connector-common/src/main/java/org/apache/paimon/hive/mapred/TableStoreInputFormat.java b/paimon-hive/paimon-hive-connector-common/src/main/java/org/apache/paimon/hive/mapred/TableStoreInputFormat.java index 7fddfb58d..a504a7088 100644 --- a/paimon-hive/paimon-hive-connector-common/src/main/java/org/apache/paimon/hive/mapred/TableStoreInputFormat.java +++ b/paimon-hive/paimon-hive-connector-common/src/main/java/org/apache/paimon/hive/mapred/TableStoreInputFormat.java @@ -18,7 +18,7 @@ package org.apache.paimon.hive.mapred; -import org.apache.flink.table.store.CoreOptions; +import org.apache.paimon.CoreOptions; import org.apache.flink.table.store.catalog.CatalogContext; import org.apache.paimon.file.predicate.Predicate; import org.apache.flink.table.store.file.schema.TableSchema; diff --git a/paimon-hive/paimon-hive-connector-common/src/test/java/org/apache/paimon/hive/FileStoreTestUtils.java b/paimon-hive/paimon-hive-connector-common/src/test/java/org/apache/paimon/hive/FileStoreTestUtils.java index 4fb5ecb7d..ec4c6d3c6 100644 --- a/paimon-hive/paimon-hive-connector-common/src/test/java/org/apache/paimon/hive/FileStoreTestUtils.java +++ b/paimon-hive/paimon-hive-connector-common/src/test/java/org/apache/paimon/hive/FileStoreTestUtils.java @@ -18,7 +18,7 @@ package org.apache.paimon.hive; -import org.apache.flink.table.store.CoreOptions; +import org.apache.paimon.CoreOptions; import org.apache.flink.table.store.file.schema.Schema; import org.apache.flink.table.store.file.schema.SchemaManager; import org.apache.flink.table.store.fs.Path; @@ -30,7 +30,7 @@ import org.apache.paimon.types.RowType; import java.util.List; -import static org.apache.flink.table.store.CoreOptions.PATH; +import static org.apache.paimon.CoreOptions.PATH; /** Test utils related to {@link org.apache.flink.table.store.file.FileStore}. */ public class FileStoreTestUtils { diff --git a/paimon-hive/paimon-hive-connector-common/src/test/java/org/apache/paimon/hive/TableStoreHiveStorageHandlerITCase.java b/paimon-hive/paimon-hive-connector-common/src/test/java/org/apache/paimon/hive/TableStoreHiveStorageHandlerITCase.java index baa99aa5d..8e92ce1ae 100644 --- a/paimon-hive/paimon-hive-connector-common/src/test/java/org/apache/paimon/hive/TableStoreHiveStorageHandlerITCase.java +++ b/paimon-hive/paimon-hive-connector-common/src/test/java/org/apache/paimon/hive/TableStoreHiveStorageHandlerITCase.java @@ -19,7 +19,7 @@ package org.apache.paimon.hive; import org.apache.flink.connectors.hive.FlinkEmbeddedHiveRunner; -import org.apache.flink.table.store.CoreOptions; +import org.apache.paimon.CoreOptions; import org.apache.flink.table.store.file.WriteMode; import org.apache.paimon.options.Options; import org.apache.paimon.table.FileStoreTable; diff --git a/paimon-hive/paimon-hive-connector-common/src/test/java/org/apache/paimon/hive/mapred/TableStoreRecordReaderTest.java b/paimon-hive/paimon-hive-connector-common/src/test/java/org/apache/paimon/hive/mapred/TableStoreRecordReaderTest.java index f3a5113cc..87fdde222 100644 --- a/paimon-hive/paimon-hive-connector-common/src/test/java/org/apache/paimon/hive/mapred/TableStoreRecordReaderTest.java +++ b/paimon-hive/paimon-hive-connector-common/src/test/java/org/apache/paimon/hive/mapred/TableStoreRecordReaderTest.java @@ -18,7 +18,7 @@ package org.apache.paimon.hive.mapred; -import org.apache.flink.table.store.CoreOptions; +import org.apache.paimon.CoreOptions; import org.apache.paimon.options.Options; import org.apache.paimon.table.FileStoreTable; import org.apache.paimon.table.sink.StreamTableCommit; diff --git a/paimon-spark/paimon-spark-2/src/test/java/org/apache/paimon/spark/SimpleTableTestHelper.java b/paimon-spark/paimon-spark-2/src/test/java/org/apache/paimon/spark/SimpleTableTestHelper.java index d0308f4b1..54d07acf1 100644 --- a/paimon-spark/paimon-spark-2/src/test/java/org/apache/paimon/spark/SimpleTableTestHelper.java +++ b/paimon-spark/paimon-spark-2/src/test/java/org/apache/paimon/spark/SimpleTableTestHelper.java @@ -18,7 +18,7 @@ package org.apache.paimon.spark; -import org.apache.flink.table.store.CoreOptions; +import org.apache.paimon.CoreOptions; import org.apache.flink.table.store.file.schema.Schema; import org.apache.flink.table.store.file.schema.SchemaManager; import org.apache.flink.table.store.fs.Path;
