You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@paimon.apache.org by lz...@apache.org on 2023/03/18 04:42:51 UTC
[incubator-paimon] 10/32: [core] Rename paimon data, annotation and data
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 698cc35388497bcf67db32eb004e74965d957758
Author: JingsongLi <lz...@aliyun.com>
AuthorDate: Fri Mar 17 14:10:54 2023 +0800
[core] Rename paimon data, annotation and data
---
.../org/apache/flink/table/store/CoreOptions.java | 4 +--
.../flink/table/store/file/AbstractFileStore.java | 5 ++--
.../table/store/file/AppendOnlyFileStore.java | 2 +-
.../apache/flink/table/store/file/KeyValue.java | 7 +++---
.../flink/table/store/file/KeyValueFileStore.java | 2 +-
.../flink/table/store/file/KeyValueSerializer.java | 7 +++---
.../file/append/AppendOnlyCompactManager.java | 3 ++-
.../table/store/file/append/AppendOnlyWriter.java | 2 +-
.../table/store/file/casting/CastExecutors.java | 7 +++---
.../table/store/file/casting/CastFieldGetter.java | 2 +-
.../flink/table/store/file/casting/CastedRow.java | 13 +++++-----
.../table/store/file/catalog/AbstractCatalog.java | 3 ++-
.../flink/table/store/file/catalog/Catalog.java | 3 ++-
.../table/store/file/catalog/CatalogFactory.java | 3 ++-
.../table/store/file/catalog/CatalogLock.java | 2 +-
.../flink/table/store/file/catalog/Identifier.java | 3 ++-
.../table/store/file/disk/BufferFileReader.java | 3 ++-
.../table/store/file/disk/BufferFileWriter.java | 3 ++-
.../store/file/disk/ChannelReaderInputView.java | 3 ++-
.../file/disk/ChannelReaderInputViewIterator.java | 5 ++--
.../store/file/disk/ChannelWriterOutputView.java | 3 ++-
.../flink/table/store/file/disk/FileIOChannel.java | 3 ++-
.../flink/table/store/file/disk/IOManager.java | 3 ++-
.../store/file/io/AbstractFileRecordIterator.java | 3 ++-
.../flink/table/store/file/io/DataFileMeta.java | 7 +++---
.../store/file/io/DataFileMetaSerializer.java | 7 +++---
.../table/store/file/io/DataFilePathFactory.java | 3 ++-
.../file/io/KeyValueDataFileRecordReader.java | 2 +-
.../store/file/io/KeyValueDataFileWriter.java | 6 ++---
.../store/file/io/KeyValueFileReaderFactory.java | 2 +-
.../store/file/io/KeyValueFileWriterFactory.java | 4 +--
.../table/store/file/io/RollingFileWriter.java | 2 +-
.../store/file/io/RowDataFileRecordReader.java | 2 +-
.../table/store/file/io/RowDataFileWriter.java | 2 +-
.../store/file/io/RowDataRollingFileWriter.java | 2 +-
.../table/store/file/io/SingleFileWriter.java | 2 +-
.../file/io/StatsCollectingSingleFileWriter.java | 2 +-
.../manifest/ManifestCommittableSerializer.java | 3 ++-
.../table/store/file/manifest/ManifestEntry.java | 3 ++-
.../file/manifest/ManifestEntrySerializer.java | 5 ++--
.../table/store/file/manifest/ManifestFile.java | 2 +-
.../file/manifest/ManifestFileMetaSerializer.java | 7 +++---
.../flink/table/store/file/memory/Buffer.java | 3 ++-
.../table/store/file/memory/MemorySegmentPool.java | 3 ++-
.../flink/table/store/file/mergetree/Levels.java | 3 ++-
.../table/store/file/mergetree/LookupLevels.java | 9 +++----
.../store/file/mergetree/MergeTreeReaders.java | 3 ++-
.../store/file/mergetree/MergeTreeWriter.java | 5 ++--
.../file/mergetree/SortBufferWriteBuffer.java | 13 +++++-----
.../table/store/file/mergetree/SortedRun.java | 5 ++--
.../table/store/file/mergetree/WriteBuffer.java | 3 ++-
.../compact/ChangelogMergeTreeRewriter.java | 3 ++-
.../FullChangelogMergeTreeCompactRewriter.java | 3 ++-
.../file/mergetree/compact/IntervalPartition.java | 5 ++--
.../LookupChangelogMergeFunctionWrapper.java | 3 ++-
.../compact/LookupMergeTreeCompactRewriter.java | 3 ++-
.../mergetree/compact/MergeTreeCompactManager.java | 4 +--
.../compact/MergeTreeCompactRewriter.java | 3 ++-
.../mergetree/compact/MergeTreeCompactTask.java | 3 ++-
.../compact/PartialUpdateMergeFunction.java | 5 ++--
.../file/mergetree/compact/SortMergeReader.java | 3 ++-
.../mergetree/compact/UniversalCompaction.java | 2 +-
.../mergetree/compact/ValueCountMergeFunction.java | 5 ++--
.../compact/aggregate/AggregateMergeFunction.java | 5 ++--
.../compact/aggregate/FieldListaggAgg.java | 3 ++-
.../mergetree/compact/aggregate/FieldSumAgg.java | 3 ++-
.../file/operation/AbstractFileStoreScan.java | 3 ++-
.../file/operation/AbstractFileStoreWrite.java | 4 +--
.../file/operation/AppendOnlyFileStoreRead.java | 2 +-
.../file/operation/AppendOnlyFileStoreWrite.java | 4 +--
.../store/file/operation/FileStoreCommitImpl.java | 4 +--
.../store/file/operation/FileStoreExpireImpl.java | 2 +-
.../table/store/file/operation/FileStoreScan.java | 3 ++-
.../table/store/file/operation/FileStoreWrite.java | 3 ++-
.../file/operation/KeyValueFileStoreRead.java | 2 +-
.../file/operation/KeyValueFileStoreWrite.java | 4 +--
.../flink/table/store/file/operation/Lock.java | 3 ++-
.../store/file/operation/PartitionExpire.java | 5 ++--
.../table/store/file/predicate/BucketSelector.java | 9 ++++---
.../flink/table/store/file/schema/Schema.java | 3 ++-
.../table/store/file/schema/SchemaChange.java | 3 ++-
.../store/file/schema/SchemaEvolutionUtil.java | 3 ++-
.../table/store/file/schema/SchemaManager.java | 3 ++-
.../file/sort/AbstractBinaryExternalMerger.java | 2 +-
.../store/file/sort/BinaryExternalMerger.java | 7 +++---
.../store/file/sort/BinaryExternalSortBuffer.java | 9 ++++---
.../store/file/sort/BinaryInMemorySortBuffer.java | 11 ++++----
.../store/file/sort/BinaryIndexedSortable.java | 11 ++++----
.../flink/table/store/file/sort/SortBuffer.java | 5 ++--
.../table/store/file/stats/BinaryTableStats.java | 11 ++++----
.../file/stats/FieldStatsArraySerializer.java | 6 ++---
.../store/file/utils/FileStorePathFactory.java | 5 ++--
.../flink/table/store/file/utils/FileUtils.java | 2 +-
.../store/file/utils/KeyComparatorSupplier.java | 3 ++-
.../table/store/file/utils/ObjectSerializer.java | 7 +++---
.../flink/table/store/file/utils/OffsetRow.java | 13 +++++-----
.../store/file/utils/RowDataPartitionComputer.java | 3 ++-
.../table/store/file/utils/SerializationUtils.java | 3 ++-
.../file/utils/VersionedObjectSerializer.java | 7 +++---
.../table/store/table/AbstractFileStoreTable.java | 3 ++-
.../store/table/AppendOnlyFileStoreTable.java | 3 ++-
.../table/ChangelogValueCountFileStoreTable.java | 5 ++--
.../table/ChangelogWithKeyFileStoreTable.java | 3 ++-
.../flink/table/store/table/FileStoreTable.java | 3 ++-
.../org/apache/flink/table/store/table/Table.java | 3 ++-
.../apache/flink/table/store/table/TableUtils.java | 3 ++-
.../table/store/table/sink/BatchTableCommit.java | 2 +-
.../table/store/table/sink/BatchTableWrite.java | 2 +-
.../table/store/table/sink/BatchWriteBuilder.java | 4 +--
.../table/store/table/sink/BucketComputer.java | 5 ++--
.../table/store/table/sink/CommitMessage.java | 4 +--
.../table/store/table/sink/CommitMessageImpl.java | 3 ++-
.../store/table/sink/CommitMessageSerializer.java | 3 ++-
.../table/store/table/sink/PartitionComputer.java | 5 ++--
.../table/store/table/sink/SequenceGenerator.java | 3 ++-
.../flink/table/store/table/sink/SinkRecord.java | 5 ++--
.../store/table/sink/SinkRecordConverter.java | 5 ++--
.../table/store/table/sink/StreamTableCommit.java | 2 +-
.../table/store/table/sink/StreamTableWrite.java | 2 +-
.../table/store/table/sink/StreamWriteBuilder.java | 4 +--
.../flink/table/store/table/sink/TableCommit.java | 3 ++-
.../flink/table/store/table/sink/TableWrite.java | 7 +++---
.../table/store/table/sink/TableWriteImpl.java | 5 ++--
.../flink/table/store/table/sink/WriteBuilder.java | 5 ++--
.../store/table/source/AbstractDataTableScan.java | 3 ++-
.../flink/table/store/table/source/DataSplit.java | 3 ++-
.../table/store/table/source/DataTableScan.java | 3 ++-
.../store/table/source/EndOfScanException.java | 2 +-
.../store/table/source/KeyValueTableRead.java | 3 ++-
.../table/source/MergeTreeSplitGenerator.java | 3 ++-
.../table/store/table/source/ReadBuilder.java | 5 ++--
.../table/source/ResetRowKindRecordIterator.java | 3 ++-
.../flink/table/store/table/source/Split.java | 2 +-
.../table/store/table/source/StreamTableScan.java | 3 ++-
.../flink/table/store/table/source/TableRead.java | 5 ++--
.../flink/table/store/table/source/TableScan.java | 3 ++-
.../store/table/source/TableStreamingReader.java | 3 ++-
.../source/ValueContentRowDataRecordIterator.java | 3 ++-
.../source/ValueCountRowDataRecordIterator.java | 3 ++-
.../table/source/snapshot/SnapshotSplitReader.java | 3 ++-
.../source/snapshot/SnapshotSplitReaderImpl.java | 3 ++-
.../table/store/table/system/AuditLogTable.java | 5 ++--
.../table/store/table/system/BucketsTable.java | 7 +++---
.../flink/table/store/table/system/FilesTable.java | 6 ++---
.../table/store/table/system/OptionsTable.java | 7 +++---
.../table/store/table/system/SchemasTable.java | 7 +++---
.../table/store/table/system/SnapshotsTable.java | 9 ++++---
.../flink/table/store/file/FileFormatTest.java | 4 +--
.../table/store/file/KeyValueSerializerTest.java | 3 ++-
.../flink/table/store/file/TestFileStore.java | 4 +--
.../table/store/file/TestKeyValueGenerator.java | 13 +++++-----
.../store/file/append/AppendOnlyWriterTest.java | 8 +++---
.../table/store/file/casting/CastExecutorTest.java | 4 +--
.../store/file/format/FileFormatSuffixTest.java | 4 +--
.../store/file/format/FlushingFileFormat.java | 2 +-
.../store/file/io/DataFileTestDataGenerator.java | 2 +-
.../table/store/file/io/DataFileTestUtils.java | 7 +++---
.../store/file/io/KeyValueFileReadWriteTest.java | 6 ++---
.../table/store/file/io/RollingFileWriterTest.java | 4 +--
.../ManifestCommittableSerializerTest.java | 2 +-
.../store/file/manifest/ManifestFileMetaTest.java | 6 ++---
.../file/manifest/ManifestTestDataGenerator.java | 2 +-
.../table/store/file/mergetree/LevelsTest.java | 2 +-
.../store/file/mergetree/LookupLevelsTest.java | 6 ++---
.../table/store/file/mergetree/MergeTreeTest.java | 6 ++---
.../mergetree/compact/IntervalPartitionTest.java | 6 ++---
.../LookupChangelogMergeFunctionWrapperTest.java | 4 +--
.../compact/MergeTreeCompactManagerTest.java | 4 +--
.../ReducerMergeFunctionWrapperTestBase.java | 2 +-
.../compact/aggregate/FieldAggregatorTest.java | 4 +--
.../file/operation/CleanedFileStoreExpireTest.java | 6 ++---
.../store/file/operation/FileStoreCommitTest.java | 2 +-
.../file/operation/FileStoreExpireTestBase.java | 2 +-
.../file/operation/KeyValueFileStoreReadTest.java | 6 ++---
.../file/operation/KeyValueFileStoreScanTest.java | 2 +-
.../store/file/operation/PartitionExpireTest.java | 4 +--
.../store/file/operation/TestCommitThread.java | 2 +-
.../store/file/schema/SchemaEvolutionUtilTest.java | 4 +--
.../file/sort/BinaryExternalSortBufferTest.java | 10 ++++----
.../store/file/sort/IntNormalizedKeyComputer.java | 3 ++-
.../table/store/file/sort/IntRecordComparator.java | 3 ++-
.../store/file/stats/BinaryTableStatsTest.java | 6 ++---
.../file/stats/FieldStatsArraySerializerTest.java | 2 +-
.../store/file/stats/FieldStatsCollectorTest.java | 6 ++---
.../store/file/stats/TestFileStatsExtractor.java | 2 +-
.../store/file/utils/FileStorePathFactoryTest.java | 6 ++---
.../table/store/file/utils/OffsetRowTest.java | 22 ++++++++--------
.../table/store/file/utils/ReusingKeyValue.java | 5 ++--
.../store/table/AppendOnlyFileStoreTableTest.java | 6 ++---
.../ChangelogWithKeyColumnTypeFileDataTest.java | 2 +-
.../table/ChangelogWithKeyFileStoreTableTest.java | 8 +++---
...hangelogWithKeyTableColumnTypeFileMetaTest.java | 2 +-
.../store/table/ColumnTypeFileDataTestBase.java | 2 +-
.../store/table/ColumnTypeFileMetaTestBase.java | 4 +--
.../table/store/table/FileDataFilterTestBase.java | 2 +-
.../table/store/table/FileStoreTableTestBase.java | 14 +++++------
.../store/table/SchemaEvolutionTableTestBase.java | 10 ++++----
.../table/store/table/SchemaEvolutionTest.java | 6 ++---
.../table/store/table/WritePreemptMemoryTest.java | 2 +-
.../store/table/sink/SinkRecordConverterTest.java | 4 +--
.../table/store/table/sink/TableWriteTest.java | 4 +--
.../source/RowDataRecordIteratorTestBase.java | 3 ++-
.../store/table/source/SplitGeneratorTest.java | 2 +-
.../ContinuousCompactorFollowUpScannerTest.java | 2 +-
.../table/source/snapshot/ScannerTestBase.java | 8 +++---
.../apache/paimon/benchmark/TableBenchmark.java | 6 ++---
.../table/store/file/predicate/LeafPredicate.java | 6 ++---
.../table/store/file/predicate/Predicate.java | 3 +--
.../store/file/predicate/PredicateBuilder.java | 9 ++++---
.../store/file/predicate/PredicateFilter.java | 3 ++-
.../table/store/file/predicate/StartsWith.java | 2 +-
.../org/apache/flink/table/store/fs/FileIO.java | 2 +-
.../apache/flink/table/store/fs/FileIOLoader.java | 2 +-
.../apache/flink/table/store/fs/FileStatus.java | 2 +-
.../java/org/apache/flink/table/store/fs/Path.java | 3 ++-
.../flink/table/store/fs/PositionOutputStream.java | 2 +-
.../flink/table/store/fs/SeekableInputStream.java | 2 +-
.../table/store/fs/UnsupportedSchemeException.java | 2 +-
.../flink/table/store/fs/hadoop/HadoopFileIO.java | 2 +-
.../flink/table/store/io/cache/CacheManager.java | 3 ++-
.../store/io/cache/CachedRandomInputView.java | 3 ++-
.../flink/table/store/memory/MemorySegment.java | 2 +-
.../table/store/memory/MemorySegmentSource.java | 2 +-
.../table/store/memory/MemorySegmentUtils.java | 25 ++++++++++---------
.../flink/table/store/options/ConfigOption.java | 3 ++-
.../flink/table/store/options/ConfigOptions.java | 3 ++-
.../flink/table/store/options/MemorySize.java | 2 +-
.../apache/flink/table/store/options/Options.java | 2 +-
.../store/options/description/Description.java | 2 +-
.../table/store/plugin/ComponentClassLoader.java | 3 ++-
.../flink/table/store/reader/RecordReader.java | 3 ++-
.../apache/flink/table/store/types/ArrayType.java | 3 ++-
.../apache/flink/table/store/types/BigIntType.java | 2 +-
.../apache/flink/table/store/types/BinaryType.java | 2 +-
.../flink/table/store/types/BooleanType.java | 2 +-
.../apache/flink/table/store/types/CharType.java | 2 +-
.../apache/flink/table/store/types/DataField.java | 4 +--
.../apache/flink/table/store/types/DataType.java | 3 ++-
.../table/store/types/DataTypeDefaultVisitor.java | 2 +-
.../flink/table/store/types/DataTypeFamily.java | 2 +-
.../flink/table/store/types/DataTypeRoot.java | 2 +-
.../flink/table/store/types/DataTypeVisitor.java | 2 +-
.../apache/flink/table/store/types/DataTypes.java | 2 +-
.../apache/flink/table/store/types/DateType.java | 2 +-
.../flink/table/store/types/DecimalType.java | 2 +-
.../apache/flink/table/store/types/DoubleType.java | 2 +-
.../apache/flink/table/store/types/FloatType.java | 2 +-
.../apache/flink/table/store/types/IntType.java | 2 +-
.../table/store/types/LocalZonedTimestampType.java | 2 +-
.../apache/flink/table/store/types/MapType.java | 3 ++-
.../flink/table/store/types/MultisetType.java | 3 ++-
.../apache/flink/table/store/types/RowKind.java | 2 +-
.../apache/flink/table/store/types/RowType.java | 3 ++-
.../flink/table/store/types/SmallIntType.java | 2 +-
.../apache/flink/table/store/types/TimeType.java | 2 +-
.../flink/table/store/types/TimestampType.java | 2 +-
.../flink/table/store/types/TinyIntType.java | 2 +-
.../flink/table/store/types/VarBinaryType.java | 2 +-
.../flink/table/store/types/VarCharType.java | 2 +-
.../flink/table/store/utils/BinaryRowDataUtil.java | 3 ++-
.../flink/table/store/utils/CloseableIterator.java | 2 +-
.../flink/table/store/utils/DateTimeUtils.java | 2 +-
.../flink/table/store/utils/DecimalUtils.java | 8 +++---
.../flink/table/store/utils/KeyProjectedRow.java | 13 +++++-----
.../flink/table/store/utils/ProjectedRow.java | 13 +++++-----
.../apache/flink/table/store/utils/Projection.java | 3 ++-
.../store/utils/RowDataToObjectArrayConverter.java | 3 ++-
.../flink/table/store/utils/RowDataUtils.java | 27 ++++++++++----------
.../apache/flink/table/store/utils/SortUtil.java | 7 +++---
.../flink/table/store/utils/StringUtils.java | 5 ++--
.../apache/flink/table/store/utils/TypeUtils.java | 7 +++---
.../store => paimon}/annotation/ConfigGroup.java | 2 +-
.../store => paimon}/annotation/ConfigGroups.java | 2 +-
.../store => paimon}/annotation/Documentation.java | 2 +-
.../store => paimon}/annotation/Experimental.java | 2 +-
.../annotation/VisibleForTesting.java | 2 +-
.../store => paimon}/catalog/CatalogContext.java | 2 +-
.../apache/paimon}/codegen/CodeGenException.scala | 0
.../org/apache/paimon}/codegen/CodeGenLoader.java | 0
.../org/apache/paimon}/codegen/CodeGenUtils.java | 3 ++-
.../store => paimon}/codegen/CodeGenerator.java | 0
.../paimon}/codegen/CodeGeneratorContext.scala | 2 +-
.../apache/paimon}/codegen/CodeGeneratorImpl.java | 0
.../paimon}/codegen/ComparatorCodeGenerator.scala | 0
.../store => paimon}/codegen/CompileUtils.java | 0
.../apache/paimon}/codegen/ExprCodeGenerator.scala | 2 +-
.../org/apache/paimon}/codegen/GenerateUtils.scala | 2 +-
.../store => paimon}/codegen/GeneratedClass.java | 0
.../paimon}/codegen/GeneratedExpression.scala | 0
.../codegen/NormalizedKeyComputer.java | 3 ++-
.../table/store => paimon}/codegen/Projection.java | 4 +--
.../paimon}/codegen/ProjectionCodeGenerator.scala | 2 +-
.../store => paimon}/codegen/RecordComparator.java | 2 +-
.../apache/paimon}/codegen/SortCodeGenerator.scala | 2 +-
.../java/org/apache/paimon}/codegen/SortSpec.java | 0
.../codesplit/AddBoolBeforeReturnRewriter.java | 0
.../AddBooleanBeforeReturnRewriterTest.java | 0
.../codegen/codesplit/BlockStatementGrouper.java | 0
.../codesplit/BlockStatementGrouperTest.java | 0
.../codegen/codesplit/BlockStatementRewriter.java | 0
.../codesplit/BlockStatementRewriterTest.java | 0
.../codegen/codesplit/BlockStatementSplitter.java | 0
.../codesplit/BlockStatementSplitterTest.java | 0
.../codegen/codesplit/CodeRewriter.java | 0
.../codegen/codesplit/CodeRewriterTestBase.java | 0
.../codegen/codesplit/CodeSplitTestUtil.java | 0
.../codegen/codesplit/CodeSplitUtil.java | 0
.../codegen/codesplit/DeclarationRewriter.java | 0
.../codegen/codesplit/DeclarationRewriterTest.java | 0
.../codegen/codesplit/FunctionSplitter.java | 0
.../codegen/codesplit/FunctionSplitterTest.java | 0
.../codegen/codesplit/JavaCodeSplitter.java | 0
.../codegen/codesplit/JavaCodeSplitterTest.java | 0
.../paimon}/codegen/codesplit/JavaParserTest.java | 0
.../codegen/codesplit/MemberFieldRewriter.java | 0
.../codegen/codesplit/MemberFieldRewriterTest.java | 0
.../codegen/codesplit/ReturnAndJumpCounter.java | 0
.../codegen/codesplit/ReturnValueRewriter.java | 0
.../codegen/codesplit/ReturnValueRewriterTest.java | 0
.../data/AbstractBinaryWriter.java | 11 ++++----
.../data/AbstractPagedInputView.java | 2 +-
.../data/AbstractPagedOutputView.java | 2 +-
.../table/store => paimon}/data/BinaryArray.java | 5 ++--
.../store => paimon}/data/BinaryArrayWriter.java | 2 +-
.../table/store => paimon}/data/BinaryMap.java | 5 ++--
.../table/store => paimon}/data/BinaryRow.java | 5 ++--
.../store => paimon}/data/BinaryRowWriter.java | 2 +-
.../table/store => paimon}/data/BinarySection.java | 2 +-
.../table/store => paimon}/data/BinaryString.java | 5 ++--
.../table/store => paimon}/data/BinaryWriter.java | 13 +++++-----
.../table/store => paimon}/data/DataGetters.java | 4 +--
.../table/store => paimon}/data/DataSetters.java | 2 +-
.../table/store => paimon}/data/Decimal.java | 5 ++--
.../table/store => paimon}/data/GenericArray.java | 5 ++--
.../table/store => paimon}/data/GenericMap.java | 5 ++--
.../table/store => paimon}/data/GenericRow.java | 5 ++--
.../table/store => paimon}/data/InternalArray.java | 5 ++--
.../table/store => paimon}/data/InternalMap.java | 5 ++--
.../table/store => paimon}/data/InternalRow.java | 5 ++--
.../table/store => paimon}/data/JoinedRow.java | 5 ++--
.../store => paimon}/data/LazyGenericRow.java | 2 +-
.../table/store => paimon}/data/NestedRow.java | 4 +--
.../data/RandomAccessInputView.java | 2 +-
.../data/RandomAccessOutputView.java | 2 +-
.../data/SimpleCollectingOutputView.java | 2 +-
.../table/store => paimon}/data/Timestamp.java | 5 ++--
.../data/columnar/ArrayColumnVector.java | 4 +--
.../data/columnar/BooleanColumnVector.java | 2 +-
.../data/columnar/ByteColumnVector.java | 2 +-
.../data/columnar/BytesColumnVector.java | 2 +-
.../data/columnar/ColumnVector.java | 2 +-
.../data/columnar/ColumnarArray.java | 18 +++++++-------
.../data/columnar/ColumnarMap.java | 6 ++---
.../data/columnar/ColumnarRow.java | 21 ++++++++--------
.../data/columnar/ColumnarRowIterator.java | 5 ++--
.../data/columnar/DecimalColumnVector.java | 4 +--
.../store => paimon}/data/columnar/Dictionary.java | 4 +--
.../data/columnar/DoubleColumnVector.java | 2 +-
.../data/columnar/FloatColumnVector.java | 2 +-
.../data/columnar/IntColumnVector.java | 2 +-
.../data/columnar/LongColumnVector.java | 2 +-
.../data/columnar/MapColumnVector.java | 4 +--
.../data/columnar/RowColumnVector.java | 2 +-
.../data/columnar/ShortColumnVector.java | 2 +-
.../data/columnar/TimestampColumnVector.java | 4 +--
.../data/columnar/VectorizedColumnBatch.java | 16 ++++++------
.../data/columnar/heap/AbstractHeapVector.java | 5 ++--
.../data/columnar/heap/HeapArrayVector.java | 12 ++++-----
.../data/columnar/heap/HeapBooleanVector.java | 4 +--
.../data/columnar/heap/HeapByteVector.java | 4 +--
.../data/columnar/heap/HeapBytesVector.java | 4 +--
.../data/columnar/heap/HeapDoubleVector.java | 4 +--
.../data/columnar/heap/HeapFloatVector.java | 4 +--
.../data/columnar/heap/HeapIntVector.java | 4 +--
.../data/columnar/heap/HeapLongVector.java | 4 +--
.../data/columnar/heap/HeapMapVector.java | 12 ++++-----
.../data/columnar/heap/HeapRowVector.java | 10 ++++----
.../data/columnar/heap/HeapShortVector.java | 4 +--
.../data/columnar/heap/HeapTimestampVector.java | 6 ++---
.../columnar/writable/AbstractWritableVector.java | 6 ++---
.../columnar/writable/WritableBooleanVector.java | 4 +--
.../data/columnar/writable/WritableByteVector.java | 4 +--
.../columnar/writable/WritableBytesVector.java | 4 +--
.../columnar/writable/WritableColumnVector.java | 6 ++---
.../columnar/writable/WritableDoubleVector.java | 4 +--
.../columnar/writable/WritableFloatVector.java | 4 +--
.../data/columnar/writable/WritableIntVector.java | 4 +--
.../data/columnar/writable/WritableLongVector.java | 4 +--
.../columnar/writable/WritableShortVector.java | 4 +--
.../columnar/writable/WritableTimestampVector.java | 6 ++---
.../data/serializer/AbstractRowDataSerializer.java | 6 ++---
.../data/serializer/BinaryRowSerializer.java | 9 ++++---
.../data/serializer/BinarySerializer.java | 2 +-
.../data/serializer/BinaryStringSerializer.java | 5 ++--
.../data/serializer/BooleanSerializer.java | 2 +-
.../data/serializer/ByteSerializer.java | 2 +-
.../data/serializer/DecimalSerializer.java | 5 ++--
.../data/serializer/DoubleSerializer.java | 2 +-
.../data/serializer/FloatSerializer.java | 2 +-
.../data/serializer/IntSerializer.java | 2 +-
.../data/serializer/InternalArraySerializer.java | 17 +++++++------
.../data/serializer/InternalMapSerializer.java | 17 +++++++------
.../data/serializer/InternalRowSerializer.java | 21 ++++++++--------
.../data/serializer/InternalSerializers.java | 2 +-
.../data/serializer/ListSerializer.java | 2 +-
.../data/serializer/LongSerializer.java | 2 +-
.../data/serializer/NullableSerializer.java | 2 +-
.../data/serializer/PagedTypeSerializer.java | 8 +++---
.../data/serializer/RowCompactedSerializer.java | 29 +++++++++++-----------
.../data/serializer/Serializer.java | 2 +-
.../data/serializer/SerializerSingleton.java | 2 +-
.../data/serializer/ShortSerializer.java | 2 +-
.../data/serializer/TimestampSerializer.java | 5 ++--
.../data/serializer/VersionedSerializer.java | 2 +-
.../apache/paimon/format/FieldStatsCollector.java | 7 +++---
.../apache/paimon/format/FormatReaderFactory.java | 3 ++-
.../org/apache/paimon/format/FormatWriter.java | 2 +-
.../store/datagen/RandomGeneratorVisitor.java | 11 ++++----
.../table/store/datagen/RowDataGenerator.java | 4 +--
.../flink/table/store/utils/RowDataUtilsTest.java | 10 ++++----
.../table/store => paimon}/data/BinaryRowTest.java | 22 ++++++++--------
.../store => paimon}/data/BinaryStringTest.java | 6 ++---
.../store => paimon}/data/DataFormatTestUtil.java | 2 +-
.../table/store => paimon}/data/DecimalTest.java | 2 +-
.../table/store => paimon}/data/MapDataUtil.java | 2 +-
.../table/store => paimon}/data/NestedRowTest.java | 6 ++---
.../table/store => paimon}/data/RowDataTest.java | 8 +++---
.../table/store => paimon}/data/TimestampTest.java | 2 +-
.../data/serializer/BinarySerializerTest.java | 2 +-
.../serializer/BinaryStringSerializerTest.java | 4 +--
.../data/serializer/BooleanSerializerTest.java | 2 +-
.../data/serializer/ByteSerializerTest.java | 2 +-
.../data/serializer/DecimalSerializerTest.java | 4 +--
.../data/serializer/DoubleSerializerTest.java | 2 +-
.../data/serializer/FloatSerializerTest.java | 2 +-
.../data/serializer/IntSerializerTest.java | 2 +-
.../serializer/InternalArraySerializerTest.java | 17 +++++++------
.../data/serializer/InternalMapSerializerTest.java | 20 +++++++--------
.../data/serializer/InternalRowSerializerTest.java | 20 +++++++--------
.../data/serializer/ListSerializerTest.java | 2 +-
.../data/serializer/LongSerializerTest.java | 2 +-
.../data/serializer/NullableSerializerTest.java | 2 +-
.../serializer/RowCompactedSerializerTest.java | 19 +++++++-------
.../data/serializer/SerializerTestBase.java | 2 +-
.../data/serializer/SerializerTestInstance.java | 2 +-
.../data/serializer/ShortSerializerTest.java | 2 +-
.../data/serializer/TimestampSerializerTest.java | 4 +--
.../paimon/format/FileStatsExtractorTestBase.java | 16 ++++++------
.../configuration/ConfigOptionsDocGenerator.java | 8 +++---
.../ConfigOptionsDocGeneratorTest.java | 6 ++---
.../ConfigOptionsDocsCompletenessITCase.java | 2 +-
.../docs/configuration/data/TestCommonOptions.java | 3 ++-
.../connector/AbstractTableStoreFactory.java | 2 +-
.../paimon/connector/BinaryRowTypeSerializer.java | 5 ++--
.../org/apache/paimon/connector/FlinkCatalog.java | 3 ++-
.../org/apache/paimon/connector/FlinkRowData.java | 13 +++++-----
.../apache/paimon/connector/FlinkRowWrapper.java | 13 +++++-----
.../paimon/connector/PredicateConverter.java | 3 ++-
.../apache/paimon/connector/RocksDBOptions.java | 2 +-
.../connector/VersionedSerializerWrapper.java | 3 ++-
.../connector/kafka/KafkaLogSinkProvider.java | 2 +-
.../connector/kafka/KafkaLogSourceProvider.java | 2 +-
.../connector/lookup/FileStoreLookupFunction.java | 2 +-
.../paimon/connector/lookup/LookupTable.java | 3 ++-
.../connector/lookup/PrimaryKeyLookupTable.java | 5 ++--
.../paimon/connector/lookup/RocksDBSetState.java | 5 ++--
.../paimon/connector/lookup/RocksDBState.java | 4 +--
.../connector/lookup/RocksDBStateFactory.java | 5 ++--
.../paimon/connector/lookup/RocksDBValueState.java | 5 ++--
.../lookup/SecondaryIndexLookupTable.java | 5 ++--
.../connector/sink/BucketStreamPartitioner.java | 2 +-
.../sink/FullChangelogStoreSinkWrite.java | 4 +--
.../sink/OffsetRowDataHashStreamPartitioner.java | 2 +-
.../connector/sink/StoreCompactOperator.java | 4 +--
.../paimon/connector/sink/StoreSinkWrite.java | 5 ++--
.../paimon/connector/sink/StoreSinkWriteImpl.java | 4 +--
.../source/FileStoreSourceSplitReader.java | 2 +-
.../connector/BinaryRowTypeSerializerTest.java | 3 ++-
.../paimon/connector/PredicateConverterTest.java | 2 +-
.../paimon/connector/action/ActionITCaseBase.java | 6 ++---
.../connector/action/CompactActionITCase.java | 2 +-
.../connector/action/DeleteActionITCase.java | 2 +-
.../action/DropPartitionActionITCase.java | 2 +-
.../paimon/connector/kafka/KafkaLogTestUtils.java | 4 +--
.../paimon/connector/lookup/LookupTableTest.java | 4 +--
.../connector/sink/CommitterOperatorTest.java | 2 +-
.../connector/sink/CommitterOperatorTestBase.java | 2 +-
.../paimon/connector/sink/CompactorSinkITCase.java | 4 +--
.../connector/sink/FileStoreShuffleBucketTest.java | 4 +--
.../connector/source/CompactorSourceITCase.java | 8 +++---
.../source/FileStoreSourceSplitReaderTest.java | 2 +-
.../source/FileStoreSourceSplitSerializerTest.java | 2 +-
.../source/TestChangelogDataReadWrite.java | 6 ++---
.../paimon/format/avro/AbstractAvroBulkFormat.java | 2 +-
.../apache/paimon/format/avro/AvroFileFormat.java | 4 +--
.../format/avro/AvroToRowDataConverters.java | 14 +++++------
.../format/avro/RowDataToAvroConverters.java | 10 ++++----
.../apache/paimon/format/orc/OrcFileFormat.java | 4 +--
.../apache/paimon/format/orc/OrcReaderFactory.java | 10 ++++----
.../apache/paimon/format/orc/OrcWriterFactory.java | 4 +--
.../format/orc/filter/OrcFileStatsExtractor.java | 6 ++---
.../orc/filter/OrcPredicateFunctionVisitor.java | 4 +--
.../format/orc/reader/AbstractOrcColumnVector.java | 4 +--
.../format/orc/reader/OrcArrayColumnVector.java | 8 +++---
.../format/orc/reader/OrcBytesColumnVector.java | 2 +-
.../format/orc/reader/OrcDecimalColumnVector.java | 5 ++--
.../format/orc/reader/OrcDoubleColumnVector.java | 4 +--
.../orc/reader/OrcLegacyTimestampColumnVector.java | 5 ++--
.../format/orc/reader/OrcLongColumnVector.java | 10 ++++----
.../format/orc/reader/OrcMapColumnVector.java | 8 +++---
.../format/orc/reader/OrcRowColumnVector.java | 8 +++---
.../orc/reader/OrcTimestampColumnVector.java | 5 ++--
.../paimon/format/orc/writer/OrcBulkWriter.java | 3 +--
.../format/orc/writer/RowDataVectorizer.java | 8 +++---
.../paimon/format/parquet/ParquetFileFormat.java | 2 +-
.../format/parquet/ParquetFileStatsExtractor.java | 6 ++---
.../format/parquet/ParquetReaderFactory.java | 12 ++++-----
.../format/parquet/ParquetWriterFactory.java | 2 +-
.../parquet/reader/AbstractColumnReader.java | 5 ++--
.../format/parquet/reader/ArrayColumnReader.java | 26 +++++++++----------
.../parquet/reader/BaseVectorizedColumnReader.java | 2 +-
.../format/parquet/reader/BooleanColumnReader.java | 5 ++--
.../format/parquet/reader/ByteColumnReader.java | 5 ++--
.../format/parquet/reader/BytesColumnReader.java | 5 ++--
.../paimon/format/parquet/reader/ColumnReader.java | 2 +-
.../format/parquet/reader/DoubleColumnReader.java | 5 ++--
.../parquet/reader/FixedLenBytesColumnReader.java | 9 +++----
.../format/parquet/reader/FloatColumnReader.java | 5 ++--
.../format/parquet/reader/IntColumnReader.java | 3 +--
.../format/parquet/reader/LongColumnReader.java | 5 ++--
.../format/parquet/reader/MapColumnReader.java | 8 +++---
.../parquet/reader/ParquetDataColumnReader.java | 3 +--
.../reader/ParquetDataColumnReaderFactory.java | 3 +--
.../parquet/reader/ParquetDecimalVector.java | 13 +++++-----
.../format/parquet/reader/ParquetDictionary.java | 4 +--
.../parquet/reader/ParquetSplitReaderUtil.java | 26 +++++++++----------
.../parquet/reader/ParquetTimestampVector.java | 9 +++----
.../format/parquet/reader/RowColumnReader.java | 4 +--
.../format/parquet/reader/RunLengthDecoder.java | 5 ++--
.../format/parquet/reader/ShortColumnReader.java | 5 ++--
.../parquet/reader/TimestampColumnReader.java | 7 +++---
.../format/parquet/writer/ParquetBulkWriter.java | 3 +--
.../parquet/writer/ParquetRowDataBuilder.java | 2 +-
.../parquet/writer/ParquetRowDataWriter.java | 10 ++++----
.../parquet/writer/RowDataParquetBuilder.java | 2 +-
.../apache/paimon/format/BulkFileFormatTest.java | 4 +--
.../paimon/format/avro/AvroBulkFormatTest.java | 6 ++---
.../format/avro/AvroBulkFormatTestUtils.java | 2 +-
.../paimon/format/orc/OrcReaderFactoryTest.java | 2 +-
.../paimon/format/orc/OrcWriterFactoryTest.java | 2 +-
.../format/parquet/ParquetReadWriteTest.java | 14 +++++------
.../TableStoreTimestampObjectInspector.java | 5 ++--
.../org/apache/paimon/hive/RowDataContainer.java | 3 +--
.../paimon/hive/mapred/TableStoreOutputFormat.java | 3 +--
.../paimon/hive/mapred/TableStoreRecordReader.java | 2 +-
.../TableStoreCharObjectInspector.java | 3 +--
.../TableStoreDecimalObjectInspector.java | 3 +--
.../TableStoreListObjectInspector.java | 2 +-
.../TableStoreMapObjectInspector.java | 4 +--
.../TableStoreRowDataObjectInspector.java | 2 +-
.../TableStoreStringObjectInspector.java | 3 +--
.../TableStoreTimestampObjectInspector.java | 3 +--
.../TableStoreVarcharObjectInspector.java | 3 +--
.../paimon/hive/RandomGenericRowDataGenerator.java | 13 +++++-----
.../SearchArgumentToPredicateConverterTest.java | 6 ++---
.../hive/TableStoreHiveStorageHandlerITCase.java | 8 +++---
.../apache/paimon/hive/TableStoreSerDeTest.java | 2 +-
.../hive/mapred/TableStoreInputSplitTest.java | 2 +-
.../hive/mapred/TableStoreRecordReaderTest.java | 8 +++---
.../TableStoreCharObjectInspectorTest.java | 3 +--
.../TableStoreDecimalObjectInspectorTest.java | 3 +--
.../TableStoreListObjectInspectorTest.java | 4 +--
.../TableStoreMapObjectInspectorTest.java | 4 +--
.../TableStoreRowDataObjectInspectorTest.java | 3 +--
.../TableStoreStringObjectInspectorTest.java | 3 +--
.../TableStoreTimestampObjectInspectorTest.java | 3 +--
.../TableStoreVarcharObjectInspectorTest.java | 3 +--
.../apache/paimon/spark/SparkInputPartition.java | 2 +-
.../apache/paimon/spark/SimpleTableTestHelper.java | 3 ++-
.../paimon/spark/SparkFilterConverterTest.java | 2 +-
.../apache/paimon/spark/SparkInternalRowTest.java | 16 ++++++------
.../org/apache/paimon/spark/SparkReadITCase.java | 4 +--
.../org/apache/paimon/spark/SparkArrayData.java | 2 +-
.../org/apache/paimon/spark/SparkInternalRow.java | 17 ++++++-------
.../apache/paimon/spark/SparkReaderFactory.java | 2 +-
.../java/org/apache/paimon/spark/SparkRow.java | 12 ++++-----
.../paimon/spark/SparkFilterConverterTest.java | 2 +-
.../apache/paimon/spark/SparkInternalRowTest.java | 16 ++++++------
.../org/apache/paimon/spark/SparkReadTestBase.java | 4 +--
589 files changed, 1378 insertions(+), 1236 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/flink/table/store/CoreOptions.java
index bfe7e7363..2c305a2db 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/flink/table/store/CoreOptions.java
@@ -18,8 +18,6 @@
package org.apache.flink.table.store;
-import org.apache.flink.table.store.annotation.Documentation.ExcludeFromDocumentation;
-import org.apache.flink.table.store.annotation.Documentation.Immutable;
import org.apache.flink.table.store.file.WriteMode;
import org.apache.flink.table.store.fs.Path;
import org.apache.flink.table.store.options.ConfigOption;
@@ -29,6 +27,8 @@ import org.apache.flink.table.store.options.description.DescribedEnum;
import org.apache.flink.table.store.options.description.Description;
import org.apache.flink.table.store.options.description.InlineElement;
+import org.apache.paimon.annotation.Documentation.ExcludeFromDocumentation;
+import org.apache.paimon.annotation.Documentation.Immutable;
import org.apache.paimon.format.FileFormat;
import java.io.Serializable;
diff --git a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/AbstractFileStore.java b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/AbstractFileStore.java
index e64c68124..037a3bbf1 100644
--- a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/AbstractFileStore.java
+++ b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/AbstractFileStore.java
@@ -19,8 +19,6 @@
package org.apache.flink.table.store.file;
import org.apache.flink.table.store.CoreOptions;
-import org.apache.flink.table.store.annotation.VisibleForTesting;
-import org.apache.flink.table.store.data.InternalRow;
import org.apache.flink.table.store.file.manifest.ManifestFile;
import org.apache.flink.table.store.file.manifest.ManifestList;
import org.apache.flink.table.store.file.operation.FileStoreCommitImpl;
@@ -32,6 +30,9 @@ import org.apache.flink.table.store.file.utils.SnapshotManager;
import org.apache.flink.table.store.fs.FileIO;
import org.apache.flink.table.store.types.RowType;
+import org.apache.paimon.annotation.VisibleForTesting;
+import org.apache.paimon.data.InternalRow;
+
import java.time.Duration;
import java.util.Comparator;
diff --git a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/AppendOnlyFileStore.java b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/AppendOnlyFileStore.java
index d27cd241c..5a25a8eef 100644
--- a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/AppendOnlyFileStore.java
+++ b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/AppendOnlyFileStore.java
@@ -19,7 +19,6 @@
package org.apache.flink.table.store.file;
import org.apache.flink.table.store.CoreOptions;
-import org.apache.flink.table.store.data.InternalRow;
import org.apache.flink.table.store.file.operation.AppendOnlyFileStoreRead;
import org.apache.flink.table.store.file.operation.AppendOnlyFileStoreScan;
import org.apache.flink.table.store.file.operation.AppendOnlyFileStoreWrite;
@@ -27,6 +26,7 @@ import org.apache.flink.table.store.file.schema.SchemaManager;
import org.apache.flink.table.store.fs.FileIO;
import org.apache.flink.table.store.types.RowType;
+import org.apache.paimon.data.InternalRow;
import org.apache.paimon.format.FileFormatDiscover;
import java.util.Comparator;
diff --git a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/KeyValue.java b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/KeyValue.java
index fe8ca39db..746fca6d2 100644
--- a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/KeyValue.java
+++ b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/KeyValue.java
@@ -18,9 +18,6 @@
package org.apache.flink.table.store.file;
-import org.apache.flink.table.store.annotation.VisibleForTesting;
-import org.apache.flink.table.store.data.InternalRow;
-import org.apache.flink.table.store.data.serializer.InternalRowSerializer;
import org.apache.flink.table.store.types.BigIntType;
import org.apache.flink.table.store.types.DataField;
import org.apache.flink.table.store.types.RowKind;
@@ -28,6 +25,10 @@ import org.apache.flink.table.store.types.RowType;
import org.apache.flink.table.store.types.TinyIntType;
import org.apache.flink.table.store.utils.RowDataUtils;
+import org.apache.paimon.annotation.VisibleForTesting;
+import org.apache.paimon.data.InternalRow;
+import org.apache.paimon.data.serializer.InternalRowSerializer;
+
import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
diff --git a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/KeyValueFileStore.java b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/KeyValueFileStore.java
index 2e36b01a3..e3f17a5d4 100644
--- a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/KeyValueFileStore.java
+++ b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/KeyValueFileStore.java
@@ -19,7 +19,6 @@
package org.apache.flink.table.store.file;
import org.apache.flink.table.store.CoreOptions;
-import org.apache.flink.table.store.data.InternalRow;
import org.apache.flink.table.store.file.mergetree.compact.MergeFunctionFactory;
import org.apache.flink.table.store.file.operation.KeyValueFileStoreRead;
import org.apache.flink.table.store.file.operation.KeyValueFileStoreScan;
@@ -30,6 +29,7 @@ import org.apache.flink.table.store.file.utils.KeyComparatorSupplier;
import org.apache.flink.table.store.fs.FileIO;
import org.apache.flink.table.store.types.RowType;
+import org.apache.paimon.data.InternalRow;
import org.apache.paimon.format.FileFormatDiscover;
import java.util.Comparator;
diff --git a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/KeyValueSerializer.java b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/KeyValueSerializer.java
index 12af5ea80..2c94781ef 100644
--- a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/KeyValueSerializer.java
+++ b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/KeyValueSerializer.java
@@ -18,14 +18,15 @@
package org.apache.flink.table.store.file;
-import org.apache.flink.table.store.data.GenericRow;
-import org.apache.flink.table.store.data.InternalRow;
-import org.apache.flink.table.store.data.JoinedRow;
import org.apache.flink.table.store.file.utils.ObjectSerializer;
import org.apache.flink.table.store.file.utils.OffsetRow;
import org.apache.flink.table.store.types.RowKind;
import org.apache.flink.table.store.types.RowType;
+import org.apache.paimon.data.GenericRow;
+import org.apache.paimon.data.InternalRow;
+import org.apache.paimon.data.JoinedRow;
+
/**
* Serializer for {@link KeyValue}.
*
diff --git a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/append/AppendOnlyCompactManager.java b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/append/AppendOnlyCompactManager.java
index c7519a54d..61a66186f 100644
--- a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/append/AppendOnlyCompactManager.java
+++ b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/append/AppendOnlyCompactManager.java
@@ -18,7 +18,6 @@
package org.apache.flink.table.store.file.append;
-import org.apache.flink.table.store.annotation.VisibleForTesting;
import org.apache.flink.table.store.file.compact.CompactFutureManager;
import org.apache.flink.table.store.file.compact.CompactResult;
import org.apache.flink.table.store.file.compact.CompactTask;
@@ -27,6 +26,8 @@ import org.apache.flink.table.store.file.io.DataFilePathFactory;
import org.apache.flink.table.store.fs.FileIO;
import org.apache.flink.table.store.utils.Preconditions;
+import org.apache.paimon.annotation.VisibleForTesting;
+
import java.io.IOException;
import java.util.ArrayList;
import java.util.Iterator;
diff --git a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/append/AppendOnlyWriter.java b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/append/AppendOnlyWriter.java
index 5e5ccc6f6..470b9ba6f 100644
--- a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/append/AppendOnlyWriter.java
+++ b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/append/AppendOnlyWriter.java
@@ -19,7 +19,6 @@
package org.apache.flink.table.store.file.append;
-import org.apache.flink.table.store.data.InternalRow;
import org.apache.flink.table.store.file.compact.CompactManager;
import org.apache.flink.table.store.file.io.CompactIncrement;
import org.apache.flink.table.store.file.io.DataFileMeta;
@@ -34,6 +33,7 @@ import org.apache.flink.table.store.types.RowType;
import org.apache.flink.table.store.utils.LongCounter;
import org.apache.flink.table.store.utils.Preconditions;
+import org.apache.paimon.data.InternalRow;
import org.apache.paimon.format.FileFormat;
import javax.annotation.Nullable;
diff --git a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/casting/CastExecutors.java b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/casting/CastExecutors.java
index 0f2ba43dd..5cce3b1af 100644
--- a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/casting/CastExecutors.java
+++ b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/casting/CastExecutors.java
@@ -18,9 +18,6 @@
package org.apache.flink.table.store.file.casting;
-import org.apache.flink.table.store.data.BinaryString;
-import org.apache.flink.table.store.data.Decimal;
-import org.apache.flink.table.store.data.Timestamp;
import org.apache.flink.table.store.types.BinaryType;
import org.apache.flink.table.store.types.CharType;
import org.apache.flink.table.store.types.DataType;
@@ -32,6 +29,10 @@ import org.apache.flink.table.store.utils.DateTimeUtils;
import org.apache.flink.table.store.utils.DecimalUtils;
import org.apache.flink.table.store.utils.StringUtils;
+import org.apache.paimon.data.BinaryString;
+import org.apache.paimon.data.Decimal;
+import org.apache.paimon.data.Timestamp;
+
import javax.annotation.Nullable;
import java.util.Arrays;
diff --git a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/casting/CastFieldGetter.java b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/casting/CastFieldGetter.java
index aaee4f047..70d0f5ee8 100644
--- a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/casting/CastFieldGetter.java
+++ b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/casting/CastFieldGetter.java
@@ -18,7 +18,7 @@
package org.apache.flink.table.store.file.casting;
-import org.apache.flink.table.store.data.InternalRow;
+import org.apache.paimon.data.InternalRow;
/**
* Get field value from row with given pos and cast it according to specific {@link CastExecutor}.
diff --git a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/casting/CastedRow.java b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/casting/CastedRow.java
index 8620d0eea..9c9bfee3a 100644
--- a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/casting/CastedRow.java
+++ b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/casting/CastedRow.java
@@ -18,14 +18,15 @@
package org.apache.flink.table.store.file.casting;
-import org.apache.flink.table.store.data.BinaryString;
-import org.apache.flink.table.store.data.Decimal;
-import org.apache.flink.table.store.data.InternalArray;
-import org.apache.flink.table.store.data.InternalMap;
-import org.apache.flink.table.store.data.InternalRow;
-import org.apache.flink.table.store.data.Timestamp;
import org.apache.flink.table.store.types.RowKind;
+import org.apache.paimon.data.BinaryString;
+import org.apache.paimon.data.Decimal;
+import org.apache.paimon.data.InternalArray;
+import org.apache.paimon.data.InternalMap;
+import org.apache.paimon.data.InternalRow;
+import org.apache.paimon.data.Timestamp;
+
import static org.apache.flink.table.store.utils.Preconditions.checkNotNull;
/**
diff --git a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/catalog/AbstractCatalog.java b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/catalog/AbstractCatalog.java
index e4f48c7ed..990b1990b 100644
--- a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/catalog/AbstractCatalog.java
+++ b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/catalog/AbstractCatalog.java
@@ -18,7 +18,6 @@
package org.apache.flink.table.store.file.catalog;
-import org.apache.flink.table.store.annotation.VisibleForTesting;
import org.apache.flink.table.store.file.schema.TableSchema;
import org.apache.flink.table.store.fs.FileIO;
import org.apache.flink.table.store.fs.Path;
@@ -28,6 +27,8 @@ import org.apache.flink.table.store.table.Table;
import org.apache.flink.table.store.table.system.SystemTableLoader;
import org.apache.flink.table.store.utils.StringUtils;
+import org.apache.paimon.annotation.VisibleForTesting;
+
/** Common implementation of {@link Catalog}. */
public abstract class AbstractCatalog implements Catalog {
diff --git a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/catalog/Catalog.java b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/catalog/Catalog.java
index 6474d610e..cd184f99d 100644
--- a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/catalog/Catalog.java
+++ b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/catalog/Catalog.java
@@ -18,11 +18,12 @@
package org.apache.flink.table.store.file.catalog;
-import org.apache.flink.table.store.annotation.Experimental;
import org.apache.flink.table.store.file.schema.Schema;
import org.apache.flink.table.store.file.schema.SchemaChange;
import org.apache.flink.table.store.table.Table;
+import org.apache.paimon.annotation.Experimental;
+
import java.util.List;
import java.util.Optional;
diff --git a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/catalog/CatalogFactory.java b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/catalog/CatalogFactory.java
index 5d8cd3130..1b9147a6e 100644
--- a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/catalog/CatalogFactory.java
+++ b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/catalog/CatalogFactory.java
@@ -18,12 +18,13 @@
package org.apache.flink.table.store.file.catalog;
-import org.apache.flink.table.store.annotation.Experimental;
import org.apache.flink.table.store.catalog.CatalogContext;
import org.apache.flink.table.store.fs.FileIO;
import org.apache.flink.table.store.fs.Path;
import org.apache.flink.table.store.utils.Preconditions;
+import org.apache.paimon.annotation.Experimental;
+
import java.io.IOException;
import java.io.UncheckedIOException;
import java.util.ArrayList;
diff --git a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/catalog/CatalogLock.java b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/catalog/CatalogLock.java
index bd15f7120..c4a263c54 100644
--- a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/catalog/CatalogLock.java
+++ b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/catalog/CatalogLock.java
@@ -18,7 +18,7 @@
package org.apache.flink.table.store.file.catalog;
-import org.apache.flink.table.store.annotation.Experimental;
+import org.apache.paimon.annotation.Experimental;
import java.io.Closeable;
import java.io.Serializable;
diff --git a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/catalog/Identifier.java b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/catalog/Identifier.java
index b7b37be8d..45c053c04 100644
--- a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/catalog/Identifier.java
+++ b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/catalog/Identifier.java
@@ -18,10 +18,11 @@
package org.apache.flink.table.store.file.catalog;
-import org.apache.flink.table.store.annotation.Experimental;
import org.apache.flink.table.store.fs.Path;
import org.apache.flink.table.store.utils.StringUtils;
+import org.apache.paimon.annotation.Experimental;
+
import java.io.Serializable;
import java.util.Objects;
diff --git a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/disk/BufferFileReader.java b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/disk/BufferFileReader.java
index 5776cb432..8c4263a37 100644
--- a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/disk/BufferFileReader.java
+++ b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/disk/BufferFileReader.java
@@ -18,9 +18,10 @@
package org.apache.flink.table.store.file.disk;
-import org.apache.flink.table.store.annotation.Experimental;
import org.apache.flink.table.store.file.memory.Buffer;
+import org.apache.paimon.annotation.Experimental;
+
import java.io.IOException;
/**
diff --git a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/disk/BufferFileWriter.java b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/disk/BufferFileWriter.java
index 982804a7d..d938e3ac8 100644
--- a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/disk/BufferFileWriter.java
+++ b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/disk/BufferFileWriter.java
@@ -18,10 +18,11 @@
package org.apache.flink.table.store.file.disk;
-import org.apache.flink.table.store.annotation.Experimental;
import org.apache.flink.table.store.file.memory.Buffer;
import org.apache.flink.table.store.memory.MemorySegment;
+import org.apache.paimon.annotation.Experimental;
+
import java.io.IOException;
/**
diff --git a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/disk/ChannelReaderInputView.java b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/disk/ChannelReaderInputView.java
index c77aa7229..9005bda1d 100644
--- a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/disk/ChannelReaderInputView.java
+++ b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/disk/ChannelReaderInputView.java
@@ -18,12 +18,13 @@
package org.apache.flink.table.store.file.disk;
-import org.apache.flink.table.store.data.AbstractPagedInputView;
import org.apache.flink.table.store.file.compression.BlockCompressionFactory;
import org.apache.flink.table.store.file.compression.BlockDecompressor;
import org.apache.flink.table.store.file.memory.Buffer;
import org.apache.flink.table.store.memory.MemorySegment;
+import org.apache.paimon.data.AbstractPagedInputView;
+
import java.io.EOFException;
import java.io.IOException;
import java.util.Collections;
diff --git a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/disk/ChannelReaderInputViewIterator.java b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/disk/ChannelReaderInputViewIterator.java
index dd175357c..7b6ede392 100644
--- a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/disk/ChannelReaderInputViewIterator.java
+++ b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/disk/ChannelReaderInputViewIterator.java
@@ -18,11 +18,12 @@
package org.apache.flink.table.store.file.disk;
-import org.apache.flink.table.store.data.BinaryRow;
-import org.apache.flink.table.store.data.serializer.BinaryRowSerializer;
import org.apache.flink.table.store.file.utils.MutableObjectIterator;
import org.apache.flink.table.store.memory.MemorySegment;
+import org.apache.paimon.data.BinaryRow;
+import org.apache.paimon.data.serializer.BinaryRowSerializer;
+
import java.io.EOFException;
import java.io.IOException;
import java.util.List;
diff --git a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/disk/ChannelWriterOutputView.java b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/disk/ChannelWriterOutputView.java
index 639c11836..e99d7f64c 100644
--- a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/disk/ChannelWriterOutputView.java
+++ b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/disk/ChannelWriterOutputView.java
@@ -18,12 +18,13 @@
package org.apache.flink.table.store.file.disk;
-import org.apache.flink.table.store.data.AbstractPagedOutputView;
import org.apache.flink.table.store.file.compression.BlockCompressionFactory;
import org.apache.flink.table.store.file.compression.BlockCompressor;
import org.apache.flink.table.store.file.memory.Buffer;
import org.apache.flink.table.store.memory.MemorySegment;
+import org.apache.paimon.data.AbstractPagedOutputView;
+
import java.io.IOException;
/**
diff --git a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/disk/FileIOChannel.java b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/disk/FileIOChannel.java
index 557108d10..b01751310 100644
--- a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/disk/FileIOChannel.java
+++ b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/disk/FileIOChannel.java
@@ -18,9 +18,10 @@
package org.apache.flink.table.store.file.disk;
-import org.apache.flink.table.store.annotation.Experimental;
import org.apache.flink.table.store.utils.StringUtils;
+import org.apache.paimon.annotation.Experimental;
+
import java.io.File;
import java.io.IOException;
import java.nio.channels.FileChannel;
diff --git a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/disk/IOManager.java b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/disk/IOManager.java
index c3f557593..fcbbe141d 100644
--- a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/disk/IOManager.java
+++ b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/disk/IOManager.java
@@ -18,10 +18,11 @@
package org.apache.flink.table.store.file.disk;
-import org.apache.flink.table.store.annotation.Experimental;
import org.apache.flink.table.store.file.disk.FileIOChannel.Enumerator;
import org.apache.flink.table.store.file.disk.FileIOChannel.ID;
+import org.apache.paimon.annotation.Experimental;
+
import java.io.IOException;
/**
diff --git a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/io/AbstractFileRecordIterator.java b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/io/AbstractFileRecordIterator.java
index 7e589e1b1..e28fdcee5 100644
--- a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/io/AbstractFileRecordIterator.java
+++ b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/io/AbstractFileRecordIterator.java
@@ -18,12 +18,13 @@
package org.apache.flink.table.store.file.io;
-import org.apache.flink.table.store.data.InternalRow;
import org.apache.flink.table.store.file.casting.CastFieldGetter;
import org.apache.flink.table.store.file.casting.CastedRow;
import org.apache.flink.table.store.reader.RecordReader;
import org.apache.flink.table.store.utils.ProjectedRow;
+import org.apache.paimon.data.InternalRow;
+
import javax.annotation.Nullable;
/**
diff --git a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/io/DataFileMeta.java b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/io/DataFileMeta.java
index 9229ae5d2..ec0fc220a 100644
--- a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/io/DataFileMeta.java
+++ b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/io/DataFileMeta.java
@@ -19,8 +19,6 @@
package org.apache.flink.table.store.file.io;
import org.apache.flink.table.store.CoreOptions;
-import org.apache.flink.table.store.data.BinaryRow;
-import org.apache.flink.table.store.data.Timestamp;
import org.apache.flink.table.store.file.stats.BinaryTableStats;
import org.apache.flink.table.store.file.stats.FieldStatsArraySerializer;
import org.apache.flink.table.store.types.ArrayType;
@@ -30,15 +28,18 @@ import org.apache.flink.table.store.types.DataTypes;
import org.apache.flink.table.store.types.IntType;
import org.apache.flink.table.store.types.RowType;
+import org.apache.paimon.data.BinaryRow;
+import org.apache.paimon.data.Timestamp;
+
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Objects;
-import static org.apache.flink.table.store.data.BinaryRow.EMPTY_ROW;
import static org.apache.flink.table.store.file.utils.SerializationUtils.newBytesType;
import static org.apache.flink.table.store.file.utils.SerializationUtils.newStringType;
import static org.apache.flink.table.store.utils.Preconditions.checkArgument;
+import static org.apache.paimon.data.BinaryRow.EMPTY_ROW;
/** Metadata of a data file. */
public class DataFileMeta {
diff --git a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/io/DataFileMetaSerializer.java b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/io/DataFileMetaSerializer.java
index 514342c66..2483ec5b3 100644
--- a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/io/DataFileMetaSerializer.java
+++ b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/io/DataFileMetaSerializer.java
@@ -18,12 +18,13 @@
package org.apache.flink.table.store.file.io;
-import org.apache.flink.table.store.data.BinaryString;
-import org.apache.flink.table.store.data.GenericRow;
-import org.apache.flink.table.store.data.InternalRow;
import org.apache.flink.table.store.file.stats.BinaryTableStats;
import org.apache.flink.table.store.file.utils.ObjectSerializer;
+import org.apache.paimon.data.BinaryString;
+import org.apache.paimon.data.GenericRow;
+import org.apache.paimon.data.InternalRow;
+
import static org.apache.flink.table.store.file.utils.SerializationUtils.deserializeBinaryRow;
import static org.apache.flink.table.store.file.utils.SerializationUtils.serializeBinaryRow;
import static org.apache.flink.table.store.utils.RowDataUtils.fromStringArrayData;
diff --git a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/io/DataFilePathFactory.java b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/io/DataFilePathFactory.java
index e11950abe..80823f5b8 100644
--- a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/io/DataFilePathFactory.java
+++ b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/io/DataFilePathFactory.java
@@ -18,9 +18,10 @@
package org.apache.flink.table.store.file.io;
-import org.apache.flink.table.store.annotation.VisibleForTesting;
import org.apache.flink.table.store.fs.Path;
+import org.apache.paimon.annotation.VisibleForTesting;
+
import javax.annotation.concurrent.ThreadSafe;
import java.util.UUID;
diff --git a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/io/KeyValueDataFileRecordReader.java b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/io/KeyValueDataFileRecordReader.java
index 3ce46bc39..4df926b72 100644
--- a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/io/KeyValueDataFileRecordReader.java
+++ b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/io/KeyValueDataFileRecordReader.java
@@ -18,7 +18,6 @@
package org.apache.flink.table.store.file.io;
-import org.apache.flink.table.store.data.InternalRow;
import org.apache.flink.table.store.file.KeyValue;
import org.apache.flink.table.store.file.KeyValueSerializer;
import org.apache.flink.table.store.file.casting.CastFieldGetter;
@@ -28,6 +27,7 @@ import org.apache.flink.table.store.fs.Path;
import org.apache.flink.table.store.reader.RecordReader;
import org.apache.flink.table.store.types.RowType;
+import org.apache.paimon.data.InternalRow;
import org.apache.paimon.format.FormatReaderFactory;
import javax.annotation.Nullable;
diff --git a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/io/KeyValueDataFileWriter.java b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/io/KeyValueDataFileWriter.java
index ecca7e9c3..1d8b33662 100644
--- a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/io/KeyValueDataFileWriter.java
+++ b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/io/KeyValueDataFileWriter.java
@@ -18,9 +18,6 @@
package org.apache.flink.table.store.file.io;
-import org.apache.flink.table.store.data.BinaryRow;
-import org.apache.flink.table.store.data.InternalRow;
-import org.apache.flink.table.store.data.serializer.InternalRowSerializer;
import org.apache.flink.table.store.file.KeyValue;
import org.apache.flink.table.store.file.stats.BinaryTableStats;
import org.apache.flink.table.store.file.stats.FieldStatsArraySerializer;
@@ -28,6 +25,9 @@ import org.apache.flink.table.store.fs.FileIO;
import org.apache.flink.table.store.fs.Path;
import org.apache.flink.table.store.types.RowType;
+import org.apache.paimon.data.BinaryRow;
+import org.apache.paimon.data.InternalRow;
+import org.apache.paimon.data.serializer.InternalRowSerializer;
import org.apache.paimon.format.FieldStats;
import org.apache.paimon.format.FileStatsExtractor;
import org.apache.paimon.format.FormatWriterFactory;
diff --git a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/io/KeyValueFileReaderFactory.java b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/io/KeyValueFileReaderFactory.java
index aba295763..54372e74f 100644
--- a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/io/KeyValueFileReaderFactory.java
+++ b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/io/KeyValueFileReaderFactory.java
@@ -18,7 +18,6 @@
package org.apache.flink.table.store.file.io;
-import org.apache.flink.table.store.data.BinaryRow;
import org.apache.flink.table.store.file.KeyValue;
import org.apache.flink.table.store.file.predicate.Predicate;
import org.apache.flink.table.store.file.schema.KeyValueFieldsExtractor;
@@ -31,6 +30,7 @@ import org.apache.flink.table.store.reader.RecordReader;
import org.apache.flink.table.store.types.RowType;
import org.apache.flink.table.store.utils.Projection;
+import org.apache.paimon.data.BinaryRow;
import org.apache.paimon.format.FileFormatDiscover;
import org.apache.paimon.format.FormatKey;
diff --git a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/io/KeyValueFileWriterFactory.java b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/io/KeyValueFileWriterFactory.java
index fb5de46a7..e30a7718d 100644
--- a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/io/KeyValueFileWriterFactory.java
+++ b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/io/KeyValueFileWriterFactory.java
@@ -18,8 +18,6 @@
package org.apache.flink.table.store.file.io;
-import org.apache.flink.table.store.annotation.VisibleForTesting;
-import org.apache.flink.table.store.data.BinaryRow;
import org.apache.flink.table.store.file.KeyValue;
import org.apache.flink.table.store.file.KeyValueSerializer;
import org.apache.flink.table.store.file.utils.FileStorePathFactory;
@@ -27,6 +25,8 @@ import org.apache.flink.table.store.fs.FileIO;
import org.apache.flink.table.store.fs.Path;
import org.apache.flink.table.store.types.RowType;
+import org.apache.paimon.annotation.VisibleForTesting;
+import org.apache.paimon.data.BinaryRow;
import org.apache.paimon.format.FileFormat;
import org.apache.paimon.format.FileStatsExtractor;
import org.apache.paimon.format.FormatWriterFactory;
diff --git a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/io/RollingFileWriter.java b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/io/RollingFileWriter.java
index cb52e1ace..1a9a1a0d6 100644
--- a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/io/RollingFileWriter.java
+++ b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/io/RollingFileWriter.java
@@ -19,9 +19,9 @@
package org.apache.flink.table.store.file.io;
-import org.apache.flink.table.store.annotation.VisibleForTesting;
import org.apache.flink.table.store.utils.Preconditions;
+import org.apache.paimon.annotation.VisibleForTesting;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/io/RowDataFileRecordReader.java b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/io/RowDataFileRecordReader.java
index 6829c5a81..ef21007bb 100644
--- a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/io/RowDataFileRecordReader.java
+++ b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/io/RowDataFileRecordReader.java
@@ -18,13 +18,13 @@
package org.apache.flink.table.store.file.io;
-import org.apache.flink.table.store.data.InternalRow;
import org.apache.flink.table.store.file.casting.CastFieldGetter;
import org.apache.flink.table.store.file.utils.FileUtils;
import org.apache.flink.table.store.fs.FileIO;
import org.apache.flink.table.store.fs.Path;
import org.apache.flink.table.store.reader.RecordReader;
+import org.apache.paimon.data.InternalRow;
import org.apache.paimon.format.FormatReaderFactory;
import javax.annotation.Nullable;
diff --git a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/io/RowDataFileWriter.java b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/io/RowDataFileWriter.java
index f016628b6..c74a3e25e 100644
--- a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/io/RowDataFileWriter.java
+++ b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/io/RowDataFileWriter.java
@@ -19,7 +19,6 @@
package org.apache.flink.table.store.file.io;
-import org.apache.flink.table.store.data.InternalRow;
import org.apache.flink.table.store.file.stats.BinaryTableStats;
import org.apache.flink.table.store.file.stats.FieldStatsArraySerializer;
import org.apache.flink.table.store.fs.FileIO;
@@ -27,6 +26,7 @@ import org.apache.flink.table.store.fs.Path;
import org.apache.flink.table.store.types.RowType;
import org.apache.flink.table.store.utils.LongCounter;
+import org.apache.paimon.data.InternalRow;
import org.apache.paimon.format.FileStatsExtractor;
import org.apache.paimon.format.FormatWriterFactory;
diff --git a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/io/RowDataRollingFileWriter.java b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/io/RowDataRollingFileWriter.java
index e615611b5..289d52fb8 100644
--- a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/io/RowDataRollingFileWriter.java
+++ b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/io/RowDataRollingFileWriter.java
@@ -19,11 +19,11 @@
package org.apache.flink.table.store.file.io;
-import org.apache.flink.table.store.data.InternalRow;
import org.apache.flink.table.store.fs.FileIO;
import org.apache.flink.table.store.types.RowType;
import org.apache.flink.table.store.utils.LongCounter;
+import org.apache.paimon.data.InternalRow;
import org.apache.paimon.format.FileFormat;
/** {@link RollingFileWriter} for data files containing {@link InternalRow}. */
diff --git a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/io/SingleFileWriter.java b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/io/SingleFileWriter.java
index f2cdaa593..f81168880 100644
--- a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/io/SingleFileWriter.java
+++ b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/io/SingleFileWriter.java
@@ -19,12 +19,12 @@
package org.apache.flink.table.store.file.io;
-import org.apache.flink.table.store.data.InternalRow;
import org.apache.flink.table.store.fs.FileIO;
import org.apache.flink.table.store.fs.Path;
import org.apache.flink.table.store.fs.PositionOutputStream;
import org.apache.flink.table.store.utils.IOUtils;
+import org.apache.paimon.data.InternalRow;
import org.apache.paimon.format.FormatWriter;
import org.apache.paimon.format.FormatWriterFactory;
import org.slf4j.Logger;
diff --git a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/io/StatsCollectingSingleFileWriter.java b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/io/StatsCollectingSingleFileWriter.java
index 11f2e25dd..34887cc43 100644
--- a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/io/StatsCollectingSingleFileWriter.java
+++ b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/io/StatsCollectingSingleFileWriter.java
@@ -19,12 +19,12 @@
package org.apache.flink.table.store.file.io;
-import org.apache.flink.table.store.data.InternalRow;
import org.apache.flink.table.store.fs.FileIO;
import org.apache.flink.table.store.fs.Path;
import org.apache.flink.table.store.types.RowType;
import org.apache.flink.table.store.utils.Preconditions;
+import org.apache.paimon.data.InternalRow;
import org.apache.paimon.format.FieldStats;
import org.apache.paimon.format.FieldStatsCollector;
import org.apache.paimon.format.FileStatsExtractor;
diff --git a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/manifest/ManifestCommittableSerializer.java b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/manifest/ManifestCommittableSerializer.java
index 8a1793b9f..311d29518 100644
--- a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/manifest/ManifestCommittableSerializer.java
+++ b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/manifest/ManifestCommittableSerializer.java
@@ -18,12 +18,13 @@
package org.apache.flink.table.store.file.manifest;
-import org.apache.flink.table.store.data.serializer.VersionedSerializer;
import org.apache.flink.table.store.io.DataInputDeserializer;
import org.apache.flink.table.store.io.DataOutputViewStreamWrapper;
import org.apache.flink.table.store.table.sink.CommitMessage;
import org.apache.flink.table.store.table.sink.CommitMessageSerializer;
+import org.apache.paimon.data.serializer.VersionedSerializer;
+
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.util.HashMap;
diff --git a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/manifest/ManifestEntry.java b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/manifest/ManifestEntry.java
index 4e2f0d8be..2f43c8b54 100644
--- a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/manifest/ManifestEntry.java
+++ b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/manifest/ManifestEntry.java
@@ -18,7 +18,6 @@
package org.apache.flink.table.store.file.manifest;
-import org.apache.flink.table.store.data.BinaryRow;
import org.apache.flink.table.store.file.io.DataFileMeta;
import org.apache.flink.table.store.file.utils.FileStorePathFactory;
import org.apache.flink.table.store.types.DataField;
@@ -27,6 +26,8 @@ import org.apache.flink.table.store.types.RowType;
import org.apache.flink.table.store.types.TinyIntType;
import org.apache.flink.table.store.utils.Preconditions;
+import org.apache.paimon.data.BinaryRow;
+
import java.util.ArrayList;
import java.util.Collection;
import java.util.LinkedHashMap;
diff --git a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/manifest/ManifestEntrySerializer.java b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/manifest/ManifestEntrySerializer.java
index c5ca6fecd..1c1ea832a 100644
--- a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/manifest/ManifestEntrySerializer.java
+++ b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/manifest/ManifestEntrySerializer.java
@@ -18,11 +18,12 @@
package org.apache.flink.table.store.file.manifest;
-import org.apache.flink.table.store.data.GenericRow;
-import org.apache.flink.table.store.data.InternalRow;
import org.apache.flink.table.store.file.io.DataFileMetaSerializer;
import org.apache.flink.table.store.file.utils.VersionedObjectSerializer;
+import org.apache.paimon.data.GenericRow;
+import org.apache.paimon.data.InternalRow;
+
import static org.apache.flink.table.store.file.utils.SerializationUtils.deserializeBinaryRow;
import static org.apache.flink.table.store.file.utils.SerializationUtils.serializeBinaryRow;
diff --git a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/manifest/ManifestFile.java b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/manifest/ManifestFile.java
index 3fc8103e7..b307a3c01 100644
--- a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/manifest/ManifestFile.java
+++ b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/manifest/ManifestFile.java
@@ -18,7 +18,6 @@
package org.apache.flink.table.store.file.manifest;
-import org.apache.flink.table.store.annotation.VisibleForTesting;
import org.apache.flink.table.store.file.io.RollingFileWriter;
import org.apache.flink.table.store.file.io.SingleFileWriter;
import org.apache.flink.table.store.file.schema.SchemaManager;
@@ -30,6 +29,7 @@ import org.apache.flink.table.store.fs.FileIO;
import org.apache.flink.table.store.fs.Path;
import org.apache.flink.table.store.types.RowType;
+import org.apache.paimon.annotation.VisibleForTesting;
import org.apache.paimon.format.FieldStatsCollector;
import org.apache.paimon.format.FileFormat;
import org.apache.paimon.format.FormatReaderFactory;
diff --git a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/manifest/ManifestFileMetaSerializer.java b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/manifest/ManifestFileMetaSerializer.java
index da38554c7..12249a433 100644
--- a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/manifest/ManifestFileMetaSerializer.java
+++ b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/manifest/ManifestFileMetaSerializer.java
@@ -18,12 +18,13 @@
package org.apache.flink.table.store.file.manifest;
-import org.apache.flink.table.store.data.BinaryString;
-import org.apache.flink.table.store.data.GenericRow;
-import org.apache.flink.table.store.data.InternalRow;
import org.apache.flink.table.store.file.stats.BinaryTableStats;
import org.apache.flink.table.store.file.utils.VersionedObjectSerializer;
+import org.apache.paimon.data.BinaryString;
+import org.apache.paimon.data.GenericRow;
+import org.apache.paimon.data.InternalRow;
+
/** Serializer for {@link ManifestFileMeta}. */
public class ManifestFileMetaSerializer extends VersionedObjectSerializer<ManifestFileMeta> {
diff --git a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/memory/Buffer.java b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/memory/Buffer.java
index 6393b134e..1e05d3db0 100644
--- a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/memory/Buffer.java
+++ b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/memory/Buffer.java
@@ -18,9 +18,10 @@
package org.apache.flink.table.store.file.memory;
-import org.apache.flink.table.store.annotation.Experimental;
import org.apache.flink.table.store.memory.MemorySegment;
+import org.apache.paimon.annotation.Experimental;
+
import java.nio.ByteBuffer;
/**
diff --git a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/memory/MemorySegmentPool.java b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/memory/MemorySegmentPool.java
index f5a73ed01..30ddee32c 100644
--- a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/memory/MemorySegmentPool.java
+++ b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/memory/MemorySegmentPool.java
@@ -18,11 +18,12 @@
package org.apache.flink.table.store.file.memory;
-import org.apache.flink.table.store.annotation.Experimental;
import org.apache.flink.table.store.memory.MemorySegment;
import org.apache.flink.table.store.memory.MemorySegmentSource;
import org.apache.flink.table.store.options.MemorySize;
+import org.apache.paimon.annotation.Experimental;
+
import java.util.List;
/**
diff --git a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/mergetree/Levels.java b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/mergetree/Levels.java
index 3804e29bc..9dc966f7c 100644
--- a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/mergetree/Levels.java
+++ b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/mergetree/Levels.java
@@ -18,10 +18,11 @@
package org.apache.flink.table.store.file.mergetree;
-import org.apache.flink.table.store.data.InternalRow;
import org.apache.flink.table.store.file.io.DataFileMeta;
import org.apache.flink.table.store.utils.Preconditions;
+import org.apache.paimon.data.InternalRow;
+
import java.util.ArrayList;
import java.util.Comparator;
import java.util.HashMap;
diff --git a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/mergetree/LookupLevels.java b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/mergetree/LookupLevels.java
index 7b7b8dbc2..f92e75a85 100644
--- a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/mergetree/LookupLevels.java
+++ b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/mergetree/LookupLevels.java
@@ -18,9 +18,6 @@
package org.apache.flink.table.store.file.mergetree;
-import org.apache.flink.table.store.annotation.VisibleForTesting;
-import org.apache.flink.table.store.data.InternalRow;
-import org.apache.flink.table.store.data.serializer.RowCompactedSerializer;
import org.apache.flink.table.store.file.KeyValue;
import org.apache.flink.table.store.file.io.DataFileMeta;
import org.apache.flink.table.store.io.DataOutputSerializer;
@@ -39,6 +36,10 @@ import org.apache.flink.shaded.guava30.com.google.common.cache.Cache;
import org.apache.flink.shaded.guava30.com.google.common.cache.CacheBuilder;
import org.apache.flink.shaded.guava30.com.google.common.cache.RemovalNotification;
+import org.apache.paimon.annotation.VisibleForTesting;
+import org.apache.paimon.data.InternalRow;
+import org.apache.paimon.data.serializer.RowCompactedSerializer;
+
import javax.annotation.Nullable;
import java.io.Closeable;
@@ -51,8 +52,6 @@ import java.util.List;
import java.util.concurrent.ExecutionException;
import java.util.function.Supplier;
-import static org.apache.flink.table.store.options.ConfigOptions.key;
-
/** Provide lookup by key. */
public class LookupLevels implements Levels.DropFileCallback, Closeable {
diff --git a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/mergetree/MergeTreeReaders.java b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/mergetree/MergeTreeReaders.java
index ef5270fd7..fa10e6620 100644
--- a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/mergetree/MergeTreeReaders.java
+++ b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/mergetree/MergeTreeReaders.java
@@ -18,7 +18,6 @@
package org.apache.flink.table.store.file.mergetree;
-import org.apache.flink.table.store.data.InternalRow;
import org.apache.flink.table.store.file.KeyValue;
import org.apache.flink.table.store.file.io.DataFileMeta;
import org.apache.flink.table.store.file.io.KeyValueFileReaderFactory;
@@ -29,6 +28,8 @@ import org.apache.flink.table.store.file.mergetree.compact.ReducerMergeFunctionW
import org.apache.flink.table.store.file.mergetree.compact.SortMergeReader;
import org.apache.flink.table.store.reader.RecordReader;
+import org.apache.paimon.data.InternalRow;
+
import java.io.IOException;
import java.util.ArrayList;
import java.util.Comparator;
diff --git a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/mergetree/MergeTreeWriter.java b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/mergetree/MergeTreeWriter.java
index 4111e7f8e..4cfa0cdc4 100644
--- a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/mergetree/MergeTreeWriter.java
+++ b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/mergetree/MergeTreeWriter.java
@@ -19,8 +19,6 @@
package org.apache.flink.table.store.file.mergetree;
import org.apache.flink.table.store.CoreOptions.ChangelogProducer;
-import org.apache.flink.table.store.annotation.VisibleForTesting;
-import org.apache.flink.table.store.data.InternalRow;
import org.apache.flink.table.store.file.KeyValue;
import org.apache.flink.table.store.file.compact.CompactManager;
import org.apache.flink.table.store.file.compact.CompactResult;
@@ -37,6 +35,9 @@ import org.apache.flink.table.store.file.utils.CommitIncrement;
import org.apache.flink.table.store.file.utils.RecordWriter;
import org.apache.flink.table.store.types.RowType;
+import org.apache.paimon.annotation.VisibleForTesting;
+import org.apache.paimon.data.InternalRow;
+
import javax.annotation.Nullable;
import java.util.ArrayList;
diff --git a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/mergetree/SortBufferWriteBuffer.java b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/mergetree/SortBufferWriteBuffer.java
index d0d93b51e..2c56afaa4 100644
--- a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/mergetree/SortBufferWriteBuffer.java
+++ b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/mergetree/SortBufferWriteBuffer.java
@@ -18,15 +18,9 @@
package org.apache.flink.table.store.file.mergetree;
-import org.apache.flink.table.store.annotation.VisibleForTesting;
import org.apache.flink.table.store.codegen.CodeGenUtils;
import org.apache.flink.table.store.codegen.NormalizedKeyComputer;
import org.apache.flink.table.store.codegen.RecordComparator;
-import org.apache.flink.table.store.data.BinaryRow;
-import org.apache.flink.table.store.data.InternalRow;
-import org.apache.flink.table.store.data.serializer.BinaryRowSerializer;
-import org.apache.flink.table.store.data.serializer.InternalRowSerializer;
-import org.apache.flink.table.store.data.serializer.InternalSerializers;
import org.apache.flink.table.store.file.KeyValue;
import org.apache.flink.table.store.file.KeyValueSerializer;
import org.apache.flink.table.store.file.disk.IOManager;
@@ -42,6 +36,13 @@ import org.apache.flink.table.store.types.DataType;
import org.apache.flink.table.store.types.RowKind;
import org.apache.flink.table.store.types.RowType;
+import org.apache.paimon.annotation.VisibleForTesting;
+import org.apache.paimon.data.BinaryRow;
+import org.apache.paimon.data.InternalRow;
+import org.apache.paimon.data.serializer.BinaryRowSerializer;
+import org.apache.paimon.data.serializer.InternalRowSerializer;
+import org.apache.paimon.data.serializer.InternalSerializers;
+
import javax.annotation.Nullable;
import java.io.IOException;
diff --git a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/mergetree/SortedRun.java b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/mergetree/SortedRun.java
index 482e80b76..10802ab89 100644
--- a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/mergetree/SortedRun.java
+++ b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/mergetree/SortedRun.java
@@ -18,11 +18,12 @@
package org.apache.flink.table.store.file.mergetree;
-import org.apache.flink.table.store.annotation.VisibleForTesting;
-import org.apache.flink.table.store.data.InternalRow;
import org.apache.flink.table.store.file.io.DataFileMeta;
import org.apache.flink.table.store.utils.Preconditions;
+import org.apache.paimon.annotation.VisibleForTesting;
+import org.apache.paimon.data.InternalRow;
+
import java.util.Collections;
import java.util.Comparator;
import java.util.List;
diff --git a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/mergetree/WriteBuffer.java b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/mergetree/WriteBuffer.java
index 429a55e33..a1a5bcd06 100644
--- a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/mergetree/WriteBuffer.java
+++ b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/mergetree/WriteBuffer.java
@@ -18,11 +18,12 @@
package org.apache.flink.table.store.file.mergetree;
-import org.apache.flink.table.store.data.InternalRow;
import org.apache.flink.table.store.file.KeyValue;
import org.apache.flink.table.store.file.mergetree.compact.MergeFunction;
import org.apache.flink.table.store.types.RowKind;
+import org.apache.paimon.data.InternalRow;
+
import javax.annotation.Nullable;
import java.io.IOException;
diff --git a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/mergetree/compact/ChangelogMergeTreeRewriter.java b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/mergetree/compact/ChangelogMergeTreeRewriter.java
index f4d4f2ed3..ece5ff705 100644
--- a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/mergetree/compact/ChangelogMergeTreeRewriter.java
+++ b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/mergetree/compact/ChangelogMergeTreeRewriter.java
@@ -18,7 +18,6 @@
package org.apache.flink.table.store.file.mergetree.compact;
-import org.apache.flink.table.store.data.InternalRow;
import org.apache.flink.table.store.file.KeyValue;
import org.apache.flink.table.store.file.compact.CompactResult;
import org.apache.flink.table.store.file.io.DataFileMeta;
@@ -30,6 +29,8 @@ import org.apache.flink.table.store.file.mergetree.SortedRun;
import org.apache.flink.table.store.reader.RecordReader;
import org.apache.flink.table.store.reader.RecordReaderIterator;
+import org.apache.paimon.data.InternalRow;
+
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
diff --git a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/mergetree/compact/FullChangelogMergeTreeCompactRewriter.java b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/mergetree/compact/FullChangelogMergeTreeCompactRewriter.java
index 5bbe3571d..d9f20fb74 100644
--- a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/mergetree/compact/FullChangelogMergeTreeCompactRewriter.java
+++ b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/mergetree/compact/FullChangelogMergeTreeCompactRewriter.java
@@ -18,7 +18,6 @@
package org.apache.flink.table.store.file.mergetree.compact;
-import org.apache.flink.table.store.data.InternalRow;
import org.apache.flink.table.store.file.KeyValue;
import org.apache.flink.table.store.file.io.DataFileMeta;
import org.apache.flink.table.store.file.io.KeyValueFileReaderFactory;
@@ -26,6 +25,8 @@ import org.apache.flink.table.store.file.io.KeyValueFileWriterFactory;
import org.apache.flink.table.store.file.mergetree.SortedRun;
import org.apache.flink.table.store.utils.Preconditions;
+import org.apache.paimon.data.InternalRow;
+
import java.io.IOException;
import java.util.Comparator;
import java.util.List;
diff --git a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/mergetree/compact/IntervalPartition.java b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/mergetree/compact/IntervalPartition.java
index ffb0e044b..8b6eb2da2 100644
--- a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/mergetree/compact/IntervalPartition.java
+++ b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/mergetree/compact/IntervalPartition.java
@@ -18,11 +18,12 @@
package org.apache.flink.table.store.file.mergetree.compact;
-import org.apache.flink.table.store.data.BinaryRow;
-import org.apache.flink.table.store.data.InternalRow;
import org.apache.flink.table.store.file.io.DataFileMeta;
import org.apache.flink.table.store.file.mergetree.SortedRun;
+import org.apache.paimon.data.BinaryRow;
+import org.apache.paimon.data.InternalRow;
+
import java.util.ArrayList;
import java.util.Comparator;
import java.util.List;
diff --git a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/mergetree/compact/LookupChangelogMergeFunctionWrapper.java b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/mergetree/compact/LookupChangelogMergeFunctionWrapper.java
index c4caeea1f..557075dec 100644
--- a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/mergetree/compact/LookupChangelogMergeFunctionWrapper.java
+++ b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/mergetree/compact/LookupChangelogMergeFunctionWrapper.java
@@ -18,10 +18,11 @@
package org.apache.flink.table.store.file.mergetree.compact;
-import org.apache.flink.table.store.data.InternalRow;
import org.apache.flink.table.store.file.KeyValue;
import org.apache.flink.table.store.types.RowKind;
+import org.apache.paimon.data.InternalRow;
+
import java.util.function.Function;
import static org.apache.flink.table.store.utils.Preconditions.checkArgument;
diff --git a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/mergetree/compact/LookupMergeTreeCompactRewriter.java b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/mergetree/compact/LookupMergeTreeCompactRewriter.java
index ce3fdbcfa..1e12b8c33 100644
--- a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/mergetree/compact/LookupMergeTreeCompactRewriter.java
+++ b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/mergetree/compact/LookupMergeTreeCompactRewriter.java
@@ -18,7 +18,6 @@
package org.apache.flink.table.store.file.mergetree.compact;
-import org.apache.flink.table.store.data.InternalRow;
import org.apache.flink.table.store.file.KeyValue;
import org.apache.flink.table.store.file.io.DataFileMeta;
import org.apache.flink.table.store.file.io.KeyValueFileReaderFactory;
@@ -26,6 +25,8 @@ import org.apache.flink.table.store.file.io.KeyValueFileWriterFactory;
import org.apache.flink.table.store.file.mergetree.LookupLevels;
import org.apache.flink.table.store.file.mergetree.SortedRun;
+import org.apache.paimon.data.InternalRow;
+
import java.io.IOException;
import java.io.UncheckedIOException;
import java.util.Comparator;
diff --git a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/mergetree/compact/MergeTreeCompactManager.java b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/mergetree/compact/MergeTreeCompactManager.java
index 9efc971bd..3234fb682 100644
--- a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/mergetree/compact/MergeTreeCompactManager.java
+++ b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/mergetree/compact/MergeTreeCompactManager.java
@@ -18,8 +18,6 @@
package org.apache.flink.table.store.file.mergetree.compact;
-import org.apache.flink.table.store.annotation.VisibleForTesting;
-import org.apache.flink.table.store.data.InternalRow;
import org.apache.flink.table.store.file.compact.CompactFutureManager;
import org.apache.flink.table.store.file.compact.CompactResult;
import org.apache.flink.table.store.file.compact.CompactUnit;
@@ -28,6 +26,8 @@ import org.apache.flink.table.store.file.mergetree.LevelSortedRun;
import org.apache.flink.table.store.file.mergetree.Levels;
import org.apache.flink.table.store.utils.Preconditions;
+import org.apache.paimon.annotation.VisibleForTesting;
+import org.apache.paimon.data.InternalRow;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/mergetree/compact/MergeTreeCompactRewriter.java b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/mergetree/compact/MergeTreeCompactRewriter.java
index cab0d846a..ffc531b9b 100644
--- a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/mergetree/compact/MergeTreeCompactRewriter.java
+++ b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/mergetree/compact/MergeTreeCompactRewriter.java
@@ -18,7 +18,6 @@
package org.apache.flink.table.store.file.mergetree.compact;
-import org.apache.flink.table.store.data.InternalRow;
import org.apache.flink.table.store.file.KeyValue;
import org.apache.flink.table.store.file.compact.CompactResult;
import org.apache.flink.table.store.file.io.DataFileMeta;
@@ -30,6 +29,8 @@ import org.apache.flink.table.store.file.mergetree.SortedRun;
import org.apache.flink.table.store.reader.RecordReader;
import org.apache.flink.table.store.reader.RecordReaderIterator;
+import org.apache.paimon.data.InternalRow;
+
import java.util.Comparator;
import java.util.List;
diff --git a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/mergetree/compact/MergeTreeCompactTask.java b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/mergetree/compact/MergeTreeCompactTask.java
index 5354e1037..5b5b242e6 100644
--- a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/mergetree/compact/MergeTreeCompactTask.java
+++ b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/mergetree/compact/MergeTreeCompactTask.java
@@ -18,13 +18,14 @@
package org.apache.flink.table.store.file.mergetree.compact;
-import org.apache.flink.table.store.data.InternalRow;
import org.apache.flink.table.store.file.compact.CompactResult;
import org.apache.flink.table.store.file.compact.CompactTask;
import org.apache.flink.table.store.file.compact.CompactUnit;
import org.apache.flink.table.store.file.io.DataFileMeta;
import org.apache.flink.table.store.file.mergetree.SortedRun;
+import org.apache.paimon.data.InternalRow;
+
import java.util.ArrayList;
import java.util.Comparator;
import java.util.List;
diff --git a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/mergetree/compact/PartialUpdateMergeFunction.java b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/mergetree/compact/PartialUpdateMergeFunction.java
index ca79a338b..9fed302bf 100644
--- a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/mergetree/compact/PartialUpdateMergeFunction.java
+++ b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/mergetree/compact/PartialUpdateMergeFunction.java
@@ -18,13 +18,14 @@
package org.apache.flink.table.store.file.mergetree.compact;
-import org.apache.flink.table.store.data.GenericRow;
-import org.apache.flink.table.store.data.InternalRow;
import org.apache.flink.table.store.file.KeyValue;
import org.apache.flink.table.store.types.DataType;
import org.apache.flink.table.store.types.RowKind;
import org.apache.flink.table.store.utils.Projection;
+import org.apache.paimon.data.GenericRow;
+import org.apache.paimon.data.InternalRow;
+
import javax.annotation.Nullable;
import java.util.List;
diff --git a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/mergetree/compact/SortMergeReader.java b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/mergetree/compact/SortMergeReader.java
index 12fce0c3f..4602121f8 100644
--- a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/mergetree/compact/SortMergeReader.java
+++ b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/mergetree/compact/SortMergeReader.java
@@ -18,11 +18,12 @@
package org.apache.flink.table.store.file.mergetree.compact;
-import org.apache.flink.table.store.data.InternalRow;
import org.apache.flink.table.store.file.KeyValue;
import org.apache.flink.table.store.reader.RecordReader;
import org.apache.flink.table.store.utils.Preconditions;
+import org.apache.paimon.data.InternalRow;
+
import javax.annotation.Nullable;
import java.io.IOException;
diff --git a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/mergetree/compact/UniversalCompaction.java b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/mergetree/compact/UniversalCompaction.java
index 91e380ee5..b5a0a50d2 100644
--- a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/mergetree/compact/UniversalCompaction.java
+++ b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/mergetree/compact/UniversalCompaction.java
@@ -18,11 +18,11 @@
package org.apache.flink.table.store.file.mergetree.compact;
-import org.apache.flink.table.store.annotation.VisibleForTesting;
import org.apache.flink.table.store.file.compact.CompactUnit;
import org.apache.flink.table.store.file.mergetree.LevelSortedRun;
import org.apache.flink.table.store.file.mergetree.SortedRun;
+import org.apache.paimon.annotation.VisibleForTesting;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/mergetree/compact/ValueCountMergeFunction.java b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/mergetree/compact/ValueCountMergeFunction.java
index 73117ae41..a4597057d 100644
--- a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/mergetree/compact/ValueCountMergeFunction.java
+++ b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/mergetree/compact/ValueCountMergeFunction.java
@@ -18,11 +18,12 @@
package org.apache.flink.table.store.file.mergetree.compact;
-import org.apache.flink.table.store.data.GenericRow;
-import org.apache.flink.table.store.data.InternalRow;
import org.apache.flink.table.store.file.KeyValue;
import org.apache.flink.table.store.types.RowKind;
+import org.apache.paimon.data.GenericRow;
+import org.apache.paimon.data.InternalRow;
+
import javax.annotation.Nullable;
import static org.apache.flink.table.store.utils.Preconditions.checkArgument;
diff --git a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/mergetree/compact/aggregate/AggregateMergeFunction.java b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/mergetree/compact/aggregate/AggregateMergeFunction.java
index 762fb6729..9f583b543 100644
--- a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/mergetree/compact/aggregate/AggregateMergeFunction.java
+++ b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/mergetree/compact/aggregate/AggregateMergeFunction.java
@@ -18,8 +18,6 @@
package org.apache.flink.table.store.file.mergetree.compact.aggregate;
-import org.apache.flink.table.store.data.GenericRow;
-import org.apache.flink.table.store.data.InternalRow;
import org.apache.flink.table.store.file.KeyValue;
import org.apache.flink.table.store.file.mergetree.compact.MergeFunction;
import org.apache.flink.table.store.file.mergetree.compact.MergeFunctionFactory;
@@ -28,6 +26,9 @@ import org.apache.flink.table.store.types.DataType;
import org.apache.flink.table.store.types.RowKind;
import org.apache.flink.table.store.utils.Projection;
+import org.apache.paimon.data.GenericRow;
+import org.apache.paimon.data.InternalRow;
+
import javax.annotation.Nullable;
import java.util.List;
diff --git a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/mergetree/compact/aggregate/FieldListaggAgg.java b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/mergetree/compact/aggregate/FieldListaggAgg.java
index b58d4276f..f76a02ec2 100644
--- a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/mergetree/compact/aggregate/FieldListaggAgg.java
+++ b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/mergetree/compact/aggregate/FieldListaggAgg.java
@@ -18,10 +18,11 @@
package org.apache.flink.table.store.file.mergetree.compact.aggregate;
-import org.apache.flink.table.store.data.BinaryString;
import org.apache.flink.table.store.types.DataType;
import org.apache.flink.table.store.utils.StringUtils;
+import org.apache.paimon.data.BinaryString;
+
/** listagg aggregate a field of a row. */
public class FieldListaggAgg extends FieldAggregator {
diff --git a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/mergetree/compact/aggregate/FieldSumAgg.java b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/mergetree/compact/aggregate/FieldSumAgg.java
index 0d1e11df0..8167456c1 100644
--- a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/mergetree/compact/aggregate/FieldSumAgg.java
+++ b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/mergetree/compact/aggregate/FieldSumAgg.java
@@ -18,10 +18,11 @@
package org.apache.flink.table.store.file.mergetree.compact.aggregate;
-import org.apache.flink.table.store.data.Decimal;
import org.apache.flink.table.store.types.DataType;
import org.apache.flink.table.store.utils.DecimalUtils;
+import org.apache.paimon.data.Decimal;
+
/** sum aggregate a field of a row. */
public class FieldSumAgg extends FieldAggregator {
diff --git a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/operation/AbstractFileStoreScan.java b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/operation/AbstractFileStoreScan.java
index df9c7f3bd..87dcf66fc 100644
--- a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/operation/AbstractFileStoreScan.java
+++ b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/operation/AbstractFileStoreScan.java
@@ -18,7 +18,6 @@
package org.apache.flink.table.store.file.operation;
-import org.apache.flink.table.store.data.BinaryRow;
import org.apache.flink.table.store.file.Snapshot;
import org.apache.flink.table.store.file.manifest.ManifestEntry;
import org.apache.flink.table.store.file.manifest.ManifestFile;
@@ -38,6 +37,8 @@ import org.apache.flink.table.store.utils.Filter;
import org.apache.flink.table.store.utils.Preconditions;
import org.apache.flink.table.store.utils.RowDataToObjectArrayConverter;
+import org.apache.paimon.data.BinaryRow;
+
import javax.annotation.Nullable;
import java.util.ArrayList;
diff --git a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/operation/AbstractFileStoreWrite.java b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/operation/AbstractFileStoreWrite.java
index 3a3e79a92..b9433f467 100644
--- a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/operation/AbstractFileStoreWrite.java
+++ b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/operation/AbstractFileStoreWrite.java
@@ -18,8 +18,6 @@
package org.apache.flink.table.store.file.operation;
-import org.apache.flink.table.store.annotation.VisibleForTesting;
-import org.apache.flink.table.store.data.BinaryRow;
import org.apache.flink.table.store.file.Snapshot;
import org.apache.flink.table.store.file.disk.IOManager;
import org.apache.flink.table.store.file.io.DataFileMeta;
@@ -32,6 +30,8 @@ import org.apache.flink.table.store.file.utils.SnapshotManager;
import org.apache.flink.table.store.table.sink.CommitMessage;
import org.apache.flink.table.store.table.sink.CommitMessageImpl;
+import org.apache.paimon.annotation.VisibleForTesting;
+import org.apache.paimon.data.BinaryRow;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/operation/AppendOnlyFileStoreRead.java b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/operation/AppendOnlyFileStoreRead.java
index 012bbfe1c..77c7ddc0e 100644
--- a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/operation/AppendOnlyFileStoreRead.java
+++ b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/operation/AppendOnlyFileStoreRead.java
@@ -18,7 +18,6 @@
package org.apache.flink.table.store.file.operation;
-import org.apache.flink.table.store.data.InternalRow;
import org.apache.flink.table.store.file.io.DataFileMeta;
import org.apache.flink.table.store.file.io.DataFilePathFactory;
import org.apache.flink.table.store.file.io.RowDataFileRecordReader;
@@ -36,6 +35,7 @@ import org.apache.flink.table.store.table.source.DataSplit;
import org.apache.flink.table.store.types.RowType;
import org.apache.flink.table.store.utils.Projection;
+import org.apache.paimon.data.InternalRow;
import org.apache.paimon.format.FileFormatDiscover;
import org.apache.paimon.format.FormatKey;
diff --git a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/operation/AppendOnlyFileStoreWrite.java b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/operation/AppendOnlyFileStoreWrite.java
index 97f19177f..7de5c9bea 100644
--- a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/operation/AppendOnlyFileStoreWrite.java
+++ b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/operation/AppendOnlyFileStoreWrite.java
@@ -19,8 +19,6 @@
package org.apache.flink.table.store.file.operation;
import org.apache.flink.table.store.CoreOptions;
-import org.apache.flink.table.store.data.BinaryRow;
-import org.apache.flink.table.store.data.InternalRow;
import org.apache.flink.table.store.file.append.AppendOnlyCompactManager;
import org.apache.flink.table.store.file.append.AppendOnlyWriter;
import org.apache.flink.table.store.file.compact.CompactManager;
@@ -38,6 +36,8 @@ import org.apache.flink.table.store.table.source.DataSplit;
import org.apache.flink.table.store.types.RowType;
import org.apache.flink.table.store.utils.LongCounter;
+import org.apache.paimon.data.BinaryRow;
+import org.apache.paimon.data.InternalRow;
import org.apache.paimon.format.FileFormat;
import javax.annotation.Nullable;
diff --git a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/operation/FileStoreCommitImpl.java b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/operation/FileStoreCommitImpl.java
index 6056d708b..91ec915af 100644
--- a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/operation/FileStoreCommitImpl.java
+++ b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/operation/FileStoreCommitImpl.java
@@ -18,8 +18,6 @@
package org.apache.flink.table.store.file.operation;
-import org.apache.flink.table.store.data.BinaryRow;
-import org.apache.flink.table.store.data.InternalRow;
import org.apache.flink.table.store.file.Snapshot;
import org.apache.flink.table.store.file.io.DataFileMeta;
import org.apache.flink.table.store.file.manifest.FileKind;
@@ -41,6 +39,8 @@ import org.apache.flink.table.store.table.sink.CommitMessageImpl;
import org.apache.flink.table.store.types.RowType;
import org.apache.flink.table.store.utils.RowDataToObjectArrayConverter;
+import org.apache.paimon.data.BinaryRow;
+import org.apache.paimon.data.InternalRow;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/operation/FileStoreExpireImpl.java b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/operation/FileStoreExpireImpl.java
index c79b83ebe..73b04462f 100644
--- a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/operation/FileStoreExpireImpl.java
+++ b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/operation/FileStoreExpireImpl.java
@@ -18,7 +18,6 @@
package org.apache.flink.table.store.file.operation;
-import org.apache.flink.table.store.annotation.VisibleForTesting;
import org.apache.flink.table.store.file.Snapshot;
import org.apache.flink.table.store.file.manifest.ManifestEntry;
import org.apache.flink.table.store.file.manifest.ManifestFile;
@@ -31,6 +30,7 @@ import org.apache.flink.table.store.fs.Path;
import org.apache.flink.shaded.guava30.com.google.common.collect.Iterables;
+import org.apache.paimon.annotation.VisibleForTesting;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/operation/FileStoreScan.java b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/operation/FileStoreScan.java
index cad750d03..56ce6aac7 100644
--- a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/operation/FileStoreScan.java
+++ b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/operation/FileStoreScan.java
@@ -18,7 +18,6 @@
package org.apache.flink.table.store.file.operation;
-import org.apache.flink.table.store.data.BinaryRow;
import org.apache.flink.table.store.file.io.DataFileMeta;
import org.apache.flink.table.store.file.manifest.FileKind;
import org.apache.flink.table.store.file.manifest.ManifestEntry;
@@ -26,6 +25,8 @@ import org.apache.flink.table.store.file.manifest.ManifestFileMeta;
import org.apache.flink.table.store.file.predicate.Predicate;
import org.apache.flink.table.store.utils.Filter;
+import org.apache.paimon.data.BinaryRow;
+
import javax.annotation.Nullable;
import java.util.ArrayList;
diff --git a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/operation/FileStoreWrite.java b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/operation/FileStoreWrite.java
index 1e0d3481e..caaddacf3 100644
--- a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/operation/FileStoreWrite.java
+++ b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/operation/FileStoreWrite.java
@@ -18,7 +18,6 @@
package org.apache.flink.table.store.file.operation;
-import org.apache.flink.table.store.data.BinaryRow;
import org.apache.flink.table.store.file.FileStore;
import org.apache.flink.table.store.file.disk.IOManager;
import org.apache.flink.table.store.file.io.DataFileMeta;
@@ -26,6 +25,8 @@ import org.apache.flink.table.store.file.utils.RecordWriter;
import org.apache.flink.table.store.table.sink.CommitMessage;
import org.apache.flink.table.store.table.sink.SinkRecord;
+import org.apache.paimon.data.BinaryRow;
+
import java.util.List;
/**
diff --git a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/operation/KeyValueFileStoreRead.java b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/operation/KeyValueFileStoreRead.java
index 1fe564220..361f5aead 100644
--- a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/operation/KeyValueFileStoreRead.java
+++ b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/operation/KeyValueFileStoreRead.java
@@ -18,7 +18,6 @@
package org.apache.flink.table.store.file.operation;
-import org.apache.flink.table.store.data.InternalRow;
import org.apache.flink.table.store.file.KeyValue;
import org.apache.flink.table.store.file.io.DataFileMeta;
import org.apache.flink.table.store.file.io.KeyValueFileReaderFactory;
@@ -41,6 +40,7 @@ import org.apache.flink.table.store.table.source.DataSplit;
import org.apache.flink.table.store.types.RowType;
import org.apache.flink.table.store.utils.ProjectedRow;
+import org.apache.paimon.data.InternalRow;
import org.apache.paimon.format.FileFormatDiscover;
import javax.annotation.Nullable;
diff --git a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/operation/KeyValueFileStoreWrite.java b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/operation/KeyValueFileStoreWrite.java
index a5838ba5e..bf25b42b8 100644
--- a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/operation/KeyValueFileStoreWrite.java
+++ b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/operation/KeyValueFileStoreWrite.java
@@ -20,8 +20,6 @@ package org.apache.flink.table.store.file.operation;
import org.apache.flink.table.store.CoreOptions;
import org.apache.flink.table.store.CoreOptions.ChangelogProducer;
-import org.apache.flink.table.store.data.BinaryRow;
-import org.apache.flink.table.store.data.InternalRow;
import org.apache.flink.table.store.file.KeyValue;
import org.apache.flink.table.store.file.compact.CompactManager;
import org.apache.flink.table.store.file.compact.NoopCompactManager;
@@ -49,6 +47,8 @@ import org.apache.flink.table.store.fs.FileIO;
import org.apache.flink.table.store.lookup.hash.HashLookupStoreFactory;
import org.apache.flink.table.store.types.RowType;
+import org.apache.paimon.data.BinaryRow;
+import org.apache.paimon.data.InternalRow;
import org.apache.paimon.format.FileFormatDiscover;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/operation/Lock.java b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/operation/Lock.java
index e881e80dd..ae7d26ef5 100644
--- a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/operation/Lock.java
+++ b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/operation/Lock.java
@@ -18,10 +18,11 @@
package org.apache.flink.table.store.file.operation;
-import org.apache.flink.table.store.annotation.Experimental;
import org.apache.flink.table.store.file.catalog.CatalogLock;
import org.apache.flink.table.store.file.catalog.Identifier;
+import org.apache.paimon.annotation.Experimental;
+
import javax.annotation.Nullable;
import java.io.Serializable;
diff --git a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/operation/PartitionExpire.java b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/operation/PartitionExpire.java
index 1785de1ed..773ed9d1a 100644
--- a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/operation/PartitionExpire.java
+++ b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/operation/PartitionExpire.java
@@ -18,14 +18,15 @@
package org.apache.flink.table.store.file.operation;
-import org.apache.flink.table.store.annotation.VisibleForTesting;
-import org.apache.flink.table.store.data.BinaryRow;
import org.apache.flink.table.store.file.manifest.ManifestCommittable;
import org.apache.flink.table.store.file.manifest.ManifestEntry;
import org.apache.flink.table.store.file.partition.PartitionTimeExtractor;
import org.apache.flink.table.store.types.RowType;
import org.apache.flink.table.store.utils.RowDataToObjectArrayConverter;
+import org.apache.paimon.annotation.VisibleForTesting;
+import org.apache.paimon.data.BinaryRow;
+
import java.time.Duration;
import java.time.LocalDateTime;
import java.util.ArrayList;
diff --git a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/predicate/BucketSelector.java b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/predicate/BucketSelector.java
index 89344036c..8bba6c1c8 100644
--- a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/predicate/BucketSelector.java
+++ b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/predicate/BucketSelector.java
@@ -18,15 +18,16 @@
package org.apache.flink.table.store.file.predicate;
-import org.apache.flink.table.store.annotation.VisibleForTesting;
-import org.apache.flink.table.store.data.BinaryRow;
-import org.apache.flink.table.store.data.GenericRow;
-import org.apache.flink.table.store.data.serializer.InternalRowSerializer;
import org.apache.flink.table.store.table.sink.BucketComputer;
import org.apache.flink.table.store.types.RowType;
import org.apache.flink.shaded.guava30.com.google.common.collect.ImmutableSet;
+import org.apache.paimon.annotation.VisibleForTesting;
+import org.apache.paimon.data.BinaryRow;
+import org.apache.paimon.data.GenericRow;
+import org.apache.paimon.data.serializer.InternalRowSerializer;
+
import javax.annotation.concurrent.ThreadSafe;
import java.io.Serializable;
diff --git a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/schema/Schema.java b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/schema/Schema.java
index 08cbc7edb..13b0314dd 100644
--- a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/schema/Schema.java
+++ b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/schema/Schema.java
@@ -18,12 +18,13 @@
package org.apache.flink.table.store.file.schema;
-import org.apache.flink.table.store.annotation.Experimental;
import org.apache.flink.table.store.types.DataField;
import org.apache.flink.table.store.types.DataType;
import org.apache.flink.table.store.types.RowType;
import org.apache.flink.table.store.utils.Preconditions;
+import org.apache.paimon.annotation.Experimental;
+
import javax.annotation.Nullable;
import java.util.ArrayList;
diff --git a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/schema/SchemaChange.java b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/schema/SchemaChange.java
index 2d5083f1d..6b46d9f6a 100644
--- a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/schema/SchemaChange.java
+++ b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/schema/SchemaChange.java
@@ -18,9 +18,10 @@
package org.apache.flink.table.store.file.schema;
-import org.apache.flink.table.store.annotation.Experimental;
import org.apache.flink.table.store.types.DataType;
+import org.apache.paimon.annotation.Experimental;
+
import javax.annotation.Nullable;
import java.util.Arrays;
diff --git a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/schema/SchemaEvolutionUtil.java b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/schema/SchemaEvolutionUtil.java
index 8d4799a37..b6a5e8eeb 100644
--- a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/schema/SchemaEvolutionUtil.java
+++ b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/schema/SchemaEvolutionUtil.java
@@ -18,7 +18,6 @@
package org.apache.flink.table.store.file.schema;
-import org.apache.flink.table.store.data.InternalRow;
import org.apache.flink.table.store.file.KeyValue;
import org.apache.flink.table.store.file.casting.CastExecutor;
import org.apache.flink.table.store.file.casting.CastExecutors;
@@ -36,6 +35,8 @@ import org.apache.flink.table.store.types.RowType;
import org.apache.flink.table.store.utils.ProjectedRow;
import org.apache.flink.table.store.utils.RowDataUtils;
+import org.apache.paimon.data.InternalRow;
+
import javax.annotation.Nullable;
import java.util.ArrayList;
diff --git a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/schema/SchemaManager.java b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/schema/SchemaManager.java
index dff6ba0f3..4b1c6e9ec 100644
--- a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/schema/SchemaManager.java
+++ b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/schema/SchemaManager.java
@@ -19,7 +19,6 @@
package org.apache.flink.table.store.file.schema;
import org.apache.flink.table.store.CoreOptions;
-import org.apache.flink.table.store.annotation.VisibleForTesting;
import org.apache.flink.table.store.file.casting.CastExecutors;
import org.apache.flink.table.store.file.operation.Lock;
import org.apache.flink.table.store.file.schema.SchemaChange.AddColumn;
@@ -42,6 +41,8 @@ import org.apache.flink.table.store.types.ReassignFieldId;
import org.apache.flink.table.store.types.RowType;
import org.apache.flink.table.store.utils.Preconditions;
+import org.apache.paimon.annotation.VisibleForTesting;
+
import javax.annotation.Nullable;
import java.io.IOException;
diff --git a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/sort/AbstractBinaryExternalMerger.java b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/sort/AbstractBinaryExternalMerger.java
index 943f61db9..ec9893ccd 100644
--- a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/sort/AbstractBinaryExternalMerger.java
+++ b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/sort/AbstractBinaryExternalMerger.java
@@ -18,7 +18,6 @@
package org.apache.flink.table.store.file.sort;
-import org.apache.flink.table.store.data.AbstractPagedOutputView;
import org.apache.flink.table.store.file.compression.BlockCompressionFactory;
import org.apache.flink.table.store.file.disk.ChannelReaderInputView;
import org.apache.flink.table.store.file.disk.ChannelWithMeta;
@@ -28,6 +27,7 @@ import org.apache.flink.table.store.file.disk.FileIOChannel;
import org.apache.flink.table.store.file.disk.IOManager;
import org.apache.flink.table.store.file.utils.MutableObjectIterator;
+import org.apache.paimon.data.AbstractPagedOutputView;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/sort/BinaryExternalMerger.java b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/sort/BinaryExternalMerger.java
index fa161f8ca..24acfef80 100644
--- a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/sort/BinaryExternalMerger.java
+++ b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/sort/BinaryExternalMerger.java
@@ -19,15 +19,16 @@
package org.apache.flink.table.store.file.sort;
import org.apache.flink.table.store.codegen.RecordComparator;
-import org.apache.flink.table.store.data.AbstractPagedOutputView;
-import org.apache.flink.table.store.data.BinaryRow;
-import org.apache.flink.table.store.data.serializer.BinaryRowSerializer;
import org.apache.flink.table.store.file.compression.BlockCompressionFactory;
import org.apache.flink.table.store.file.disk.ChannelReaderInputView;
import org.apache.flink.table.store.file.disk.ChannelReaderInputViewIterator;
import org.apache.flink.table.store.file.disk.IOManager;
import org.apache.flink.table.store.file.utils.MutableObjectIterator;
+import org.apache.paimon.data.AbstractPagedOutputView;
+import org.apache.paimon.data.BinaryRow;
+import org.apache.paimon.data.serializer.BinaryRowSerializer;
+
import java.io.IOException;
import java.util.ArrayList;
import java.util.Comparator;
diff --git a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/sort/BinaryExternalSortBuffer.java b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/sort/BinaryExternalSortBuffer.java
index 8cb08a76c..4a87002ab 100644
--- a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/sort/BinaryExternalSortBuffer.java
+++ b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/sort/BinaryExternalSortBuffer.java
@@ -18,11 +18,7 @@
package org.apache.flink.table.store.file.sort;
-import org.apache.flink.table.store.annotation.VisibleForTesting;
import org.apache.flink.table.store.codegen.RecordComparator;
-import org.apache.flink.table.store.data.BinaryRow;
-import org.apache.flink.table.store.data.InternalRow;
-import org.apache.flink.table.store.data.serializer.BinaryRowSerializer;
import org.apache.flink.table.store.file.compression.BlockCompressionFactory;
import org.apache.flink.table.store.file.compression.Lz4BlockCompressionFactory;
import org.apache.flink.table.store.file.disk.ChannelWithMeta;
@@ -33,6 +29,11 @@ import org.apache.flink.table.store.file.disk.IOManager;
import org.apache.flink.table.store.file.utils.MutableObjectIterator;
import org.apache.flink.table.store.options.MemorySize;
+import org.apache.paimon.annotation.VisibleForTesting;
+import org.apache.paimon.data.BinaryRow;
+import org.apache.paimon.data.InternalRow;
+import org.apache.paimon.data.serializer.BinaryRowSerializer;
+
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
diff --git a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/sort/BinaryInMemorySortBuffer.java b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/sort/BinaryInMemorySortBuffer.java
index de6137e78..7e3323b38 100644
--- a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/sort/BinaryInMemorySortBuffer.java
+++ b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/sort/BinaryInMemorySortBuffer.java
@@ -20,15 +20,16 @@ package org.apache.flink.table.store.file.sort;
import org.apache.flink.table.store.codegen.NormalizedKeyComputer;
import org.apache.flink.table.store.codegen.RecordComparator;
-import org.apache.flink.table.store.data.BinaryRow;
-import org.apache.flink.table.store.data.InternalRow;
-import org.apache.flink.table.store.data.SimpleCollectingOutputView;
-import org.apache.flink.table.store.data.serializer.AbstractRowDataSerializer;
-import org.apache.flink.table.store.data.serializer.BinaryRowSerializer;
import org.apache.flink.table.store.file.memory.MemorySegmentPool;
import org.apache.flink.table.store.file.utils.MutableObjectIterator;
import org.apache.flink.table.store.memory.MemorySegment;
+import org.apache.paimon.data.BinaryRow;
+import org.apache.paimon.data.InternalRow;
+import org.apache.paimon.data.SimpleCollectingOutputView;
+import org.apache.paimon.data.serializer.AbstractRowDataSerializer;
+import org.apache.paimon.data.serializer.BinaryRowSerializer;
+
import java.io.EOFException;
import java.io.IOException;
import java.util.ArrayList;
diff --git a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/sort/BinaryIndexedSortable.java b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/sort/BinaryIndexedSortable.java
index e351dcf74..6d397b5ea 100644
--- a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/sort/BinaryIndexedSortable.java
+++ b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/sort/BinaryIndexedSortable.java
@@ -20,14 +20,15 @@ package org.apache.flink.table.store.file.sort;
import org.apache.flink.table.store.codegen.NormalizedKeyComputer;
import org.apache.flink.table.store.codegen.RecordComparator;
-import org.apache.flink.table.store.data.AbstractPagedOutputView;
-import org.apache.flink.table.store.data.BinaryRow;
-import org.apache.flink.table.store.data.InternalRow;
-import org.apache.flink.table.store.data.RandomAccessInputView;
-import org.apache.flink.table.store.data.serializer.BinaryRowSerializer;
import org.apache.flink.table.store.file.memory.MemorySegmentPool;
import org.apache.flink.table.store.memory.MemorySegment;
+import org.apache.paimon.data.AbstractPagedOutputView;
+import org.apache.paimon.data.BinaryRow;
+import org.apache.paimon.data.InternalRow;
+import org.apache.paimon.data.RandomAccessInputView;
+import org.apache.paimon.data.serializer.BinaryRowSerializer;
+
import java.io.IOException;
import java.util.ArrayList;
diff --git a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/sort/SortBuffer.java b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/sort/SortBuffer.java
index 96e30889d..c2315ab0f 100644
--- a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/sort/SortBuffer.java
+++ b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/sort/SortBuffer.java
@@ -18,10 +18,11 @@
package org.apache.flink.table.store.file.sort;
-import org.apache.flink.table.store.data.BinaryRow;
-import org.apache.flink.table.store.data.InternalRow;
import org.apache.flink.table.store.file.utils.MutableObjectIterator;
+import org.apache.paimon.data.BinaryRow;
+import org.apache.paimon.data.InternalRow;
+
import java.io.IOException;
/** Sort buffer to sort records. */
diff --git a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/stats/BinaryTableStats.java b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/stats/BinaryTableStats.java
index e01cd8dcc..6fc066776 100644
--- a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/stats/BinaryTableStats.java
+++ b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/stats/BinaryTableStats.java
@@ -18,12 +18,11 @@
package org.apache.flink.table.store.file.stats;
-import org.apache.flink.table.store.data.BinaryRow;
-import org.apache.flink.table.store.data.GenericArray;
-import org.apache.flink.table.store.data.GenericRow;
-import org.apache.flink.table.store.data.InternalArray;
-import org.apache.flink.table.store.data.InternalRow;
-
+import org.apache.paimon.data.BinaryRow;
+import org.apache.paimon.data.GenericArray;
+import org.apache.paimon.data.GenericRow;
+import org.apache.paimon.data.InternalArray;
+import org.apache.paimon.data.InternalRow;
import org.apache.paimon.format.FieldStats;
import javax.annotation.Nullable;
diff --git a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/stats/FieldStatsArraySerializer.java b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/stats/FieldStatsArraySerializer.java
index ca5e58a5f..ed7550de1 100644
--- a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/stats/FieldStatsArraySerializer.java
+++ b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/stats/FieldStatsArraySerializer.java
@@ -18,9 +18,6 @@
package org.apache.flink.table.store.file.stats;
-import org.apache.flink.table.store.data.GenericRow;
-import org.apache.flink.table.store.data.InternalRow;
-import org.apache.flink.table.store.data.serializer.InternalRowSerializer;
import org.apache.flink.table.store.file.casting.CastExecutor;
import org.apache.flink.table.store.types.ArrayType;
import org.apache.flink.table.store.types.BigIntType;
@@ -29,6 +26,9 @@ import org.apache.flink.table.store.types.DataType;
import org.apache.flink.table.store.types.RowType;
import org.apache.flink.table.store.utils.RowDataUtils;
+import org.apache.paimon.data.GenericRow;
+import org.apache.paimon.data.InternalRow;
+import org.apache.paimon.data.serializer.InternalRowSerializer;
import org.apache.paimon.format.FieldStats;
import javax.annotation.Nullable;
diff --git a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/utils/FileStorePathFactory.java b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/utils/FileStorePathFactory.java
index ebaeae4a7..c03707740 100644
--- a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/utils/FileStorePathFactory.java
+++ b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/utils/FileStorePathFactory.java
@@ -19,14 +19,15 @@
package org.apache.flink.table.store.file.utils;
import org.apache.flink.table.store.CoreOptions;
-import org.apache.flink.table.store.annotation.VisibleForTesting;
-import org.apache.flink.table.store.data.BinaryRow;
import org.apache.flink.table.store.file.io.DataFilePathFactory;
import org.apache.flink.table.store.fs.Path;
import org.apache.flink.table.store.options.ConfigOption;
import org.apache.flink.table.store.types.RowType;
import org.apache.flink.table.store.utils.Preconditions;
+import org.apache.paimon.annotation.VisibleForTesting;
+import org.apache.paimon.data.BinaryRow;
+
import javax.annotation.concurrent.ThreadSafe;
import java.util.UUID;
diff --git a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/utils/FileUtils.java b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/utils/FileUtils.java
index 8650d3020..cbf0e2d9f 100644
--- a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/utils/FileUtils.java
+++ b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/utils/FileUtils.java
@@ -18,12 +18,12 @@
package org.apache.flink.table.store.file.utils;
-import org.apache.flink.table.store.data.InternalRow;
import org.apache.flink.table.store.fs.FileIO;
import org.apache.flink.table.store.fs.FileStatus;
import org.apache.flink.table.store.fs.Path;
import org.apache.flink.table.store.reader.RecordReader;
+import org.apache.paimon.data.InternalRow;
import org.apache.paimon.format.FormatReaderFactory;
import java.io.FileNotFoundException;
diff --git a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/utils/KeyComparatorSupplier.java b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/utils/KeyComparatorSupplier.java
index d46a1cc1e..23100bd92 100644
--- a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/utils/KeyComparatorSupplier.java
+++ b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/utils/KeyComparatorSupplier.java
@@ -21,9 +21,10 @@ package org.apache.flink.table.store.file.utils;
import org.apache.flink.table.store.codegen.CodeGenUtils;
import org.apache.flink.table.store.codegen.GeneratedClass;
import org.apache.flink.table.store.codegen.RecordComparator;
-import org.apache.flink.table.store.data.InternalRow;
import org.apache.flink.table.store.types.RowType;
+import org.apache.paimon.data.InternalRow;
+
import java.util.Comparator;
import java.util.function.Supplier;
diff --git a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/utils/ObjectSerializer.java b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/utils/ObjectSerializer.java
index 8d0aa876e..42a5c7040 100644
--- a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/utils/ObjectSerializer.java
+++ b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/utils/ObjectSerializer.java
@@ -18,15 +18,16 @@
package org.apache.flink.table.store.file.utils;
-import org.apache.flink.table.store.data.InternalRow;
-import org.apache.flink.table.store.data.serializer.InternalRowSerializer;
-import org.apache.flink.table.store.data.serializer.InternalSerializers;
import org.apache.flink.table.store.io.DataInputView;
import org.apache.flink.table.store.io.DataInputViewStreamWrapper;
import org.apache.flink.table.store.io.DataOutputView;
import org.apache.flink.table.store.io.DataOutputViewStreamWrapper;
import org.apache.flink.table.store.types.RowType;
+import org.apache.paimon.data.InternalRow;
+import org.apache.paimon.data.serializer.InternalRowSerializer;
+import org.apache.paimon.data.serializer.InternalSerializers;
+
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
diff --git a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/utils/OffsetRow.java b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/utils/OffsetRow.java
index 2b712b35b..fad055fd1 100644
--- a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/utils/OffsetRow.java
+++ b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/utils/OffsetRow.java
@@ -18,14 +18,15 @@
package org.apache.flink.table.store.file.utils;
-import org.apache.flink.table.store.data.BinaryString;
-import org.apache.flink.table.store.data.Decimal;
-import org.apache.flink.table.store.data.InternalArray;
-import org.apache.flink.table.store.data.InternalMap;
-import org.apache.flink.table.store.data.InternalRow;
-import org.apache.flink.table.store.data.Timestamp;
import org.apache.flink.table.store.types.RowKind;
+import org.apache.paimon.data.BinaryString;
+import org.apache.paimon.data.Decimal;
+import org.apache.paimon.data.InternalArray;
+import org.apache.paimon.data.InternalMap;
+import org.apache.paimon.data.InternalRow;
+import org.apache.paimon.data.Timestamp;
+
/** A {@link InternalRow} to wrap row with offset. */
public class OffsetRow implements InternalRow {
diff --git a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/utils/RowDataPartitionComputer.java b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/utils/RowDataPartitionComputer.java
index 171d663d1..dc7102a9c 100644
--- a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/utils/RowDataPartitionComputer.java
+++ b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/utils/RowDataPartitionComputer.java
@@ -18,11 +18,12 @@
package org.apache.flink.table.store.file.utils;
-import org.apache.flink.table.store.data.InternalRow;
import org.apache.flink.table.store.types.RowType;
import org.apache.flink.table.store.utils.RowDataUtils;
import org.apache.flink.table.store.utils.StringUtils;
+import org.apache.paimon.data.InternalRow;
+
import java.util.Arrays;
import java.util.LinkedHashMap;
import java.util.List;
diff --git a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/utils/SerializationUtils.java b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/utils/SerializationUtils.java
index 692047d8f..1981da240 100644
--- a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/utils/SerializationUtils.java
+++ b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/utils/SerializationUtils.java
@@ -18,13 +18,14 @@
package org.apache.flink.table.store.file.utils;
-import org.apache.flink.table.store.data.BinaryRow;
import org.apache.flink.table.store.io.DataInputView;
import org.apache.flink.table.store.io.DataOutputView;
import org.apache.flink.table.store.memory.MemorySegment;
import org.apache.flink.table.store.types.VarBinaryType;
import org.apache.flink.table.store.types.VarCharType;
+import org.apache.paimon.data.BinaryRow;
+
import java.io.EOFException;
import java.io.IOException;
import java.nio.ByteBuffer;
diff --git a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/utils/VersionedObjectSerializer.java b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/utils/VersionedObjectSerializer.java
index e42f02c65..6a7676a8e 100644
--- a/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/utils/VersionedObjectSerializer.java
+++ b/flink-table-store-core/src/main/java/org/apache/flink/table/store/file/utils/VersionedObjectSerializer.java
@@ -18,13 +18,14 @@
package org.apache.flink.table.store.file.utils;
-import org.apache.flink.table.store.data.GenericRow;
-import org.apache.flink.table.store.data.InternalRow;
-import org.apache.flink.table.store.data.JoinedRow;
import org.apache.flink.table.store.types.DataField;
import org.apache.flink.table.store.types.IntType;
import org.apache.flink.table.store.types.RowType;
+import org.apache.paimon.data.GenericRow;
+import org.apache.paimon.data.InternalRow;
+import org.apache.paimon.data.JoinedRow;
+
import java.util.ArrayList;
import java.util.List;
diff --git a/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/AbstractFileStoreTable.java b/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/AbstractFileStoreTable.java
index d8d1ba8eb..d5eb8250f 100644
--- a/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/AbstractFileStoreTable.java
+++ b/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/AbstractFileStoreTable.java
@@ -19,7 +19,6 @@
package org.apache.flink.table.store.table;
import org.apache.flink.table.store.CoreOptions;
-import org.apache.flink.table.store.annotation.VisibleForTesting;
import org.apache.flink.table.store.file.FileStore;
import org.apache.flink.table.store.file.operation.FileStoreScan;
import org.apache.flink.table.store.file.predicate.Predicate;
@@ -39,6 +38,8 @@ import org.apache.flink.table.store.table.source.StreamDataTableScanImpl;
import org.apache.flink.table.store.table.source.snapshot.SnapshotSplitReader;
import org.apache.flink.table.store.table.source.snapshot.SnapshotSplitReaderImpl;
+import org.apache.paimon.annotation.VisibleForTesting;
+
import java.util.Map;
import java.util.Objects;
import java.util.Optional;
diff --git a/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/AppendOnlyFileStoreTable.java b/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/AppendOnlyFileStoreTable.java
index c2c676906..52a253dff 100644
--- a/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/AppendOnlyFileStoreTable.java
+++ b/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/AppendOnlyFileStoreTable.java
@@ -19,7 +19,6 @@
package org.apache.flink.table.store.table;
import org.apache.flink.table.store.CoreOptions;
-import org.apache.flink.table.store.data.InternalRow;
import org.apache.flink.table.store.file.AppendOnlyFileStore;
import org.apache.flink.table.store.file.WriteMode;
import org.apache.flink.table.store.file.operation.AppendOnlyFileStoreRead;
@@ -41,6 +40,8 @@ import org.apache.flink.table.store.table.source.SplitGenerator;
import org.apache.flink.table.store.types.RowKind;
import org.apache.flink.table.store.utils.Preconditions;
+import org.apache.paimon.data.InternalRow;
+
import java.io.IOException;
import java.util.function.BiConsumer;
diff --git a/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/ChangelogValueCountFileStoreTable.java b/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/ChangelogValueCountFileStoreTable.java
index 3f883c275..363787fed 100644
--- a/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/ChangelogValueCountFileStoreTable.java
+++ b/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/ChangelogValueCountFileStoreTable.java
@@ -19,8 +19,6 @@
package org.apache.flink.table.store.table;
import org.apache.flink.table.store.CoreOptions;
-import org.apache.flink.table.store.data.GenericRow;
-import org.apache.flink.table.store.data.InternalRow;
import org.apache.flink.table.store.file.KeyValue;
import org.apache.flink.table.store.file.KeyValueFileStore;
import org.apache.flink.table.store.file.WriteMode;
@@ -48,6 +46,9 @@ import org.apache.flink.table.store.types.DataField;
import org.apache.flink.table.store.types.RowKind;
import org.apache.flink.table.store.types.RowType;
+import org.apache.paimon.data.GenericRow;
+import org.apache.paimon.data.InternalRow;
+
import java.util.Collections;
import java.util.List;
import java.util.function.BiConsumer;
diff --git a/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/ChangelogWithKeyFileStoreTable.java b/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/ChangelogWithKeyFileStoreTable.java
index 552f2f778..7bb697c78 100644
--- a/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/ChangelogWithKeyFileStoreTable.java
+++ b/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/ChangelogWithKeyFileStoreTable.java
@@ -20,7 +20,6 @@ package org.apache.flink.table.store.table;
import org.apache.flink.table.store.CoreOptions;
import org.apache.flink.table.store.CoreOptions.ChangelogProducer;
-import org.apache.flink.table.store.data.InternalRow;
import org.apache.flink.table.store.file.KeyValue;
import org.apache.flink.table.store.file.KeyValueFileStore;
import org.apache.flink.table.store.file.WriteMode;
@@ -49,6 +48,8 @@ import org.apache.flink.table.store.table.source.ValueContentRowDataRecordIterat
import org.apache.flink.table.store.types.DataField;
import org.apache.flink.table.store.types.RowType;
+import org.apache.paimon.data.InternalRow;
+
import java.util.List;
import java.util.function.BiConsumer;
import java.util.stream.Collectors;
diff --git a/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/FileStoreTable.java b/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/FileStoreTable.java
index cd498db86..572b0f86c 100644
--- a/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/FileStoreTable.java
+++ b/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/FileStoreTable.java
@@ -18,7 +18,6 @@
package org.apache.flink.table.store.table;
-import org.apache.flink.table.store.data.InternalRow;
import org.apache.flink.table.store.file.io.DataFileMeta;
import org.apache.flink.table.store.file.schema.TableSchema;
import org.apache.flink.table.store.file.stats.BinaryTableStats;
@@ -26,6 +25,8 @@ import org.apache.flink.table.store.table.sink.TableCommitImpl;
import org.apache.flink.table.store.table.sink.TableWriteImpl;
import org.apache.flink.table.store.types.RowType;
+import org.apache.paimon.data.InternalRow;
+
import java.util.List;
import java.util.Map;
diff --git a/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/Table.java b/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/Table.java
index e4257fa3f..974114373 100644
--- a/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/Table.java
+++ b/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/Table.java
@@ -18,12 +18,13 @@
package org.apache.flink.table.store.table;
-import org.apache.flink.table.store.annotation.Experimental;
import org.apache.flink.table.store.table.sink.BatchWriteBuilder;
import org.apache.flink.table.store.table.sink.StreamWriteBuilder;
import org.apache.flink.table.store.table.source.ReadBuilder;
import org.apache.flink.table.store.types.RowType;
+import org.apache.paimon.annotation.Experimental;
+
import java.io.Serializable;
import java.util.Map;
diff --git a/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/TableUtils.java b/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/TableUtils.java
index 94b46764a..cb84c4adc 100644
--- a/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/TableUtils.java
+++ b/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/TableUtils.java
@@ -18,7 +18,6 @@
package org.apache.flink.table.store.table;
-import org.apache.flink.table.store.data.InternalRow;
import org.apache.flink.table.store.file.operation.Lock;
import org.apache.flink.table.store.file.predicate.Predicate;
import org.apache.flink.table.store.file.predicate.PredicateFilter;
@@ -32,6 +31,8 @@ import org.apache.flink.table.store.table.source.Split;
import org.apache.flink.table.store.types.RowKind;
import org.apache.flink.table.store.utils.CloseableIterator;
+import org.apache.paimon.data.InternalRow;
+
import java.util.List;
/** Utils for Table. TODO we can introduce LocalAction maybe? */
diff --git a/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/sink/BatchTableCommit.java b/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/sink/BatchTableCommit.java
index 1a7491224..3bff2ce73 100644
--- a/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/sink/BatchTableCommit.java
+++ b/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/sink/BatchTableCommit.java
@@ -18,7 +18,7 @@
package org.apache.flink.table.store.table.sink;
-import org.apache.flink.table.store.annotation.Experimental;
+import org.apache.paimon.annotation.Experimental;
import java.util.List;
diff --git a/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/sink/BatchTableWrite.java b/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/sink/BatchTableWrite.java
index 4820eef85..b40276c06 100644
--- a/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/sink/BatchTableWrite.java
+++ b/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/sink/BatchTableWrite.java
@@ -18,7 +18,7 @@
package org.apache.flink.table.store.table.sink;
-import org.apache.flink.table.store.annotation.Experimental;
+import org.apache.paimon.annotation.Experimental;
import java.util.List;
diff --git a/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/sink/BatchWriteBuilder.java b/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/sink/BatchWriteBuilder.java
index 2a7984bd9..d90b46a0f 100644
--- a/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/sink/BatchWriteBuilder.java
+++ b/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/sink/BatchWriteBuilder.java
@@ -18,8 +18,8 @@
package org.apache.flink.table.store.table.sink;
-import org.apache.flink.table.store.annotation.Experimental;
-import org.apache.flink.table.store.data.InternalRow;
+import org.apache.paimon.annotation.Experimental;
+import org.apache.paimon.data.InternalRow;
import javax.annotation.Nullable;
diff --git a/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/sink/BucketComputer.java b/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/sink/BucketComputer.java
index 2d376057c..6fce6a210 100644
--- a/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/sink/BucketComputer.java
+++ b/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/sink/BucketComputer.java
@@ -21,12 +21,13 @@ package org.apache.flink.table.store.table.sink;
import org.apache.flink.table.store.CoreOptions;
import org.apache.flink.table.store.codegen.CodeGenUtils;
import org.apache.flink.table.store.codegen.Projection;
-import org.apache.flink.table.store.data.BinaryRow;
-import org.apache.flink.table.store.data.InternalRow;
import org.apache.flink.table.store.file.schema.TableSchema;
import org.apache.flink.table.store.types.RowKind;
import org.apache.flink.table.store.types.RowType;
+import org.apache.paimon.data.BinaryRow;
+import org.apache.paimon.data.InternalRow;
+
import java.util.stream.IntStream;
/** A {@link BucketComputer} to compute bucket by bucket keys or primary keys or whole row. */
diff --git a/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/sink/CommitMessage.java b/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/sink/CommitMessage.java
index 12cfa4e76..c4af9c4fd 100644
--- a/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/sink/CommitMessage.java
+++ b/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/sink/CommitMessage.java
@@ -18,8 +18,8 @@
package org.apache.flink.table.store.table.sink;
-import org.apache.flink.table.store.annotation.Experimental;
-import org.apache.flink.table.store.data.BinaryRow;
+import org.apache.paimon.annotation.Experimental;
+import org.apache.paimon.data.BinaryRow;
import java.io.Serializable;
diff --git a/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/sink/CommitMessageImpl.java b/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/sink/CommitMessageImpl.java
index 747c0898c..351413a8f 100644
--- a/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/sink/CommitMessageImpl.java
+++ b/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/sink/CommitMessageImpl.java
@@ -18,12 +18,13 @@
package org.apache.flink.table.store.table.sink;
-import org.apache.flink.table.store.data.BinaryRow;
import org.apache.flink.table.store.file.io.CompactIncrement;
import org.apache.flink.table.store.file.io.NewFilesIncrement;
import org.apache.flink.table.store.io.DataInputViewStreamWrapper;
import org.apache.flink.table.store.io.DataOutputViewStreamWrapper;
+import org.apache.paimon.data.BinaryRow;
+
import java.io.IOException;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
diff --git a/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/sink/CommitMessageSerializer.java b/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/sink/CommitMessageSerializer.java
index 76a00bd6f..2989c5c4c 100644
--- a/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/sink/CommitMessageSerializer.java
+++ b/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/sink/CommitMessageSerializer.java
@@ -18,7 +18,6 @@
package org.apache.flink.table.store.table.sink;
-import org.apache.flink.table.store.data.serializer.VersionedSerializer;
import org.apache.flink.table.store.file.io.CompactIncrement;
import org.apache.flink.table.store.file.io.DataFileMetaSerializer;
import org.apache.flink.table.store.file.io.NewFilesIncrement;
@@ -27,6 +26,8 @@ import org.apache.flink.table.store.io.DataInputView;
import org.apache.flink.table.store.io.DataOutputView;
import org.apache.flink.table.store.io.DataOutputViewStreamWrapper;
+import org.apache.paimon.data.serializer.VersionedSerializer;
+
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.util.ArrayList;
diff --git a/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/sink/PartitionComputer.java b/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/sink/PartitionComputer.java
index dd611afef..c54418cd7 100644
--- a/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/sink/PartitionComputer.java
+++ b/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/sink/PartitionComputer.java
@@ -20,11 +20,12 @@ package org.apache.flink.table.store.table.sink;
import org.apache.flink.table.store.codegen.CodeGenUtils;
import org.apache.flink.table.store.codegen.Projection;
-import org.apache.flink.table.store.data.BinaryRow;
-import org.apache.flink.table.store.data.InternalRow;
import org.apache.flink.table.store.file.schema.TableSchema;
import org.apache.flink.table.store.types.RowType;
+import org.apache.paimon.data.BinaryRow;
+import org.apache.paimon.data.InternalRow;
+
/** A {@link PartitionComputer} to compute partition by partition keys. */
public class PartitionComputer {
private final Projection partitionProjection;
diff --git a/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/sink/SequenceGenerator.java b/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/sink/SequenceGenerator.java
index e2cc83a0f..32040e997 100644
--- a/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/sink/SequenceGenerator.java
+++ b/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/sink/SequenceGenerator.java
@@ -18,7 +18,6 @@
package org.apache.flink.table.store.table.sink;
-import org.apache.flink.table.store.data.InternalRow;
import org.apache.flink.table.store.types.BigIntType;
import org.apache.flink.table.store.types.CharType;
import org.apache.flink.table.store.types.DataType;
@@ -36,6 +35,8 @@ import org.apache.flink.table.store.types.TinyIntType;
import org.apache.flink.table.store.types.VarCharType;
import org.apache.flink.table.store.utils.RowDataUtils;
+import org.apache.paimon.data.InternalRow;
+
/** Generate sequence number. */
public class SequenceGenerator {
diff --git a/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/sink/SinkRecord.java b/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/sink/SinkRecord.java
index 31016b36d..a9edb602e 100644
--- a/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/sink/SinkRecord.java
+++ b/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/sink/SinkRecord.java
@@ -18,10 +18,11 @@
package org.apache.flink.table.store.table.sink;
-import org.apache.flink.table.store.data.BinaryRow;
-import org.apache.flink.table.store.data.InternalRow;
import org.apache.flink.table.store.types.RowKind;
+import org.apache.paimon.data.BinaryRow;
+import org.apache.paimon.data.InternalRow;
+
import static org.apache.flink.table.store.utils.Preconditions.checkArgument;
/** A sink record contains key, row and partition, bucket information. */
diff --git a/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/sink/SinkRecordConverter.java b/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/sink/SinkRecordConverter.java
index 52516d4b0..799b42c77 100644
--- a/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/sink/SinkRecordConverter.java
+++ b/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/sink/SinkRecordConverter.java
@@ -20,11 +20,12 @@ package org.apache.flink.table.store.table.sink;
import org.apache.flink.table.store.codegen.CodeGenUtils;
import org.apache.flink.table.store.codegen.Projection;
-import org.apache.flink.table.store.data.BinaryRow;
-import org.apache.flink.table.store.data.InternalRow;
import org.apache.flink.table.store.file.schema.TableSchema;
import org.apache.flink.table.store.types.RowType;
+import org.apache.paimon.data.BinaryRow;
+import org.apache.paimon.data.InternalRow;
+
import javax.annotation.Nullable;
import java.util.Arrays;
diff --git a/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/sink/StreamTableCommit.java b/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/sink/StreamTableCommit.java
index fab1dc34d..c788a7b95 100644
--- a/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/sink/StreamTableCommit.java
+++ b/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/sink/StreamTableCommit.java
@@ -18,7 +18,7 @@
package org.apache.flink.table.store.table.sink;
-import org.apache.flink.table.store.annotation.Experimental;
+import org.apache.paimon.annotation.Experimental;
import java.util.List;
import java.util.Set;
diff --git a/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/sink/StreamTableWrite.java b/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/sink/StreamTableWrite.java
index 9fe236bda..649df6f75 100644
--- a/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/sink/StreamTableWrite.java
+++ b/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/sink/StreamTableWrite.java
@@ -18,7 +18,7 @@
package org.apache.flink.table.store.table.sink;
-import org.apache.flink.table.store.annotation.Experimental;
+import org.apache.paimon.annotation.Experimental;
import java.util.List;
diff --git a/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/sink/StreamWriteBuilder.java b/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/sink/StreamWriteBuilder.java
index 44bfcc141..e51911765 100644
--- a/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/sink/StreamWriteBuilder.java
+++ b/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/sink/StreamWriteBuilder.java
@@ -18,8 +18,8 @@
package org.apache.flink.table.store.table.sink;
-import org.apache.flink.table.store.annotation.Experimental;
-import org.apache.flink.table.store.data.InternalRow;
+import org.apache.paimon.annotation.Experimental;
+import org.apache.paimon.data.InternalRow;
/**
* An interface for building the {@link StreamTableWrite} and {@link StreamTableCommit}.
diff --git a/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/sink/TableCommit.java b/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/sink/TableCommit.java
index 6e61f8b71..a8b8d4cd1 100644
--- a/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/sink/TableCommit.java
+++ b/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/sink/TableCommit.java
@@ -18,9 +18,10 @@
package org.apache.flink.table.store.table.sink;
-import org.apache.flink.table.store.annotation.Experimental;
import org.apache.flink.table.store.table.Table;
+import org.apache.paimon.annotation.Experimental;
+
/**
* Create and commit snapshots of a {@link Table}. Snapshots are produced from {@link
* CommitMessage}s, which themselves are generated by {@link TableWrite}.
diff --git a/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/sink/TableWrite.java b/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/sink/TableWrite.java
index 7beea73d4..52d704338 100644
--- a/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/sink/TableWrite.java
+++ b/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/sink/TableWrite.java
@@ -18,12 +18,13 @@
package org.apache.flink.table.store.table.sink;
-import org.apache.flink.table.store.annotation.Experimental;
-import org.apache.flink.table.store.data.BinaryRow;
-import org.apache.flink.table.store.data.InternalRow;
import org.apache.flink.table.store.file.disk.IOManager;
import org.apache.flink.table.store.table.Table;
+import org.apache.paimon.annotation.Experimental;
+import org.apache.paimon.data.BinaryRow;
+import org.apache.paimon.data.InternalRow;
+
/**
* Write of {@link Table} to provide {@link InternalRow} writing.
*
diff --git a/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/sink/TableWriteImpl.java b/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/sink/TableWriteImpl.java
index b304d22da..58215b955 100644
--- a/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/sink/TableWriteImpl.java
+++ b/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/sink/TableWriteImpl.java
@@ -18,14 +18,15 @@
package org.apache.flink.table.store.table.sink;
-import org.apache.flink.table.store.data.BinaryRow;
-import org.apache.flink.table.store.data.InternalRow;
import org.apache.flink.table.store.file.disk.IOManager;
import org.apache.flink.table.store.file.io.DataFileMeta;
import org.apache.flink.table.store.file.operation.AbstractFileStoreWrite;
import org.apache.flink.table.store.file.operation.FileStoreWrite;
import org.apache.flink.table.store.file.utils.Restorable;
+import org.apache.paimon.data.BinaryRow;
+import org.apache.paimon.data.InternalRow;
+
import java.util.List;
import static org.apache.flink.table.store.utils.Preconditions.checkState;
diff --git a/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/sink/WriteBuilder.java b/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/sink/WriteBuilder.java
index ea8ce8afa..a52f6401f 100644
--- a/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/sink/WriteBuilder.java
+++ b/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/sink/WriteBuilder.java
@@ -18,10 +18,11 @@
package org.apache.flink.table.store.table.sink;
-import org.apache.flink.table.store.annotation.Experimental;
-import org.apache.flink.table.store.data.InternalRow;
import org.apache.flink.table.store.types.RowType;
+import org.apache.paimon.annotation.Experimental;
+import org.apache.paimon.data.InternalRow;
+
import java.io.Serializable;
/**
diff --git a/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/source/AbstractDataTableScan.java b/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/source/AbstractDataTableScan.java
index 7b39048ba..e8c5200c0 100644
--- a/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/source/AbstractDataTableScan.java
+++ b/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/source/AbstractDataTableScan.java
@@ -19,7 +19,6 @@
package org.apache.flink.table.store.table.source;
import org.apache.flink.table.store.CoreOptions;
-import org.apache.flink.table.store.annotation.VisibleForTesting;
import org.apache.flink.table.store.file.operation.FileStoreScan;
import org.apache.flink.table.store.file.operation.ScanKind;
import org.apache.flink.table.store.file.predicate.Predicate;
@@ -35,6 +34,8 @@ import org.apache.flink.table.store.table.source.snapshot.StaticFromTimestampSta
import org.apache.flink.table.store.utils.Filter;
import org.apache.flink.table.store.utils.Preconditions;
+import org.apache.paimon.annotation.VisibleForTesting;
+
/** An abstraction layer above {@link FileStoreScan} to provide input split generation. */
public abstract class AbstractDataTableScan implements DataTableScan {
diff --git a/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/source/DataSplit.java b/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/source/DataSplit.java
index f1d37b4a4..35ba5a2c7 100644
--- a/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/source/DataSplit.java
+++ b/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/source/DataSplit.java
@@ -18,7 +18,6 @@
package org.apache.flink.table.store.table.source;
-import org.apache.flink.table.store.data.BinaryRow;
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.SerializationUtils;
@@ -27,6 +26,8 @@ import org.apache.flink.table.store.io.DataInputViewStreamWrapper;
import org.apache.flink.table.store.io.DataOutputView;
import org.apache.flink.table.store.io.DataOutputViewStreamWrapper;
+import org.apache.paimon.data.BinaryRow;
+
import java.io.IOException;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
diff --git a/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/source/DataTableScan.java b/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/source/DataTableScan.java
index 4aaf36ac7..fef0c3c1c 100644
--- a/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/source/DataTableScan.java
+++ b/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/source/DataTableScan.java
@@ -18,11 +18,12 @@
package org.apache.flink.table.store.table.source;
-import org.apache.flink.table.store.annotation.VisibleForTesting;
import org.apache.flink.table.store.file.operation.ScanKind;
import org.apache.flink.table.store.file.predicate.Predicate;
import org.apache.flink.table.store.utils.Filter;
+import org.apache.paimon.annotation.VisibleForTesting;
+
import javax.annotation.Nullable;
import java.util.List;
diff --git a/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/source/EndOfScanException.java b/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/source/EndOfScanException.java
index ae89b1a37..000c2e1a7 100644
--- a/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/source/EndOfScanException.java
+++ b/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/source/EndOfScanException.java
@@ -18,7 +18,7 @@
package org.apache.flink.table.store.table.source;
-import org.apache.flink.table.store.annotation.Experimental;
+import org.apache.paimon.annotation.Experimental;
/**
* Signals that an end of scanning has been reached unexpectedly during input.
diff --git a/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/source/KeyValueTableRead.java b/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/source/KeyValueTableRead.java
index 10270aab3..e5a5d7b4c 100644
--- a/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/source/KeyValueTableRead.java
+++ b/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/source/KeyValueTableRead.java
@@ -18,11 +18,12 @@
package org.apache.flink.table.store.table.source;
-import org.apache.flink.table.store.data.InternalRow;
import org.apache.flink.table.store.file.KeyValue;
import org.apache.flink.table.store.file.operation.KeyValueFileStoreRead;
import org.apache.flink.table.store.reader.RecordReader;
+import org.apache.paimon.data.InternalRow;
+
import javax.annotation.Nullable;
import java.io.IOException;
diff --git a/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/source/MergeTreeSplitGenerator.java b/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/source/MergeTreeSplitGenerator.java
index 42efdd124..a20d6baef 100644
--- a/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/source/MergeTreeSplitGenerator.java
+++ b/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/source/MergeTreeSplitGenerator.java
@@ -18,12 +18,13 @@
package org.apache.flink.table.store.table.source;
-import org.apache.flink.table.store.data.InternalRow;
import org.apache.flink.table.store.file.io.DataFileMeta;
import org.apache.flink.table.store.file.mergetree.SortedRun;
import org.apache.flink.table.store.file.mergetree.compact.IntervalPartition;
import org.apache.flink.table.store.utils.OrderedPacking;
+import org.apache.paimon.data.InternalRow;
+
import java.util.ArrayList;
import java.util.Comparator;
import java.util.List;
diff --git a/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/source/ReadBuilder.java b/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/source/ReadBuilder.java
index 81f7c31e3..4e347659f 100644
--- a/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/source/ReadBuilder.java
+++ b/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/source/ReadBuilder.java
@@ -18,12 +18,13 @@
package org.apache.flink.table.store.table.source;
-import org.apache.flink.table.store.annotation.Experimental;
-import org.apache.flink.table.store.data.InternalRow;
import org.apache.flink.table.store.file.predicate.Predicate;
import org.apache.flink.table.store.file.predicate.PredicateBuilder;
import org.apache.flink.table.store.types.RowType;
+import org.apache.paimon.annotation.Experimental;
+import org.apache.paimon.data.InternalRow;
+
import java.io.Serializable;
import java.util.Arrays;
import java.util.List;
diff --git a/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/source/ResetRowKindRecordIterator.java b/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/source/ResetRowKindRecordIterator.java
index bc32526d8..765741286 100644
--- a/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/source/ResetRowKindRecordIterator.java
+++ b/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/source/ResetRowKindRecordIterator.java
@@ -18,11 +18,12 @@
package org.apache.flink.table.store.table.source;
-import org.apache.flink.table.store.data.InternalRow;
import org.apache.flink.table.store.file.KeyValue;
import org.apache.flink.table.store.reader.RecordReader;
import org.apache.flink.table.store.types.RowKind;
+import org.apache.paimon.data.InternalRow;
+
import java.io.IOException;
/**
diff --git a/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/source/Split.java b/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/source/Split.java
index 2ceea07a2..bf35c505e 100644
--- a/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/source/Split.java
+++ b/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/source/Split.java
@@ -18,7 +18,7 @@
package org.apache.flink.table.store.table.source;
-import org.apache.flink.table.store.annotation.Experimental;
+import org.apache.paimon.annotation.Experimental;
import java.io.Serializable;
diff --git a/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/source/StreamTableScan.java b/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/source/StreamTableScan.java
index 9fd99f517..82ff8cd13 100644
--- a/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/source/StreamTableScan.java
+++ b/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/source/StreamTableScan.java
@@ -18,9 +18,10 @@
package org.apache.flink.table.store.table.source;
-import org.apache.flink.table.store.annotation.Experimental;
import org.apache.flink.table.store.file.utils.Restorable;
+import org.apache.paimon.annotation.Experimental;
+
/**
* {@link TableScan} for streaming, supports {@link #checkpoint} and {@link #restore}.
*
diff --git a/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/source/TableRead.java b/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/source/TableRead.java
index 8351938da..9050e6543 100644
--- a/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/source/TableRead.java
+++ b/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/source/TableRead.java
@@ -18,12 +18,13 @@
package org.apache.flink.table.store.table.source;
-import org.apache.flink.table.store.annotation.Experimental;
-import org.apache.flink.table.store.data.InternalRow;
import org.apache.flink.table.store.file.mergetree.compact.ConcatRecordReader;
import org.apache.flink.table.store.file.operation.FileStoreRead;
import org.apache.flink.table.store.reader.RecordReader;
+import org.apache.paimon.annotation.Experimental;
+import org.apache.paimon.data.InternalRow;
+
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
diff --git a/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/source/TableScan.java b/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/source/TableScan.java
index 5db5d9924..1a9f42243 100644
--- a/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/source/TableScan.java
+++ b/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/source/TableScan.java
@@ -18,9 +18,10 @@
package org.apache.flink.table.store.table.source;
-import org.apache.flink.table.store.annotation.Experimental;
import org.apache.flink.table.store.table.Table;
+import org.apache.paimon.annotation.Experimental;
+
import java.util.List;
/**
diff --git a/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/source/TableStreamingReader.java b/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/source/TableStreamingReader.java
index 0961b9f94..dfc3dea9b 100644
--- a/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/source/TableStreamingReader.java
+++ b/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/source/TableStreamingReader.java
@@ -18,7 +18,6 @@
package org.apache.flink.table.store.table.source;
-import org.apache.flink.table.store.data.InternalRow;
import org.apache.flink.table.store.file.mergetree.compact.ConcatRecordReader;
import org.apache.flink.table.store.file.predicate.Predicate;
import org.apache.flink.table.store.file.predicate.PredicateFilter;
@@ -30,6 +29,8 @@ import org.apache.flink.table.store.utils.TypeUtils;
import org.apache.flink.shaded.guava30.com.google.common.collect.Iterators;
import org.apache.flink.shaded.guava30.com.google.common.primitives.Ints;
+import org.apache.paimon.data.InternalRow;
+
import javax.annotation.Nullable;
import java.io.IOException;
diff --git a/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/source/ValueContentRowDataRecordIterator.java b/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/source/ValueContentRowDataRecordIterator.java
index e1049ccf8..100fc287d 100644
--- a/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/source/ValueContentRowDataRecordIterator.java
+++ b/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/source/ValueContentRowDataRecordIterator.java
@@ -18,10 +18,11 @@
package org.apache.flink.table.store.table.source;
-import org.apache.flink.table.store.data.InternalRow;
import org.apache.flink.table.store.file.KeyValue;
import org.apache.flink.table.store.reader.RecordReader;
+import org.apache.paimon.data.InternalRow;
+
import java.io.IOException;
/** A {@link RecordReader.RecordIterator} mapping a {@link KeyValue} to its value. */
diff --git a/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/source/ValueCountRowDataRecordIterator.java b/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/source/ValueCountRowDataRecordIterator.java
index c6af858f7..4411ee620 100644
--- a/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/source/ValueCountRowDataRecordIterator.java
+++ b/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/source/ValueCountRowDataRecordIterator.java
@@ -18,11 +18,12 @@
package org.apache.flink.table.store.table.source;
-import org.apache.flink.table.store.data.InternalRow;
import org.apache.flink.table.store.file.KeyValue;
import org.apache.flink.table.store.reader.RecordReader;
import org.apache.flink.table.store.types.RowKind;
+import org.apache.paimon.data.InternalRow;
+
import java.io.IOException;
/**
diff --git a/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/source/snapshot/SnapshotSplitReader.java b/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/source/snapshot/SnapshotSplitReader.java
index 9e4fa37e4..8de2c13b8 100644
--- a/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/source/snapshot/SnapshotSplitReader.java
+++ b/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/source/snapshot/SnapshotSplitReader.java
@@ -18,7 +18,6 @@
package org.apache.flink.table.store.table.source.snapshot;
-import org.apache.flink.table.store.data.BinaryRow;
import org.apache.flink.table.store.file.Snapshot;
import org.apache.flink.table.store.file.io.DataFileMeta;
import org.apache.flink.table.store.file.operation.ScanKind;
@@ -27,6 +26,8 @@ import org.apache.flink.table.store.table.source.DataSplit;
import org.apache.flink.table.store.table.source.SplitGenerator;
import org.apache.flink.table.store.utils.Filter;
+import org.apache.paimon.data.BinaryRow;
+
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
diff --git a/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/source/snapshot/SnapshotSplitReaderImpl.java b/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/source/snapshot/SnapshotSplitReaderImpl.java
index 3a7c7b00f..4932ad098 100644
--- a/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/source/snapshot/SnapshotSplitReaderImpl.java
+++ b/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/source/snapshot/SnapshotSplitReaderImpl.java
@@ -21,7 +21,6 @@ package org.apache.flink.table.store.table.source.snapshot;
import org.apache.flink.table.store.CoreOptions;
import org.apache.flink.table.store.codegen.CodeGenUtils;
import org.apache.flink.table.store.codegen.RecordComparator;
-import org.apache.flink.table.store.data.BinaryRow;
import org.apache.flink.table.store.file.Snapshot;
import org.apache.flink.table.store.file.io.DataFileMeta;
import org.apache.flink.table.store.file.manifest.FileKind;
@@ -35,6 +34,8 @@ import org.apache.flink.table.store.table.source.DataSplit;
import org.apache.flink.table.store.table.source.SplitGenerator;
import org.apache.flink.table.store.utils.Filter;
+import org.apache.paimon.data.BinaryRow;
+
import java.util.ArrayList;
import java.util.LinkedHashMap;
import java.util.List;
diff --git a/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/system/AuditLogTable.java b/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/system/AuditLogTable.java
index a58b8fc36..5711892cf 100644
--- a/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/system/AuditLogTable.java
+++ b/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/system/AuditLogTable.java
@@ -19,8 +19,6 @@
package org.apache.flink.table.store.table.system;
import org.apache.flink.table.store.CoreOptions;
-import org.apache.flink.table.store.data.BinaryString;
-import org.apache.flink.table.store.data.InternalRow;
import org.apache.flink.table.store.file.operation.ScanKind;
import org.apache.flink.table.store.file.predicate.LeafPredicate;
import org.apache.flink.table.store.file.predicate.Predicate;
@@ -52,6 +50,9 @@ import org.apache.flink.table.store.utils.ProjectedRow;
import org.apache.flink.shaded.guava30.com.google.common.primitives.Ints;
+import org.apache.paimon.data.BinaryString;
+import org.apache.paimon.data.InternalRow;
+
import javax.annotation.Nullable;
import java.io.IOException;
diff --git a/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/system/BucketsTable.java b/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/system/BucketsTable.java
index e8d385b85..80d17f765 100644
--- a/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/system/BucketsTable.java
+++ b/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/system/BucketsTable.java
@@ -19,9 +19,6 @@
package org.apache.flink.table.store.table.system;
import org.apache.flink.table.store.CoreOptions;
-import org.apache.flink.table.store.data.GenericRow;
-import org.apache.flink.table.store.data.InternalRow;
-import org.apache.flink.table.store.data.JoinedRow;
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.predicate.Predicate;
@@ -46,6 +43,10 @@ import org.apache.flink.table.store.types.IntType;
import org.apache.flink.table.store.types.RowType;
import org.apache.flink.table.store.types.VarBinaryType;
+import org.apache.paimon.data.GenericRow;
+import org.apache.paimon.data.InternalRow;
+import org.apache.paimon.data.JoinedRow;
+
import java.io.IOException;
import java.util.ArrayList;
import java.util.Collections;
diff --git a/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/system/FilesTable.java b/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/system/FilesTable.java
index d4109c852..e40c65c11 100644
--- a/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/system/FilesTable.java
+++ b/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/system/FilesTable.java
@@ -18,9 +18,6 @@
package org.apache.flink.table.store.table.system;
-import org.apache.flink.table.store.data.BinaryString;
-import org.apache.flink.table.store.data.InternalRow;
-import org.apache.flink.table.store.data.LazyGenericRow;
import org.apache.flink.table.store.file.io.DataFileMeta;
import org.apache.flink.table.store.file.io.DataFilePathFactory;
import org.apache.flink.table.store.file.predicate.Predicate;
@@ -51,6 +48,9 @@ import org.apache.flink.table.store.utils.RowDataToObjectArrayConverter;
import org.apache.flink.shaded.guava30.com.google.common.collect.Iterators;
+import org.apache.paimon.data.BinaryString;
+import org.apache.paimon.data.InternalRow;
+import org.apache.paimon.data.LazyGenericRow;
import org.apache.paimon.format.FieldStats;
import javax.annotation.Nullable;
diff --git a/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/system/OptionsTable.java b/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/system/OptionsTable.java
index 68fad5aed..191bd4771 100644
--- a/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/system/OptionsTable.java
+++ b/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/system/OptionsTable.java
@@ -18,9 +18,6 @@
package org.apache.flink.table.store.table.system;
-import org.apache.flink.table.store.data.BinaryString;
-import org.apache.flink.table.store.data.GenericRow;
-import org.apache.flink.table.store.data.InternalRow;
import org.apache.flink.table.store.file.predicate.Predicate;
import org.apache.flink.table.store.file.schema.SchemaManager;
import org.apache.flink.table.store.file.utils.IteratorRecordReader;
@@ -39,6 +36,10 @@ import org.apache.flink.table.store.utils.ProjectedRow;
import org.apache.flink.shaded.guava30.com.google.common.collect.Iterators;
+import org.apache.paimon.data.BinaryString;
+import org.apache.paimon.data.GenericRow;
+import org.apache.paimon.data.InternalRow;
+
import java.io.IOException;
import java.util.Arrays;
import java.util.Collections;
diff --git a/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/system/SchemasTable.java b/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/system/SchemasTable.java
index 26d4795a8..9d7f8bc80 100644
--- a/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/system/SchemasTable.java
+++ b/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/system/SchemasTable.java
@@ -18,9 +18,6 @@
package org.apache.flink.table.store.table.system;
-import org.apache.flink.table.store.data.BinaryString;
-import org.apache.flink.table.store.data.GenericRow;
-import org.apache.flink.table.store.data.InternalRow;
import org.apache.flink.table.store.file.predicate.Predicate;
import org.apache.flink.table.store.file.schema.SchemaManager;
import org.apache.flink.table.store.file.schema.TableSchema;
@@ -44,6 +41,10 @@ import org.apache.flink.table.store.utils.ProjectedRow;
import org.apache.flink.shaded.guava30.com.google.common.collect.Iterators;
+import org.apache.paimon.data.BinaryString;
+import org.apache.paimon.data.GenericRow;
+import org.apache.paimon.data.InternalRow;
+
import java.io.IOException;
import java.util.Arrays;
import java.util.Collections;
diff --git a/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/system/SnapshotsTable.java b/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/system/SnapshotsTable.java
index a6d705144..adfc9fbf4 100644
--- a/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/system/SnapshotsTable.java
+++ b/flink-table-store-core/src/main/java/org/apache/flink/table/store/table/system/SnapshotsTable.java
@@ -18,10 +18,6 @@
package org.apache.flink.table.store.table.system;
-import org.apache.flink.table.store.data.BinaryString;
-import org.apache.flink.table.store.data.GenericRow;
-import org.apache.flink.table.store.data.InternalRow;
-import org.apache.flink.table.store.data.Timestamp;
import org.apache.flink.table.store.file.Snapshot;
import org.apache.flink.table.store.file.predicate.Predicate;
import org.apache.flink.table.store.file.utils.IteratorRecordReader;
@@ -44,6 +40,11 @@ import org.apache.flink.table.store.utils.ProjectedRow;
import org.apache.flink.shaded.guava30.com.google.common.collect.Iterators;
+import org.apache.paimon.data.BinaryString;
+import org.apache.paimon.data.GenericRow;
+import org.apache.paimon.data.InternalRow;
+import org.apache.paimon.data.Timestamp;
+
import java.io.IOException;
import java.time.Instant;
import java.time.LocalDateTime;
diff --git a/flink-table-store-core/src/test/java/org/apache/flink/table/store/file/FileFormatTest.java b/flink-table-store-core/src/test/java/org/apache/flink/table/store/file/FileFormatTest.java
index 52fa7abf2..1cbb8e420 100644
--- a/flink-table-store-core/src/test/java/org/apache/flink/table/store/file/FileFormatTest.java
+++ b/flink-table-store-core/src/test/java/org/apache/flink/table/store/file/FileFormatTest.java
@@ -19,8 +19,6 @@
package org.apache.flink.table.store.file;
import org.apache.flink.table.store.CoreOptions;
-import org.apache.flink.table.store.data.GenericRow;
-import org.apache.flink.table.store.data.InternalRow;
import org.apache.flink.table.store.fs.Path;
import org.apache.flink.table.store.fs.PositionOutputStream;
import org.apache.flink.table.store.fs.local.LocalFileIO;
@@ -29,6 +27,8 @@ import org.apache.flink.table.store.reader.RecordReader;
import org.apache.flink.table.store.types.IntType;
import org.apache.flink.table.store.types.RowType;
+import org.apache.paimon.data.GenericRow;
+import org.apache.paimon.data.InternalRow;
import org.apache.paimon.format.FileFormat;
import org.apache.paimon.format.FormatWriter;
import org.apache.paimon.format.FormatWriterFactory;
diff --git a/flink-table-store-core/src/test/java/org/apache/flink/table/store/file/KeyValueSerializerTest.java b/flink-table-store-core/src/test/java/org/apache/flink/table/store/file/KeyValueSerializerTest.java
index 214a782b0..df7a8ce01 100644
--- a/flink-table-store-core/src/test/java/org/apache/flink/table/store/file/KeyValueSerializerTest.java
+++ b/flink-table-store-core/src/test/java/org/apache/flink/table/store/file/KeyValueSerializerTest.java
@@ -18,10 +18,11 @@
package org.apache.flink.table.store.file;
-import org.apache.flink.table.store.data.serializer.InternalRowSerializer;
import org.apache.flink.table.store.file.utils.ObjectSerializer;
import org.apache.flink.table.store.file.utils.ObjectSerializerTestBase;
+import org.apache.paimon.data.serializer.InternalRowSerializer;
+
import static org.assertj.core.api.Assertions.assertThat;
/** Tests for {@link KeyValueSerializer}. */
diff --git a/flink-table-store-core/src/test/java/org/apache/flink/table/store/file/TestFileStore.java b/flink-table-store-core/src/test/java/org/apache/flink/table/store/file/TestFileStore.java
index 3261ee59d..9ce88730a 100644
--- a/flink-table-store-core/src/test/java/org/apache/flink/table/store/file/TestFileStore.java
+++ b/flink-table-store-core/src/test/java/org/apache/flink/table/store/file/TestFileStore.java
@@ -19,8 +19,6 @@
package org.apache.flink.table.store.file;
import org.apache.flink.table.store.CoreOptions;
-import org.apache.flink.table.store.data.BinaryRow;
-import org.apache.flink.table.store.data.serializer.InternalRowSerializer;
import org.apache.flink.table.store.file.io.DataFileMeta;
import org.apache.flink.table.store.file.manifest.ManifestCommittable;
import org.apache.flink.table.store.file.manifest.ManifestEntry;
@@ -52,6 +50,8 @@ import org.apache.flink.table.store.table.sink.CommitMessageImpl;
import org.apache.flink.table.store.table.source.DataSplit;
import org.apache.flink.table.store.types.RowType;
+import org.apache.paimon.data.BinaryRow;
+import org.apache.paimon.data.serializer.InternalRowSerializer;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/flink-table-store-core/src/test/java/org/apache/flink/table/store/file/TestKeyValueGenerator.java b/flink-table-store-core/src/test/java/org/apache/flink/table/store/file/TestKeyValueGenerator.java
index 02bd7f1ee..8c71f9a08 100644
--- a/flink-table-store-core/src/test/java/org/apache/flink/table/store/file/TestKeyValueGenerator.java
+++ b/flink-table-store-core/src/test/java/org/apache/flink/table/store/file/TestKeyValueGenerator.java
@@ -19,12 +19,6 @@
package org.apache.flink.table.store.file;
import org.apache.flink.table.store.codegen.RecordComparator;
-import org.apache.flink.table.store.data.BinaryRow;
-import org.apache.flink.table.store.data.BinaryString;
-import org.apache.flink.table.store.data.GenericArray;
-import org.apache.flink.table.store.data.GenericRow;
-import org.apache.flink.table.store.data.InternalRow;
-import org.apache.flink.table.store.data.serializer.InternalRowSerializer;
import org.apache.flink.table.store.file.schema.KeyValueFieldsExtractor;
import org.apache.flink.table.store.file.schema.SchemaManager;
import org.apache.flink.table.store.file.schema.TableSchema;
@@ -39,6 +33,13 @@ import org.apache.flink.table.store.types.RowKind;
import org.apache.flink.table.store.types.RowType;
import org.apache.flink.table.store.types.VarCharType;
+import org.apache.paimon.data.BinaryRow;
+import org.apache.paimon.data.BinaryString;
+import org.apache.paimon.data.GenericArray;
+import org.apache.paimon.data.GenericRow;
+import org.apache.paimon.data.InternalRow;
+import org.apache.paimon.data.serializer.InternalRowSerializer;
+
import javax.annotation.Nullable;
import java.util.ArrayList;
diff --git a/flink-table-store-core/src/test/java/org/apache/flink/table/store/file/append/AppendOnlyWriterTest.java b/flink-table-store-core/src/test/java/org/apache/flink/table/store/file/append/AppendOnlyWriterTest.java
index 61074926d..837490a7d 100644
--- a/flink-table-store-core/src/test/java/org/apache/flink/table/store/file/append/AppendOnlyWriterTest.java
+++ b/flink-table-store-core/src/test/java/org/apache/flink/table/store/file/append/AppendOnlyWriterTest.java
@@ -20,10 +20,6 @@
package org.apache.flink.table.store.file.append;
import org.apache.flink.table.store.CoreOptions;
-import org.apache.flink.table.store.data.BinaryRow;
-import org.apache.flink.table.store.data.BinaryString;
-import org.apache.flink.table.store.data.GenericRow;
-import org.apache.flink.table.store.data.InternalRow;
import org.apache.flink.table.store.file.io.DataFileMeta;
import org.apache.flink.table.store.file.io.DataFilePathFactory;
import org.apache.flink.table.store.file.stats.FieldStatsArraySerializer;
@@ -39,6 +35,10 @@ import org.apache.flink.table.store.types.RowType;
import org.apache.flink.table.store.types.VarCharType;
import org.apache.flink.table.store.utils.Pair;
+import org.apache.paimon.data.BinaryRow;
+import org.apache.paimon.data.BinaryString;
+import org.apache.paimon.data.GenericRow;
+import org.apache.paimon.data.InternalRow;
import org.apache.paimon.format.FieldStats;
import org.apache.paimon.format.FileFormat;
import org.junit.jupiter.api.BeforeEach;
diff --git a/flink-table-store-core/src/test/java/org/apache/flink/table/store/file/casting/CastExecutorTest.java b/flink-table-store-core/src/test/java/org/apache/flink/table/store/file/casting/CastExecutorTest.java
index 889f55c87..95a0138d1 100644
--- a/flink-table-store-core/src/test/java/org/apache/flink/table/store/file/casting/CastExecutorTest.java
+++ b/flink-table-store-core/src/test/java/org/apache/flink/table/store/file/casting/CastExecutorTest.java
@@ -18,8 +18,6 @@
package org.apache.flink.table.store.file.casting;
-import org.apache.flink.table.store.data.BinaryString;
-import org.apache.flink.table.store.data.Timestamp;
import org.apache.flink.table.store.types.BigIntType;
import org.apache.flink.table.store.types.BinaryType;
import org.apache.flink.table.store.types.CharType;
@@ -37,6 +35,8 @@ import org.apache.flink.table.store.types.VarCharType;
import org.apache.flink.table.store.utils.DateTimeUtils;
import org.apache.flink.table.store.utils.DecimalUtils;
+import org.apache.paimon.data.BinaryString;
+import org.apache.paimon.data.Timestamp;
import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat;
diff --git a/flink-table-store-core/src/test/java/org/apache/flink/table/store/file/format/FileFormatSuffixTest.java b/flink-table-store-core/src/test/java/org/apache/flink/table/store/file/format/FileFormatSuffixTest.java
index 1675564b0..08219cd97 100644
--- a/flink-table-store-core/src/test/java/org/apache/flink/table/store/file/format/FileFormatSuffixTest.java
+++ b/flink-table-store-core/src/test/java/org/apache/flink/table/store/file/format/FileFormatSuffixTest.java
@@ -18,8 +18,6 @@
package org.apache.flink.table.store.file.format;
-import org.apache.flink.table.store.data.BinaryString;
-import org.apache.flink.table.store.data.GenericRow;
import org.apache.flink.table.store.file.append.AppendOnlyCompactManager;
import org.apache.flink.table.store.file.append.AppendOnlyWriter;
import org.apache.flink.table.store.file.io.DataFileMeta;
@@ -35,6 +33,8 @@ import org.apache.flink.table.store.types.IntType;
import org.apache.flink.table.store.types.RowType;
import org.apache.flink.table.store.types.VarCharType;
+import org.apache.paimon.data.BinaryString;
+import org.apache.paimon.data.GenericRow;
import org.apache.paimon.format.FileFormat;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
diff --git a/flink-table-store-core/src/test/java/org/apache/flink/table/store/file/format/FlushingFileFormat.java b/flink-table-store-core/src/test/java/org/apache/flink/table/store/file/format/FlushingFileFormat.java
index 460edb144..1d9227fd6 100644
--- a/flink-table-store-core/src/test/java/org/apache/flink/table/store/file/format/FlushingFileFormat.java
+++ b/flink-table-store-core/src/test/java/org/apache/flink/table/store/file/format/FlushingFileFormat.java
@@ -18,11 +18,11 @@
package org.apache.flink.table.store.file.format;
-import org.apache.flink.table.store.data.InternalRow;
import org.apache.flink.table.store.file.predicate.Predicate;
import org.apache.flink.table.store.options.Options;
import org.apache.flink.table.store.types.RowType;
+import org.apache.paimon.data.InternalRow;
import org.apache.paimon.format.FileFormat;
import org.apache.paimon.format.FormatReaderFactory;
import org.apache.paimon.format.FormatWriter;
diff --git a/flink-table-store-core/src/test/java/org/apache/flink/table/store/file/io/DataFileTestDataGenerator.java b/flink-table-store-core/src/test/java/org/apache/flink/table/store/file/io/DataFileTestDataGenerator.java
index d049a5255..c605fde79 100644
--- a/flink-table-store-core/src/test/java/org/apache/flink/table/store/file/io/DataFileTestDataGenerator.java
+++ b/flink-table-store-core/src/test/java/org/apache/flink/table/store/file/io/DataFileTestDataGenerator.java
@@ -18,11 +18,11 @@
package org.apache.flink.table.store.file.io;
-import org.apache.flink.table.store.data.BinaryRow;
import org.apache.flink.table.store.file.KeyValue;
import org.apache.flink.table.store.file.TestKeyValueGenerator;
import org.apache.flink.table.store.file.stats.FieldStatsArraySerializer;
+import org.apache.paimon.data.BinaryRow;
import org.apache.paimon.format.FieldStatsCollector;
import java.util.ArrayList;
diff --git a/flink-table-store-core/src/test/java/org/apache/flink/table/store/file/io/DataFileTestUtils.java b/flink-table-store-core/src/test/java/org/apache/flink/table/store/file/io/DataFileTestUtils.java
index c81832a0e..648e1afcc 100644
--- a/flink-table-store-core/src/test/java/org/apache/flink/table/store/file/io/DataFileTestUtils.java
+++ b/flink-table-store-core/src/test/java/org/apache/flink/table/store/file/io/DataFileTestUtils.java
@@ -18,11 +18,12 @@
package org.apache.flink.table.store.file.io;
-import org.apache.flink.table.store.data.BinaryRow;
-import org.apache.flink.table.store.data.BinaryRowWriter;
-import org.apache.flink.table.store.data.Timestamp;
import org.apache.flink.table.store.file.stats.StatsTestUtils;
+import org.apache.paimon.data.BinaryRow;
+import org.apache.paimon.data.BinaryRowWriter;
+import org.apache.paimon.data.Timestamp;
+
import java.util.Collections;
/** Utils for {@link DataFileMeta}. */
diff --git a/flink-table-store-core/src/test/java/org/apache/flink/table/store/file/io/KeyValueFileReadWriteTest.java b/flink-table-store-core/src/test/java/org/apache/flink/table/store/file/io/KeyValueFileReadWriteTest.java
index 6211a05d6..dd47a4df8 100644
--- a/flink-table-store-core/src/test/java/org/apache/flink/table/store/file/io/KeyValueFileReadWriteTest.java
+++ b/flink-table-store-core/src/test/java/org/apache/flink/table/store/file/io/KeyValueFileReadWriteTest.java
@@ -19,9 +19,6 @@
package org.apache.flink.table.store.file.io;
import org.apache.flink.table.store.CoreOptions;
-import org.apache.flink.table.store.data.BinaryRow;
-import org.apache.flink.table.store.data.GenericRow;
-import org.apache.flink.table.store.data.serializer.InternalRowSerializer;
import org.apache.flink.table.store.file.KeyValue;
import org.apache.flink.table.store.file.KeyValueSerializerTest;
import org.apache.flink.table.store.file.TestKeyValueGenerator;
@@ -43,6 +40,9 @@ import org.apache.flink.table.store.types.RowType;
import org.apache.flink.table.store.types.VarCharType;
import org.apache.flink.table.store.utils.CloseableIterator;
+import org.apache.paimon.data.BinaryRow;
+import org.apache.paimon.data.GenericRow;
+import org.apache.paimon.data.serializer.InternalRowSerializer;
import org.junit.jupiter.api.RepeatedTest;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.io.TempDir;
diff --git a/flink-table-store-core/src/test/java/org/apache/flink/table/store/file/io/RollingFileWriterTest.java b/flink-table-store-core/src/test/java/org/apache/flink/table/store/file/io/RollingFileWriterTest.java
index 8b11236a0..47005830f 100644
--- a/flink-table-store-core/src/test/java/org/apache/flink/table/store/file/io/RollingFileWriterTest.java
+++ b/flink-table-store-core/src/test/java/org/apache/flink/table/store/file/io/RollingFileWriterTest.java
@@ -19,8 +19,6 @@
package org.apache.flink.table.store.file.io;
import org.apache.flink.table.store.CoreOptions;
-import org.apache.flink.table.store.data.GenericRow;
-import org.apache.flink.table.store.data.InternalRow;
import org.apache.flink.table.store.fs.Path;
import org.apache.flink.table.store.fs.local.LocalFileIO;
import org.apache.flink.table.store.options.Options;
@@ -29,6 +27,8 @@ import org.apache.flink.table.store.types.IntType;
import org.apache.flink.table.store.types.RowType;
import org.apache.flink.table.store.utils.LongCounter;
+import org.apache.paimon.data.GenericRow;
+import org.apache.paimon.data.InternalRow;
import org.apache.paimon.format.FileFormat;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git a/flink-table-store-core/src/test/java/org/apache/flink/table/store/file/manifest/ManifestCommittableSerializerTest.java b/flink-table-store-core/src/test/java/org/apache/flink/table/store/file/manifest/ManifestCommittableSerializerTest.java
index b7c148390..ec28cd185 100644
--- a/flink-table-store-core/src/test/java/org/apache/flink/table/store/file/manifest/ManifestCommittableSerializerTest.java
+++ b/flink-table-store-core/src/test/java/org/apache/flink/table/store/file/manifest/ManifestCommittableSerializerTest.java
@@ -18,13 +18,13 @@
package org.apache.flink.table.store.file.manifest;
-import org.apache.flink.table.store.data.BinaryRow;
import org.apache.flink.table.store.file.io.CompactIncrement;
import org.apache.flink.table.store.file.io.DataFileMeta;
import org.apache.flink.table.store.file.io.NewFilesIncrement;
import org.apache.flink.table.store.table.sink.CommitMessage;
import org.apache.flink.table.store.table.sink.CommitMessageImpl;
+import org.apache.paimon.data.BinaryRow;
import org.junit.jupiter.api.Test;
import java.io.IOException;
diff --git a/flink-table-store-core/src/test/java/org/apache/flink/table/store/file/manifest/ManifestFileMetaTest.java b/flink-table-store-core/src/test/java/org/apache/flink/table/store/file/manifest/ManifestFileMetaTest.java
index ae5ef1de5..998fc8686 100644
--- a/flink-table-store-core/src/test/java/org/apache/flink/table/store/file/manifest/ManifestFileMetaTest.java
+++ b/flink-table-store-core/src/test/java/org/apache/flink/table/store/file/manifest/ManifestFileMetaTest.java
@@ -19,9 +19,6 @@
package org.apache.flink.table.store.file.manifest;
import org.apache.flink.table.store.CoreOptions;
-import org.apache.flink.table.store.data.BinaryRow;
-import org.apache.flink.table.store.data.BinaryRowWriter;
-import org.apache.flink.table.store.data.Timestamp;
import org.apache.flink.table.store.file.io.DataFileMeta;
import org.apache.flink.table.store.file.schema.SchemaManager;
import org.apache.flink.table.store.file.stats.StatsTestUtils;
@@ -35,6 +32,9 @@ import org.apache.flink.table.store.options.Options;
import org.apache.flink.table.store.types.IntType;
import org.apache.flink.table.store.types.RowType;
+import org.apache.paimon.data.BinaryRow;
+import org.apache.paimon.data.BinaryRowWriter;
+import org.apache.paimon.data.Timestamp;
import org.apache.paimon.format.FileFormat;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.RepeatedTest;
diff --git a/flink-table-store-core/src/test/java/org/apache/flink/table/store/file/manifest/ManifestTestDataGenerator.java b/flink-table-store-core/src/test/java/org/apache/flink/table/store/file/manifest/ManifestTestDataGenerator.java
index 857b98449..228a28790 100644
--- a/flink-table-store-core/src/test/java/org/apache/flink/table/store/file/manifest/ManifestTestDataGenerator.java
+++ b/flink-table-store-core/src/test/java/org/apache/flink/table/store/file/manifest/ManifestTestDataGenerator.java
@@ -18,13 +18,13 @@
package org.apache.flink.table.store.file.manifest;
-import org.apache.flink.table.store.data.BinaryRow;
import org.apache.flink.table.store.file.KeyValue;
import org.apache.flink.table.store.file.TestKeyValueGenerator;
import org.apache.flink.table.store.file.io.DataFileTestDataGenerator;
import org.apache.flink.table.store.file.stats.FieldStatsArraySerializer;
import org.apache.flink.table.store.utils.Preconditions;
+import org.apache.paimon.data.BinaryRow;
import org.apache.paimon.format.FieldStatsCollector;
import java.util.ArrayList;
diff --git a/flink-table-store-core/src/test/java/org/apache/flink/table/store/file/mergetree/LevelsTest.java b/flink-table-store-core/src/test/java/org/apache/flink/table/store/file/mergetree/LevelsTest.java
index ed2ad6594..cfdf5ba40 100644
--- a/flink-table-store-core/src/test/java/org/apache/flink/table/store/file/mergetree/LevelsTest.java
+++ b/flink-table-store-core/src/test/java/org/apache/flink/table/store/file/mergetree/LevelsTest.java
@@ -18,9 +18,9 @@
package org.apache.flink.table.store.file.mergetree;
-import org.apache.flink.table.store.data.InternalRow;
import org.apache.flink.table.store.file.io.DataFileMeta;
+import org.apache.paimon.data.InternalRow;
import org.junit.jupiter.api.Test;
import java.util.Arrays;
diff --git a/flink-table-store-core/src/test/java/org/apache/flink/table/store/file/mergetree/LookupLevelsTest.java b/flink-table-store-core/src/test/java/org/apache/flink/table/store/file/mergetree/LookupLevelsTest.java
index 39077a139..9bb6c94f2 100644
--- a/flink-table-store-core/src/test/java/org/apache/flink/table/store/file/mergetree/LookupLevelsTest.java
+++ b/flink-table-store-core/src/test/java/org/apache/flink/table/store/file/mergetree/LookupLevelsTest.java
@@ -18,9 +18,6 @@
package org.apache.flink.table.store.file.mergetree;
-import org.apache.flink.table.store.data.BinaryRow;
-import org.apache.flink.table.store.data.GenericRow;
-import org.apache.flink.table.store.data.InternalRow;
import org.apache.flink.table.store.file.KeyValue;
import org.apache.flink.table.store.file.format.FlushingFileFormat;
import org.apache.flink.table.store.file.io.DataFileMeta;
@@ -42,6 +39,9 @@ import org.apache.flink.table.store.types.DataTypes;
import org.apache.flink.table.store.types.RowKind;
import org.apache.flink.table.store.types.RowType;
+import org.apache.paimon.data.BinaryRow;
+import org.apache.paimon.data.GenericRow;
+import org.apache.paimon.data.InternalRow;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.io.TempDir;
diff --git a/flink-table-store-core/src/test/java/org/apache/flink/table/store/file/mergetree/MergeTreeTest.java b/flink-table-store-core/src/test/java/org/apache/flink/table/store/file/mergetree/MergeTreeTest.java
index faa262b11..30ab4902e 100644
--- a/flink-table-store-core/src/test/java/org/apache/flink/table/store/file/mergetree/MergeTreeTest.java
+++ b/flink-table-store-core/src/test/java/org/apache/flink/table/store/file/mergetree/MergeTreeTest.java
@@ -20,9 +20,6 @@ package org.apache.flink.table.store.file.mergetree;
import org.apache.flink.table.store.CoreOptions;
import org.apache.flink.table.store.CoreOptions.ChangelogProducer;
-import org.apache.flink.table.store.data.BinaryRow;
-import org.apache.flink.table.store.data.GenericRow;
-import org.apache.flink.table.store.data.InternalRow;
import org.apache.flink.table.store.file.KeyValue;
import org.apache.flink.table.store.file.compact.CompactResult;
import org.apache.flink.table.store.file.format.FlushingFileFormat;
@@ -56,6 +53,9 @@ import org.apache.flink.table.store.types.IntType;
import org.apache.flink.table.store.types.RowKind;
import org.apache.flink.table.store.types.RowType;
+import org.apache.paimon.data.BinaryRow;
+import org.apache.paimon.data.GenericRow;
+import org.apache.paimon.data.InternalRow;
import org.apache.paimon.format.FileFormat;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
diff --git a/flink-table-store-core/src/test/java/org/apache/flink/table/store/file/mergetree/compact/IntervalPartitionTest.java b/flink-table-store-core/src/test/java/org/apache/flink/table/store/file/mergetree/compact/IntervalPartitionTest.java
index 3b778b6a7..d7bb9aa8e 100644
--- a/flink-table-store-core/src/test/java/org/apache/flink/table/store/file/mergetree/compact/IntervalPartitionTest.java
+++ b/flink-table-store-core/src/test/java/org/apache/flink/table/store/file/mergetree/compact/IntervalPartitionTest.java
@@ -19,13 +19,13 @@
package org.apache.flink.table.store.file.mergetree.compact;
import org.apache.flink.table.store.codegen.RecordComparator;
-import org.apache.flink.table.store.data.BinaryRow;
-import org.apache.flink.table.store.data.BinaryRowWriter;
-import org.apache.flink.table.store.data.Timestamp;
import org.apache.flink.table.store.file.io.DataFileMeta;
import org.apache.flink.table.store.file.mergetree.SortedRun;
import org.apache.flink.table.store.file.stats.StatsTestUtils;
+import org.apache.paimon.data.BinaryRow;
+import org.apache.paimon.data.BinaryRowWriter;
+import org.apache.paimon.data.Timestamp;
import org.junit.jupiter.api.RepeatedTest;
import org.junit.jupiter.api.Test;
diff --git a/flink-table-store-core/src/test/java/org/apache/flink/table/store/file/mergetree/compact/LookupChangelogMergeFunctionWrapperTest.java b/flink-table-store-core/src/test/java/org/apache/flink/table/store/file/mergetree/compact/LookupChangelogMergeFunctionWrapperTest.java
index c697948a2..f45d4026a 100644
--- a/flink-table-store-core/src/test/java/org/apache/flink/table/store/file/mergetree/compact/LookupChangelogMergeFunctionWrapperTest.java
+++ b/flink-table-store-core/src/test/java/org/apache/flink/table/store/file/mergetree/compact/LookupChangelogMergeFunctionWrapperTest.java
@@ -18,14 +18,14 @@
package org.apache.flink.table.store.file.mergetree.compact;
-import org.apache.flink.table.store.data.InternalRow;
-import org.apache.flink.table.store.data.InternalRow.FieldGetter;
import org.apache.flink.table.store.file.KeyValue;
import org.apache.flink.table.store.file.mergetree.compact.aggregate.AggregateMergeFunction;
import org.apache.flink.table.store.file.mergetree.compact.aggregate.FieldAggregator;
import org.apache.flink.table.store.file.mergetree.compact.aggregate.FieldSumAgg;
import org.apache.flink.table.store.types.DataTypes;
+import org.apache.paimon.data.InternalRow;
+import org.apache.paimon.data.InternalRow.FieldGetter;
import org.junit.jupiter.api.Test;
import java.util.HashMap;
diff --git a/flink-table-store-core/src/test/java/org/apache/flink/table/store/file/mergetree/compact/MergeTreeCompactManagerTest.java b/flink-table-store-core/src/test/java/org/apache/flink/table/store/file/mergetree/compact/MergeTreeCompactManagerTest.java
index d5c2d9c8f..f791ff0cf 100644
--- a/flink-table-store-core/src/test/java/org/apache/flink/table/store/file/mergetree/compact/MergeTreeCompactManagerTest.java
+++ b/flink-table-store-core/src/test/java/org/apache/flink/table/store/file/mergetree/compact/MergeTreeCompactManagerTest.java
@@ -18,8 +18,6 @@
package org.apache.flink.table.store.file.mergetree.compact;
-import org.apache.flink.table.store.data.BinaryRow;
-import org.apache.flink.table.store.data.InternalRow;
import org.apache.flink.table.store.file.compact.CompactResult;
import org.apache.flink.table.store.file.compact.CompactUnit;
import org.apache.flink.table.store.file.io.DataFileMeta;
@@ -27,6 +25,8 @@ import org.apache.flink.table.store.file.io.DataFileTestUtils;
import org.apache.flink.table.store.file.mergetree.Levels;
import org.apache.flink.table.store.file.mergetree.SortedRun;
+import org.apache.paimon.data.BinaryRow;
+import org.apache.paimon.data.InternalRow;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
diff --git a/flink-table-store-core/src/test/java/org/apache/flink/table/store/file/mergetree/compact/ReducerMergeFunctionWrapperTestBase.java b/flink-table-store-core/src/test/java/org/apache/flink/table/store/file/mergetree/compact/ReducerMergeFunctionWrapperTestBase.java
index f513af6d5..6b412d3c8 100644
--- a/flink-table-store-core/src/test/java/org/apache/flink/table/store/file/mergetree/compact/ReducerMergeFunctionWrapperTestBase.java
+++ b/flink-table-store-core/src/test/java/org/apache/flink/table/store/file/mergetree/compact/ReducerMergeFunctionWrapperTestBase.java
@@ -18,10 +18,10 @@
package org.apache.flink.table.store.file.mergetree.compact;
-import org.apache.flink.table.store.data.GenericRow;
import org.apache.flink.table.store.file.KeyValue;
import org.apache.flink.table.store.types.RowKind;
+import org.apache.paimon.data.GenericRow;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
diff --git a/flink-table-store-core/src/test/java/org/apache/flink/table/store/file/mergetree/compact/aggregate/FieldAggregatorTest.java b/flink-table-store-core/src/test/java/org/apache/flink/table/store/file/mergetree/compact/aggregate/FieldAggregatorTest.java
index d2fe08461..bbce72e2d 100644
--- a/flink-table-store-core/src/test/java/org/apache/flink/table/store/file/mergetree/compact/aggregate/FieldAggregatorTest.java
+++ b/flink-table-store-core/src/test/java/org/apache/flink/table/store/file/mergetree/compact/aggregate/FieldAggregatorTest.java
@@ -18,8 +18,6 @@
package org.apache.flink.table.store.file.mergetree.compact.aggregate;
-import org.apache.flink.table.store.data.BinaryString;
-import org.apache.flink.table.store.data.Decimal;
import org.apache.flink.table.store.types.BigIntType;
import org.apache.flink.table.store.types.BooleanType;
import org.apache.flink.table.store.types.DecimalType;
@@ -30,6 +28,8 @@ import org.apache.flink.table.store.types.SmallIntType;
import org.apache.flink.table.store.types.TinyIntType;
import org.apache.flink.table.store.types.VarCharType;
+import org.apache.paimon.data.BinaryString;
+import org.apache.paimon.data.Decimal;
import org.junit.jupiter.api.Test;
import java.math.BigDecimal;
diff --git a/flink-table-store-core/src/test/java/org/apache/flink/table/store/file/operation/CleanedFileStoreExpireTest.java b/flink-table-store-core/src/test/java/org/apache/flink/table/store/file/operation/CleanedFileStoreExpireTest.java
index 6b8daee60..0d03203ce 100644
--- a/flink-table-store-core/src/test/java/org/apache/flink/table/store/file/operation/CleanedFileStoreExpireTest.java
+++ b/flink-table-store-core/src/test/java/org/apache/flink/table/store/file/operation/CleanedFileStoreExpireTest.java
@@ -18,8 +18,6 @@
package org.apache.flink.table.store.file.operation;
-import org.apache.flink.table.store.data.BinaryRow;
-import org.apache.flink.table.store.data.Timestamp;
import org.apache.flink.table.store.file.KeyValue;
import org.apache.flink.table.store.file.io.DataFileMeta;
import org.apache.flink.table.store.file.manifest.FileKind;
@@ -28,6 +26,8 @@ import org.apache.flink.table.store.file.utils.SnapshotManager;
import org.apache.flink.table.store.fs.Path;
import org.apache.flink.table.store.fs.local.LocalFileIO;
+import org.apache.paimon.data.BinaryRow;
+import org.apache.paimon.data.Timestamp;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Test;
@@ -37,7 +37,7 @@ import java.util.Arrays;
import java.util.List;
import java.util.concurrent.ThreadLocalRandom;
-import static org.apache.flink.table.store.data.BinaryRow.EMPTY_ROW;
+import static org.apache.paimon.data.BinaryRow.EMPTY_ROW;
import static org.assertj.core.api.Assertions.assertThat;
/**
diff --git a/flink-table-store-core/src/test/java/org/apache/flink/table/store/file/operation/FileStoreCommitTest.java b/flink-table-store-core/src/test/java/org/apache/flink/table/store/file/operation/FileStoreCommitTest.java
index 05d920a8c..cae26f111 100644
--- a/flink-table-store-core/src/test/java/org/apache/flink/table/store/file/operation/FileStoreCommitTest.java
+++ b/flink-table-store-core/src/test/java/org/apache/flink/table/store/file/operation/FileStoreCommitTest.java
@@ -19,7 +19,6 @@
package org.apache.flink.table.store.file.operation;
import org.apache.flink.table.store.CoreOptions;
-import org.apache.flink.table.store.data.BinaryRow;
import org.apache.flink.table.store.file.KeyValue;
import org.apache.flink.table.store.file.Snapshot;
import org.apache.flink.table.store.file.TestFileStore;
@@ -36,6 +35,7 @@ import org.apache.flink.table.store.fs.Path;
import org.apache.flink.table.store.fs.local.LocalFileIO;
import org.apache.flink.table.store.types.RowKind;
+import org.apache.paimon.data.BinaryRow;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git a/flink-table-store-core/src/test/java/org/apache/flink/table/store/file/operation/FileStoreExpireTestBase.java b/flink-table-store-core/src/test/java/org/apache/flink/table/store/file/operation/FileStoreExpireTestBase.java
index cb111d7fb..b83a1bcf4 100644
--- a/flink-table-store-core/src/test/java/org/apache/flink/table/store/file/operation/FileStoreExpireTestBase.java
+++ b/flink-table-store-core/src/test/java/org/apache/flink/table/store/file/operation/FileStoreExpireTestBase.java
@@ -19,7 +19,6 @@
package org.apache.flink.table.store.file.operation;
import org.apache.flink.table.store.CoreOptions;
-import org.apache.flink.table.store.data.BinaryRow;
import org.apache.flink.table.store.file.KeyValue;
import org.apache.flink.table.store.file.Snapshot;
import org.apache.flink.table.store.file.TestFileStore;
@@ -32,6 +31,7 @@ import org.apache.flink.table.store.fs.FileIO;
import org.apache.flink.table.store.fs.Path;
import org.apache.flink.table.store.fs.local.LocalFileIO;
+import org.apache.paimon.data.BinaryRow;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.io.TempDir;
diff --git a/flink-table-store-core/src/test/java/org/apache/flink/table/store/file/operation/KeyValueFileStoreReadTest.java b/flink-table-store-core/src/test/java/org/apache/flink/table/store/file/operation/KeyValueFileStoreReadTest.java
index 597d380d1..a7b9a3408 100644
--- a/flink-table-store-core/src/test/java/org/apache/flink/table/store/file/operation/KeyValueFileStoreReadTest.java
+++ b/flink-table-store-core/src/test/java/org/apache/flink/table/store/file/operation/KeyValueFileStoreReadTest.java
@@ -18,9 +18,6 @@
package org.apache.flink.table.store.file.operation;
-import org.apache.flink.table.store.data.BinaryRow;
-import org.apache.flink.table.store.data.GenericRow;
-import org.apache.flink.table.store.data.serializer.InternalRowSerializer;
import org.apache.flink.table.store.file.KeyValue;
import org.apache.flink.table.store.file.TestFileStore;
import org.apache.flink.table.store.file.TestKeyValueGenerator;
@@ -45,6 +42,9 @@ import org.apache.flink.table.store.types.RowKind;
import org.apache.flink.table.store.types.RowType;
import org.apache.flink.table.store.types.VarCharType;
+import org.apache.paimon.data.BinaryRow;
+import org.apache.paimon.data.GenericRow;
+import org.apache.paimon.data.serializer.InternalRowSerializer;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.io.TempDir;
diff --git a/flink-table-store-core/src/test/java/org/apache/flink/table/store/file/operation/KeyValueFileStoreScanTest.java b/flink-table-store-core/src/test/java/org/apache/flink/table/store/file/operation/KeyValueFileStoreScanTest.java
index eb95046f2..451be55a4 100644
--- a/flink-table-store-core/src/test/java/org/apache/flink/table/store/file/operation/KeyValueFileStoreScanTest.java
+++ b/flink-table-store-core/src/test/java/org/apache/flink/table/store/file/operation/KeyValueFileStoreScanTest.java
@@ -18,7 +18,6 @@
package org.apache.flink.table.store.file.operation;
-import org.apache.flink.table.store.data.BinaryRow;
import org.apache.flink.table.store.file.KeyValue;
import org.apache.flink.table.store.file.Snapshot;
import org.apache.flink.table.store.file.TestFileStore;
@@ -35,6 +34,7 @@ import org.apache.flink.table.store.fs.local.LocalFileIO;
import org.apache.flink.table.store.types.IntType;
import org.apache.flink.table.store.types.RowType;
+import org.apache.paimon.data.BinaryRow;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.io.TempDir;
diff --git a/flink-table-store-core/src/test/java/org/apache/flink/table/store/file/operation/PartitionExpireTest.java b/flink-table-store-core/src/test/java/org/apache/flink/table/store/file/operation/PartitionExpireTest.java
index 5a954f6dc..784f4ed45 100644
--- a/flink-table-store-core/src/test/java/org/apache/flink/table/store/file/operation/PartitionExpireTest.java
+++ b/flink-table-store-core/src/test/java/org/apache/flink/table/store/file/operation/PartitionExpireTest.java
@@ -19,8 +19,6 @@
package org.apache.flink.table.store.file.operation;
import org.apache.flink.table.store.CoreOptions;
-import org.apache.flink.table.store.data.BinaryString;
-import org.apache.flink.table.store.data.GenericRow;
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;
@@ -32,6 +30,8 @@ import org.apache.flink.table.store.table.sink.StreamTableWrite;
import org.apache.flink.table.store.types.RowType;
import org.apache.flink.table.store.types.VarCharType;
+import org.apache.paimon.data.BinaryString;
+import org.apache.paimon.data.GenericRow;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.io.TempDir;
diff --git a/flink-table-store-core/src/test/java/org/apache/flink/table/store/file/operation/TestCommitThread.java b/flink-table-store-core/src/test/java/org/apache/flink/table/store/file/operation/TestCommitThread.java
index 232c6f7f1..84a8ce20b 100644
--- a/flink-table-store-core/src/test/java/org/apache/flink/table/store/file/operation/TestCommitThread.java
+++ b/flink-table-store-core/src/test/java/org/apache/flink/table/store/file/operation/TestCommitThread.java
@@ -18,7 +18,6 @@
package org.apache.flink.table.store.file.operation;
-import org.apache.flink.table.store.data.BinaryRow;
import org.apache.flink.table.store.file.KeyValue;
import org.apache.flink.table.store.file.TestFileStore;
import org.apache.flink.table.store.file.TestKeyValueGenerator;
@@ -29,6 +28,7 @@ import org.apache.flink.table.store.file.utils.CommitIncrement;
import org.apache.flink.table.store.table.sink.CommitMessageImpl;
import org.apache.flink.table.store.types.RowType;
+import org.apache.paimon.data.BinaryRow;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/flink-table-store-core/src/test/java/org/apache/flink/table/store/file/schema/SchemaEvolutionUtilTest.java b/flink-table-store-core/src/test/java/org/apache/flink/table/store/file/schema/SchemaEvolutionUtilTest.java
index 376ab80f8..49b2ff4e3 100644
--- a/flink-table-store-core/src/test/java/org/apache/flink/table/store/file/schema/SchemaEvolutionUtilTest.java
+++ b/flink-table-store-core/src/test/java/org/apache/flink/table/store/file/schema/SchemaEvolutionUtilTest.java
@@ -18,8 +18,6 @@
package org.apache.flink.table.store.file.schema;
-import org.apache.flink.table.store.data.GenericRow;
-import org.apache.flink.table.store.data.InternalRow;
import org.apache.flink.table.store.file.predicate.Equal;
import org.apache.flink.table.store.file.predicate.IsNotNull;
import org.apache.flink.table.store.file.predicate.IsNull;
@@ -35,6 +33,8 @@ import org.apache.flink.table.store.types.IntType;
import org.apache.flink.table.store.utils.ProjectedRow;
import org.apache.flink.table.store.utils.Projection;
+import org.apache.paimon.data.GenericRow;
+import org.apache.paimon.data.InternalRow;
import org.junit.jupiter.api.Test;
import java.util.ArrayList;
diff --git a/flink-table-store-core/src/test/java/org/apache/flink/table/store/file/sort/BinaryExternalSortBufferTest.java b/flink-table-store-core/src/test/java/org/apache/flink/table/store/file/sort/BinaryExternalSortBufferTest.java
index f95792369..228d38e69 100644
--- a/flink-table-store-core/src/test/java/org/apache/flink/table/store/file/sort/BinaryExternalSortBufferTest.java
+++ b/flink-table-store-core/src/test/java/org/apache/flink/table/store/file/sort/BinaryExternalSortBufferTest.java
@@ -18,16 +18,16 @@
package org.apache.flink.table.store.file.sort;
-import org.apache.flink.table.store.data.BinaryRow;
-import org.apache.flink.table.store.data.BinaryRowWriter;
-import org.apache.flink.table.store.data.BinaryString;
-import org.apache.flink.table.store.data.serializer.AbstractRowDataSerializer;
-import org.apache.flink.table.store.data.serializer.BinaryRowSerializer;
import org.apache.flink.table.store.file.disk.IOManager;
import org.apache.flink.table.store.file.memory.HeapMemorySegmentPool;
import org.apache.flink.table.store.file.memory.MemorySegmentPool;
import org.apache.flink.table.store.file.utils.MutableObjectIterator;
+import org.apache.paimon.data.BinaryRow;
+import org.apache.paimon.data.BinaryRowWriter;
+import org.apache.paimon.data.BinaryString;
+import org.apache.paimon.data.serializer.AbstractRowDataSerializer;
+import org.apache.paimon.data.serializer.BinaryRowSerializer;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git a/flink-table-store-core/src/test/java/org/apache/flink/table/store/file/sort/IntNormalizedKeyComputer.java b/flink-table-store-core/src/test/java/org/apache/flink/table/store/file/sort/IntNormalizedKeyComputer.java
index 18cd0b3aa..801be9263 100644
--- a/flink-table-store-core/src/test/java/org/apache/flink/table/store/file/sort/IntNormalizedKeyComputer.java
+++ b/flink-table-store-core/src/test/java/org/apache/flink/table/store/file/sort/IntNormalizedKeyComputer.java
@@ -19,10 +19,11 @@
package org.apache.flink.table.store.file.sort;
import org.apache.flink.table.store.codegen.NormalizedKeyComputer;
-import org.apache.flink.table.store.data.InternalRow;
import org.apache.flink.table.store.memory.MemorySegment;
import org.apache.flink.table.store.utils.SortUtil;
+import org.apache.paimon.data.InternalRow;
+
/** Example for int {@link NormalizedKeyComputer}. */
public class IntNormalizedKeyComputer implements NormalizedKeyComputer {
diff --git a/flink-table-store-core/src/test/java/org/apache/flink/table/store/file/sort/IntRecordComparator.java b/flink-table-store-core/src/test/java/org/apache/flink/table/store/file/sort/IntRecordComparator.java
index 8675d2ffe..7c3da46d0 100644
--- a/flink-table-store-core/src/test/java/org/apache/flink/table/store/file/sort/IntRecordComparator.java
+++ b/flink-table-store-core/src/test/java/org/apache/flink/table/store/file/sort/IntRecordComparator.java
@@ -19,7 +19,8 @@
package org.apache.flink.table.store.file.sort;
import org.apache.flink.table.store.codegen.RecordComparator;
-import org.apache.flink.table.store.data.InternalRow;
+
+import org.apache.paimon.data.InternalRow;
/** Example Int {@link RecordComparator}. */
public class IntRecordComparator implements RecordComparator {
diff --git a/flink-table-store-core/src/test/java/org/apache/flink/table/store/file/stats/BinaryTableStatsTest.java b/flink-table-store-core/src/test/java/org/apache/flink/table/store/file/stats/BinaryTableStatsTest.java
index 924c64d97..98d52a394 100644
--- a/flink-table-store-core/src/test/java/org/apache/flink/table/store/file/stats/BinaryTableStatsTest.java
+++ b/flink-table-store-core/src/test/java/org/apache/flink/table/store/file/stats/BinaryTableStatsTest.java
@@ -18,12 +18,12 @@
package org.apache.flink.table.store.file.stats;
-import org.apache.flink.table.store.data.BinaryRow;
-import org.apache.flink.table.store.data.BinaryRowWriter;
-import org.apache.flink.table.store.data.InternalRow;
import org.apache.flink.table.store.types.IntType;
import org.apache.flink.table.store.types.RowType;
+import org.apache.paimon.data.BinaryRow;
+import org.apache.paimon.data.BinaryRowWriter;
+import org.apache.paimon.data.InternalRow;
import org.apache.paimon.format.FieldStats;
import org.junit.jupiter.api.Test;
diff --git a/flink-table-store-core/src/test/java/org/apache/flink/table/store/file/stats/FieldStatsArraySerializerTest.java b/flink-table-store-core/src/test/java/org/apache/flink/table/store/file/stats/FieldStatsArraySerializerTest.java
index f94d710f1..495195117 100644
--- a/flink-table-store-core/src/test/java/org/apache/flink/table/store/file/stats/FieldStatsArraySerializerTest.java
+++ b/flink-table-store-core/src/test/java/org/apache/flink/table/store/file/stats/FieldStatsArraySerializerTest.java
@@ -18,13 +18,13 @@
package org.apache.flink.table.store.file.stats;
-import org.apache.flink.table.store.data.BinaryRow;
import org.apache.flink.table.store.file.casting.CastExecutor;
import org.apache.flink.table.store.file.schema.SchemaEvolutionUtil;
import org.apache.flink.table.store.file.schema.TableSchema;
import org.apache.flink.table.store.types.DataField;
import org.apache.flink.table.store.types.IntType;
+import org.apache.paimon.data.BinaryRow;
import org.apache.paimon.format.FieldStats;
import org.junit.jupiter.api.Test;
diff --git a/flink-table-store-core/src/test/java/org/apache/flink/table/store/file/stats/FieldStatsCollectorTest.java b/flink-table-store-core/src/test/java/org/apache/flink/table/store/file/stats/FieldStatsCollectorTest.java
index 4601a7525..bdb8508cf 100644
--- a/flink-table-store-core/src/test/java/org/apache/flink/table/store/file/stats/FieldStatsCollectorTest.java
+++ b/flink-table-store-core/src/test/java/org/apache/flink/table/store/file/stats/FieldStatsCollectorTest.java
@@ -18,14 +18,14 @@
package org.apache.flink.table.store.file.stats;
-import org.apache.flink.table.store.data.BinaryString;
-import org.apache.flink.table.store.data.GenericArray;
-import org.apache.flink.table.store.data.GenericRow;
import org.apache.flink.table.store.types.ArrayType;
import org.apache.flink.table.store.types.IntType;
import org.apache.flink.table.store.types.RowType;
import org.apache.flink.table.store.types.VarCharType;
+import org.apache.paimon.data.BinaryString;
+import org.apache.paimon.data.GenericArray;
+import org.apache.paimon.data.GenericRow;
import org.apache.paimon.format.FieldStats;
import org.apache.paimon.format.FieldStatsCollector;
import org.junit.jupiter.api.Test;
diff --git a/flink-table-store-core/src/test/java/org/apache/flink/table/store/file/stats/TestFileStatsExtractor.java b/flink-table-store-core/src/test/java/org/apache/flink/table/store/file/stats/TestFileStatsExtractor.java
index d793b8ee2..6eb5c013b 100644
--- a/flink-table-store-core/src/test/java/org/apache/flink/table/store/file/stats/TestFileStatsExtractor.java
+++ b/flink-table-store-core/src/test/java/org/apache/flink/table/store/file/stats/TestFileStatsExtractor.java
@@ -18,13 +18,13 @@
package org.apache.flink.table.store.file.stats;
-import org.apache.flink.table.store.data.InternalRow;
import org.apache.flink.table.store.file.utils.FileUtils;
import org.apache.flink.table.store.file.utils.ObjectSerializer;
import org.apache.flink.table.store.fs.FileIO;
import org.apache.flink.table.store.fs.Path;
import org.apache.flink.table.store.types.RowType;
+import org.apache.paimon.data.InternalRow;
import org.apache.paimon.format.FieldStats;
import org.apache.paimon.format.FieldStatsCollector;
import org.apache.paimon.format.FileFormat;
diff --git a/flink-table-store-core/src/test/java/org/apache/flink/table/store/file/utils/FileStorePathFactoryTest.java b/flink-table-store-core/src/test/java/org/apache/flink/table/store/file/utils/FileStorePathFactoryTest.java
index 239fd6e62..9c2ca975e 100644
--- a/flink-table-store-core/src/test/java/org/apache/flink/table/store/file/utils/FileStorePathFactoryTest.java
+++ b/flink-table-store-core/src/test/java/org/apache/flink/table/store/file/utils/FileStorePathFactoryTest.java
@@ -19,9 +19,6 @@
package org.apache.flink.table.store.file.utils;
import org.apache.flink.table.store.CoreOptions;
-import org.apache.flink.table.store.data.BinaryRow;
-import org.apache.flink.table.store.data.BinaryRowWriter;
-import org.apache.flink.table.store.data.BinaryString;
import org.apache.flink.table.store.file.io.DataFilePathFactory;
import org.apache.flink.table.store.fs.Path;
import org.apache.flink.table.store.types.DataType;
@@ -29,6 +26,9 @@ import org.apache.flink.table.store.types.IntType;
import org.apache.flink.table.store.types.RowType;
import org.apache.flink.table.store.types.VarCharType;
+import org.apache.paimon.data.BinaryRow;
+import org.apache.paimon.data.BinaryRowWriter;
+import org.apache.paimon.data.BinaryString;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.io.TempDir;
diff --git a/flink-table-store-core/src/test/java/org/apache/flink/table/store/file/utils/OffsetRowTest.java b/flink-table-store-core/src/test/java/org/apache/flink/table/store/file/utils/OffsetRowTest.java
index 1c403ab1f..c54c505d8 100644
--- a/flink-table-store-core/src/test/java/org/apache/flink/table/store/file/utils/OffsetRowTest.java
+++ b/flink-table-store-core/src/test/java/org/apache/flink/table/store/file/utils/OffsetRowTest.java
@@ -17,19 +17,19 @@
package org.apache.flink.table.store.file.utils;
-import org.apache.flink.table.store.data.BinaryArray;
-import org.apache.flink.table.store.data.BinaryArrayWriter;
-import org.apache.flink.table.store.data.BinaryMap;
-import org.apache.flink.table.store.data.BinaryRow;
-import org.apache.flink.table.store.data.BinaryRowWriter;
-import org.apache.flink.table.store.data.BinaryString;
-import org.apache.flink.table.store.data.Decimal;
-import org.apache.flink.table.store.data.GenericRow;
-import org.apache.flink.table.store.data.InternalRow;
-import org.apache.flink.table.store.data.JoinedRow;
-import org.apache.flink.table.store.data.Timestamp;
import org.apache.flink.table.store.types.RowKind;
+import org.apache.paimon.data.BinaryArray;
+import org.apache.paimon.data.BinaryArrayWriter;
+import org.apache.paimon.data.BinaryMap;
+import org.apache.paimon.data.BinaryRow;
+import org.apache.paimon.data.BinaryRowWriter;
+import org.apache.paimon.data.BinaryString;
+import org.apache.paimon.data.Decimal;
+import org.apache.paimon.data.GenericRow;
+import org.apache.paimon.data.InternalRow;
+import org.apache.paimon.data.JoinedRow;
+import org.apache.paimon.data.Timestamp;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git a/flink-table-store-core/src/test/java/org/apache/flink/table/store/file/utils/ReusingKeyValue.java b/flink-table-store-core/src/test/java/org/apache/flink/table/store/file/utils/ReusingKeyValue.java
index fe1071ba4..6a30928e5 100644
--- a/flink-table-store-core/src/test/java/org/apache/flink/table/store/file/utils/ReusingKeyValue.java
+++ b/flink-table-store-core/src/test/java/org/apache/flink/table/store/file/utils/ReusingKeyValue.java
@@ -18,10 +18,11 @@
package org.apache.flink.table.store.file.utils;
-import org.apache.flink.table.store.data.BinaryRow;
-import org.apache.flink.table.store.data.BinaryRowWriter;
import org.apache.flink.table.store.file.KeyValue;
+import org.apache.paimon.data.BinaryRow;
+import org.apache.paimon.data.BinaryRowWriter;
+
/**
* Util class which reuses a {@link KeyValue} to test if other components handle reuse correctly.
* This must be used along with {@link ReusingTestData}.
diff --git a/flink-table-store-core/src/test/java/org/apache/flink/table/store/table/AppendOnlyFileStoreTableTest.java b/flink-table-store-core/src/test/java/org/apache/flink/table/store/table/AppendOnlyFileStoreTableTest.java
index d12b7fc99..ee3e47f97 100644
--- a/flink-table-store-core/src/test/java/org/apache/flink/table/store/table/AppendOnlyFileStoreTableTest.java
+++ b/flink-table-store-core/src/test/java/org/apache/flink/table/store/table/AppendOnlyFileStoreTableTest.java
@@ -19,9 +19,6 @@
package org.apache.flink.table.store.table;
import org.apache.flink.table.store.CoreOptions;
-import org.apache.flink.table.store.data.BinaryRow;
-import org.apache.flink.table.store.data.InternalRow;
-import org.apache.flink.table.store.data.serializer.InternalRowSerializer;
import org.apache.flink.table.store.file.WriteMode;
import org.apache.flink.table.store.file.operation.ScanKind;
import org.apache.flink.table.store.file.predicate.Predicate;
@@ -38,6 +35,9 @@ import org.apache.flink.table.store.table.source.DataSplit;
import org.apache.flink.table.store.table.source.Split;
import org.apache.flink.table.store.table.source.TableRead;
+import org.apache.paimon.data.BinaryRow;
+import org.apache.paimon.data.InternalRow;
+import org.apache.paimon.data.serializer.InternalRowSerializer;
import org.junit.jupiter.api.Test;
import java.util.ArrayList;
diff --git a/flink-table-store-core/src/test/java/org/apache/flink/table/store/table/ChangelogWithKeyColumnTypeFileDataTest.java b/flink-table-store-core/src/test/java/org/apache/flink/table/store/table/ChangelogWithKeyColumnTypeFileDataTest.java
index 6ab9151c2..1d8dd08dd 100644
--- a/flink-table-store-core/src/test/java/org/apache/flink/table/store/table/ChangelogWithKeyColumnTypeFileDataTest.java
+++ b/flink-table-store-core/src/test/java/org/apache/flink/table/store/table/ChangelogWithKeyColumnTypeFileDataTest.java
@@ -19,7 +19,6 @@
package org.apache.flink.table.store.table;
import org.apache.flink.table.store.CoreOptions;
-import org.apache.flink.table.store.data.InternalRow;
import org.apache.flink.table.store.file.WriteMode;
import org.apache.flink.table.store.file.predicate.Predicate;
import org.apache.flink.table.store.file.predicate.PredicateBuilder;
@@ -27,6 +26,7 @@ import org.apache.flink.table.store.file.schema.SchemaManager;
import org.apache.flink.table.store.file.schema.TableSchema;
import org.apache.flink.table.store.table.source.Split;
+import org.apache.paimon.data.InternalRow;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git a/flink-table-store-core/src/test/java/org/apache/flink/table/store/table/ChangelogWithKeyFileStoreTableTest.java b/flink-table-store-core/src/test/java/org/apache/flink/table/store/table/ChangelogWithKeyFileStoreTableTest.java
index be234f388..2260f525d 100644
--- a/flink-table-store-core/src/test/java/org/apache/flink/table/store/table/ChangelogWithKeyFileStoreTableTest.java
+++ b/flink-table-store-core/src/test/java/org/apache/flink/table/store/table/ChangelogWithKeyFileStoreTableTest.java
@@ -20,9 +20,6 @@ package org.apache.flink.table.store.table;
import org.apache.flink.table.store.CoreOptions;
import org.apache.flink.table.store.CoreOptions.ChangelogProducer;
-import org.apache.flink.table.store.data.BinaryString;
-import org.apache.flink.table.store.data.GenericRow;
-import org.apache.flink.table.store.data.InternalRow;
import org.apache.flink.table.store.file.WriteMode;
import org.apache.flink.table.store.file.operation.ScanKind;
import org.apache.flink.table.store.file.predicate.Predicate;
@@ -56,6 +53,9 @@ import org.apache.flink.table.store.types.RowKind;
import org.apache.flink.table.store.types.RowType;
import org.apache.flink.table.store.utils.CompatibilityTestUtils;
+import org.apache.paimon.data.BinaryString;
+import org.apache.paimon.data.GenericRow;
+import org.apache.paimon.data.InternalRow;
import org.junit.jupiter.api.Test;
import java.util.Arrays;
@@ -66,7 +66,7 @@ import java.util.Map;
import java.util.function.Consumer;
import java.util.function.Function;
-import static org.apache.flink.table.store.data.DataFormatTestUtil.rowDataToString;
+import static org.apache.paimon.data.DataFormatTestUtil.rowDataToString;
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/flink/table/store/table/ChangelogWithKeyTableColumnTypeFileMetaTest.java b/flink-table-store-core/src/test/java/org/apache/flink/table/store/table/ChangelogWithKeyTableColumnTypeFileMetaTest.java
index 94427d158..52a7656a2 100644
--- a/flink-table-store-core/src/test/java/org/apache/flink/table/store/table/ChangelogWithKeyTableColumnTypeFileMetaTest.java
+++ b/flink-table-store-core/src/test/java/org/apache/flink/table/store/table/ChangelogWithKeyTableColumnTypeFileMetaTest.java
@@ -19,7 +19,6 @@
package org.apache.flink.table.store.table;
import org.apache.flink.table.store.CoreOptions;
-import org.apache.flink.table.store.data.BinaryString;
import org.apache.flink.table.store.file.WriteMode;
import org.apache.flink.table.store.file.io.DataFileMeta;
import org.apache.flink.table.store.file.predicate.Predicate;
@@ -29,6 +28,7 @@ import org.apache.flink.table.store.file.schema.TableSchema;
import org.apache.flink.table.store.file.stats.BinaryTableStats;
import org.apache.flink.table.store.table.source.DataSplit;
+import org.apache.paimon.data.BinaryString;
import org.apache.paimon.format.FieldStats;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git a/flink-table-store-core/src/test/java/org/apache/flink/table/store/table/ColumnTypeFileDataTestBase.java b/flink-table-store-core/src/test/java/org/apache/flink/table/store/table/ColumnTypeFileDataTestBase.java
index 1529f8974..d32a77712 100644
--- a/flink-table-store-core/src/test/java/org/apache/flink/table/store/table/ColumnTypeFileDataTestBase.java
+++ b/flink-table-store-core/src/test/java/org/apache/flink/table/store/table/ColumnTypeFileDataTestBase.java
@@ -19,13 +19,13 @@
package org.apache.flink.table.store.table;
import org.apache.flink.table.store.CoreOptions;
-import org.apache.flink.table.store.data.InternalRow;
import org.apache.flink.table.store.file.predicate.Predicate;
import org.apache.flink.table.store.file.predicate.PredicateBuilder;
import org.apache.flink.table.store.table.source.Split;
import org.apache.flink.table.store.types.DataField;
import org.apache.flink.table.store.utils.RowDataUtils;
+import org.apache.paimon.data.InternalRow;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git a/flink-table-store-core/src/test/java/org/apache/flink/table/store/table/ColumnTypeFileMetaTestBase.java b/flink-table-store-core/src/test/java/org/apache/flink/table/store/table/ColumnTypeFileMetaTestBase.java
index d0993eed0..0dbe53c00 100644
--- a/flink-table-store-core/src/test/java/org/apache/flink/table/store/table/ColumnTypeFileMetaTestBase.java
+++ b/flink-table-store-core/src/test/java/org/apache/flink/table/store/table/ColumnTypeFileMetaTestBase.java
@@ -19,14 +19,14 @@
package org.apache.flink.table.store.table;
import org.apache.flink.table.store.CoreOptions;
-import org.apache.flink.table.store.data.BinaryString;
-import org.apache.flink.table.store.data.Decimal;
import org.apache.flink.table.store.file.io.DataFileMeta;
import org.apache.flink.table.store.file.predicate.Predicate;
import org.apache.flink.table.store.file.predicate.PredicateBuilder;
import org.apache.flink.table.store.file.stats.BinaryTableStats;
import org.apache.flink.table.store.table.source.DataSplit;
+import org.apache.paimon.data.BinaryString;
+import org.apache.paimon.data.Decimal;
import org.apache.paimon.format.FieldStats;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git a/flink-table-store-core/src/test/java/org/apache/flink/table/store/table/FileDataFilterTestBase.java b/flink-table-store-core/src/test/java/org/apache/flink/table/store/table/FileDataFilterTestBase.java
index c7d3973a9..a69710ada 100644
--- a/flink-table-store-core/src/test/java/org/apache/flink/table/store/table/FileDataFilterTestBase.java
+++ b/flink-table-store-core/src/test/java/org/apache/flink/table/store/table/FileDataFilterTestBase.java
@@ -18,7 +18,6 @@
package org.apache.flink.table.store.table;
-import org.apache.flink.table.store.data.InternalRow;
import org.apache.flink.table.store.file.operation.ScanKind;
import org.apache.flink.table.store.file.predicate.Equal;
import org.apache.flink.table.store.file.predicate.IsNull;
@@ -31,6 +30,7 @@ import org.apache.flink.table.store.types.DataTypes;
import org.apache.flink.table.store.types.RowKind;
import org.apache.flink.table.store.types.RowType;
+import org.apache.paimon.data.InternalRow;
import org.junit.jupiter.api.Test;
import java.util.Arrays;
diff --git a/flink-table-store-core/src/test/java/org/apache/flink/table/store/table/FileStoreTableTestBase.java b/flink-table-store-core/src/test/java/org/apache/flink/table/store/table/FileStoreTableTestBase.java
index 03b5ef04b..401db85eb 100644
--- a/flink-table-store-core/src/test/java/org/apache/flink/table/store/table/FileStoreTableTestBase.java
+++ b/flink-table-store-core/src/test/java/org/apache/flink/table/store/table/FileStoreTableTestBase.java
@@ -18,13 +18,6 @@
package org.apache.flink.table.store.table;
-import org.apache.flink.table.store.data.BinaryRow;
-import org.apache.flink.table.store.data.BinaryRowWriter;
-import org.apache.flink.table.store.data.BinaryString;
-import org.apache.flink.table.store.data.GenericMap;
-import org.apache.flink.table.store.data.GenericRow;
-import org.apache.flink.table.store.data.InternalRow;
-import org.apache.flink.table.store.data.JoinedRow;
import org.apache.flink.table.store.file.Snapshot;
import org.apache.flink.table.store.file.io.DataFileMeta;
import org.apache.flink.table.store.file.mergetree.compact.ConcatRecordReader;
@@ -52,6 +45,13 @@ import org.apache.flink.table.store.types.DataTypes;
import org.apache.flink.table.store.types.RowKind;
import org.apache.flink.table.store.types.RowType;
+import org.apache.paimon.data.BinaryRow;
+import org.apache.paimon.data.BinaryRowWriter;
+import org.apache.paimon.data.BinaryString;
+import org.apache.paimon.data.GenericMap;
+import org.apache.paimon.data.GenericRow;
+import org.apache.paimon.data.InternalRow;
+import org.apache.paimon.data.JoinedRow;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git a/flink-table-store-core/src/test/java/org/apache/flink/table/store/table/SchemaEvolutionTableTestBase.java b/flink-table-store-core/src/test/java/org/apache/flink/table/store/table/SchemaEvolutionTableTestBase.java
index b8fae0d98..8a603ce86 100644
--- a/flink-table-store-core/src/test/java/org/apache/flink/table/store/table/SchemaEvolutionTableTestBase.java
+++ b/flink-table-store-core/src/test/java/org/apache/flink/table/store/table/SchemaEvolutionTableTestBase.java
@@ -19,11 +19,6 @@
package org.apache.flink.table.store.table;
import org.apache.flink.table.store.CoreOptions;
-import org.apache.flink.table.store.data.BinaryString;
-import org.apache.flink.table.store.data.Decimal;
-import org.apache.flink.table.store.data.GenericRow;
-import org.apache.flink.table.store.data.InternalRow;
-import org.apache.flink.table.store.data.Timestamp;
import org.apache.flink.table.store.file.io.DataFileMeta;
import org.apache.flink.table.store.file.mergetree.compact.ConcatRecordReader;
import org.apache.flink.table.store.file.schema.Schema;
@@ -57,6 +52,11 @@ import org.apache.flink.table.store.types.VarBinaryType;
import org.apache.flink.table.store.types.VarCharType;
import org.apache.flink.table.store.utils.StringUtils;
+import org.apache.paimon.data.BinaryString;
+import org.apache.paimon.data.Decimal;
+import org.apache.paimon.data.GenericRow;
+import org.apache.paimon.data.InternalRow;
+import org.apache.paimon.data.Timestamp;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.io.TempDir;
diff --git a/flink-table-store-core/src/test/java/org/apache/flink/table/store/table/SchemaEvolutionTest.java b/flink-table-store-core/src/test/java/org/apache/flink/table/store/table/SchemaEvolutionTest.java
index c965e7072..be835fac7 100644
--- a/flink-table-store-core/src/test/java/org/apache/flink/table/store/table/SchemaEvolutionTest.java
+++ b/flink-table-store-core/src/test/java/org/apache/flink/table/store/table/SchemaEvolutionTest.java
@@ -18,9 +18,6 @@
package org.apache.flink.table.store.table;
-import org.apache.flink.table.store.data.DataFormatTestUtil;
-import org.apache.flink.table.store.data.GenericRow;
-import org.apache.flink.table.store.data.InternalRow;
import org.apache.flink.table.store.file.predicate.Predicate;
import org.apache.flink.table.store.file.predicate.PredicateBuilder;
import org.apache.flink.table.store.file.schema.Schema;
@@ -38,6 +35,9 @@ import org.apache.flink.table.store.types.FloatType;
import org.apache.flink.table.store.types.IntType;
import org.apache.flink.table.store.types.RowType;
+import org.apache.paimon.data.DataFormatTestUtil;
+import org.apache.paimon.data.GenericRow;
+import org.apache.paimon.data.InternalRow;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.io.TempDir;
diff --git a/flink-table-store-core/src/test/java/org/apache/flink/table/store/table/WritePreemptMemoryTest.java b/flink-table-store-core/src/test/java/org/apache/flink/table/store/table/WritePreemptMemoryTest.java
index 5a2634ed8..c613fb4a7 100644
--- a/flink-table-store-core/src/test/java/org/apache/flink/table/store/table/WritePreemptMemoryTest.java
+++ b/flink-table-store-core/src/test/java/org/apache/flink/table/store/table/WritePreemptMemoryTest.java
@@ -19,7 +19,6 @@
package org.apache.flink.table.store.table;
import org.apache.flink.table.store.CoreOptions;
-import org.apache.flink.table.store.data.GenericRow;
import org.apache.flink.table.store.file.WriteMode;
import org.apache.flink.table.store.file.schema.Schema;
import org.apache.flink.table.store.file.schema.SchemaManager;
@@ -33,6 +32,7 @@ import org.apache.flink.table.store.table.sink.StreamTableWrite;
import org.apache.flink.table.store.table.source.Split;
import org.apache.flink.table.store.table.source.TableRead;
+import org.apache.paimon.data.GenericRow;
import org.junit.jupiter.api.Test;
import java.util.ArrayList;
diff --git a/flink-table-store-core/src/test/java/org/apache/flink/table/store/table/sink/SinkRecordConverterTest.java b/flink-table-store-core/src/test/java/org/apache/flink/table/store/table/sink/SinkRecordConverterTest.java
index d04fcc854..15e3845d2 100644
--- a/flink-table-store-core/src/test/java/org/apache/flink/table/store/table/sink/SinkRecordConverterTest.java
+++ b/flink-table-store-core/src/test/java/org/apache/flink/table/store/table/sink/SinkRecordConverterTest.java
@@ -18,13 +18,13 @@
package org.apache.flink.table.store.table.sink;
-import org.apache.flink.table.store.data.GenericRow;
-import org.apache.flink.table.store.data.InternalRow;
import org.apache.flink.table.store.file.schema.TableSchema;
import org.apache.flink.table.store.types.DataField;
import org.apache.flink.table.store.types.IntType;
import org.apache.flink.table.store.types.RowType;
+import org.apache.paimon.data.GenericRow;
+import org.apache.paimon.data.InternalRow;
import org.junit.jupiter.api.Test;
import java.util.Arrays;
diff --git a/flink-table-store-core/src/test/java/org/apache/flink/table/store/table/sink/TableWriteTest.java b/flink-table-store-core/src/test/java/org/apache/flink/table/store/table/sink/TableWriteTest.java
index c9f6cd931..13f660036 100644
--- a/flink-table-store-core/src/test/java/org/apache/flink/table/store/table/sink/TableWriteTest.java
+++ b/flink-table-store-core/src/test/java/org/apache/flink/table/store/table/sink/TableWriteTest.java
@@ -19,8 +19,6 @@
package org.apache.flink.table.store.table.sink;
import org.apache.flink.table.store.CoreOptions;
-import org.apache.flink.table.store.data.GenericRow;
-import org.apache.flink.table.store.data.InternalRow;
import org.apache.flink.table.store.file.operation.AbstractFileStoreWrite;
import org.apache.flink.table.store.file.schema.Schema;
import org.apache.flink.table.store.file.schema.SchemaManager;
@@ -39,6 +37,8 @@ import org.apache.flink.table.store.types.DataType;
import org.apache.flink.table.store.types.DataTypes;
import org.apache.flink.table.store.types.RowType;
+import org.apache.paimon.data.GenericRow;
+import org.apache.paimon.data.InternalRow;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git a/flink-table-store-core/src/test/java/org/apache/flink/table/store/table/source/RowDataRecordIteratorTestBase.java b/flink-table-store-core/src/test/java/org/apache/flink/table/store/table/source/RowDataRecordIteratorTestBase.java
index fa1919b81..69357d8cf 100644
--- a/flink-table-store-core/src/test/java/org/apache/flink/table/store/table/source/RowDataRecordIteratorTestBase.java
+++ b/flink-table-store-core/src/test/java/org/apache/flink/table/store/table/source/RowDataRecordIteratorTestBase.java
@@ -18,13 +18,14 @@
package org.apache.flink.table.store.table.source;
-import org.apache.flink.table.store.data.InternalRow;
import org.apache.flink.table.store.file.KeyValue;
import org.apache.flink.table.store.file.utils.ReusingTestData;
import org.apache.flink.table.store.file.utils.TestReusingRecordReader;
import org.apache.flink.table.store.reader.RecordReader;
import org.apache.flink.table.store.types.RowKind;
+import org.apache.paimon.data.InternalRow;
+
import java.io.IOException;
import java.util.List;
import java.util.function.BiConsumer;
diff --git a/flink-table-store-core/src/test/java/org/apache/flink/table/store/table/source/SplitGeneratorTest.java b/flink-table-store-core/src/test/java/org/apache/flink/table/store/table/source/SplitGeneratorTest.java
index cb5e56c03..715f24c98 100644
--- a/flink-table-store-core/src/test/java/org/apache/flink/table/store/table/source/SplitGeneratorTest.java
+++ b/flink-table-store-core/src/test/java/org/apache/flink/table/store/table/source/SplitGeneratorTest.java
@@ -18,9 +18,9 @@
package org.apache.flink.table.store.table.source;
-import org.apache.flink.table.store.data.InternalRow;
import org.apache.flink.table.store.file.io.DataFileMeta;
+import org.apache.paimon.data.InternalRow;
import org.junit.jupiter.api.Test;
import java.util.Arrays;
diff --git a/flink-table-store-core/src/test/java/org/apache/flink/table/store/table/source/snapshot/ContinuousCompactorFollowUpScannerTest.java b/flink-table-store-core/src/test/java/org/apache/flink/table/store/table/source/snapshot/ContinuousCompactorFollowUpScannerTest.java
index 4e3a6a9ca..0bc4f3536 100644
--- a/flink-table-store-core/src/test/java/org/apache/flink/table/store/table/source/snapshot/ContinuousCompactorFollowUpScannerTest.java
+++ b/flink-table-store-core/src/test/java/org/apache/flink/table/store/table/source/snapshot/ContinuousCompactorFollowUpScannerTest.java
@@ -18,7 +18,6 @@
package org.apache.flink.table.store.table.source.snapshot;
-import org.apache.flink.table.store.data.InternalRow;
import org.apache.flink.table.store.file.Snapshot;
import org.apache.flink.table.store.file.io.DataFileMetaSerializer;
import org.apache.flink.table.store.file.utils.SnapshotManager;
@@ -29,6 +28,7 @@ import org.apache.flink.table.store.table.source.TableRead;
import org.apache.flink.table.store.table.system.BucketsTable;
import org.apache.flink.table.store.types.RowKind;
+import org.apache.paimon.data.InternalRow;
import org.junit.jupiter.api.Test;
import java.io.IOException;
diff --git a/flink-table-store-core/src/test/java/org/apache/flink/table/store/table/source/snapshot/ScannerTestBase.java b/flink-table-store-core/src/test/java/org/apache/flink/table/store/table/source/snapshot/ScannerTestBase.java
index 7a01eaee7..3811ba507 100644
--- a/flink-table-store-core/src/test/java/org/apache/flink/table/store/table/source/snapshot/ScannerTestBase.java
+++ b/flink-table-store-core/src/test/java/org/apache/flink/table/store/table/source/snapshot/ScannerTestBase.java
@@ -18,10 +18,6 @@
package org.apache.flink.table.store.table.source.snapshot;
-import org.apache.flink.table.store.data.BinaryRow;
-import org.apache.flink.table.store.data.BinaryRowWriter;
-import org.apache.flink.table.store.data.GenericRow;
-import org.apache.flink.table.store.data.InternalRow;
import org.apache.flink.table.store.file.mergetree.compact.ConcatRecordReader;
import org.apache.flink.table.store.file.schema.Schema;
import org.apache.flink.table.store.file.schema.SchemaManager;
@@ -42,6 +38,10 @@ import org.apache.flink.table.store.types.DataTypes;
import org.apache.flink.table.store.types.RowKind;
import org.apache.flink.table.store.types.RowType;
+import org.apache.paimon.data.BinaryRow;
+import org.apache.paimon.data.BinaryRowWriter;
+import org.apache.paimon.data.GenericRow;
+import org.apache.paimon.data.InternalRow;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.io.TempDir;
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 43206ace5..e9a27a159 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
@@ -20,9 +20,6 @@ package org.apache.paimon.benchmark;
import org.apache.flink.table.store.CoreOptions;
import org.apache.flink.table.store.catalog.CatalogContext;
-import org.apache.flink.table.store.data.BinaryString;
-import org.apache.flink.table.store.data.GenericRow;
-import org.apache.flink.table.store.data.InternalRow;
import org.apache.flink.table.store.file.catalog.Catalog;
import org.apache.flink.table.store.file.catalog.CatalogFactory;
import org.apache.flink.table.store.file.catalog.Identifier;
@@ -35,6 +32,9 @@ import org.apache.flink.table.store.types.DataTypes;
import org.apache.flink.table.store.types.IntType;
import org.apache.commons.math3.random.RandomDataGenerator;
+import org.apache.paimon.data.BinaryString;
+import org.apache.paimon.data.GenericRow;
+import org.apache.paimon.data.InternalRow;
import org.junit.jupiter.api.io.TempDir;
import java.util.ArrayList;
diff --git a/paimon-common/src/main/java/org/apache/flink/table/store/file/predicate/LeafPredicate.java b/paimon-common/src/main/java/org/apache/flink/table/store/file/predicate/LeafPredicate.java
index da74f71dd..83bcfb942 100644
--- a/paimon-common/src/main/java/org/apache/flink/table/store/file/predicate/LeafPredicate.java
+++ b/paimon-common/src/main/java/org/apache/flink/table/store/file/predicate/LeafPredicate.java
@@ -18,13 +18,13 @@
package org.apache.flink.table.store.file.predicate;
-import org.apache.flink.table.store.data.serializer.InternalSerializers;
-import org.apache.flink.table.store.data.serializer.ListSerializer;
-import org.apache.flink.table.store.data.serializer.NullableSerializer;
import org.apache.flink.table.store.io.DataInputViewStreamWrapper;
import org.apache.flink.table.store.io.DataOutputViewStreamWrapper;
import org.apache.flink.table.store.types.DataType;
+import org.apache.paimon.data.serializer.InternalSerializers;
+import org.apache.paimon.data.serializer.ListSerializer;
+import org.apache.paimon.data.serializer.NullableSerializer;
import org.apache.paimon.format.FieldStats;
import java.io.IOException;
diff --git a/paimon-common/src/main/java/org/apache/flink/table/store/file/predicate/Predicate.java b/paimon-common/src/main/java/org/apache/flink/table/store/file/predicate/Predicate.java
index 5b6d07284..b2f9a60f7 100644
--- a/paimon-common/src/main/java/org/apache/flink/table/store/file/predicate/Predicate.java
+++ b/paimon-common/src/main/java/org/apache/flink/table/store/file/predicate/Predicate.java
@@ -18,8 +18,7 @@
package org.apache.flink.table.store.file.predicate;
-import org.apache.flink.table.store.annotation.Experimental;
-
+import org.apache.paimon.annotation.Experimental;
import org.apache.paimon.format.FieldStats;
import java.io.Serializable;
diff --git a/paimon-common/src/main/java/org/apache/flink/table/store/file/predicate/PredicateBuilder.java b/paimon-common/src/main/java/org/apache/flink/table/store/file/predicate/PredicateBuilder.java
index 6cf7b04e5..612661c1b 100644
--- a/paimon-common/src/main/java/org/apache/flink/table/store/file/predicate/PredicateBuilder.java
+++ b/paimon-common/src/main/java/org/apache/flink/table/store/file/predicate/PredicateBuilder.java
@@ -18,10 +18,6 @@
package org.apache.flink.table.store.file.predicate;
-import org.apache.flink.table.store.annotation.Experimental;
-import org.apache.flink.table.store.data.BinaryString;
-import org.apache.flink.table.store.data.Decimal;
-import org.apache.flink.table.store.data.Timestamp;
import org.apache.flink.table.store.types.DataField;
import org.apache.flink.table.store.types.DataType;
import org.apache.flink.table.store.types.DecimalType;
@@ -29,6 +25,11 @@ import org.apache.flink.table.store.types.RowType;
import org.apache.flink.table.store.utils.Preconditions;
import org.apache.flink.table.store.utils.TypeUtils;
+import org.apache.paimon.annotation.Experimental;
+import org.apache.paimon.data.BinaryString;
+import org.apache.paimon.data.Decimal;
+import org.apache.paimon.data.Timestamp;
+
import javax.annotation.Nullable;
import java.math.BigDecimal;
diff --git a/paimon-common/src/main/java/org/apache/flink/table/store/file/predicate/PredicateFilter.java b/paimon-common/src/main/java/org/apache/flink/table/store/file/predicate/PredicateFilter.java
index bb2f89c17..bda83761b 100644
--- a/paimon-common/src/main/java/org/apache/flink/table/store/file/predicate/PredicateFilter.java
+++ b/paimon-common/src/main/java/org/apache/flink/table/store/file/predicate/PredicateFilter.java
@@ -18,10 +18,11 @@
package org.apache.flink.table.store.file.predicate;
-import org.apache.flink.table.store.data.InternalRow;
import org.apache.flink.table.store.types.RowType;
import org.apache.flink.table.store.utils.RowDataToObjectArrayConverter;
+import org.apache.paimon.data.InternalRow;
+
import javax.annotation.Nullable;
import java.util.List;
diff --git a/paimon-common/src/main/java/org/apache/flink/table/store/file/predicate/StartsWith.java b/paimon-common/src/main/java/org/apache/flink/table/store/file/predicate/StartsWith.java
index 476c0a77a..342d32841 100644
--- a/paimon-common/src/main/java/org/apache/flink/table/store/file/predicate/StartsWith.java
+++ b/paimon-common/src/main/java/org/apache/flink/table/store/file/predicate/StartsWith.java
@@ -18,9 +18,9 @@
package org.apache.flink.table.store.file.predicate;
-import org.apache.flink.table.store.data.BinaryString;
import org.apache.flink.table.store.types.DataType;
+import org.apache.paimon.data.BinaryString;
import org.apache.paimon.format.FieldStats;
import java.util.List;
diff --git a/paimon-common/src/main/java/org/apache/flink/table/store/fs/FileIO.java b/paimon-common/src/main/java/org/apache/flink/table/store/fs/FileIO.java
index 8e2f03745..28111330c 100644
--- a/paimon-common/src/main/java/org/apache/flink/table/store/fs/FileIO.java
+++ b/paimon-common/src/main/java/org/apache/flink/table/store/fs/FileIO.java
@@ -18,10 +18,10 @@
package org.apache.flink.table.store.fs;
-import org.apache.flink.table.store.annotation.Experimental;
import org.apache.flink.table.store.catalog.CatalogContext;
import org.apache.flink.table.store.fs.local.LocalFileIO;
+import org.apache.paimon.annotation.Experimental;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/paimon-common/src/main/java/org/apache/flink/table/store/fs/FileIOLoader.java b/paimon-common/src/main/java/org/apache/flink/table/store/fs/FileIOLoader.java
index 1332a5832..e04d22830 100644
--- a/paimon-common/src/main/java/org/apache/flink/table/store/fs/FileIOLoader.java
+++ b/paimon-common/src/main/java/org/apache/flink/table/store/fs/FileIOLoader.java
@@ -18,7 +18,7 @@
package org.apache.flink.table.store.fs;
-import org.apache.flink.table.store.annotation.Experimental;
+import org.apache.paimon.annotation.Experimental;
/**
* Loader to load {@link FileIO}.
diff --git a/paimon-common/src/main/java/org/apache/flink/table/store/fs/FileStatus.java b/paimon-common/src/main/java/org/apache/flink/table/store/fs/FileStatus.java
index 09cc44462..1962cffb5 100644
--- a/paimon-common/src/main/java/org/apache/flink/table/store/fs/FileStatus.java
+++ b/paimon-common/src/main/java/org/apache/flink/table/store/fs/FileStatus.java
@@ -18,7 +18,7 @@
package org.apache.flink.table.store.fs;
-import org.apache.flink.table.store.annotation.Experimental;
+import org.apache.paimon.annotation.Experimental;
/**
* Interface that represents the client side information for a file independent of the file system.
diff --git a/paimon-common/src/main/java/org/apache/flink/table/store/fs/Path.java b/paimon-common/src/main/java/org/apache/flink/table/store/fs/Path.java
index 73fca2a5d..f3c898323 100644
--- a/paimon-common/src/main/java/org/apache/flink/table/store/fs/Path.java
+++ b/paimon-common/src/main/java/org/apache/flink/table/store/fs/Path.java
@@ -22,9 +22,10 @@
package org.apache.flink.table.store.fs;
-import org.apache.flink.table.store.annotation.Experimental;
import org.apache.flink.table.store.utils.StringUtils;
+import org.apache.paimon.annotation.Experimental;
+
import java.io.Serializable;
import java.net.URI;
import java.net.URISyntaxException;
diff --git a/paimon-common/src/main/java/org/apache/flink/table/store/fs/PositionOutputStream.java b/paimon-common/src/main/java/org/apache/flink/table/store/fs/PositionOutputStream.java
index 76cfffe6d..ebb34a3ad 100644
--- a/paimon-common/src/main/java/org/apache/flink/table/store/fs/PositionOutputStream.java
+++ b/paimon-common/src/main/java/org/apache/flink/table/store/fs/PositionOutputStream.java
@@ -18,7 +18,7 @@
package org.apache.flink.table.store.fs;
-import org.apache.flink.table.store.annotation.Experimental;
+import org.apache.paimon.annotation.Experimental;
import java.io.IOException;
import java.io.OutputStream;
diff --git a/paimon-common/src/main/java/org/apache/flink/table/store/fs/SeekableInputStream.java b/paimon-common/src/main/java/org/apache/flink/table/store/fs/SeekableInputStream.java
index 0e9fc875a..bf7215f67 100644
--- a/paimon-common/src/main/java/org/apache/flink/table/store/fs/SeekableInputStream.java
+++ b/paimon-common/src/main/java/org/apache/flink/table/store/fs/SeekableInputStream.java
@@ -18,7 +18,7 @@
package org.apache.flink.table.store.fs;
-import org.apache.flink.table.store.annotation.Experimental;
+import org.apache.paimon.annotation.Experimental;
import java.io.IOException;
import java.io.InputStream;
diff --git a/paimon-common/src/main/java/org/apache/flink/table/store/fs/UnsupportedSchemeException.java b/paimon-common/src/main/java/org/apache/flink/table/store/fs/UnsupportedSchemeException.java
index 5bb748d7d..7119119af 100644
--- a/paimon-common/src/main/java/org/apache/flink/table/store/fs/UnsupportedSchemeException.java
+++ b/paimon-common/src/main/java/org/apache/flink/table/store/fs/UnsupportedSchemeException.java
@@ -18,7 +18,7 @@
package org.apache.flink.table.store.fs;
-import org.apache.flink.table.store.annotation.Experimental;
+import org.apache.paimon.annotation.Experimental;
import java.io.IOException;
diff --git a/paimon-common/src/main/java/org/apache/flink/table/store/fs/hadoop/HadoopFileIO.java b/paimon-common/src/main/java/org/apache/flink/table/store/fs/hadoop/HadoopFileIO.java
index c3614dc7f..25a476e0a 100644
--- a/paimon-common/src/main/java/org/apache/flink/table/store/fs/hadoop/HadoopFileIO.java
+++ b/paimon-common/src/main/java/org/apache/flink/table/store/fs/hadoop/HadoopFileIO.java
@@ -18,7 +18,6 @@
package org.apache.flink.table.store.fs.hadoop;
-import org.apache.flink.table.store.annotation.VisibleForTesting;
import org.apache.flink.table.store.catalog.CatalogContext;
import org.apache.flink.table.store.fs.FileIO;
import org.apache.flink.table.store.fs.FileStatus;
@@ -30,6 +29,7 @@ import org.apache.flink.table.store.hadoop.SerializableConfiguration;
import org.apache.hadoop.fs.FSDataInputStream;
import org.apache.hadoop.fs.FSDataOutputStream;
import org.apache.hadoop.fs.FileSystem;
+import org.apache.paimon.annotation.VisibleForTesting;
import java.io.IOException;
diff --git a/paimon-common/src/main/java/org/apache/flink/table/store/io/cache/CacheManager.java b/paimon-common/src/main/java/org/apache/flink/table/store/io/cache/CacheManager.java
index 7daeae837..bed759999 100644
--- a/paimon-common/src/main/java/org/apache/flink/table/store/io/cache/CacheManager.java
+++ b/paimon-common/src/main/java/org/apache/flink/table/store/io/cache/CacheManager.java
@@ -18,7 +18,6 @@
package org.apache.flink.table.store.io.cache;
-import org.apache.flink.table.store.annotation.VisibleForTesting;
import org.apache.flink.table.store.memory.MemorySegment;
import org.apache.flink.table.store.options.MemorySize;
@@ -26,6 +25,8 @@ import org.apache.flink.shaded.guava30.com.google.common.cache.Cache;
import org.apache.flink.shaded.guava30.com.google.common.cache.CacheBuilder;
import org.apache.flink.shaded.guava30.com.google.common.cache.RemovalNotification;
+import org.apache.paimon.annotation.VisibleForTesting;
+
import java.io.IOException;
import java.io.RandomAccessFile;
import java.util.Objects;
diff --git a/paimon-common/src/main/java/org/apache/flink/table/store/io/cache/CachedRandomInputView.java b/paimon-common/src/main/java/org/apache/flink/table/store/io/cache/CachedRandomInputView.java
index 8d8e5f2fc..2c8016d35 100644
--- a/paimon-common/src/main/java/org/apache/flink/table/store/io/cache/CachedRandomInputView.java
+++ b/paimon-common/src/main/java/org/apache/flink/table/store/io/cache/CachedRandomInputView.java
@@ -18,11 +18,12 @@
package org.apache.flink.table.store.io.cache;
-import org.apache.flink.table.store.data.AbstractPagedInputView;
import org.apache.flink.table.store.io.SeekableDataInputView;
import org.apache.flink.table.store.memory.MemorySegment;
import org.apache.flink.table.store.utils.MathUtils;
+import org.apache.paimon.data.AbstractPagedInputView;
+
import java.io.Closeable;
import java.io.EOFException;
import java.io.File;
diff --git a/paimon-common/src/main/java/org/apache/flink/table/store/memory/MemorySegment.java b/paimon-common/src/main/java/org/apache/flink/table/store/memory/MemorySegment.java
index a7b72980f..39dfd9f0a 100644
--- a/paimon-common/src/main/java/org/apache/flink/table/store/memory/MemorySegment.java
+++ b/paimon-common/src/main/java/org/apache/flink/table/store/memory/MemorySegment.java
@@ -18,7 +18,7 @@
package org.apache.flink.table.store.memory;
-import org.apache.flink.table.store.annotation.Experimental;
+import org.apache.paimon.annotation.Experimental;
import javax.annotation.Nullable;
diff --git a/paimon-common/src/main/java/org/apache/flink/table/store/memory/MemorySegmentSource.java b/paimon-common/src/main/java/org/apache/flink/table/store/memory/MemorySegmentSource.java
index 3485e8fae..805b6484f 100644
--- a/paimon-common/src/main/java/org/apache/flink/table/store/memory/MemorySegmentSource.java
+++ b/paimon-common/src/main/java/org/apache/flink/table/store/memory/MemorySegmentSource.java
@@ -18,7 +18,7 @@
package org.apache.flink.table.store.memory;
-import org.apache.flink.table.store.annotation.Experimental;
+import org.apache.paimon.annotation.Experimental;
/**
* Interface describing entities that can provide memory segments.
diff --git a/paimon-common/src/main/java/org/apache/flink/table/store/memory/MemorySegmentUtils.java b/paimon-common/src/main/java/org/apache/flink/table/store/memory/MemorySegmentUtils.java
index 3f6e0c15b..4954541af 100644
--- a/paimon-common/src/main/java/org/apache/flink/table/store/memory/MemorySegmentUtils.java
+++ b/paimon-common/src/main/java/org/apache/flink/table/store/memory/MemorySegmentUtils.java
@@ -18,25 +18,26 @@
package org.apache.flink.table.store.memory;
-import org.apache.flink.table.store.annotation.VisibleForTesting;
-import org.apache.flink.table.store.data.BinaryArray;
-import org.apache.flink.table.store.data.BinaryMap;
-import org.apache.flink.table.store.data.BinaryString;
-import org.apache.flink.table.store.data.Decimal;
-import org.apache.flink.table.store.data.InternalArray;
-import org.apache.flink.table.store.data.InternalMap;
-import org.apache.flink.table.store.data.InternalRow;
-import org.apache.flink.table.store.data.NestedRow;
-import org.apache.flink.table.store.data.Timestamp;
import org.apache.flink.table.store.io.DataOutputView;
import org.apache.flink.table.store.utils.MurmurHashUtils;
+import org.apache.paimon.annotation.VisibleForTesting;
+import org.apache.paimon.data.BinaryArray;
+import org.apache.paimon.data.BinaryMap;
+import org.apache.paimon.data.BinaryString;
+import org.apache.paimon.data.Decimal;
+import org.apache.paimon.data.InternalArray;
+import org.apache.paimon.data.InternalMap;
+import org.apache.paimon.data.InternalRow;
+import org.apache.paimon.data.NestedRow;
+import org.apache.paimon.data.Timestamp;
+
import java.io.IOException;
-import static org.apache.flink.table.store.data.BinarySection.HIGHEST_FIRST_BIT;
-import static org.apache.flink.table.store.data.BinarySection.HIGHEST_SECOND_TO_EIGHTH_BIT;
import static org.apache.flink.table.store.memory.MemorySegment.BYTE_ARRAY_BASE_OFFSET;
import static org.apache.flink.table.store.memory.MemorySegment.LITTLE_ENDIAN;
+import static org.apache.paimon.data.BinarySection.HIGHEST_FIRST_BIT;
+import static org.apache.paimon.data.BinarySection.HIGHEST_SECOND_TO_EIGHTH_BIT;
/** Utils for {@link MemorySegment}. */
public class MemorySegmentUtils {
diff --git a/paimon-common/src/main/java/org/apache/flink/table/store/options/ConfigOption.java b/paimon-common/src/main/java/org/apache/flink/table/store/options/ConfigOption.java
index dcdd1d124..5ef84f74f 100644
--- a/paimon-common/src/main/java/org/apache/flink/table/store/options/ConfigOption.java
+++ b/paimon-common/src/main/java/org/apache/flink/table/store/options/ConfigOption.java
@@ -18,9 +18,10 @@
package org.apache.flink.table.store.options;
-import org.apache.flink.table.store.annotation.Experimental;
import org.apache.flink.table.store.options.description.Description;
+import org.apache.paimon.annotation.Experimental;
+
import java.util.Arrays;
import java.util.Collections;
import java.util.stream.Collectors;
diff --git a/paimon-common/src/main/java/org/apache/flink/table/store/options/ConfigOptions.java b/paimon-common/src/main/java/org/apache/flink/table/store/options/ConfigOptions.java
index 29ffee712..7c8ac3b0e 100644
--- a/paimon-common/src/main/java/org/apache/flink/table/store/options/ConfigOptions.java
+++ b/paimon-common/src/main/java/org/apache/flink/table/store/options/ConfigOptions.java
@@ -18,9 +18,10 @@
package org.apache.flink.table.store.options;
-import org.apache.flink.table.store.annotation.Experimental;
import org.apache.flink.table.store.options.description.Description;
+import org.apache.paimon.annotation.Experimental;
+
import java.time.Duration;
import java.util.Arrays;
import java.util.List;
diff --git a/paimon-common/src/main/java/org/apache/flink/table/store/options/MemorySize.java b/paimon-common/src/main/java/org/apache/flink/table/store/options/MemorySize.java
index b906d66cb..06c065bf6 100644
--- a/paimon-common/src/main/java/org/apache/flink/table/store/options/MemorySize.java
+++ b/paimon-common/src/main/java/org/apache/flink/table/store/options/MemorySize.java
@@ -18,7 +18,7 @@
package org.apache.flink.table.store.options;
-import org.apache.flink.table.store.annotation.Experimental;
+import org.apache.paimon.annotation.Experimental;
import java.math.BigDecimal;
import java.util.Arrays;
diff --git a/paimon-common/src/main/java/org/apache/flink/table/store/options/Options.java b/paimon-common/src/main/java/org/apache/flink/table/store/options/Options.java
index 19ddfff80..e4557a763 100644
--- a/paimon-common/src/main/java/org/apache/flink/table/store/options/Options.java
+++ b/paimon-common/src/main/java/org/apache/flink/table/store/options/Options.java
@@ -18,7 +18,7 @@
package org.apache.flink.table.store.options;
-import org.apache.flink.table.store.annotation.Experimental;
+import org.apache.paimon.annotation.Experimental;
import javax.annotation.concurrent.ThreadSafe;
diff --git a/paimon-common/src/main/java/org/apache/flink/table/store/options/description/Description.java b/paimon-common/src/main/java/org/apache/flink/table/store/options/description/Description.java
index c523722e8..7f9a02fc3 100644
--- a/paimon-common/src/main/java/org/apache/flink/table/store/options/description/Description.java
+++ b/paimon-common/src/main/java/org/apache/flink/table/store/options/description/Description.java
@@ -18,7 +18,7 @@
package org.apache.flink.table.store.options.description;
-import org.apache.flink.table.store.annotation.Experimental;
+import org.apache.paimon.annotation.Experimental;
import java.util.ArrayList;
import java.util.List;
diff --git a/paimon-common/src/main/java/org/apache/flink/table/store/plugin/ComponentClassLoader.java b/paimon-common/src/main/java/org/apache/flink/table/store/plugin/ComponentClassLoader.java
index 46598f9cd..5abe5a2ae 100644
--- a/paimon-common/src/main/java/org/apache/flink/table/store/plugin/ComponentClassLoader.java
+++ b/paimon-common/src/main/java/org/apache/flink/table/store/plugin/ComponentClassLoader.java
@@ -17,11 +17,12 @@
package org.apache.flink.table.store.plugin;
-import org.apache.flink.table.store.annotation.VisibleForTesting;
import org.apache.flink.table.store.utils.FunctionWithException;
import org.apache.flink.shaded.guava30.com.google.common.collect.Iterators;
+import org.apache.paimon.annotation.VisibleForTesting;
+
import java.io.IOException;
import java.net.URL;
import java.net.URLClassLoader;
diff --git a/paimon-common/src/main/java/org/apache/flink/table/store/reader/RecordReader.java b/paimon-common/src/main/java/org/apache/flink/table/store/reader/RecordReader.java
index c6f09c4b2..b3c50c27e 100644
--- a/paimon-common/src/main/java/org/apache/flink/table/store/reader/RecordReader.java
+++ b/paimon-common/src/main/java/org/apache/flink/table/store/reader/RecordReader.java
@@ -18,9 +18,10 @@
package org.apache.flink.table.store.reader;
-import org.apache.flink.table.store.annotation.Experimental;
import org.apache.flink.table.store.utils.CloseableIterator;
+import org.apache.paimon.annotation.Experimental;
+
import javax.annotation.Nullable;
import java.io.Closeable;
diff --git a/paimon-common/src/main/java/org/apache/flink/table/store/types/ArrayType.java b/paimon-common/src/main/java/org/apache/flink/table/store/types/ArrayType.java
index 76e31852a..3cea3386e 100644
--- a/paimon-common/src/main/java/org/apache/flink/table/store/types/ArrayType.java
+++ b/paimon-common/src/main/java/org/apache/flink/table/store/types/ArrayType.java
@@ -18,11 +18,12 @@
package org.apache.flink.table.store.types;
-import org.apache.flink.table.store.annotation.Experimental;
import org.apache.flink.table.store.utils.Preconditions;
import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.core.JsonGenerator;
+import org.apache.paimon.annotation.Experimental;
+
import java.io.IOException;
import java.util.Objects;
import java.util.Set;
diff --git a/paimon-common/src/main/java/org/apache/flink/table/store/types/BigIntType.java b/paimon-common/src/main/java/org/apache/flink/table/store/types/BigIntType.java
index 25c3f4475..fc766bcbb 100644
--- a/paimon-common/src/main/java/org/apache/flink/table/store/types/BigIntType.java
+++ b/paimon-common/src/main/java/org/apache/flink/table/store/types/BigIntType.java
@@ -18,7 +18,7 @@
package org.apache.flink.table.store.types;
-import org.apache.flink.table.store.annotation.Experimental;
+import org.apache.paimon.annotation.Experimental;
/**
* Data type of an 8-byte signed integer with values from -9,223,372,036,854,775,808 to
diff --git a/paimon-common/src/main/java/org/apache/flink/table/store/types/BinaryType.java b/paimon-common/src/main/java/org/apache/flink/table/store/types/BinaryType.java
index f3a5bf8d1..064f8746d 100644
--- a/paimon-common/src/main/java/org/apache/flink/table/store/types/BinaryType.java
+++ b/paimon-common/src/main/java/org/apache/flink/table/store/types/BinaryType.java
@@ -18,7 +18,7 @@
package org.apache.flink.table.store.types;
-import org.apache.flink.table.store.annotation.Experimental;
+import org.apache.paimon.annotation.Experimental;
import java.util.Objects;
diff --git a/paimon-common/src/main/java/org/apache/flink/table/store/types/BooleanType.java b/paimon-common/src/main/java/org/apache/flink/table/store/types/BooleanType.java
index d9fda104d..813e9e49e 100644
--- a/paimon-common/src/main/java/org/apache/flink/table/store/types/BooleanType.java
+++ b/paimon-common/src/main/java/org/apache/flink/table/store/types/BooleanType.java
@@ -18,7 +18,7 @@
package org.apache.flink.table.store.types;
-import org.apache.flink.table.store.annotation.Experimental;
+import org.apache.paimon.annotation.Experimental;
/**
* Data type of a boolean with a (possibly) three-valued logic of {@code TRUE, FALSE, UNKNOWN}.
diff --git a/paimon-common/src/main/java/org/apache/flink/table/store/types/CharType.java b/paimon-common/src/main/java/org/apache/flink/table/store/types/CharType.java
index d2f78b4e3..7087e93bc 100644
--- a/paimon-common/src/main/java/org/apache/flink/table/store/types/CharType.java
+++ b/paimon-common/src/main/java/org/apache/flink/table/store/types/CharType.java
@@ -18,7 +18,7 @@
package org.apache.flink.table.store.types;
-import org.apache.flink.table.store.annotation.Experimental;
+import org.apache.paimon.annotation.Experimental;
import java.util.Objects;
diff --git a/paimon-common/src/main/java/org/apache/flink/table/store/types/DataField.java b/paimon-common/src/main/java/org/apache/flink/table/store/types/DataField.java
index c49245e73..4db6b77ef 100644
--- a/paimon-common/src/main/java/org/apache/flink/table/store/types/DataField.java
+++ b/paimon-common/src/main/java/org/apache/flink/table/store/types/DataField.java
@@ -18,10 +18,10 @@
package org.apache.flink.table.store.types;
-import org.apache.flink.table.store.annotation.Experimental;
-
import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.core.JsonGenerator;
+import org.apache.paimon.annotation.Experimental;
+
import javax.annotation.Nullable;
import java.io.IOException;
diff --git a/paimon-common/src/main/java/org/apache/flink/table/store/types/DataType.java b/paimon-common/src/main/java/org/apache/flink/table/store/types/DataType.java
index 7dec9c1fc..63318a225 100644
--- a/paimon-common/src/main/java/org/apache/flink/table/store/types/DataType.java
+++ b/paimon-common/src/main/java/org/apache/flink/table/store/types/DataType.java
@@ -18,11 +18,12 @@
package org.apache.flink.table.store.types;
-import org.apache.flink.table.store.annotation.Experimental;
import org.apache.flink.table.store.utils.Preconditions;
import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.core.JsonGenerator;
+import org.apache.paimon.annotation.Experimental;
+
import javax.annotation.Nonnull;
import java.io.IOException;
diff --git a/paimon-common/src/main/java/org/apache/flink/table/store/types/DataTypeDefaultVisitor.java b/paimon-common/src/main/java/org/apache/flink/table/store/types/DataTypeDefaultVisitor.java
index 342dd616b..5e23becd2 100644
--- a/paimon-common/src/main/java/org/apache/flink/table/store/types/DataTypeDefaultVisitor.java
+++ b/paimon-common/src/main/java/org/apache/flink/table/store/types/DataTypeDefaultVisitor.java
@@ -18,7 +18,7 @@
package org.apache.flink.table.store.types;
-import org.apache.flink.table.store.annotation.Experimental;
+import org.apache.paimon.annotation.Experimental;
/**
* Implementation of {@link DataTypeVisitor} that redirects all calls to {@link
diff --git a/paimon-common/src/main/java/org/apache/flink/table/store/types/DataTypeFamily.java b/paimon-common/src/main/java/org/apache/flink/table/store/types/DataTypeFamily.java
index e75cc3934..950649cbf 100644
--- a/paimon-common/src/main/java/org/apache/flink/table/store/types/DataTypeFamily.java
+++ b/paimon-common/src/main/java/org/apache/flink/table/store/types/DataTypeFamily.java
@@ -18,7 +18,7 @@
package org.apache.flink.table.store.types;
-import org.apache.flink.table.store.annotation.Experimental;
+import org.apache.paimon.annotation.Experimental;
/**
* An enumeration of Data type families for clustering {@link DataTypeRoot}s into categories.
diff --git a/paimon-common/src/main/java/org/apache/flink/table/store/types/DataTypeRoot.java b/paimon-common/src/main/java/org/apache/flink/table/store/types/DataTypeRoot.java
index 2b12a6f63..6daf7fd6b 100644
--- a/paimon-common/src/main/java/org/apache/flink/table/store/types/DataTypeRoot.java
+++ b/paimon-common/src/main/java/org/apache/flink/table/store/types/DataTypeRoot.java
@@ -18,7 +18,7 @@
package org.apache.flink.table.store.types;
-import org.apache.flink.table.store.annotation.Experimental;
+import org.apache.paimon.annotation.Experimental;
import java.util.Collections;
import java.util.EnumSet;
diff --git a/paimon-common/src/main/java/org/apache/flink/table/store/types/DataTypeVisitor.java b/paimon-common/src/main/java/org/apache/flink/table/store/types/DataTypeVisitor.java
index 3562fecba..a1d55c937 100644
--- a/paimon-common/src/main/java/org/apache/flink/table/store/types/DataTypeVisitor.java
+++ b/paimon-common/src/main/java/org/apache/flink/table/store/types/DataTypeVisitor.java
@@ -18,7 +18,7 @@
package org.apache.flink.table.store.types;
-import org.apache.flink.table.store.annotation.Experimental;
+import org.apache.paimon.annotation.Experimental;
/**
* The visitor definition of {@link DataType}. The visitor transforms a data type into instances of
diff --git a/paimon-common/src/main/java/org/apache/flink/table/store/types/DataTypes.java b/paimon-common/src/main/java/org/apache/flink/table/store/types/DataTypes.java
index df8fd8b72..0a01b0cf8 100644
--- a/paimon-common/src/main/java/org/apache/flink/table/store/types/DataTypes.java
+++ b/paimon-common/src/main/java/org/apache/flink/table/store/types/DataTypes.java
@@ -18,7 +18,7 @@
package org.apache.flink.table.store.types;
-import org.apache.flink.table.store.annotation.Experimental;
+import org.apache.paimon.annotation.Experimental;
import java.util.Arrays;
diff --git a/paimon-common/src/main/java/org/apache/flink/table/store/types/DateType.java b/paimon-common/src/main/java/org/apache/flink/table/store/types/DateType.java
index 644ac0b4b..50024d68f 100644
--- a/paimon-common/src/main/java/org/apache/flink/table/store/types/DateType.java
+++ b/paimon-common/src/main/java/org/apache/flink/table/store/types/DateType.java
@@ -18,7 +18,7 @@
package org.apache.flink.table.store.types;
-import org.apache.flink.table.store.annotation.Experimental;
+import org.apache.paimon.annotation.Experimental;
/**
* Data type of a date consisting of {@code year-month-day} with values ranging from {@code
diff --git a/paimon-common/src/main/java/org/apache/flink/table/store/types/DecimalType.java b/paimon-common/src/main/java/org/apache/flink/table/store/types/DecimalType.java
index 244a20b88..a88cf1f73 100644
--- a/paimon-common/src/main/java/org/apache/flink/table/store/types/DecimalType.java
+++ b/paimon-common/src/main/java/org/apache/flink/table/store/types/DecimalType.java
@@ -18,7 +18,7 @@
package org.apache.flink.table.store.types;
-import org.apache.flink.table.store.annotation.Experimental;
+import org.apache.paimon.annotation.Experimental;
import java.util.Objects;
diff --git a/paimon-common/src/main/java/org/apache/flink/table/store/types/DoubleType.java b/paimon-common/src/main/java/org/apache/flink/table/store/types/DoubleType.java
index fd1e9d12a..0d36b2cfd 100644
--- a/paimon-common/src/main/java/org/apache/flink/table/store/types/DoubleType.java
+++ b/paimon-common/src/main/java/org/apache/flink/table/store/types/DoubleType.java
@@ -18,7 +18,7 @@
package org.apache.flink.table.store.types;
-import org.apache.flink.table.store.annotation.Experimental;
+import org.apache.paimon.annotation.Experimental;
/**
* Data type of an 8-byte double precision floating point number.
diff --git a/paimon-common/src/main/java/org/apache/flink/table/store/types/FloatType.java b/paimon-common/src/main/java/org/apache/flink/table/store/types/FloatType.java
index a518327a8..eece59a99 100644
--- a/paimon-common/src/main/java/org/apache/flink/table/store/types/FloatType.java
+++ b/paimon-common/src/main/java/org/apache/flink/table/store/types/FloatType.java
@@ -18,7 +18,7 @@
package org.apache.flink.table.store.types;
-import org.apache.flink.table.store.annotation.Experimental;
+import org.apache.paimon.annotation.Experimental;
/**
* Data type of a 4-byte single precision floating point number. Compared to the SQL standard, the
diff --git a/paimon-common/src/main/java/org/apache/flink/table/store/types/IntType.java b/paimon-common/src/main/java/org/apache/flink/table/store/types/IntType.java
index 870604891..7ffe4848a 100644
--- a/paimon-common/src/main/java/org/apache/flink/table/store/types/IntType.java
+++ b/paimon-common/src/main/java/org/apache/flink/table/store/types/IntType.java
@@ -18,7 +18,7 @@
package org.apache.flink.table.store.types;
-import org.apache.flink.table.store.annotation.Experimental;
+import org.apache.paimon.annotation.Experimental;
/**
* Data type of a 4-byte signed integer with values from -2,147,483,648 to 2,147,483,647.
diff --git a/paimon-common/src/main/java/org/apache/flink/table/store/types/LocalZonedTimestampType.java b/paimon-common/src/main/java/org/apache/flink/table/store/types/LocalZonedTimestampType.java
index 227c554ec..bbe7b5697 100644
--- a/paimon-common/src/main/java/org/apache/flink/table/store/types/LocalZonedTimestampType.java
+++ b/paimon-common/src/main/java/org/apache/flink/table/store/types/LocalZonedTimestampType.java
@@ -18,7 +18,7 @@
package org.apache.flink.table.store.types;
-import org.apache.flink.table.store.annotation.Experimental;
+import org.apache.paimon.annotation.Experimental;
import java.util.Objects;
diff --git a/paimon-common/src/main/java/org/apache/flink/table/store/types/MapType.java b/paimon-common/src/main/java/org/apache/flink/table/store/types/MapType.java
index a3c085057..679d7d168 100644
--- a/paimon-common/src/main/java/org/apache/flink/table/store/types/MapType.java
+++ b/paimon-common/src/main/java/org/apache/flink/table/store/types/MapType.java
@@ -18,11 +18,12 @@
package org.apache.flink.table.store.types;
-import org.apache.flink.table.store.annotation.Experimental;
import org.apache.flink.table.store.utils.Preconditions;
import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.core.JsonGenerator;
+import org.apache.paimon.annotation.Experimental;
+
import java.io.IOException;
import java.util.Objects;
import java.util.Set;
diff --git a/paimon-common/src/main/java/org/apache/flink/table/store/types/MultisetType.java b/paimon-common/src/main/java/org/apache/flink/table/store/types/MultisetType.java
index c712b62bf..9c26e6cf9 100644
--- a/paimon-common/src/main/java/org/apache/flink/table/store/types/MultisetType.java
+++ b/paimon-common/src/main/java/org/apache/flink/table/store/types/MultisetType.java
@@ -18,11 +18,12 @@
package org.apache.flink.table.store.types;
-import org.apache.flink.table.store.annotation.Experimental;
import org.apache.flink.table.store.utils.Preconditions;
import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.core.JsonGenerator;
+import org.apache.paimon.annotation.Experimental;
+
import java.io.IOException;
import java.util.Objects;
import java.util.Set;
diff --git a/paimon-common/src/main/java/org/apache/flink/table/store/types/RowKind.java b/paimon-common/src/main/java/org/apache/flink/table/store/types/RowKind.java
index 270874d7a..fddef8d1d 100644
--- a/paimon-common/src/main/java/org/apache/flink/table/store/types/RowKind.java
+++ b/paimon-common/src/main/java/org/apache/flink/table/store/types/RowKind.java
@@ -18,7 +18,7 @@
package org.apache.flink.table.store.types;
-import org.apache.flink.table.store.annotation.Experimental;
+import org.apache.paimon.annotation.Experimental;
/**
* Lists all kinds of changes that a row can describe in a changelog.
diff --git a/paimon-common/src/main/java/org/apache/flink/table/store/types/RowType.java b/paimon-common/src/main/java/org/apache/flink/table/store/types/RowType.java
index 05e40b43b..a7365a1fa 100644
--- a/paimon-common/src/main/java/org/apache/flink/table/store/types/RowType.java
+++ b/paimon-common/src/main/java/org/apache/flink/table/store/types/RowType.java
@@ -18,12 +18,13 @@
package org.apache.flink.table.store.types;
-import org.apache.flink.table.store.annotation.Experimental;
import org.apache.flink.table.store.utils.Preconditions;
import org.apache.flink.table.store.utils.StringUtils;
import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.core.JsonGenerator;
+import org.apache.paimon.annotation.Experimental;
+
import java.io.IOException;
import java.util.ArrayList;
import java.util.Collections;
diff --git a/paimon-common/src/main/java/org/apache/flink/table/store/types/SmallIntType.java b/paimon-common/src/main/java/org/apache/flink/table/store/types/SmallIntType.java
index a6980c677..347b7d82a 100644
--- a/paimon-common/src/main/java/org/apache/flink/table/store/types/SmallIntType.java
+++ b/paimon-common/src/main/java/org/apache/flink/table/store/types/SmallIntType.java
@@ -18,7 +18,7 @@
package org.apache.flink.table.store.types;
-import org.apache.flink.table.store.annotation.Experimental;
+import org.apache.paimon.annotation.Experimental;
/**
* Data type of a 2-byte signed integer with values from -32,768 to 32,767.
diff --git a/paimon-common/src/main/java/org/apache/flink/table/store/types/TimeType.java b/paimon-common/src/main/java/org/apache/flink/table/store/types/TimeType.java
index 0f6d7a7be..397a29354 100644
--- a/paimon-common/src/main/java/org/apache/flink/table/store/types/TimeType.java
+++ b/paimon-common/src/main/java/org/apache/flink/table/store/types/TimeType.java
@@ -18,7 +18,7 @@
package org.apache.flink.table.store.types;
-import org.apache.flink.table.store.annotation.Experimental;
+import org.apache.paimon.annotation.Experimental;
import java.util.Objects;
diff --git a/paimon-common/src/main/java/org/apache/flink/table/store/types/TimestampType.java b/paimon-common/src/main/java/org/apache/flink/table/store/types/TimestampType.java
index 5360ea7d4..56d5999d5 100644
--- a/paimon-common/src/main/java/org/apache/flink/table/store/types/TimestampType.java
+++ b/paimon-common/src/main/java/org/apache/flink/table/store/types/TimestampType.java
@@ -18,7 +18,7 @@
package org.apache.flink.table.store.types;
-import org.apache.flink.table.store.annotation.Experimental;
+import org.apache.paimon.annotation.Experimental;
import java.util.Objects;
diff --git a/paimon-common/src/main/java/org/apache/flink/table/store/types/TinyIntType.java b/paimon-common/src/main/java/org/apache/flink/table/store/types/TinyIntType.java
index 83fccfde6..fd6f303c1 100644
--- a/paimon-common/src/main/java/org/apache/flink/table/store/types/TinyIntType.java
+++ b/paimon-common/src/main/java/org/apache/flink/table/store/types/TinyIntType.java
@@ -18,7 +18,7 @@
package org.apache.flink.table.store.types;
-import org.apache.flink.table.store.annotation.Experimental;
+import org.apache.paimon.annotation.Experimental;
/**
* Data type of a 1-byte signed integer with values from -128 to 127.
diff --git a/paimon-common/src/main/java/org/apache/flink/table/store/types/VarBinaryType.java b/paimon-common/src/main/java/org/apache/flink/table/store/types/VarBinaryType.java
index 4b5383eb0..9f83a83aa 100644
--- a/paimon-common/src/main/java/org/apache/flink/table/store/types/VarBinaryType.java
+++ b/paimon-common/src/main/java/org/apache/flink/table/store/types/VarBinaryType.java
@@ -18,7 +18,7 @@
package org.apache.flink.table.store.types;
-import org.apache.flink.table.store.annotation.Experimental;
+import org.apache.paimon.annotation.Experimental;
import java.util.Objects;
diff --git a/paimon-common/src/main/java/org/apache/flink/table/store/types/VarCharType.java b/paimon-common/src/main/java/org/apache/flink/table/store/types/VarCharType.java
index e56268158..ecc3c60bb 100644
--- a/paimon-common/src/main/java/org/apache/flink/table/store/types/VarCharType.java
+++ b/paimon-common/src/main/java/org/apache/flink/table/store/types/VarCharType.java
@@ -18,7 +18,7 @@
package org.apache.flink.table.store.types;
-import org.apache.flink.table.store.annotation.Experimental;
+import org.apache.paimon.annotation.Experimental;
import java.util.Objects;
diff --git a/paimon-common/src/main/java/org/apache/flink/table/store/utils/BinaryRowDataUtil.java b/paimon-common/src/main/java/org/apache/flink/table/store/utils/BinaryRowDataUtil.java
index 5e399796b..b3a983085 100644
--- a/paimon-common/src/main/java/org/apache/flink/table/store/utils/BinaryRowDataUtil.java
+++ b/paimon-common/src/main/java/org/apache/flink/table/store/utils/BinaryRowDataUtil.java
@@ -18,9 +18,10 @@
package org.apache.flink.table.store.utils;
-import org.apache.flink.table.store.data.BinaryRow;
import org.apache.flink.table.store.memory.MemorySegment;
+import org.apache.paimon.data.BinaryRow;
+
/**
* Utilities for {@link BinaryRow}. Many of the methods in this class are used in code generation.
*
diff --git a/paimon-common/src/main/java/org/apache/flink/table/store/utils/CloseableIterator.java b/paimon-common/src/main/java/org/apache/flink/table/store/utils/CloseableIterator.java
index d8dac4c6c..4ca11d895 100644
--- a/paimon-common/src/main/java/org/apache/flink/table/store/utils/CloseableIterator.java
+++ b/paimon-common/src/main/java/org/apache/flink/table/store/utils/CloseableIterator.java
@@ -18,7 +18,7 @@
package org.apache.flink.table.store.utils;
-import org.apache.flink.table.store.annotation.Experimental;
+import org.apache.paimon.annotation.Experimental;
import javax.annotation.Nonnull;
diff --git a/paimon-common/src/main/java/org/apache/flink/table/store/utils/DateTimeUtils.java b/paimon-common/src/main/java/org/apache/flink/table/store/utils/DateTimeUtils.java
index 5287d1441..576b2a61a 100644
--- a/paimon-common/src/main/java/org/apache/flink/table/store/utils/DateTimeUtils.java
+++ b/paimon-common/src/main/java/org/apache/flink/table/store/utils/DateTimeUtils.java
@@ -18,7 +18,7 @@
package org.apache.flink.table.store.utils;
-import org.apache.flink.table.store.data.Timestamp;
+import org.apache.paimon.data.Timestamp;
import java.time.DateTimeException;
import java.time.LocalDate;
diff --git a/paimon-common/src/main/java/org/apache/flink/table/store/utils/DecimalUtils.java b/paimon-common/src/main/java/org/apache/flink/table/store/utils/DecimalUtils.java
index d513aa184..a25cb6aa8 100644
--- a/paimon-common/src/main/java/org/apache/flink/table/store/utils/DecimalUtils.java
+++ b/paimon-common/src/main/java/org/apache/flink/table/store/utils/DecimalUtils.java
@@ -18,14 +18,14 @@
package org.apache.flink.table.store.utils;
-import org.apache.flink.table.store.data.BinaryString;
-import org.apache.flink.table.store.data.Decimal;
+import org.apache.paimon.data.BinaryString;
+import org.apache.paimon.data.Decimal;
import java.math.BigDecimal;
import java.math.RoundingMode;
-import static org.apache.flink.table.store.data.Decimal.fromBigDecimal;
-import static org.apache.flink.table.store.data.Decimal.fromUnscaledLong;
+import static org.apache.paimon.data.Decimal.fromBigDecimal;
+import static org.apache.paimon.data.Decimal.fromUnscaledLong;
/** Utilities for {@link Decimal}. */
public class DecimalUtils {
diff --git a/paimon-common/src/main/java/org/apache/flink/table/store/utils/KeyProjectedRow.java b/paimon-common/src/main/java/org/apache/flink/table/store/utils/KeyProjectedRow.java
index 830098d8b..723b09746 100644
--- a/paimon-common/src/main/java/org/apache/flink/table/store/utils/KeyProjectedRow.java
+++ b/paimon-common/src/main/java/org/apache/flink/table/store/utils/KeyProjectedRow.java
@@ -18,14 +18,15 @@
package org.apache.flink.table.store.utils;
-import org.apache.flink.table.store.data.BinaryString;
-import org.apache.flink.table.store.data.Decimal;
-import org.apache.flink.table.store.data.InternalArray;
-import org.apache.flink.table.store.data.InternalMap;
-import org.apache.flink.table.store.data.InternalRow;
-import org.apache.flink.table.store.data.Timestamp;
import org.apache.flink.table.store.types.RowKind;
+import org.apache.paimon.data.BinaryString;
+import org.apache.paimon.data.Decimal;
+import org.apache.paimon.data.InternalArray;
+import org.apache.paimon.data.InternalMap;
+import org.apache.paimon.data.InternalRow;
+import org.apache.paimon.data.Timestamp;
+
import java.util.Arrays;
/** A {@link InternalRow} to project key fields with {@link RowKind#INSERT}. */
diff --git a/paimon-common/src/main/java/org/apache/flink/table/store/utils/ProjectedRow.java b/paimon-common/src/main/java/org/apache/flink/table/store/utils/ProjectedRow.java
index eae65eb7f..4b1ab88de 100644
--- a/paimon-common/src/main/java/org/apache/flink/table/store/utils/ProjectedRow.java
+++ b/paimon-common/src/main/java/org/apache/flink/table/store/utils/ProjectedRow.java
@@ -18,15 +18,16 @@
package org.apache.flink.table.store.utils;
-import org.apache.flink.table.store.data.BinaryString;
-import org.apache.flink.table.store.data.Decimal;
-import org.apache.flink.table.store.data.InternalArray;
-import org.apache.flink.table.store.data.InternalMap;
-import org.apache.flink.table.store.data.InternalRow;
-import org.apache.flink.table.store.data.Timestamp;
import org.apache.flink.table.store.types.DataType;
import org.apache.flink.table.store.types.RowKind;
+import org.apache.paimon.data.BinaryString;
+import org.apache.paimon.data.Decimal;
+import org.apache.paimon.data.InternalArray;
+import org.apache.paimon.data.InternalMap;
+import org.apache.paimon.data.InternalRow;
+import org.apache.paimon.data.Timestamp;
+
import java.util.Arrays;
/**
diff --git a/paimon-common/src/main/java/org/apache/flink/table/store/utils/Projection.java b/paimon-common/src/main/java/org/apache/flink/table/store/utils/Projection.java
index 2d9eadadb..00eb295ab 100644
--- a/paimon-common/src/main/java/org/apache/flink/table/store/utils/Projection.java
+++ b/paimon-common/src/main/java/org/apache/flink/table/store/utils/Projection.java
@@ -18,11 +18,12 @@
package org.apache.flink.table.store.utils;
-import org.apache.flink.table.store.data.InternalRow;
import org.apache.flink.table.store.types.DataField;
import org.apache.flink.table.store.types.DataType;
import org.apache.flink.table.store.types.RowType;
+import org.apache.paimon.data.InternalRow;
+
import java.lang.reflect.Array;
import java.util.ArrayList;
import java.util.Arrays;
diff --git a/paimon-common/src/main/java/org/apache/flink/table/store/utils/RowDataToObjectArrayConverter.java b/paimon-common/src/main/java/org/apache/flink/table/store/utils/RowDataToObjectArrayConverter.java
index 843e5813e..9d913b299 100644
--- a/paimon-common/src/main/java/org/apache/flink/table/store/utils/RowDataToObjectArrayConverter.java
+++ b/paimon-common/src/main/java/org/apache/flink/table/store/utils/RowDataToObjectArrayConverter.java
@@ -18,9 +18,10 @@
package org.apache.flink.table.store.utils;
-import org.apache.flink.table.store.data.InternalRow;
import org.apache.flink.table.store.types.RowType;
+import org.apache.paimon.data.InternalRow;
+
import java.util.stream.IntStream;
/** Convert {@link InternalRow} to object array. */
diff --git a/paimon-common/src/main/java/org/apache/flink/table/store/utils/RowDataUtils.java b/paimon-common/src/main/java/org/apache/flink/table/store/utils/RowDataUtils.java
index 8d813ab22..36a6b6e5c 100644
--- a/paimon-common/src/main/java/org/apache/flink/table/store/utils/RowDataUtils.java
+++ b/paimon-common/src/main/java/org/apache/flink/table/store/utils/RowDataUtils.java
@@ -18,19 +18,6 @@
package org.apache.flink.table.store.utils;
-import org.apache.flink.table.store.data.BinaryArray;
-import org.apache.flink.table.store.data.BinaryMap;
-import org.apache.flink.table.store.data.BinaryRow;
-import org.apache.flink.table.store.data.BinaryString;
-import org.apache.flink.table.store.data.Decimal;
-import org.apache.flink.table.store.data.GenericArray;
-import org.apache.flink.table.store.data.GenericMap;
-import org.apache.flink.table.store.data.GenericRow;
-import org.apache.flink.table.store.data.InternalArray;
-import org.apache.flink.table.store.data.InternalMap;
-import org.apache.flink.table.store.data.InternalRow;
-import org.apache.flink.table.store.data.NestedRow;
-import org.apache.flink.table.store.data.Timestamp;
import org.apache.flink.table.store.types.ArrayType;
import org.apache.flink.table.store.types.DataType;
import org.apache.flink.table.store.types.DataTypeRoot;
@@ -42,6 +29,20 @@ import org.apache.flink.table.store.types.MultisetType;
import org.apache.flink.table.store.types.RowType;
import org.apache.flink.table.store.types.TimestampType;
+import org.apache.paimon.data.BinaryArray;
+import org.apache.paimon.data.BinaryMap;
+import org.apache.paimon.data.BinaryRow;
+import org.apache.paimon.data.BinaryString;
+import org.apache.paimon.data.Decimal;
+import org.apache.paimon.data.GenericArray;
+import org.apache.paimon.data.GenericMap;
+import org.apache.paimon.data.GenericRow;
+import org.apache.paimon.data.InternalArray;
+import org.apache.paimon.data.InternalMap;
+import org.apache.paimon.data.InternalRow;
+import org.apache.paimon.data.NestedRow;
+import org.apache.paimon.data.Timestamp;
+
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.util.ArrayList;
diff --git a/paimon-common/src/main/java/org/apache/flink/table/store/utils/SortUtil.java b/paimon-common/src/main/java/org/apache/flink/table/store/utils/SortUtil.java
index 0cc9467f3..fc8467ccd 100644
--- a/paimon-common/src/main/java/org/apache/flink/table/store/utils/SortUtil.java
+++ b/paimon-common/src/main/java/org/apache/flink/table/store/utils/SortUtil.java
@@ -18,11 +18,12 @@
package org.apache.flink.table.store.utils;
-import org.apache.flink.table.store.data.BinaryString;
-import org.apache.flink.table.store.data.Decimal;
-import org.apache.flink.table.store.data.Timestamp;
import org.apache.flink.table.store.memory.MemorySegment;
+import org.apache.paimon.data.BinaryString;
+import org.apache.paimon.data.Decimal;
+import org.apache.paimon.data.Timestamp;
+
import java.nio.ByteOrder;
import static org.apache.flink.table.store.memory.MemorySegment.UNSAFE;
diff --git a/paimon-common/src/main/java/org/apache/flink/table/store/utils/StringUtils.java b/paimon-common/src/main/java/org/apache/flink/table/store/utils/StringUtils.java
index 37faa38ff..3640aff4b 100644
--- a/paimon-common/src/main/java/org/apache/flink/table/store/utils/StringUtils.java
+++ b/paimon-common/src/main/java/org/apache/flink/table/store/utils/StringUtils.java
@@ -18,9 +18,10 @@
package org.apache.flink.table.store.utils;
-import org.apache.flink.table.store.data.BinaryString;
import org.apache.flink.table.store.memory.MemorySegmentUtils;
+import org.apache.paimon.data.BinaryString;
+
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Iterator;
@@ -29,9 +30,9 @@ import java.util.Objects;
import java.util.Random;
import java.util.concurrent.ThreadLocalRandom;
-import static org.apache.flink.table.store.data.BinaryString.fromBytes;
import static org.apache.flink.table.store.utils.Preconditions.checkArgument;
import static org.apache.flink.table.store.utils.Preconditions.checkNotNull;
+import static org.apache.paimon.data.BinaryString.fromBytes;
/**
* Utils for {@link BinaryString} and utility class to convert objects into strings in vice-versa.
diff --git a/paimon-common/src/main/java/org/apache/flink/table/store/utils/TypeUtils.java b/paimon-common/src/main/java/org/apache/flink/table/store/utils/TypeUtils.java
index c500b206e..040beaf33 100644
--- a/paimon-common/src/main/java/org/apache/flink/table/store/utils/TypeUtils.java
+++ b/paimon-common/src/main/java/org/apache/flink/table/store/utils/TypeUtils.java
@@ -18,9 +18,6 @@
package org.apache.flink.table.store.utils;
-import org.apache.flink.table.store.data.BinaryString;
-import org.apache.flink.table.store.data.Decimal;
-import org.apache.flink.table.store.data.Timestamp;
import org.apache.flink.table.store.types.DataField;
import org.apache.flink.table.store.types.DataType;
import org.apache.flink.table.store.types.DataTypeRoot;
@@ -29,6 +26,10 @@ import org.apache.flink.table.store.types.LocalZonedTimestampType;
import org.apache.flink.table.store.types.RowType;
import org.apache.flink.table.store.types.TimestampType;
+import org.apache.paimon.data.BinaryString;
+import org.apache.paimon.data.Decimal;
+import org.apache.paimon.data.Timestamp;
+
import java.math.BigDecimal;
import java.time.DateTimeException;
import java.util.Arrays;
diff --git a/paimon-common/src/main/java/org/apache/flink/table/store/annotation/ConfigGroup.java b/paimon-common/src/main/java/org/apache/paimon/annotation/ConfigGroup.java
similarity index 95%
rename from paimon-common/src/main/java/org/apache/flink/table/store/annotation/ConfigGroup.java
rename to paimon-common/src/main/java/org/apache/paimon/annotation/ConfigGroup.java
index 147b6cd3d..01d9f8abd 100644
--- a/paimon-common/src/main/java/org/apache/flink/table/store/annotation/ConfigGroup.java
+++ b/paimon-common/src/main/java/org/apache/paimon/annotation/ConfigGroup.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.flink.table.store.annotation;
+package org.apache.paimon.annotation;
import java.lang.annotation.Target;
diff --git a/paimon-common/src/main/java/org/apache/flink/table/store/annotation/ConfigGroups.java b/paimon-common/src/main/java/org/apache/paimon/annotation/ConfigGroups.java
similarity index 96%
rename from paimon-common/src/main/java/org/apache/flink/table/store/annotation/ConfigGroups.java
rename to paimon-common/src/main/java/org/apache/paimon/annotation/ConfigGroups.java
index 0fc6f73c3..a8ac0a31e 100644
--- a/paimon-common/src/main/java/org/apache/flink/table/store/annotation/ConfigGroups.java
+++ b/paimon-common/src/main/java/org/apache/paimon/annotation/ConfigGroups.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.flink.table.store.annotation;
+package org.apache.paimon.annotation;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
diff --git a/paimon-common/src/main/java/org/apache/flink/table/store/annotation/Documentation.java b/paimon-common/src/main/java/org/apache/paimon/annotation/Documentation.java
similarity index 98%
rename from paimon-common/src/main/java/org/apache/flink/table/store/annotation/Documentation.java
rename to paimon-common/src/main/java/org/apache/paimon/annotation/Documentation.java
index 99a8eeecd..8cdd96709 100644
--- a/paimon-common/src/main/java/org/apache/flink/table/store/annotation/Documentation.java
+++ b/paimon-common/src/main/java/org/apache/paimon/annotation/Documentation.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.flink.table.store.annotation;
+package org.apache.paimon.annotation;
import org.apache.flink.table.store.options.ConfigOption;
diff --git a/paimon-common/src/main/java/org/apache/flink/table/store/annotation/Experimental.java b/paimon-common/src/main/java/org/apache/paimon/annotation/Experimental.java
similarity index 96%
rename from paimon-common/src/main/java/org/apache/flink/table/store/annotation/Experimental.java
rename to paimon-common/src/main/java/org/apache/paimon/annotation/Experimental.java
index f117987cf..401317cea 100644
--- a/paimon-common/src/main/java/org/apache/flink/table/store/annotation/Experimental.java
+++ b/paimon-common/src/main/java/org/apache/paimon/annotation/Experimental.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.flink.table.store.annotation;
+package org.apache.paimon.annotation;
import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
diff --git a/paimon-common/src/main/java/org/apache/flink/table/store/annotation/VisibleForTesting.java b/paimon-common/src/main/java/org/apache/paimon/annotation/VisibleForTesting.java
similarity index 96%
rename from paimon-common/src/main/java/org/apache/flink/table/store/annotation/VisibleForTesting.java
rename to paimon-common/src/main/java/org/apache/paimon/annotation/VisibleForTesting.java
index ff5a0d983..29d1f76dc 100644
--- a/paimon-common/src/main/java/org/apache/flink/table/store/annotation/VisibleForTesting.java
+++ b/paimon-common/src/main/java/org/apache/paimon/annotation/VisibleForTesting.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.flink.table.store.annotation;
+package org.apache.paimon.annotation;
import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
diff --git a/paimon-common/src/main/java/org/apache/flink/table/store/catalog/CatalogContext.java b/paimon-common/src/main/java/org/apache/paimon/catalog/CatalogContext.java
similarity index 98%
rename from paimon-common/src/main/java/org/apache/flink/table/store/catalog/CatalogContext.java
rename to paimon-common/src/main/java/org/apache/paimon/catalog/CatalogContext.java
index 35c5e1434..6a83d793f 100644
--- a/paimon-common/src/main/java/org/apache/flink/table/store/catalog/CatalogContext.java
+++ b/paimon-common/src/main/java/org/apache/paimon/catalog/CatalogContext.java
@@ -18,7 +18,6 @@
package org.apache.flink.table.store.catalog;
-import org.apache.flink.table.store.annotation.Experimental;
import org.apache.flink.table.store.fs.FileIOLoader;
import org.apache.flink.table.store.fs.Path;
import org.apache.flink.table.store.fs.hadoop.HadoopFileIOLoader;
@@ -26,6 +25,7 @@ import org.apache.flink.table.store.options.Options;
import org.apache.flink.table.store.utils.HadoopUtils;
import org.apache.hadoop.conf.Configuration;
+import org.apache.paimon.annotation.Experimental;
import javax.annotation.Nullable;
diff --git a/paimon-codegen/src/main/scala/org/apache/flink/table/store/codegen/CodeGenException.scala b/paimon-common/src/main/java/org/apache/paimon/codegen/CodeGenException.scala
similarity index 100%
rename from paimon-codegen/src/main/scala/org/apache/flink/table/store/codegen/CodeGenException.scala
rename to paimon-common/src/main/java/org/apache/paimon/codegen/CodeGenException.scala
diff --git a/paimon-codegen-loader/src/main/java/org/apache/flink/table/store/codegen/CodeGenLoader.java b/paimon-common/src/main/java/org/apache/paimon/codegen/CodeGenLoader.java
similarity index 100%
rename from paimon-codegen-loader/src/main/java/org/apache/flink/table/store/codegen/CodeGenLoader.java
rename to paimon-common/src/main/java/org/apache/paimon/codegen/CodeGenLoader.java
diff --git a/flink-table-store-core/src/main/java/org/apache/flink/table/store/codegen/CodeGenUtils.java b/paimon-common/src/main/java/org/apache/paimon/codegen/CodeGenUtils.java
similarity index 97%
rename from flink-table-store-core/src/main/java/org/apache/flink/table/store/codegen/CodeGenUtils.java
rename to paimon-common/src/main/java/org/apache/paimon/codegen/CodeGenUtils.java
index f867a859c..f7b1dcd3c 100644
--- a/flink-table-store-core/src/main/java/org/apache/flink/table/store/codegen/CodeGenUtils.java
+++ b/paimon-common/src/main/java/org/apache/paimon/codegen/CodeGenUtils.java
@@ -18,10 +18,11 @@
package org.apache.flink.table.store.codegen;
-import org.apache.flink.table.store.data.BinaryRow;
import org.apache.flink.table.store.types.DataType;
import org.apache.flink.table.store.types.RowType;
+import org.apache.paimon.data.BinaryRow;
+
import java.util.List;
/** Utils for code generations. */
diff --git a/paimon-common/src/main/java/org/apache/flink/table/store/codegen/CodeGenerator.java b/paimon-common/src/main/java/org/apache/paimon/codegen/CodeGenerator.java
similarity index 100%
rename from paimon-common/src/main/java/org/apache/flink/table/store/codegen/CodeGenerator.java
rename to paimon-common/src/main/java/org/apache/paimon/codegen/CodeGenerator.java
diff --git a/paimon-codegen/src/main/scala/org/apache/flink/table/store/codegen/CodeGeneratorContext.scala b/paimon-common/src/main/java/org/apache/paimon/codegen/CodeGeneratorContext.scala
similarity index 98%
rename from paimon-codegen/src/main/scala/org/apache/flink/table/store/codegen/CodeGeneratorContext.scala
rename to paimon-common/src/main/java/org/apache/paimon/codegen/CodeGeneratorContext.scala
index 0819ceefe..bb4c920fe 100644
--- a/paimon-codegen/src/main/scala/org/apache/flink/table/store/codegen/CodeGeneratorContext.scala
+++ b/paimon-common/src/main/java/org/apache/paimon/codegen/CodeGeneratorContext.scala
@@ -17,7 +17,7 @@
*/
package org.apache.flink.table.store.codegen
-import org.apache.flink.table.store.data.serializer.InternalSerializers
+import org.apache.paimon.data.serializer.InternalSerializers
import org.apache.flink.table.store.types.DataType
import org.apache.flink.table.store.utils.InstantiationUtil
diff --git a/paimon-codegen/src/main/java/org/apache/flink/table/store/codegen/CodeGeneratorImpl.java b/paimon-common/src/main/java/org/apache/paimon/codegen/CodeGeneratorImpl.java
similarity index 100%
rename from paimon-codegen/src/main/java/org/apache/flink/table/store/codegen/CodeGeneratorImpl.java
rename to paimon-common/src/main/java/org/apache/paimon/codegen/CodeGeneratorImpl.java
diff --git a/paimon-codegen/src/main/scala/org/apache/flink/table/store/codegen/ComparatorCodeGenerator.scala b/paimon-common/src/main/java/org/apache/paimon/codegen/ComparatorCodeGenerator.scala
similarity index 100%
rename from paimon-codegen/src/main/scala/org/apache/flink/table/store/codegen/ComparatorCodeGenerator.scala
rename to paimon-common/src/main/java/org/apache/paimon/codegen/ComparatorCodeGenerator.scala
diff --git a/paimon-common/src/main/java/org/apache/flink/table/store/codegen/CompileUtils.java b/paimon-common/src/main/java/org/apache/paimon/codegen/CompileUtils.java
similarity index 100%
rename from paimon-common/src/main/java/org/apache/flink/table/store/codegen/CompileUtils.java
rename to paimon-common/src/main/java/org/apache/paimon/codegen/CompileUtils.java
diff --git a/paimon-codegen/src/main/scala/org/apache/flink/table/store/codegen/ExprCodeGenerator.scala b/paimon-common/src/main/java/org/apache/paimon/codegen/ExprCodeGenerator.scala
similarity index 98%
rename from paimon-codegen/src/main/scala/org/apache/flink/table/store/codegen/ExprCodeGenerator.scala
rename to paimon-common/src/main/java/org/apache/paimon/codegen/ExprCodeGenerator.scala
index 9d41244ad..a89327fe4 100644
--- a/paimon-codegen/src/main/scala/org/apache/flink/table/store/codegen/ExprCodeGenerator.scala
+++ b/paimon-common/src/main/java/org/apache/paimon/codegen/ExprCodeGenerator.scala
@@ -17,7 +17,7 @@
*/
package org.apache.flink.table.store.codegen
-import org.apache.flink.table.store.data.{BinaryRow, InternalRow}
+import org.apache.paimon.data.{BinaryRow, InternalRow}
import org.apache.flink.table.store.types.{RowType, TimestampType}
import org.apache.flink.table.store.utils.TypeUtils.isInteroperable
diff --git a/paimon-codegen/src/main/scala/org/apache/flink/table/store/codegen/GenerateUtils.scala b/paimon-common/src/main/java/org/apache/paimon/codegen/GenerateUtils.scala
similarity index 99%
rename from paimon-codegen/src/main/scala/org/apache/flink/table/store/codegen/GenerateUtils.scala
rename to paimon-common/src/main/java/org/apache/paimon/codegen/GenerateUtils.scala
index e08206ce5..76110a744 100644
--- a/paimon-codegen/src/main/scala/org/apache/flink/table/store/codegen/GenerateUtils.scala
+++ b/paimon-common/src/main/java/org/apache/paimon/codegen/GenerateUtils.scala
@@ -17,7 +17,7 @@
*/
package org.apache.flink.table.store.codegen
-import org.apache.flink.table.store.data._
+import org.apache.paimon.data._
import org.apache.flink.table.store.memory.MemorySegment
import org.apache.flink.table.store.types._
import org.apache.flink.table.store.types.DataTypeChecks.{getFieldCount, getFieldTypes, getPrecision, getScale}
diff --git a/paimon-common/src/main/java/org/apache/flink/table/store/codegen/GeneratedClass.java b/paimon-common/src/main/java/org/apache/paimon/codegen/GeneratedClass.java
similarity index 100%
rename from paimon-common/src/main/java/org/apache/flink/table/store/codegen/GeneratedClass.java
rename to paimon-common/src/main/java/org/apache/paimon/codegen/GeneratedClass.java
diff --git a/paimon-codegen/src/main/scala/org/apache/flink/table/store/codegen/GeneratedExpression.scala b/paimon-common/src/main/java/org/apache/paimon/codegen/GeneratedExpression.scala
similarity index 100%
rename from paimon-codegen/src/main/scala/org/apache/flink/table/store/codegen/GeneratedExpression.scala
rename to paimon-common/src/main/java/org/apache/paimon/codegen/GeneratedExpression.scala
diff --git a/paimon-common/src/main/java/org/apache/flink/table/store/codegen/NormalizedKeyComputer.java b/paimon-common/src/main/java/org/apache/paimon/codegen/NormalizedKeyComputer.java
similarity index 97%
rename from paimon-common/src/main/java/org/apache/flink/table/store/codegen/NormalizedKeyComputer.java
rename to paimon-common/src/main/java/org/apache/paimon/codegen/NormalizedKeyComputer.java
index 071669530..3d6d55767 100644
--- a/paimon-common/src/main/java/org/apache/flink/table/store/codegen/NormalizedKeyComputer.java
+++ b/paimon-common/src/main/java/org/apache/paimon/codegen/NormalizedKeyComputer.java
@@ -18,9 +18,10 @@
package org.apache.flink.table.store.codegen;
-import org.apache.flink.table.store.data.InternalRow;
import org.apache.flink.table.store.memory.MemorySegment;
+import org.apache.paimon.data.InternalRow;
+
/**
* Normalized key computer for {@code SortBuffer}. For performance, subclasses are usually
* implemented through CodeGenerator. Copied from Flink.
diff --git a/paimon-common/src/main/java/org/apache/flink/table/store/codegen/Projection.java b/paimon-common/src/main/java/org/apache/paimon/codegen/Projection.java
similarity index 90%
rename from paimon-common/src/main/java/org/apache/flink/table/store/codegen/Projection.java
rename to paimon-common/src/main/java/org/apache/paimon/codegen/Projection.java
index 1f88d8e21..91c2ef28e 100644
--- a/paimon-common/src/main/java/org/apache/flink/table/store/codegen/Projection.java
+++ b/paimon-common/src/main/java/org/apache/paimon/codegen/Projection.java
@@ -18,8 +18,8 @@
package org.apache.flink.table.store.codegen;
-import org.apache.flink.table.store.data.BinaryRow;
-import org.apache.flink.table.store.data.InternalRow;
+import org.apache.paimon.data.BinaryRow;
+import org.apache.paimon.data.InternalRow;
/**
* Interface for code generated projection, which will map a RowData to another BinaryRowData.
diff --git a/paimon-codegen/src/main/scala/org/apache/flink/table/store/codegen/ProjectionCodeGenerator.scala b/paimon-common/src/main/java/org/apache/paimon/codegen/ProjectionCodeGenerator.scala
similarity index 98%
rename from paimon-codegen/src/main/scala/org/apache/flink/table/store/codegen/ProjectionCodeGenerator.scala
rename to paimon-common/src/main/java/org/apache/paimon/codegen/ProjectionCodeGenerator.scala
index 328007a27..31538ea27 100644
--- a/paimon-codegen/src/main/scala/org/apache/flink/table/store/codegen/ProjectionCodeGenerator.scala
+++ b/paimon-common/src/main/java/org/apache/paimon/codegen/ProjectionCodeGenerator.scala
@@ -18,7 +18,7 @@
package org.apache.flink.table.store.codegen
import org.apache.flink.table.store.codegen.GenerateUtils.{generateRecordStatement, newName, DEFAULT_INPUT1_TERM, DEFAULT_OUT_RECORD_TERM, DEFAULT_OUT_RECORD_WRITER_TERM, ROW_DATA}
-import org.apache.flink.table.store.data.{BinaryRow, InternalRow}
+import org.apache.paimon.data.{BinaryRow, InternalRow}
import org.apache.flink.table.store.types.RowType
import GeneratedExpression.{NEVER_NULL, NO_CODE}
diff --git a/paimon-common/src/main/java/org/apache/flink/table/store/codegen/RecordComparator.java b/paimon-common/src/main/java/org/apache/paimon/codegen/RecordComparator.java
similarity index 95%
rename from paimon-common/src/main/java/org/apache/flink/table/store/codegen/RecordComparator.java
rename to paimon-common/src/main/java/org/apache/paimon/codegen/RecordComparator.java
index ad2621871..b4a3a62c7 100644
--- a/paimon-common/src/main/java/org/apache/flink/table/store/codegen/RecordComparator.java
+++ b/paimon-common/src/main/java/org/apache/paimon/codegen/RecordComparator.java
@@ -18,7 +18,7 @@
package org.apache.flink.table.store.codegen;
-import org.apache.flink.table.store.data.InternalRow;
+import org.apache.paimon.data.InternalRow;
import java.io.Serializable;
import java.util.Comparator;
diff --git a/paimon-codegen/src/main/scala/org/apache/flink/table/store/codegen/SortCodeGenerator.scala b/paimon-common/src/main/java/org/apache/paimon/codegen/SortCodeGenerator.scala
similarity index 99%
rename from paimon-codegen/src/main/scala/org/apache/flink/table/store/codegen/SortCodeGenerator.scala
rename to paimon-common/src/main/java/org/apache/paimon/codegen/SortCodeGenerator.scala
index 144bb14af..810dda0fe 100644
--- a/paimon-codegen/src/main/scala/org/apache/flink/table/store/codegen/SortCodeGenerator.scala
+++ b/paimon-common/src/main/java/org/apache/paimon/codegen/SortCodeGenerator.scala
@@ -18,7 +18,7 @@
package org.apache.flink.table.store.codegen
import org.apache.flink.table.store.codegen.GenerateUtils.{newName, ROW_DATA, SEGMENT}
-import org.apache.flink.table.store.data.{BinaryRow, Decimal, Timestamp}
+import org.apache.paimon.data.{BinaryRow, Decimal, Timestamp}
import org.apache.flink.table.store.types.{DataType, DecimalType, RowType, TimestampType}
import org.apache.flink.table.store.types.DataTypeRoot._
import org.apache.flink.table.store.utils.{SortUtil, TypeUtils}
diff --git a/paimon-codegen/src/main/java/org/apache/flink/table/store/codegen/SortSpec.java b/paimon-common/src/main/java/org/apache/paimon/codegen/SortSpec.java
similarity index 100%
rename from paimon-codegen/src/main/java/org/apache/flink/table/store/codegen/SortSpec.java
rename to paimon-common/src/main/java/org/apache/paimon/codegen/SortSpec.java
diff --git a/paimon-common/src/main/java/org/apache/flink/table/store/codegen/codesplit/AddBoolBeforeReturnRewriter.java b/paimon-common/src/main/java/org/apache/paimon/codegen/codesplit/AddBoolBeforeReturnRewriter.java
similarity index 100%
rename from paimon-common/src/main/java/org/apache/flink/table/store/codegen/codesplit/AddBoolBeforeReturnRewriter.java
rename to paimon-common/src/main/java/org/apache/paimon/codegen/codesplit/AddBoolBeforeReturnRewriter.java
diff --git a/paimon-common/src/test/java/org/apache/flink/table/store/codegen/codesplit/AddBooleanBeforeReturnRewriterTest.java b/paimon-common/src/main/java/org/apache/paimon/codegen/codesplit/AddBooleanBeforeReturnRewriterTest.java
similarity index 100%
rename from paimon-common/src/test/java/org/apache/flink/table/store/codegen/codesplit/AddBooleanBeforeReturnRewriterTest.java
rename to paimon-common/src/main/java/org/apache/paimon/codegen/codesplit/AddBooleanBeforeReturnRewriterTest.java
diff --git a/paimon-common/src/main/java/org/apache/flink/table/store/codegen/codesplit/BlockStatementGrouper.java b/paimon-common/src/main/java/org/apache/paimon/codegen/codesplit/BlockStatementGrouper.java
similarity index 100%
rename from paimon-common/src/main/java/org/apache/flink/table/store/codegen/codesplit/BlockStatementGrouper.java
rename to paimon-common/src/main/java/org/apache/paimon/codegen/codesplit/BlockStatementGrouper.java
diff --git a/paimon-common/src/test/java/org/apache/flink/table/store/codegen/codesplit/BlockStatementGrouperTest.java b/paimon-common/src/main/java/org/apache/paimon/codegen/codesplit/BlockStatementGrouperTest.java
similarity index 100%
rename from paimon-common/src/test/java/org/apache/flink/table/store/codegen/codesplit/BlockStatementGrouperTest.java
rename to paimon-common/src/main/java/org/apache/paimon/codegen/codesplit/BlockStatementGrouperTest.java
diff --git a/paimon-common/src/main/java/org/apache/flink/table/store/codegen/codesplit/BlockStatementRewriter.java b/paimon-common/src/main/java/org/apache/paimon/codegen/codesplit/BlockStatementRewriter.java
similarity index 100%
rename from paimon-common/src/main/java/org/apache/flink/table/store/codegen/codesplit/BlockStatementRewriter.java
rename to paimon-common/src/main/java/org/apache/paimon/codegen/codesplit/BlockStatementRewriter.java
diff --git a/paimon-common/src/test/java/org/apache/flink/table/store/codegen/codesplit/BlockStatementRewriterTest.java b/paimon-common/src/main/java/org/apache/paimon/codegen/codesplit/BlockStatementRewriterTest.java
similarity index 100%
rename from paimon-common/src/test/java/org/apache/flink/table/store/codegen/codesplit/BlockStatementRewriterTest.java
rename to paimon-common/src/main/java/org/apache/paimon/codegen/codesplit/BlockStatementRewriterTest.java
diff --git a/paimon-common/src/main/java/org/apache/flink/table/store/codegen/codesplit/BlockStatementSplitter.java b/paimon-common/src/main/java/org/apache/paimon/codegen/codesplit/BlockStatementSplitter.java
similarity index 100%
rename from paimon-common/src/main/java/org/apache/flink/table/store/codegen/codesplit/BlockStatementSplitter.java
rename to paimon-common/src/main/java/org/apache/paimon/codegen/codesplit/BlockStatementSplitter.java
diff --git a/paimon-common/src/test/java/org/apache/flink/table/store/codegen/codesplit/BlockStatementSplitterTest.java b/paimon-common/src/main/java/org/apache/paimon/codegen/codesplit/BlockStatementSplitterTest.java
similarity index 100%
rename from paimon-common/src/test/java/org/apache/flink/table/store/codegen/codesplit/BlockStatementSplitterTest.java
rename to paimon-common/src/main/java/org/apache/paimon/codegen/codesplit/BlockStatementSplitterTest.java
diff --git a/paimon-common/src/main/java/org/apache/flink/table/store/codegen/codesplit/CodeRewriter.java b/paimon-common/src/main/java/org/apache/paimon/codegen/codesplit/CodeRewriter.java
similarity index 100%
rename from paimon-common/src/main/java/org/apache/flink/table/store/codegen/codesplit/CodeRewriter.java
rename to paimon-common/src/main/java/org/apache/paimon/codegen/codesplit/CodeRewriter.java
diff --git a/paimon-common/src/test/java/org/apache/flink/table/store/codegen/codesplit/CodeRewriterTestBase.java b/paimon-common/src/main/java/org/apache/paimon/codegen/codesplit/CodeRewriterTestBase.java
similarity index 100%
rename from paimon-common/src/test/java/org/apache/flink/table/store/codegen/codesplit/CodeRewriterTestBase.java
rename to paimon-common/src/main/java/org/apache/paimon/codegen/codesplit/CodeRewriterTestBase.java
diff --git a/paimon-common/src/test/java/org/apache/flink/table/store/codegen/codesplit/CodeSplitTestUtil.java b/paimon-common/src/main/java/org/apache/paimon/codegen/codesplit/CodeSplitTestUtil.java
similarity index 100%
rename from paimon-common/src/test/java/org/apache/flink/table/store/codegen/codesplit/CodeSplitTestUtil.java
rename to paimon-common/src/main/java/org/apache/paimon/codegen/codesplit/CodeSplitTestUtil.java
diff --git a/paimon-common/src/main/java/org/apache/flink/table/store/codegen/codesplit/CodeSplitUtil.java b/paimon-common/src/main/java/org/apache/paimon/codegen/codesplit/CodeSplitUtil.java
similarity index 100%
rename from paimon-common/src/main/java/org/apache/flink/table/store/codegen/codesplit/CodeSplitUtil.java
rename to paimon-common/src/main/java/org/apache/paimon/codegen/codesplit/CodeSplitUtil.java
diff --git a/paimon-common/src/main/java/org/apache/flink/table/store/codegen/codesplit/DeclarationRewriter.java b/paimon-common/src/main/java/org/apache/paimon/codegen/codesplit/DeclarationRewriter.java
similarity index 100%
rename from paimon-common/src/main/java/org/apache/flink/table/store/codegen/codesplit/DeclarationRewriter.java
rename to paimon-common/src/main/java/org/apache/paimon/codegen/codesplit/DeclarationRewriter.java
diff --git a/paimon-common/src/test/java/org/apache/flink/table/store/codegen/codesplit/DeclarationRewriterTest.java b/paimon-common/src/main/java/org/apache/paimon/codegen/codesplit/DeclarationRewriterTest.java
similarity index 100%
rename from paimon-common/src/test/java/org/apache/flink/table/store/codegen/codesplit/DeclarationRewriterTest.java
rename to paimon-common/src/main/java/org/apache/paimon/codegen/codesplit/DeclarationRewriterTest.java
diff --git a/paimon-common/src/main/java/org/apache/flink/table/store/codegen/codesplit/FunctionSplitter.java b/paimon-common/src/main/java/org/apache/paimon/codegen/codesplit/FunctionSplitter.java
similarity index 100%
rename from paimon-common/src/main/java/org/apache/flink/table/store/codegen/codesplit/FunctionSplitter.java
rename to paimon-common/src/main/java/org/apache/paimon/codegen/codesplit/FunctionSplitter.java
diff --git a/paimon-common/src/test/java/org/apache/flink/table/store/codegen/codesplit/FunctionSplitterTest.java b/paimon-common/src/main/java/org/apache/paimon/codegen/codesplit/FunctionSplitterTest.java
similarity index 100%
rename from paimon-common/src/test/java/org/apache/flink/table/store/codegen/codesplit/FunctionSplitterTest.java
rename to paimon-common/src/main/java/org/apache/paimon/codegen/codesplit/FunctionSplitterTest.java
diff --git a/paimon-common/src/main/java/org/apache/flink/table/store/codegen/codesplit/JavaCodeSplitter.java b/paimon-common/src/main/java/org/apache/paimon/codegen/codesplit/JavaCodeSplitter.java
similarity index 100%
rename from paimon-common/src/main/java/org/apache/flink/table/store/codegen/codesplit/JavaCodeSplitter.java
rename to paimon-common/src/main/java/org/apache/paimon/codegen/codesplit/JavaCodeSplitter.java
diff --git a/paimon-common/src/test/java/org/apache/flink/table/store/codegen/codesplit/JavaCodeSplitterTest.java b/paimon-common/src/main/java/org/apache/paimon/codegen/codesplit/JavaCodeSplitterTest.java
similarity index 100%
rename from paimon-common/src/test/java/org/apache/flink/table/store/codegen/codesplit/JavaCodeSplitterTest.java
rename to paimon-common/src/main/java/org/apache/paimon/codegen/codesplit/JavaCodeSplitterTest.java
diff --git a/paimon-common/src/test/java/org/apache/flink/table/store/codegen/codesplit/JavaParserTest.java b/paimon-common/src/main/java/org/apache/paimon/codegen/codesplit/JavaParserTest.java
similarity index 100%
rename from paimon-common/src/test/java/org/apache/flink/table/store/codegen/codesplit/JavaParserTest.java
rename to paimon-common/src/main/java/org/apache/paimon/codegen/codesplit/JavaParserTest.java
diff --git a/paimon-common/src/main/java/org/apache/flink/table/store/codegen/codesplit/MemberFieldRewriter.java b/paimon-common/src/main/java/org/apache/paimon/codegen/codesplit/MemberFieldRewriter.java
similarity index 100%
rename from paimon-common/src/main/java/org/apache/flink/table/store/codegen/codesplit/MemberFieldRewriter.java
rename to paimon-common/src/main/java/org/apache/paimon/codegen/codesplit/MemberFieldRewriter.java
diff --git a/paimon-common/src/test/java/org/apache/flink/table/store/codegen/codesplit/MemberFieldRewriterTest.java b/paimon-common/src/main/java/org/apache/paimon/codegen/codesplit/MemberFieldRewriterTest.java
similarity index 100%
rename from paimon-common/src/test/java/org/apache/flink/table/store/codegen/codesplit/MemberFieldRewriterTest.java
rename to paimon-common/src/main/java/org/apache/paimon/codegen/codesplit/MemberFieldRewriterTest.java
diff --git a/paimon-common/src/main/java/org/apache/flink/table/store/codegen/codesplit/ReturnAndJumpCounter.java b/paimon-common/src/main/java/org/apache/paimon/codegen/codesplit/ReturnAndJumpCounter.java
similarity index 100%
rename from paimon-common/src/main/java/org/apache/flink/table/store/codegen/codesplit/ReturnAndJumpCounter.java
rename to paimon-common/src/main/java/org/apache/paimon/codegen/codesplit/ReturnAndJumpCounter.java
diff --git a/paimon-common/src/main/java/org/apache/flink/table/store/codegen/codesplit/ReturnValueRewriter.java b/paimon-common/src/main/java/org/apache/paimon/codegen/codesplit/ReturnValueRewriter.java
similarity index 100%
rename from paimon-common/src/main/java/org/apache/flink/table/store/codegen/codesplit/ReturnValueRewriter.java
rename to paimon-common/src/main/java/org/apache/paimon/codegen/codesplit/ReturnValueRewriter.java
diff --git a/paimon-common/src/test/java/org/apache/flink/table/store/codegen/codesplit/ReturnValueRewriterTest.java b/paimon-common/src/main/java/org/apache/paimon/codegen/codesplit/ReturnValueRewriterTest.java
similarity index 100%
rename from paimon-common/src/test/java/org/apache/flink/table/store/codegen/codesplit/ReturnValueRewriterTest.java
rename to paimon-common/src/main/java/org/apache/paimon/codegen/codesplit/ReturnValueRewriterTest.java
diff --git a/paimon-common/src/main/java/org/apache/flink/table/store/data/AbstractBinaryWriter.java b/paimon-common/src/main/java/org/apache/paimon/data/AbstractBinaryWriter.java
similarity index 96%
rename from paimon-common/src/main/java/org/apache/flink/table/store/data/AbstractBinaryWriter.java
rename to paimon-common/src/main/java/org/apache/paimon/data/AbstractBinaryWriter.java
index 06c5d85a9..e31219825 100644
--- a/paimon-common/src/main/java/org/apache/flink/table/store/data/AbstractBinaryWriter.java
+++ b/paimon-common/src/main/java/org/apache/paimon/data/AbstractBinaryWriter.java
@@ -15,18 +15,19 @@
* limitations under the License.
*/
-package org.apache.flink.table.store.data;
+package org.apache.paimon.data;
-import org.apache.flink.table.store.data.serializer.InternalArraySerializer;
-import org.apache.flink.table.store.data.serializer.InternalMapSerializer;
-import org.apache.flink.table.store.data.serializer.InternalRowSerializer;
import org.apache.flink.table.store.memory.MemorySegment;
import org.apache.flink.table.store.memory.MemorySegmentUtils;
+import org.apache.paimon.data.serializer.InternalArraySerializer;
+import org.apache.paimon.data.serializer.InternalMapSerializer;
+import org.apache.paimon.data.serializer.InternalRowSerializer;
+
import java.nio.charset.StandardCharsets;
import java.util.Arrays;
-import static org.apache.flink.table.store.data.BinarySection.MAX_FIX_PART_DATA_SIZE;
+import static org.apache.paimon.data.BinarySection.MAX_FIX_PART_DATA_SIZE;
/**
* Use the special format to write data to a {@link MemorySegment} (its capacity grows
diff --git a/paimon-common/src/main/java/org/apache/flink/table/store/data/AbstractPagedInputView.java b/paimon-common/src/main/java/org/apache/paimon/data/AbstractPagedInputView.java
similarity index 99%
rename from paimon-common/src/main/java/org/apache/flink/table/store/data/AbstractPagedInputView.java
rename to paimon-common/src/main/java/org/apache/paimon/data/AbstractPagedInputView.java
index 52113ce9a..f6bec8b5d 100644
--- a/paimon-common/src/main/java/org/apache/flink/table/store/data/AbstractPagedInputView.java
+++ b/paimon-common/src/main/java/org/apache/paimon/data/AbstractPagedInputView.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.flink.table.store.data;
+package org.apache.paimon.data;
import org.apache.flink.table.store.io.DataInputView;
import org.apache.flink.table.store.memory.MemorySegment;
diff --git a/paimon-common/src/main/java/org/apache/flink/table/store/data/AbstractPagedOutputView.java b/paimon-common/src/main/java/org/apache/paimon/data/AbstractPagedOutputView.java
similarity index 99%
rename from paimon-common/src/main/java/org/apache/flink/table/store/data/AbstractPagedOutputView.java
rename to paimon-common/src/main/java/org/apache/paimon/data/AbstractPagedOutputView.java
index 555829d78..1319abada 100644
--- a/paimon-common/src/main/java/org/apache/flink/table/store/data/AbstractPagedOutputView.java
+++ b/paimon-common/src/main/java/org/apache/paimon/data/AbstractPagedOutputView.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.flink.table.store.data;
+package org.apache.paimon.data;
import org.apache.flink.table.store.io.DataInputView;
import org.apache.flink.table.store.io.DataOutputView;
diff --git a/paimon-common/src/main/java/org/apache/flink/table/store/data/BinaryArray.java b/paimon-common/src/main/java/org/apache/paimon/data/BinaryArray.java
similarity index 99%
rename from paimon-common/src/main/java/org/apache/flink/table/store/data/BinaryArray.java
rename to paimon-common/src/main/java/org/apache/paimon/data/BinaryArray.java
index 62e7b3089..6d74bb698 100644
--- a/paimon-common/src/main/java/org/apache/flink/table/store/data/BinaryArray.java
+++ b/paimon-common/src/main/java/org/apache/paimon/data/BinaryArray.java
@@ -16,13 +16,14 @@
* limitations under the License.
*/
-package org.apache.flink.table.store.data;
+package org.apache.paimon.data;
-import org.apache.flink.table.store.annotation.Experimental;
import org.apache.flink.table.store.memory.MemorySegment;
import org.apache.flink.table.store.memory.MemorySegmentUtils;
import org.apache.flink.table.store.types.DataType;
+import org.apache.paimon.annotation.Experimental;
+
import java.lang.reflect.Array;
import static org.apache.flink.table.store.memory.MemorySegment.UNSAFE;
diff --git a/paimon-common/src/main/java/org/apache/flink/table/store/data/BinaryArrayWriter.java b/paimon-common/src/main/java/org/apache/paimon/data/BinaryArrayWriter.java
similarity index 99%
rename from paimon-common/src/main/java/org/apache/flink/table/store/data/BinaryArrayWriter.java
rename to paimon-common/src/main/java/org/apache/paimon/data/BinaryArrayWriter.java
index e7e92cf16..b09f287e1 100644
--- a/paimon-common/src/main/java/org/apache/flink/table/store/data/BinaryArrayWriter.java
+++ b/paimon-common/src/main/java/org/apache/paimon/data/BinaryArrayWriter.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.flink.table.store.data;
+package org.apache.paimon.data;
import org.apache.flink.table.store.memory.MemorySegment;
import org.apache.flink.table.store.memory.MemorySegmentUtils;
diff --git a/paimon-common/src/main/java/org/apache/flink/table/store/data/BinaryMap.java b/paimon-common/src/main/java/org/apache/paimon/data/BinaryMap.java
similarity index 97%
rename from paimon-common/src/main/java/org/apache/flink/table/store/data/BinaryMap.java
rename to paimon-common/src/main/java/org/apache/paimon/data/BinaryMap.java
index fffe1ca48..446844db2 100644
--- a/paimon-common/src/main/java/org/apache/flink/table/store/data/BinaryMap.java
+++ b/paimon-common/src/main/java/org/apache/paimon/data/BinaryMap.java
@@ -16,13 +16,14 @@
* limitations under the License.
*/
-package org.apache.flink.table.store.data;
+package org.apache.paimon.data;
-import org.apache.flink.table.store.annotation.Experimental;
import org.apache.flink.table.store.memory.MemorySegment;
import org.apache.flink.table.store.memory.MemorySegmentUtils;
import org.apache.flink.table.store.types.DataType;
+import org.apache.paimon.annotation.Experimental;
+
import java.util.HashMap;
import java.util.Map;
diff --git a/paimon-common/src/main/java/org/apache/flink/table/store/data/BinaryRow.java b/paimon-common/src/main/java/org/apache/paimon/data/BinaryRow.java
similarity index 99%
rename from paimon-common/src/main/java/org/apache/flink/table/store/data/BinaryRow.java
rename to paimon-common/src/main/java/org/apache/paimon/data/BinaryRow.java
index dd1943ba1..b72eded9c 100644
--- a/paimon-common/src/main/java/org/apache/flink/table/store/data/BinaryRow.java
+++ b/paimon-common/src/main/java/org/apache/paimon/data/BinaryRow.java
@@ -15,9 +15,8 @@
* limitations under the License.
*/
-package org.apache.flink.table.store.data;
+package org.apache.paimon.data;
-import org.apache.flink.table.store.annotation.Experimental;
import org.apache.flink.table.store.memory.MemorySegment;
import org.apache.flink.table.store.memory.MemorySegmentUtils;
import org.apache.flink.table.store.types.DataType;
@@ -27,6 +26,8 @@ import org.apache.flink.table.store.types.LocalZonedTimestampType;
import org.apache.flink.table.store.types.RowKind;
import org.apache.flink.table.store.types.TimestampType;
+import org.apache.paimon.annotation.Experimental;
+
import java.nio.ByteOrder;
import static org.apache.flink.table.store.utils.Preconditions.checkArgument;
diff --git a/paimon-common/src/main/java/org/apache/flink/table/store/data/BinaryRowWriter.java b/paimon-common/src/main/java/org/apache/paimon/data/BinaryRowWriter.java
similarity index 98%
rename from paimon-common/src/main/java/org/apache/flink/table/store/data/BinaryRowWriter.java
rename to paimon-common/src/main/java/org/apache/paimon/data/BinaryRowWriter.java
index d0d01f790..9df75bea9 100644
--- a/paimon-common/src/main/java/org/apache/flink/table/store/data/BinaryRowWriter.java
+++ b/paimon-common/src/main/java/org/apache/paimon/data/BinaryRowWriter.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.flink.table.store.data;
+package org.apache.paimon.data;
import org.apache.flink.table.store.memory.MemorySegment;
import org.apache.flink.table.store.memory.MemorySegmentUtils;
diff --git a/paimon-common/src/main/java/org/apache/flink/table/store/data/BinarySection.java b/paimon-common/src/main/java/org/apache/paimon/data/BinarySection.java
similarity index 99%
rename from paimon-common/src/main/java/org/apache/flink/table/store/data/BinarySection.java
rename to paimon-common/src/main/java/org/apache/paimon/data/BinarySection.java
index 0b1ff78d7..192c6ae13 100644
--- a/paimon-common/src/main/java/org/apache/flink/table/store/data/BinarySection.java
+++ b/paimon-common/src/main/java/org/apache/paimon/data/BinarySection.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.flink.table.store.data;
+package org.apache.paimon.data;
import org.apache.flink.table.store.memory.MemorySegment;
import org.apache.flink.table.store.memory.MemorySegmentUtils;
diff --git a/paimon-common/src/main/java/org/apache/flink/table/store/data/BinaryString.java b/paimon-common/src/main/java/org/apache/paimon/data/BinaryString.java
similarity index 99%
rename from paimon-common/src/main/java/org/apache/flink/table/store/data/BinaryString.java
rename to paimon-common/src/main/java/org/apache/paimon/data/BinaryString.java
index 921a29d3d..aeb9be83b 100644
--- a/paimon-common/src/main/java/org/apache/flink/table/store/data/BinaryString.java
+++ b/paimon-common/src/main/java/org/apache/paimon/data/BinaryString.java
@@ -16,12 +16,13 @@
* limitations under the License.
*/
-package org.apache.flink.table.store.data;
+package org.apache.paimon.data;
-import org.apache.flink.table.store.annotation.Experimental;
import org.apache.flink.table.store.memory.MemorySegment;
import org.apache.flink.table.store.memory.MemorySegmentUtils;
+import org.apache.paimon.annotation.Experimental;
+
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
diff --git a/paimon-common/src/main/java/org/apache/flink/table/store/data/BinaryWriter.java b/paimon-common/src/main/java/org/apache/paimon/data/BinaryWriter.java
similarity index 95%
rename from paimon-common/src/main/java/org/apache/flink/table/store/data/BinaryWriter.java
rename to paimon-common/src/main/java/org/apache/paimon/data/BinaryWriter.java
index fee0b8c28..dc58eab7a 100644
--- a/paimon-common/src/main/java/org/apache/flink/table/store/data/BinaryWriter.java
+++ b/paimon-common/src/main/java/org/apache/paimon/data/BinaryWriter.java
@@ -15,18 +15,19 @@
* limitations under the License.
*/
-package org.apache.flink.table.store.data;
+package org.apache.paimon.data;
-import org.apache.flink.table.store.data.serializer.InternalArraySerializer;
-import org.apache.flink.table.store.data.serializer.InternalMapSerializer;
-import org.apache.flink.table.store.data.serializer.InternalRowSerializer;
-import org.apache.flink.table.store.data.serializer.InternalSerializers;
-import org.apache.flink.table.store.data.serializer.Serializer;
import org.apache.flink.table.store.types.DataType;
import org.apache.flink.table.store.types.DecimalType;
import org.apache.flink.table.store.types.LocalZonedTimestampType;
import org.apache.flink.table.store.types.TimestampType;
+import org.apache.paimon.data.serializer.InternalArraySerializer;
+import org.apache.paimon.data.serializer.InternalMapSerializer;
+import org.apache.paimon.data.serializer.InternalRowSerializer;
+import org.apache.paimon.data.serializer.InternalSerializers;
+import org.apache.paimon.data.serializer.Serializer;
+
import java.io.Serializable;
import static org.apache.flink.table.store.types.DataTypeChecks.getPrecision;
diff --git a/paimon-common/src/main/java/org/apache/flink/table/store/data/DataGetters.java b/paimon-common/src/main/java/org/apache/paimon/data/DataGetters.java
similarity index 96%
rename from paimon-common/src/main/java/org/apache/flink/table/store/data/DataGetters.java
rename to paimon-common/src/main/java/org/apache/paimon/data/DataGetters.java
index fe8b93bc5..8e838fc7b 100644
--- a/paimon-common/src/main/java/org/apache/flink/table/store/data/DataGetters.java
+++ b/paimon-common/src/main/java/org/apache/paimon/data/DataGetters.java
@@ -16,9 +16,9 @@
* limitations under the License.
*/
-package org.apache.flink.table.store.data;
+package org.apache.paimon.data;
-import org.apache.flink.table.store.annotation.Experimental;
+import org.apache.paimon.annotation.Experimental;
/**
* Getters to get data.
diff --git a/paimon-common/src/main/java/org/apache/flink/table/store/data/DataSetters.java b/paimon-common/src/main/java/org/apache/paimon/data/DataSetters.java
similarity index 98%
rename from paimon-common/src/main/java/org/apache/flink/table/store/data/DataSetters.java
rename to paimon-common/src/main/java/org/apache/paimon/data/DataSetters.java
index ec7298148..b66dfd197 100644
--- a/paimon-common/src/main/java/org/apache/flink/table/store/data/DataSetters.java
+++ b/paimon-common/src/main/java/org/apache/paimon/data/DataSetters.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.flink.table.store.data;
+package org.apache.paimon.data;
/**
* Provide type specialized setters to reduce if/else and eliminate box and unbox. This is mainly
diff --git a/paimon-common/src/main/java/org/apache/flink/table/store/data/Decimal.java b/paimon-common/src/main/java/org/apache/paimon/data/Decimal.java
similarity index 98%
rename from paimon-common/src/main/java/org/apache/flink/table/store/data/Decimal.java
rename to paimon-common/src/main/java/org/apache/paimon/data/Decimal.java
index 983b12c87..4a2f5de6f 100644
--- a/paimon-common/src/main/java/org/apache/flink/table/store/data/Decimal.java
+++ b/paimon-common/src/main/java/org/apache/paimon/data/Decimal.java
@@ -16,11 +16,12 @@
* limitations under the License.
*/
-package org.apache.flink.table.store.data;
+package org.apache.paimon.data;
-import org.apache.flink.table.store.annotation.Experimental;
import org.apache.flink.table.store.types.DecimalType;
+import org.apache.paimon.annotation.Experimental;
+
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
diff --git a/paimon-common/src/main/java/org/apache/flink/table/store/data/GenericArray.java b/paimon-common/src/main/java/org/apache/paimon/data/GenericArray.java
similarity index 98%
rename from paimon-common/src/main/java/org/apache/flink/table/store/data/GenericArray.java
rename to paimon-common/src/main/java/org/apache/paimon/data/GenericArray.java
index 609a329d5..3a826c768 100644
--- a/paimon-common/src/main/java/org/apache/flink/table/store/data/GenericArray.java
+++ b/paimon-common/src/main/java/org/apache/paimon/data/GenericArray.java
@@ -16,12 +16,13 @@
* limitations under the License.
*/
-package org.apache.flink.table.store.data;
+package org.apache.paimon.data;
-import org.apache.flink.table.store.annotation.Experimental;
import org.apache.flink.table.store.types.ArrayType;
import org.apache.flink.table.store.utils.ArrayUtils;
+import org.apache.paimon.annotation.Experimental;
+
import java.io.Serializable;
import java.util.Arrays;
import java.util.Objects;
diff --git a/paimon-common/src/main/java/org/apache/flink/table/store/data/GenericMap.java b/paimon-common/src/main/java/org/apache/paimon/data/GenericMap.java
similarity index 97%
rename from paimon-common/src/main/java/org/apache/flink/table/store/data/GenericMap.java
rename to paimon-common/src/main/java/org/apache/paimon/data/GenericMap.java
index 142d00e24..110c7fc01 100644
--- a/paimon-common/src/main/java/org/apache/flink/table/store/data/GenericMap.java
+++ b/paimon-common/src/main/java/org/apache/paimon/data/GenericMap.java
@@ -16,12 +16,13 @@
* limitations under the License.
*/
-package org.apache.flink.table.store.data;
+package org.apache.paimon.data;
-import org.apache.flink.table.store.annotation.Experimental;
import org.apache.flink.table.store.types.MapType;
import org.apache.flink.table.store.types.MultisetType;
+import org.apache.paimon.annotation.Experimental;
+
import java.io.Serializable;
import java.util.Map;
import java.util.Objects;
diff --git a/paimon-common/src/main/java/org/apache/flink/table/store/data/GenericRow.java b/paimon-common/src/main/java/org/apache/paimon/data/GenericRow.java
similarity index 98%
rename from paimon-common/src/main/java/org/apache/flink/table/store/data/GenericRow.java
rename to paimon-common/src/main/java/org/apache/paimon/data/GenericRow.java
index 09c7db287..5c04ace87 100644
--- a/paimon-common/src/main/java/org/apache/flink/table/store/data/GenericRow.java
+++ b/paimon-common/src/main/java/org/apache/paimon/data/GenericRow.java
@@ -16,12 +16,13 @@
* limitations under the License.
*/
-package org.apache.flink.table.store.data;
+package org.apache.paimon.data;
-import org.apache.flink.table.store.annotation.Experimental;
import org.apache.flink.table.store.types.RowKind;
import org.apache.flink.table.store.types.RowType;
+import org.apache.paimon.annotation.Experimental;
+
import java.io.Serializable;
import java.util.Arrays;
import java.util.Objects;
diff --git a/paimon-common/src/main/java/org/apache/flink/table/store/data/InternalArray.java b/paimon-common/src/main/java/org/apache/paimon/data/InternalArray.java
similarity index 98%
rename from paimon-common/src/main/java/org/apache/flink/table/store/data/InternalArray.java
rename to paimon-common/src/main/java/org/apache/paimon/data/InternalArray.java
index f6bb205d0..db8889de6 100644
--- a/paimon-common/src/main/java/org/apache/flink/table/store/data/InternalArray.java
+++ b/paimon-common/src/main/java/org/apache/paimon/data/InternalArray.java
@@ -16,12 +16,13 @@
* limitations under the License.
*/
-package org.apache.flink.table.store.data;
+package org.apache.paimon.data;
-import org.apache.flink.table.store.annotation.Experimental;
import org.apache.flink.table.store.types.ArrayType;
import org.apache.flink.table.store.types.DataType;
+import org.apache.paimon.annotation.Experimental;
+
import javax.annotation.Nullable;
import java.io.Serializable;
diff --git a/paimon-common/src/main/java/org/apache/flink/table/store/data/InternalMap.java b/paimon-common/src/main/java/org/apache/paimon/data/InternalMap.java
similarity index 94%
rename from paimon-common/src/main/java/org/apache/flink/table/store/data/InternalMap.java
rename to paimon-common/src/main/java/org/apache/paimon/data/InternalMap.java
index 4434c4f77..8f111083b 100644
--- a/paimon-common/src/main/java/org/apache/flink/table/store/data/InternalMap.java
+++ b/paimon-common/src/main/java/org/apache/paimon/data/InternalMap.java
@@ -16,12 +16,13 @@
* limitations under the License.
*/
-package org.apache.flink.table.store.data;
+package org.apache.paimon.data;
-import org.apache.flink.table.store.annotation.Experimental;
import org.apache.flink.table.store.types.MapType;
import org.apache.flink.table.store.types.MultisetType;
+import org.apache.paimon.annotation.Experimental;
+
/**
* Base interface of an internal data structure representing data of {@link MapType} or {@link
* MultisetType}.
diff --git a/paimon-common/src/main/java/org/apache/flink/table/store/data/InternalRow.java b/paimon-common/src/main/java/org/apache/paimon/data/InternalRow.java
similarity index 98%
rename from paimon-common/src/main/java/org/apache/flink/table/store/data/InternalRow.java
rename to paimon-common/src/main/java/org/apache/paimon/data/InternalRow.java
index 36893df19..9ae7e5cc0 100644
--- a/paimon-common/src/main/java/org/apache/flink/table/store/data/InternalRow.java
+++ b/paimon-common/src/main/java/org/apache/paimon/data/InternalRow.java
@@ -16,14 +16,15 @@
* limitations under the License.
*/
-package org.apache.flink.table.store.data;
+package org.apache.paimon.data;
-import org.apache.flink.table.store.annotation.Experimental;
import org.apache.flink.table.store.types.DataType;
import org.apache.flink.table.store.types.DataTypeChecks;
import org.apache.flink.table.store.types.RowKind;
import org.apache.flink.table.store.types.RowType;
+import org.apache.paimon.annotation.Experimental;
+
import javax.annotation.Nullable;
import java.io.Serializable;
diff --git a/paimon-common/src/main/java/org/apache/flink/table/store/data/JoinedRow.java b/paimon-common/src/main/java/org/apache/paimon/data/JoinedRow.java
similarity index 98%
rename from paimon-common/src/main/java/org/apache/flink/table/store/data/JoinedRow.java
rename to paimon-common/src/main/java/org/apache/paimon/data/JoinedRow.java
index 47d354525..f8424e3e4 100644
--- a/paimon-common/src/main/java/org/apache/flink/table/store/data/JoinedRow.java
+++ b/paimon-common/src/main/java/org/apache/paimon/data/JoinedRow.java
@@ -16,11 +16,12 @@
* limitations under the License.
*/
-package org.apache.flink.table.store.data;
+package org.apache.paimon.data;
-import org.apache.flink.table.store.annotation.Experimental;
import org.apache.flink.table.store.types.RowKind;
+import org.apache.paimon.annotation.Experimental;
+
import javax.annotation.Nullable;
import java.util.Objects;
diff --git a/paimon-common/src/main/java/org/apache/flink/table/store/data/LazyGenericRow.java b/paimon-common/src/main/java/org/apache/paimon/data/LazyGenericRow.java
similarity index 99%
rename from paimon-common/src/main/java/org/apache/flink/table/store/data/LazyGenericRow.java
rename to paimon-common/src/main/java/org/apache/paimon/data/LazyGenericRow.java
index 0d6be2be3..4bdd16333 100644
--- a/paimon-common/src/main/java/org/apache/flink/table/store/data/LazyGenericRow.java
+++ b/paimon-common/src/main/java/org/apache/paimon/data/LazyGenericRow.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.flink.table.store.data;
+package org.apache.paimon.data;
import org.apache.flink.table.store.types.RowKind;
diff --git a/paimon-common/src/main/java/org/apache/flink/table/store/data/NestedRow.java b/paimon-common/src/main/java/org/apache/paimon/data/NestedRow.java
similarity index 98%
rename from paimon-common/src/main/java/org/apache/flink/table/store/data/NestedRow.java
rename to paimon-common/src/main/java/org/apache/paimon/data/NestedRow.java
index 8ea6a3aff..a1a48c092 100644
--- a/paimon-common/src/main/java/org/apache/flink/table/store/data/NestedRow.java
+++ b/paimon-common/src/main/java/org/apache/paimon/data/NestedRow.java
@@ -15,14 +15,14 @@
* limitations under the License.
*/
-package org.apache.flink.table.store.data;
+package org.apache.paimon.data;
import org.apache.flink.table.store.memory.MemorySegment;
import org.apache.flink.table.store.memory.MemorySegmentUtils;
import org.apache.flink.table.store.types.RowKind;
-import static org.apache.flink.table.store.data.BinaryRow.calculateBitSetWidthInBytes;
import static org.apache.flink.table.store.utils.Preconditions.checkArgument;
+import static org.apache.paimon.data.BinaryRow.calculateBitSetWidthInBytes;
/**
* Its memory storage structure is exactly the same with {@link BinaryRow}. The only different is
diff --git a/paimon-common/src/main/java/org/apache/flink/table/store/data/RandomAccessInputView.java b/paimon-common/src/main/java/org/apache/paimon/data/RandomAccessInputView.java
similarity index 98%
rename from paimon-common/src/main/java/org/apache/flink/table/store/data/RandomAccessInputView.java
rename to paimon-common/src/main/java/org/apache/paimon/data/RandomAccessInputView.java
index 18de2307f..e244a63f6 100644
--- a/paimon-common/src/main/java/org/apache/flink/table/store/data/RandomAccessInputView.java
+++ b/paimon-common/src/main/java/org/apache/paimon/data/RandomAccessInputView.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.flink.table.store.data;
+package org.apache.paimon.data;
import org.apache.flink.table.store.io.SeekableDataInputView;
import org.apache.flink.table.store.memory.MemorySegment;
diff --git a/paimon-common/src/main/java/org/apache/flink/table/store/data/RandomAccessOutputView.java b/paimon-common/src/main/java/org/apache/paimon/data/RandomAccessOutputView.java
similarity index 97%
rename from paimon-common/src/main/java/org/apache/flink/table/store/data/RandomAccessOutputView.java
rename to paimon-common/src/main/java/org/apache/paimon/data/RandomAccessOutputView.java
index 4e3bd605d..49aec3e6d 100644
--- a/paimon-common/src/main/java/org/apache/flink/table/store/data/RandomAccessOutputView.java
+++ b/paimon-common/src/main/java/org/apache/paimon/data/RandomAccessOutputView.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.flink.table.store.data;
+package org.apache.paimon.data;
import org.apache.flink.table.store.memory.MemorySegment;
diff --git a/paimon-common/src/main/java/org/apache/flink/table/store/data/SimpleCollectingOutputView.java b/paimon-common/src/main/java/org/apache/paimon/data/SimpleCollectingOutputView.java
similarity index 98%
rename from paimon-common/src/main/java/org/apache/flink/table/store/data/SimpleCollectingOutputView.java
rename to paimon-common/src/main/java/org/apache/paimon/data/SimpleCollectingOutputView.java
index f17879281..387dc5f48 100644
--- a/paimon-common/src/main/java/org/apache/flink/table/store/data/SimpleCollectingOutputView.java
+++ b/paimon-common/src/main/java/org/apache/paimon/data/SimpleCollectingOutputView.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.flink.table.store.data;
+package org.apache.paimon.data;
import org.apache.flink.table.store.memory.MemorySegment;
import org.apache.flink.table.store.memory.MemorySegmentSource;
diff --git a/paimon-common/src/main/java/org/apache/flink/table/store/data/Timestamp.java b/paimon-common/src/main/java/org/apache/paimon/data/Timestamp.java
similarity index 98%
rename from paimon-common/src/main/java/org/apache/flink/table/store/data/Timestamp.java
rename to paimon-common/src/main/java/org/apache/paimon/data/Timestamp.java
index bb155ff2d..99849ac9a 100644
--- a/paimon-common/src/main/java/org/apache/flink/table/store/data/Timestamp.java
+++ b/paimon-common/src/main/java/org/apache/paimon/data/Timestamp.java
@@ -16,13 +16,14 @@
* limitations under the License.
*/
-package org.apache.flink.table.store.data;
+package org.apache.paimon.data;
-import org.apache.flink.table.store.annotation.Experimental;
import org.apache.flink.table.store.types.LocalZonedTimestampType;
import org.apache.flink.table.store.types.TimestampType;
import org.apache.flink.table.store.utils.Preconditions;
+import org.apache.paimon.annotation.Experimental;
+
import java.io.Serializable;
import java.time.Instant;
import java.time.LocalDate;
diff --git a/paimon-common/src/main/java/org/apache/flink/table/store/data/columnar/ArrayColumnVector.java b/paimon-common/src/main/java/org/apache/paimon/data/columnar/ArrayColumnVector.java
similarity index 89%
rename from paimon-common/src/main/java/org/apache/flink/table/store/data/columnar/ArrayColumnVector.java
rename to paimon-common/src/main/java/org/apache/paimon/data/columnar/ArrayColumnVector.java
index a3f7018dd..97ee1cc48 100644
--- a/paimon-common/src/main/java/org/apache/flink/table/store/data/columnar/ArrayColumnVector.java
+++ b/paimon-common/src/main/java/org/apache/paimon/data/columnar/ArrayColumnVector.java
@@ -16,9 +16,9 @@
* limitations under the License.
*/
-package org.apache.flink.table.store.data.columnar;
+package org.apache.paimon.data.columnar;
-import org.apache.flink.table.store.data.InternalArray;
+import org.apache.paimon.data.InternalArray;
/** Array column vector. */
public interface ArrayColumnVector extends ColumnVector {
diff --git a/paimon-common/src/main/java/org/apache/flink/table/store/data/columnar/BooleanColumnVector.java b/paimon-common/src/main/java/org/apache/paimon/data/columnar/BooleanColumnVector.java
similarity index 94%
rename from paimon-common/src/main/java/org/apache/flink/table/store/data/columnar/BooleanColumnVector.java
rename to paimon-common/src/main/java/org/apache/paimon/data/columnar/BooleanColumnVector.java
index 5e823645d..049b8697c 100644
--- a/paimon-common/src/main/java/org/apache/flink/table/store/data/columnar/BooleanColumnVector.java
+++ b/paimon-common/src/main/java/org/apache/paimon/data/columnar/BooleanColumnVector.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.flink.table.store.data.columnar;
+package org.apache.paimon.data.columnar;
/** Boolean column vector. */
public interface BooleanColumnVector extends ColumnVector {
diff --git a/paimon-common/src/main/java/org/apache/flink/table/store/data/columnar/ByteColumnVector.java b/paimon-common/src/main/java/org/apache/paimon/data/columnar/ByteColumnVector.java
similarity index 94%
rename from paimon-common/src/main/java/org/apache/flink/table/store/data/columnar/ByteColumnVector.java
rename to paimon-common/src/main/java/org/apache/paimon/data/columnar/ByteColumnVector.java
index ddf53d120..a6e2131b5 100644
--- a/paimon-common/src/main/java/org/apache/flink/table/store/data/columnar/ByteColumnVector.java
+++ b/paimon-common/src/main/java/org/apache/paimon/data/columnar/ByteColumnVector.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.flink.table.store.data.columnar;
+package org.apache.paimon.data.columnar;
/** Byte column vector. */
public interface ByteColumnVector extends ColumnVector {
diff --git a/paimon-common/src/main/java/org/apache/flink/table/store/data/columnar/BytesColumnVector.java b/paimon-common/src/main/java/org/apache/paimon/data/columnar/BytesColumnVector.java
similarity index 96%
rename from paimon-common/src/main/java/org/apache/flink/table/store/data/columnar/BytesColumnVector.java
rename to paimon-common/src/main/java/org/apache/paimon/data/columnar/BytesColumnVector.java
index 283550fb1..c50eee776 100644
--- a/paimon-common/src/main/java/org/apache/flink/table/store/data/columnar/BytesColumnVector.java
+++ b/paimon-common/src/main/java/org/apache/paimon/data/columnar/BytesColumnVector.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.flink.table.store.data.columnar;
+package org.apache.paimon.data.columnar;
/**
* Bytes column vector to get {@link Bytes}, it include original data and offset and length. The
diff --git a/paimon-common/src/main/java/org/apache/flink/table/store/data/columnar/ColumnVector.java b/paimon-common/src/main/java/org/apache/paimon/data/columnar/ColumnVector.java
similarity index 94%
rename from paimon-common/src/main/java/org/apache/flink/table/store/data/columnar/ColumnVector.java
rename to paimon-common/src/main/java/org/apache/paimon/data/columnar/ColumnVector.java
index 25a90d53e..612b28c02 100644
--- a/paimon-common/src/main/java/org/apache/flink/table/store/data/columnar/ColumnVector.java
+++ b/paimon-common/src/main/java/org/apache/paimon/data/columnar/ColumnVector.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.flink.table.store.data.columnar;
+package org.apache.paimon.data.columnar;
/** Nullable column vector. Access data through specific subclasses. */
public interface ColumnVector {
diff --git a/paimon-common/src/main/java/org/apache/flink/table/store/data/columnar/ColumnarArray.java b/paimon-common/src/main/java/org/apache/paimon/data/columnar/ColumnarArray.java
similarity index 94%
rename from paimon-common/src/main/java/org/apache/flink/table/store/data/columnar/ColumnarArray.java
rename to paimon-common/src/main/java/org/apache/paimon/data/columnar/ColumnarArray.java
index a56c461a0..d13bc7165 100644
--- a/paimon-common/src/main/java/org/apache/flink/table/store/data/columnar/ColumnarArray.java
+++ b/paimon-common/src/main/java/org/apache/paimon/data/columnar/ColumnarArray.java
@@ -16,15 +16,15 @@
* limitations under the License.
*/
-package org.apache.flink.table.store.data.columnar;
-
-import org.apache.flink.table.store.data.BinaryString;
-import org.apache.flink.table.store.data.DataSetters;
-import org.apache.flink.table.store.data.Decimal;
-import org.apache.flink.table.store.data.InternalArray;
-import org.apache.flink.table.store.data.InternalMap;
-import org.apache.flink.table.store.data.InternalRow;
-import org.apache.flink.table.store.data.Timestamp;
+package org.apache.paimon.data.columnar;
+
+import org.apache.paimon.data.BinaryString;
+import org.apache.paimon.data.DataSetters;
+import org.apache.paimon.data.Decimal;
+import org.apache.paimon.data.InternalArray;
+import org.apache.paimon.data.InternalMap;
+import org.apache.paimon.data.InternalRow;
+import org.apache.paimon.data.Timestamp;
import java.io.Serializable;
import java.util.Arrays;
diff --git a/paimon-common/src/main/java/org/apache/flink/table/store/data/columnar/ColumnarMap.java b/paimon-common/src/main/java/org/apache/paimon/data/columnar/ColumnarMap.java
similarity index 93%
rename from paimon-common/src/main/java/org/apache/flink/table/store/data/columnar/ColumnarMap.java
rename to paimon-common/src/main/java/org/apache/paimon/data/columnar/ColumnarMap.java
index 141702149..72bb47236 100644
--- a/paimon-common/src/main/java/org/apache/flink/table/store/data/columnar/ColumnarMap.java
+++ b/paimon-common/src/main/java/org/apache/paimon/data/columnar/ColumnarMap.java
@@ -16,10 +16,10 @@
* limitations under the License.
*/
-package org.apache.flink.table.store.data.columnar;
+package org.apache.paimon.data.columnar;
-import org.apache.flink.table.store.data.InternalArray;
-import org.apache.flink.table.store.data.InternalMap;
+import org.apache.paimon.data.InternalArray;
+import org.apache.paimon.data.InternalMap;
import java.io.Serializable;
diff --git a/paimon-common/src/main/java/org/apache/flink/table/store/data/columnar/ColumnarRow.java b/paimon-common/src/main/java/org/apache/paimon/data/columnar/ColumnarRow.java
similarity index 92%
rename from paimon-common/src/main/java/org/apache/flink/table/store/data/columnar/ColumnarRow.java
rename to paimon-common/src/main/java/org/apache/paimon/data/columnar/ColumnarRow.java
index 6d379bac1..1408104b0 100644
--- a/paimon-common/src/main/java/org/apache/flink/table/store/data/columnar/ColumnarRow.java
+++ b/paimon-common/src/main/java/org/apache/paimon/data/columnar/ColumnarRow.java
@@ -16,18 +16,19 @@
* limitations under the License.
*/
-package org.apache.flink.table.store.data.columnar;
-
-import org.apache.flink.table.store.data.BinaryString;
-import org.apache.flink.table.store.data.DataSetters;
-import org.apache.flink.table.store.data.Decimal;
-import org.apache.flink.table.store.data.InternalArray;
-import org.apache.flink.table.store.data.InternalMap;
-import org.apache.flink.table.store.data.InternalRow;
-import org.apache.flink.table.store.data.Timestamp;
-import org.apache.flink.table.store.data.columnar.BytesColumnVector.Bytes;
+package org.apache.paimon.data.columnar;
+
import org.apache.flink.table.store.types.RowKind;
+import org.apache.paimon.data.BinaryString;
+import org.apache.paimon.data.DataSetters;
+import org.apache.paimon.data.Decimal;
+import org.apache.paimon.data.InternalArray;
+import org.apache.paimon.data.InternalMap;
+import org.apache.paimon.data.InternalRow;
+import org.apache.paimon.data.Timestamp;
+import org.apache.paimon.data.columnar.BytesColumnVector.Bytes;
+
import java.io.Serializable;
/**
diff --git a/paimon-common/src/main/java/org/apache/flink/table/store/data/columnar/ColumnarRowIterator.java b/paimon-common/src/main/java/org/apache/paimon/data/columnar/ColumnarRowIterator.java
similarity index 94%
rename from paimon-common/src/main/java/org/apache/flink/table/store/data/columnar/ColumnarRowIterator.java
rename to paimon-common/src/main/java/org/apache/paimon/data/columnar/ColumnarRowIterator.java
index 3053428e6..bb97a44cb 100644
--- a/paimon-common/src/main/java/org/apache/flink/table/store/data/columnar/ColumnarRowIterator.java
+++ b/paimon-common/src/main/java/org/apache/paimon/data/columnar/ColumnarRowIterator.java
@@ -16,12 +16,13 @@
* limitations under the License.
*/
-package org.apache.flink.table.store.data.columnar;
+package org.apache.paimon.data.columnar;
-import org.apache.flink.table.store.data.InternalRow;
import org.apache.flink.table.store.reader.RecordReader;
import org.apache.flink.table.store.utils.RecyclableIterator;
+import org.apache.paimon.data.InternalRow;
+
import javax.annotation.Nullable;
/**
diff --git a/paimon-common/src/main/java/org/apache/flink/table/store/data/columnar/DecimalColumnVector.java b/paimon-common/src/main/java/org/apache/paimon/data/columnar/DecimalColumnVector.java
similarity index 90%
rename from paimon-common/src/main/java/org/apache/flink/table/store/data/columnar/DecimalColumnVector.java
rename to paimon-common/src/main/java/org/apache/paimon/data/columnar/DecimalColumnVector.java
index 4d8b4e3eb..648708435 100644
--- a/paimon-common/src/main/java/org/apache/flink/table/store/data/columnar/DecimalColumnVector.java
+++ b/paimon-common/src/main/java/org/apache/paimon/data/columnar/DecimalColumnVector.java
@@ -16,9 +16,9 @@
* limitations under the License.
*/
-package org.apache.flink.table.store.data.columnar;
+package org.apache.paimon.data.columnar;
-import org.apache.flink.table.store.data.Decimal;
+import org.apache.paimon.data.Decimal;
/** Decimal column vector. */
public interface DecimalColumnVector extends ColumnVector {
diff --git a/paimon-common/src/main/java/org/apache/flink/table/store/data/columnar/Dictionary.java b/paimon-common/src/main/java/org/apache/paimon/data/columnar/Dictionary.java
similarity index 91%
rename from paimon-common/src/main/java/org/apache/flink/table/store/data/columnar/Dictionary.java
rename to paimon-common/src/main/java/org/apache/paimon/data/columnar/Dictionary.java
index 7f77762f9..013c95d13 100644
--- a/paimon-common/src/main/java/org/apache/flink/table/store/data/columnar/Dictionary.java
+++ b/paimon-common/src/main/java/org/apache/paimon/data/columnar/Dictionary.java
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package org.apache.flink.table.store.data.columnar;
+package org.apache.paimon.data.columnar;
-import org.apache.flink.table.store.data.Timestamp;
+import org.apache.paimon.data.Timestamp;
/** The interface for dictionary in AbstractColumnVector to decode dictionary encoded values. */
public interface Dictionary {
diff --git a/paimon-common/src/main/java/org/apache/flink/table/store/data/columnar/DoubleColumnVector.java b/paimon-common/src/main/java/org/apache/paimon/data/columnar/DoubleColumnVector.java
similarity index 94%
rename from paimon-common/src/main/java/org/apache/flink/table/store/data/columnar/DoubleColumnVector.java
rename to paimon-common/src/main/java/org/apache/paimon/data/columnar/DoubleColumnVector.java
index 5e962afab..0f5b06c6a 100644
--- a/paimon-common/src/main/java/org/apache/flink/table/store/data/columnar/DoubleColumnVector.java
+++ b/paimon-common/src/main/java/org/apache/paimon/data/columnar/DoubleColumnVector.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.flink.table.store.data.columnar;
+package org.apache.paimon.data.columnar;
/** Double column vector. */
public interface DoubleColumnVector extends ColumnVector {
diff --git a/paimon-common/src/main/java/org/apache/flink/table/store/data/columnar/FloatColumnVector.java b/paimon-common/src/main/java/org/apache/paimon/data/columnar/FloatColumnVector.java
similarity index 94%
rename from paimon-common/src/main/java/org/apache/flink/table/store/data/columnar/FloatColumnVector.java
rename to paimon-common/src/main/java/org/apache/paimon/data/columnar/FloatColumnVector.java
index a1ed66564..bfa89fcfd 100644
--- a/paimon-common/src/main/java/org/apache/flink/table/store/data/columnar/FloatColumnVector.java
+++ b/paimon-common/src/main/java/org/apache/paimon/data/columnar/FloatColumnVector.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.flink.table.store.data.columnar;
+package org.apache.paimon.data.columnar;
/** Float column vector. */
public interface FloatColumnVector extends ColumnVector {
diff --git a/paimon-common/src/main/java/org/apache/flink/table/store/data/columnar/IntColumnVector.java b/paimon-common/src/main/java/org/apache/paimon/data/columnar/IntColumnVector.java
similarity index 94%
rename from paimon-common/src/main/java/org/apache/flink/table/store/data/columnar/IntColumnVector.java
rename to paimon-common/src/main/java/org/apache/paimon/data/columnar/IntColumnVector.java
index 5d7b3a966..43301569c 100644
--- a/paimon-common/src/main/java/org/apache/flink/table/store/data/columnar/IntColumnVector.java
+++ b/paimon-common/src/main/java/org/apache/paimon/data/columnar/IntColumnVector.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.flink.table.store.data.columnar;
+package org.apache.paimon.data.columnar;
/** Int column vector. */
public interface IntColumnVector extends ColumnVector {
diff --git a/paimon-common/src/main/java/org/apache/flink/table/store/data/columnar/LongColumnVector.java b/paimon-common/src/main/java/org/apache/paimon/data/columnar/LongColumnVector.java
similarity index 94%
rename from paimon-common/src/main/java/org/apache/flink/table/store/data/columnar/LongColumnVector.java
rename to paimon-common/src/main/java/org/apache/paimon/data/columnar/LongColumnVector.java
index 7c89809ab..0dad4a036 100644
--- a/paimon-common/src/main/java/org/apache/flink/table/store/data/columnar/LongColumnVector.java
+++ b/paimon-common/src/main/java/org/apache/paimon/data/columnar/LongColumnVector.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.flink.table.store.data.columnar;
+package org.apache.paimon.data.columnar;
/** Long column vector. */
public interface LongColumnVector extends ColumnVector {
diff --git a/paimon-common/src/main/java/org/apache/flink/table/store/data/columnar/MapColumnVector.java b/paimon-common/src/main/java/org/apache/paimon/data/columnar/MapColumnVector.java
similarity index 89%
rename from paimon-common/src/main/java/org/apache/flink/table/store/data/columnar/MapColumnVector.java
rename to paimon-common/src/main/java/org/apache/paimon/data/columnar/MapColumnVector.java
index dfd292d62..fc9ef8fba 100644
--- a/paimon-common/src/main/java/org/apache/flink/table/store/data/columnar/MapColumnVector.java
+++ b/paimon-common/src/main/java/org/apache/paimon/data/columnar/MapColumnVector.java
@@ -16,9 +16,9 @@
* limitations under the License.
*/
-package org.apache.flink.table.store.data.columnar;
+package org.apache.paimon.data.columnar;
-import org.apache.flink.table.store.data.InternalMap;
+import org.apache.paimon.data.InternalMap;
/** Map column vector. */
public interface MapColumnVector extends ColumnVector {
diff --git a/paimon-common/src/main/java/org/apache/flink/table/store/data/columnar/RowColumnVector.java b/paimon-common/src/main/java/org/apache/paimon/data/columnar/RowColumnVector.java
similarity index 94%
rename from paimon-common/src/main/java/org/apache/flink/table/store/data/columnar/RowColumnVector.java
rename to paimon-common/src/main/java/org/apache/paimon/data/columnar/RowColumnVector.java
index 3c638933b..891bb100d 100644
--- a/paimon-common/src/main/java/org/apache/flink/table/store/data/columnar/RowColumnVector.java
+++ b/paimon-common/src/main/java/org/apache/paimon/data/columnar/RowColumnVector.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.flink.table.store.data.columnar;
+package org.apache.paimon.data.columnar;
/** Row column vector. */
public interface RowColumnVector extends ColumnVector {
diff --git a/paimon-common/src/main/java/org/apache/flink/table/store/data/columnar/ShortColumnVector.java b/paimon-common/src/main/java/org/apache/paimon/data/columnar/ShortColumnVector.java
similarity index 94%
rename from paimon-common/src/main/java/org/apache/flink/table/store/data/columnar/ShortColumnVector.java
rename to paimon-common/src/main/java/org/apache/paimon/data/columnar/ShortColumnVector.java
index 58793d048..e940c9314 100644
--- a/paimon-common/src/main/java/org/apache/flink/table/store/data/columnar/ShortColumnVector.java
+++ b/paimon-common/src/main/java/org/apache/paimon/data/columnar/ShortColumnVector.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.flink.table.store.data.columnar;
+package org.apache.paimon.data.columnar;
/** Short column vector. */
public interface ShortColumnVector extends ColumnVector {
diff --git a/paimon-common/src/main/java/org/apache/flink/table/store/data/columnar/TimestampColumnVector.java b/paimon-common/src/main/java/org/apache/paimon/data/columnar/TimestampColumnVector.java
similarity index 90%
rename from paimon-common/src/main/java/org/apache/flink/table/store/data/columnar/TimestampColumnVector.java
rename to paimon-common/src/main/java/org/apache/paimon/data/columnar/TimestampColumnVector.java
index 094de9757..43ebd807e 100644
--- a/paimon-common/src/main/java/org/apache/flink/table/store/data/columnar/TimestampColumnVector.java
+++ b/paimon-common/src/main/java/org/apache/paimon/data/columnar/TimestampColumnVector.java
@@ -16,9 +16,9 @@
* limitations under the License.
*/
-package org.apache.flink.table.store.data.columnar;
+package org.apache.paimon.data.columnar;
-import org.apache.flink.table.store.data.Timestamp;
+import org.apache.paimon.data.Timestamp;
/** Timestamp column vector. */
public interface TimestampColumnVector extends ColumnVector {
diff --git a/paimon-common/src/main/java/org/apache/flink/table/store/data/columnar/VectorizedColumnBatch.java b/paimon-common/src/main/java/org/apache/paimon/data/columnar/VectorizedColumnBatch.java
similarity index 89%
rename from paimon-common/src/main/java/org/apache/flink/table/store/data/columnar/VectorizedColumnBatch.java
rename to paimon-common/src/main/java/org/apache/paimon/data/columnar/VectorizedColumnBatch.java
index a45408bbc..3ea392934 100644
--- a/paimon-common/src/main/java/org/apache/flink/table/store/data/columnar/VectorizedColumnBatch.java
+++ b/paimon-common/src/main/java/org/apache/paimon/data/columnar/VectorizedColumnBatch.java
@@ -16,14 +16,14 @@
* limitations under the License.
*/
-package org.apache.flink.table.store.data.columnar;
+package org.apache.paimon.data.columnar;
-import org.apache.flink.table.store.data.Decimal;
-import org.apache.flink.table.store.data.InternalArray;
-import org.apache.flink.table.store.data.InternalMap;
-import org.apache.flink.table.store.data.InternalRow;
-import org.apache.flink.table.store.data.Timestamp;
-import org.apache.flink.table.store.data.columnar.BytesColumnVector.Bytes;
+import org.apache.paimon.data.Decimal;
+import org.apache.paimon.data.InternalArray;
+import org.apache.paimon.data.InternalMap;
+import org.apache.paimon.data.InternalRow;
+import org.apache.paimon.data.Timestamp;
+import org.apache.paimon.data.columnar.BytesColumnVector.Bytes;
import java.io.Serializable;
import java.nio.charset.StandardCharsets;
@@ -44,7 +44,7 @@ public class VectorizedColumnBatch implements Serializable {
public static final int DEFAULT_SIZE = 2048;
private int numRows;
- public final org.apache.flink.table.store.data.columnar.ColumnVector[] columns;
+ public final org.apache.paimon.data.columnar.ColumnVector[] columns;
public VectorizedColumnBatch(ColumnVector[] vectors) {
this.columns = vectors;
diff --git a/paimon-common/src/main/java/org/apache/flink/table/store/data/columnar/heap/AbstractHeapVector.java b/paimon-common/src/main/java/org/apache/paimon/data/columnar/heap/AbstractHeapVector.java
similarity index 96%
rename from paimon-common/src/main/java/org/apache/flink/table/store/data/columnar/heap/AbstractHeapVector.java
rename to paimon-common/src/main/java/org/apache/paimon/data/columnar/heap/AbstractHeapVector.java
index 72c9adaa3..3b865568a 100644
--- a/paimon-common/src/main/java/org/apache/flink/table/store/data/columnar/heap/AbstractHeapVector.java
+++ b/paimon-common/src/main/java/org/apache/paimon/data/columnar/heap/AbstractHeapVector.java
@@ -16,11 +16,12 @@
* limitations under the License.
*/
-package org.apache.flink.table.store.data.columnar.heap;
+package org.apache.paimon.data.columnar.heap;
-import org.apache.flink.table.store.data.columnar.writable.AbstractWritableVector;
import org.apache.flink.table.store.memory.MemorySegment;
+import org.apache.paimon.data.columnar.writable.AbstractWritableVector;
+
import java.nio.ByteOrder;
import java.util.Arrays;
diff --git a/paimon-common/src/main/java/org/apache/flink/table/store/data/columnar/heap/HeapArrayVector.java b/paimon-common/src/main/java/org/apache/paimon/data/columnar/heap/HeapArrayVector.java
similarity index 84%
rename from paimon-common/src/main/java/org/apache/flink/table/store/data/columnar/heap/HeapArrayVector.java
rename to paimon-common/src/main/java/org/apache/paimon/data/columnar/heap/HeapArrayVector.java
index bb3cfefff..cdcad94ed 100644
--- a/paimon-common/src/main/java/org/apache/flink/table/store/data/columnar/heap/HeapArrayVector.java
+++ b/paimon-common/src/main/java/org/apache/paimon/data/columnar/heap/HeapArrayVector.java
@@ -16,13 +16,13 @@
* limitations under the License.
*/
-package org.apache.flink.table.store.data.columnar.heap;
+package org.apache.paimon.data.columnar.heap;
-import org.apache.flink.table.store.data.InternalArray;
-import org.apache.flink.table.store.data.columnar.ArrayColumnVector;
-import org.apache.flink.table.store.data.columnar.ColumnVector;
-import org.apache.flink.table.store.data.columnar.ColumnarArray;
-import org.apache.flink.table.store.data.columnar.writable.WritableColumnVector;
+import org.apache.paimon.data.InternalArray;
+import org.apache.paimon.data.columnar.ArrayColumnVector;
+import org.apache.paimon.data.columnar.ColumnVector;
+import org.apache.paimon.data.columnar.ColumnarArray;
+import org.apache.paimon.data.columnar.writable.WritableColumnVector;
/** This class represents a nullable heap array column vector. */
public class HeapArrayVector extends AbstractHeapVector
diff --git a/paimon-common/src/main/java/org/apache/flink/table/store/data/columnar/heap/HeapBooleanVector.java b/paimon-common/src/main/java/org/apache/paimon/data/columnar/heap/HeapBooleanVector.java
similarity index 92%
rename from paimon-common/src/main/java/org/apache/flink/table/store/data/columnar/heap/HeapBooleanVector.java
rename to paimon-common/src/main/java/org/apache/paimon/data/columnar/heap/HeapBooleanVector.java
index 026086f48..90fdcf3c2 100644
--- a/paimon-common/src/main/java/org/apache/flink/table/store/data/columnar/heap/HeapBooleanVector.java
+++ b/paimon-common/src/main/java/org/apache/paimon/data/columnar/heap/HeapBooleanVector.java
@@ -16,9 +16,9 @@
* limitations under the License.
*/
-package org.apache.flink.table.store.data.columnar.heap;
+package org.apache.paimon.data.columnar.heap;
-import org.apache.flink.table.store.data.columnar.writable.WritableBooleanVector;
+import org.apache.paimon.data.columnar.writable.WritableBooleanVector;
import java.util.Arrays;
diff --git a/paimon-common/src/main/java/org/apache/flink/table/store/data/columnar/heap/HeapByteVector.java b/paimon-common/src/main/java/org/apache/paimon/data/columnar/heap/HeapByteVector.java
similarity index 92%
rename from paimon-common/src/main/java/org/apache/flink/table/store/data/columnar/heap/HeapByteVector.java
rename to paimon-common/src/main/java/org/apache/paimon/data/columnar/heap/HeapByteVector.java
index eba7d86c6..c9cdeacd1 100644
--- a/paimon-common/src/main/java/org/apache/flink/table/store/data/columnar/heap/HeapByteVector.java
+++ b/paimon-common/src/main/java/org/apache/paimon/data/columnar/heap/HeapByteVector.java
@@ -16,9 +16,9 @@
* limitations under the License.
*/
-package org.apache.flink.table.store.data.columnar.heap;
+package org.apache.paimon.data.columnar.heap;
-import org.apache.flink.table.store.data.columnar.writable.WritableByteVector;
+import org.apache.paimon.data.columnar.writable.WritableByteVector;
import java.util.Arrays;
diff --git a/paimon-common/src/main/java/org/apache/flink/table/store/data/columnar/heap/HeapBytesVector.java b/paimon-common/src/main/java/org/apache/paimon/data/columnar/heap/HeapBytesVector.java
similarity index 96%
rename from paimon-common/src/main/java/org/apache/flink/table/store/data/columnar/heap/HeapBytesVector.java
rename to paimon-common/src/main/java/org/apache/paimon/data/columnar/heap/HeapBytesVector.java
index 8d7a236e2..d4936b0b8 100644
--- a/paimon-common/src/main/java/org/apache/flink/table/store/data/columnar/heap/HeapBytesVector.java
+++ b/paimon-common/src/main/java/org/apache/paimon/data/columnar/heap/HeapBytesVector.java
@@ -16,9 +16,9 @@
* limitations under the License.
*/
-package org.apache.flink.table.store.data.columnar.heap;
+package org.apache.paimon.data.columnar.heap;
-import org.apache.flink.table.store.data.columnar.writable.WritableBytesVector;
+import org.apache.paimon.data.columnar.writable.WritableBytesVector;
import java.util.Arrays;
diff --git a/paimon-common/src/main/java/org/apache/flink/table/store/data/columnar/heap/HeapDoubleVector.java b/paimon-common/src/main/java/org/apache/paimon/data/columnar/heap/HeapDoubleVector.java
similarity index 95%
rename from paimon-common/src/main/java/org/apache/flink/table/store/data/columnar/heap/HeapDoubleVector.java
rename to paimon-common/src/main/java/org/apache/paimon/data/columnar/heap/HeapDoubleVector.java
index a5b08a7f7..1df8fcd45 100644
--- a/paimon-common/src/main/java/org/apache/flink/table/store/data/columnar/heap/HeapDoubleVector.java
+++ b/paimon-common/src/main/java/org/apache/paimon/data/columnar/heap/HeapDoubleVector.java
@@ -16,9 +16,9 @@
* limitations under the License.
*/
-package org.apache.flink.table.store.data.columnar.heap;
+package org.apache.paimon.data.columnar.heap;
-import org.apache.flink.table.store.data.columnar.writable.WritableDoubleVector;
+import org.apache.paimon.data.columnar.writable.WritableDoubleVector;
import java.nio.ByteBuffer;
import java.nio.ByteOrder;
diff --git a/paimon-common/src/main/java/org/apache/flink/table/store/data/columnar/heap/HeapFloatVector.java b/paimon-common/src/main/java/org/apache/paimon/data/columnar/heap/HeapFloatVector.java
similarity index 95%
rename from paimon-common/src/main/java/org/apache/flink/table/store/data/columnar/heap/HeapFloatVector.java
rename to paimon-common/src/main/java/org/apache/paimon/data/columnar/heap/HeapFloatVector.java
index 71f808f4b..f9e5305e2 100644
--- a/paimon-common/src/main/java/org/apache/flink/table/store/data/columnar/heap/HeapFloatVector.java
+++ b/paimon-common/src/main/java/org/apache/paimon/data/columnar/heap/HeapFloatVector.java
@@ -16,9 +16,9 @@
* limitations under the License.
*/
-package org.apache.flink.table.store.data.columnar.heap;
+package org.apache.paimon.data.columnar.heap;
-import org.apache.flink.table.store.data.columnar.writable.WritableFloatVector;
+import org.apache.paimon.data.columnar.writable.WritableFloatVector;
import java.nio.ByteBuffer;
import java.nio.ByteOrder;
diff --git a/paimon-common/src/main/java/org/apache/flink/table/store/data/columnar/heap/HeapIntVector.java b/paimon-common/src/main/java/org/apache/paimon/data/columnar/heap/HeapIntVector.java
similarity index 95%
rename from paimon-common/src/main/java/org/apache/flink/table/store/data/columnar/heap/HeapIntVector.java
rename to paimon-common/src/main/java/org/apache/paimon/data/columnar/heap/HeapIntVector.java
index ff52f4e03..347ad8e57 100644
--- a/paimon-common/src/main/java/org/apache/flink/table/store/data/columnar/heap/HeapIntVector.java
+++ b/paimon-common/src/main/java/org/apache/paimon/data/columnar/heap/HeapIntVector.java
@@ -16,9 +16,9 @@
* limitations under the License.
*/
-package org.apache.flink.table.store.data.columnar.heap;
+package org.apache.paimon.data.columnar.heap;
-import org.apache.flink.table.store.data.columnar.writable.WritableIntVector;
+import org.apache.paimon.data.columnar.writable.WritableIntVector;
import java.util.Arrays;
diff --git a/paimon-common/src/main/java/org/apache/flink/table/store/data/columnar/heap/HeapLongVector.java b/paimon-common/src/main/java/org/apache/paimon/data/columnar/heap/HeapLongVector.java
similarity index 95%
rename from paimon-common/src/main/java/org/apache/flink/table/store/data/columnar/heap/HeapLongVector.java
rename to paimon-common/src/main/java/org/apache/paimon/data/columnar/heap/HeapLongVector.java
index bda26bc2b..f5cc5ec7f 100644
--- a/paimon-common/src/main/java/org/apache/flink/table/store/data/columnar/heap/HeapLongVector.java
+++ b/paimon-common/src/main/java/org/apache/paimon/data/columnar/heap/HeapLongVector.java
@@ -16,9 +16,9 @@
* limitations under the License.
*/
-package org.apache.flink.table.store.data.columnar.heap;
+package org.apache.paimon.data.columnar.heap;
-import org.apache.flink.table.store.data.columnar.writable.WritableLongVector;
+import org.apache.paimon.data.columnar.writable.WritableLongVector;
import java.util.Arrays;
diff --git a/paimon-common/src/main/java/org/apache/flink/table/store/data/columnar/heap/HeapMapVector.java b/paimon-common/src/main/java/org/apache/paimon/data/columnar/heap/HeapMapVector.java
similarity index 83%
rename from paimon-common/src/main/java/org/apache/flink/table/store/data/columnar/heap/HeapMapVector.java
rename to paimon-common/src/main/java/org/apache/paimon/data/columnar/heap/HeapMapVector.java
index 7d84a741d..5ee016719 100644
--- a/paimon-common/src/main/java/org/apache/flink/table/store/data/columnar/heap/HeapMapVector.java
+++ b/paimon-common/src/main/java/org/apache/paimon/data/columnar/heap/HeapMapVector.java
@@ -16,13 +16,13 @@
* limitations under the License.
*/
-package org.apache.flink.table.store.data.columnar.heap;
+package org.apache.paimon.data.columnar.heap;
-import org.apache.flink.table.store.data.InternalMap;
-import org.apache.flink.table.store.data.columnar.ColumnVector;
-import org.apache.flink.table.store.data.columnar.ColumnarMap;
-import org.apache.flink.table.store.data.columnar.MapColumnVector;
-import org.apache.flink.table.store.data.columnar.writable.WritableColumnVector;
+import org.apache.paimon.data.InternalMap;
+import org.apache.paimon.data.columnar.ColumnVector;
+import org.apache.paimon.data.columnar.ColumnarMap;
+import org.apache.paimon.data.columnar.MapColumnVector;
+import org.apache.paimon.data.columnar.writable.WritableColumnVector;
/** This class represents a nullable heap map column vector. */
public class HeapMapVector extends AbstractHeapVector
diff --git a/paimon-common/src/main/java/org/apache/flink/table/store/data/columnar/heap/HeapRowVector.java b/paimon-common/src/main/java/org/apache/paimon/data/columnar/heap/HeapRowVector.java
similarity index 82%
rename from paimon-common/src/main/java/org/apache/flink/table/store/data/columnar/heap/HeapRowVector.java
rename to paimon-common/src/main/java/org/apache/paimon/data/columnar/heap/HeapRowVector.java
index 73ff4ed82..034009805 100644
--- a/paimon-common/src/main/java/org/apache/flink/table/store/data/columnar/heap/HeapRowVector.java
+++ b/paimon-common/src/main/java/org/apache/paimon/data/columnar/heap/HeapRowVector.java
@@ -16,12 +16,12 @@
* limitations under the License.
*/
-package org.apache.flink.table.store.data.columnar.heap;
+package org.apache.paimon.data.columnar.heap;
-import org.apache.flink.table.store.data.columnar.ColumnarRow;
-import org.apache.flink.table.store.data.columnar.RowColumnVector;
-import org.apache.flink.table.store.data.columnar.VectorizedColumnBatch;
-import org.apache.flink.table.store.data.columnar.writable.WritableColumnVector;
+import org.apache.paimon.data.columnar.ColumnarRow;
+import org.apache.paimon.data.columnar.RowColumnVector;
+import org.apache.paimon.data.columnar.VectorizedColumnBatch;
+import org.apache.paimon.data.columnar.writable.WritableColumnVector;
/** This class represents a nullable heap row column vector. */
public class HeapRowVector extends AbstractHeapVector
diff --git a/paimon-common/src/main/java/org/apache/flink/table/store/data/columnar/heap/HeapShortVector.java b/paimon-common/src/main/java/org/apache/paimon/data/columnar/heap/HeapShortVector.java
similarity index 92%
rename from paimon-common/src/main/java/org/apache/flink/table/store/data/columnar/heap/HeapShortVector.java
rename to paimon-common/src/main/java/org/apache/paimon/data/columnar/heap/HeapShortVector.java
index c31bc422f..796ad06b8 100644
--- a/paimon-common/src/main/java/org/apache/flink/table/store/data/columnar/heap/HeapShortVector.java
+++ b/paimon-common/src/main/java/org/apache/paimon/data/columnar/heap/HeapShortVector.java
@@ -16,9 +16,9 @@
* limitations under the License.
*/
-package org.apache.flink.table.store.data.columnar.heap;
+package org.apache.paimon.data.columnar.heap;
-import org.apache.flink.table.store.data.columnar.writable.WritableShortVector;
+import org.apache.paimon.data.columnar.writable.WritableShortVector;
import java.util.Arrays;
diff --git a/paimon-common/src/main/java/org/apache/flink/table/store/data/columnar/heap/HeapTimestampVector.java b/paimon-common/src/main/java/org/apache/paimon/data/columnar/heap/HeapTimestampVector.java
similarity index 91%
rename from paimon-common/src/main/java/org/apache/flink/table/store/data/columnar/heap/HeapTimestampVector.java
rename to paimon-common/src/main/java/org/apache/paimon/data/columnar/heap/HeapTimestampVector.java
index a0d25e174..1a8d8bbb3 100644
--- a/paimon-common/src/main/java/org/apache/flink/table/store/data/columnar/heap/HeapTimestampVector.java
+++ b/paimon-common/src/main/java/org/apache/paimon/data/columnar/heap/HeapTimestampVector.java
@@ -16,10 +16,10 @@
* limitations under the License.
*/
-package org.apache.flink.table.store.data.columnar.heap;
+package org.apache.paimon.data.columnar.heap;
-import org.apache.flink.table.store.data.Timestamp;
-import org.apache.flink.table.store.data.columnar.writable.WritableTimestampVector;
+import org.apache.paimon.data.Timestamp;
+import org.apache.paimon.data.columnar.writable.WritableTimestampVector;
import java.util.Arrays;
diff --git a/paimon-common/src/main/java/org/apache/flink/table/store/data/columnar/writable/AbstractWritableVector.java b/paimon-common/src/main/java/org/apache/paimon/data/columnar/writable/AbstractWritableVector.java
similarity index 90%
rename from paimon-common/src/main/java/org/apache/flink/table/store/data/columnar/writable/AbstractWritableVector.java
rename to paimon-common/src/main/java/org/apache/paimon/data/columnar/writable/AbstractWritableVector.java
index d19bee072..20c2c619f 100644
--- a/paimon-common/src/main/java/org/apache/flink/table/store/data/columnar/writable/AbstractWritableVector.java
+++ b/paimon-common/src/main/java/org/apache/paimon/data/columnar/writable/AbstractWritableVector.java
@@ -16,10 +16,10 @@
* limitations under the License.
*/
-package org.apache.flink.table.store.data.columnar.writable;
+package org.apache.paimon.data.columnar.writable;
-import org.apache.flink.table.store.data.columnar.ColumnVector;
-import org.apache.flink.table.store.data.columnar.Dictionary;
+import org.apache.paimon.data.columnar.ColumnVector;
+import org.apache.paimon.data.columnar.Dictionary;
import java.io.Serializable;
diff --git a/paimon-common/src/main/java/org/apache/flink/table/store/data/columnar/writable/WritableBooleanVector.java b/paimon-common/src/main/java/org/apache/paimon/data/columnar/writable/WritableBooleanVector.java
similarity index 89%
rename from paimon-common/src/main/java/org/apache/flink/table/store/data/columnar/writable/WritableBooleanVector.java
rename to paimon-common/src/main/java/org/apache/paimon/data/columnar/writable/WritableBooleanVector.java
index f42734369..43f0e8a11 100644
--- a/paimon-common/src/main/java/org/apache/flink/table/store/data/columnar/writable/WritableBooleanVector.java
+++ b/paimon-common/src/main/java/org/apache/paimon/data/columnar/writable/WritableBooleanVector.java
@@ -16,9 +16,9 @@
* limitations under the License.
*/
-package org.apache.flink.table.store.data.columnar.writable;
+package org.apache.paimon.data.columnar.writable;
-import org.apache.flink.table.store.data.columnar.BooleanColumnVector;
+import org.apache.paimon.data.columnar.BooleanColumnVector;
/** Writable {@link BooleanColumnVector}. */
public interface WritableBooleanVector extends WritableColumnVector, BooleanColumnVector {
diff --git a/paimon-common/src/main/java/org/apache/flink/table/store/data/columnar/writable/WritableByteVector.java b/paimon-common/src/main/java/org/apache/paimon/data/columnar/writable/WritableByteVector.java
similarity index 89%
rename from paimon-common/src/main/java/org/apache/flink/table/store/data/columnar/writable/WritableByteVector.java
rename to paimon-common/src/main/java/org/apache/paimon/data/columnar/writable/WritableByteVector.java
index beeab10a5..7ed6240d9 100644
--- a/paimon-common/src/main/java/org/apache/flink/table/store/data/columnar/writable/WritableByteVector.java
+++ b/paimon-common/src/main/java/org/apache/paimon/data/columnar/writable/WritableByteVector.java
@@ -16,9 +16,9 @@
* limitations under the License.
*/
-package org.apache.flink.table.store.data.columnar.writable;
+package org.apache.paimon.data.columnar.writable;
-import org.apache.flink.table.store.data.columnar.ByteColumnVector;
+import org.apache.paimon.data.columnar.ByteColumnVector;
/** Writable {@link ByteColumnVector}. */
public interface WritableByteVector extends WritableColumnVector, ByteColumnVector {
diff --git a/paimon-common/src/main/java/org/apache/flink/table/store/data/columnar/writable/WritableBytesVector.java b/paimon-common/src/main/java/org/apache/paimon/data/columnar/writable/WritableBytesVector.java
similarity index 90%
rename from paimon-common/src/main/java/org/apache/flink/table/store/data/columnar/writable/WritableBytesVector.java
rename to paimon-common/src/main/java/org/apache/paimon/data/columnar/writable/WritableBytesVector.java
index 062f870ad..e39eb397f 100644
--- a/paimon-common/src/main/java/org/apache/flink/table/store/data/columnar/writable/WritableBytesVector.java
+++ b/paimon-common/src/main/java/org/apache/paimon/data/columnar/writable/WritableBytesVector.java
@@ -16,9 +16,9 @@
* limitations under the License.
*/
-package org.apache.flink.table.store.data.columnar.writable;
+package org.apache.paimon.data.columnar.writable;
-import org.apache.flink.table.store.data.columnar.BytesColumnVector;
+import org.apache.paimon.data.columnar.BytesColumnVector;
/** Writable {@link BytesColumnVector}. */
public interface WritableBytesVector extends WritableColumnVector, BytesColumnVector {
diff --git a/paimon-common/src/main/java/org/apache/flink/table/store/data/columnar/writable/WritableColumnVector.java b/paimon-common/src/main/java/org/apache/paimon/data/columnar/writable/WritableColumnVector.java
similarity index 90%
rename from paimon-common/src/main/java/org/apache/flink/table/store/data/columnar/writable/WritableColumnVector.java
rename to paimon-common/src/main/java/org/apache/paimon/data/columnar/writable/WritableColumnVector.java
index 3de8f6b4c..3163404cc 100644
--- a/paimon-common/src/main/java/org/apache/flink/table/store/data/columnar/writable/WritableColumnVector.java
+++ b/paimon-common/src/main/java/org/apache/paimon/data/columnar/writable/WritableColumnVector.java
@@ -16,10 +16,10 @@
* limitations under the License.
*/
-package org.apache.flink.table.store.data.columnar.writable;
+package org.apache.paimon.data.columnar.writable;
-import org.apache.flink.table.store.data.columnar.ColumnVector;
-import org.apache.flink.table.store.data.columnar.Dictionary;
+import org.apache.paimon.data.columnar.ColumnVector;
+import org.apache.paimon.data.columnar.Dictionary;
/** Writable {@link ColumnVector}. */
public interface WritableColumnVector extends ColumnVector {
diff --git a/paimon-common/src/main/java/org/apache/flink/table/store/data/columnar/writable/WritableDoubleVector.java b/paimon-common/src/main/java/org/apache/paimon/data/columnar/writable/WritableDoubleVector.java
similarity index 92%
rename from paimon-common/src/main/java/org/apache/flink/table/store/data/columnar/writable/WritableDoubleVector.java
rename to paimon-common/src/main/java/org/apache/paimon/data/columnar/writable/WritableDoubleVector.java
index a1974e8e7..ab8285090 100644
--- a/paimon-common/src/main/java/org/apache/flink/table/store/data/columnar/writable/WritableDoubleVector.java
+++ b/paimon-common/src/main/java/org/apache/paimon/data/columnar/writable/WritableDoubleVector.java
@@ -16,9 +16,9 @@
* limitations under the License.
*/
-package org.apache.flink.table.store.data.columnar.writable;
+package org.apache.paimon.data.columnar.writable;
-import org.apache.flink.table.store.data.columnar.DoubleColumnVector;
+import org.apache.paimon.data.columnar.DoubleColumnVector;
/** Writable {@link DoubleColumnVector}. */
public interface WritableDoubleVector extends WritableColumnVector, DoubleColumnVector {
diff --git a/paimon-common/src/main/java/org/apache/flink/table/store/data/columnar/writable/WritableFloatVector.java b/paimon-common/src/main/java/org/apache/paimon/data/columnar/writable/WritableFloatVector.java
similarity index 92%
rename from paimon-common/src/main/java/org/apache/flink/table/store/data/columnar/writable/WritableFloatVector.java
rename to paimon-common/src/main/java/org/apache/paimon/data/columnar/writable/WritableFloatVector.java
index b0ec5b26f..79c713c57 100644
--- a/paimon-common/src/main/java/org/apache/flink/table/store/data/columnar/writable/WritableFloatVector.java
+++ b/paimon-common/src/main/java/org/apache/paimon/data/columnar/writable/WritableFloatVector.java
@@ -16,9 +16,9 @@
* limitations under the License.
*/
-package org.apache.flink.table.store.data.columnar.writable;
+package org.apache.paimon.data.columnar.writable;
-import org.apache.flink.table.store.data.columnar.FloatColumnVector;
+import org.apache.paimon.data.columnar.FloatColumnVector;
/** Writable {@link FloatColumnVector}. */
public interface WritableFloatVector extends WritableColumnVector, FloatColumnVector {
diff --git a/paimon-common/src/main/java/org/apache/flink/table/store/data/columnar/writable/WritableIntVector.java b/paimon-common/src/main/java/org/apache/paimon/data/columnar/writable/WritableIntVector.java
similarity index 93%
rename from paimon-common/src/main/java/org/apache/flink/table/store/data/columnar/writable/WritableIntVector.java
rename to paimon-common/src/main/java/org/apache/paimon/data/columnar/writable/WritableIntVector.java
index 82280f7d3..79c99230f 100644
--- a/paimon-common/src/main/java/org/apache/flink/table/store/data/columnar/writable/WritableIntVector.java
+++ b/paimon-common/src/main/java/org/apache/paimon/data/columnar/writable/WritableIntVector.java
@@ -16,9 +16,9 @@
* limitations under the License.
*/
-package org.apache.flink.table.store.data.columnar.writable;
+package org.apache.paimon.data.columnar.writable;
-import org.apache.flink.table.store.data.columnar.IntColumnVector;
+import org.apache.paimon.data.columnar.IntColumnVector;
/** Writable {@link IntColumnVector}. */
public interface WritableIntVector extends WritableColumnVector, IntColumnVector {
diff --git a/paimon-common/src/main/java/org/apache/flink/table/store/data/columnar/writable/WritableLongVector.java b/paimon-common/src/main/java/org/apache/paimon/data/columnar/writable/WritableLongVector.java
similarity index 92%
rename from paimon-common/src/main/java/org/apache/flink/table/store/data/columnar/writable/WritableLongVector.java
rename to paimon-common/src/main/java/org/apache/paimon/data/columnar/writable/WritableLongVector.java
index 41a4f8529..fc0e70aa8 100644
--- a/paimon-common/src/main/java/org/apache/flink/table/store/data/columnar/writable/WritableLongVector.java
+++ b/paimon-common/src/main/java/org/apache/paimon/data/columnar/writable/WritableLongVector.java
@@ -16,9 +16,9 @@
* limitations under the License.
*/
-package org.apache.flink.table.store.data.columnar.writable;
+package org.apache.paimon.data.columnar.writable;
-import org.apache.flink.table.store.data.columnar.LongColumnVector;
+import org.apache.paimon.data.columnar.LongColumnVector;
/** Writable {@link LongColumnVector}. */
public interface WritableLongVector extends WritableColumnVector, LongColumnVector {
diff --git a/paimon-common/src/main/java/org/apache/flink/table/store/data/columnar/writable/WritableShortVector.java b/paimon-common/src/main/java/org/apache/paimon/data/columnar/writable/WritableShortVector.java
similarity index 89%
rename from paimon-common/src/main/java/org/apache/flink/table/store/data/columnar/writable/WritableShortVector.java
rename to paimon-common/src/main/java/org/apache/paimon/data/columnar/writable/WritableShortVector.java
index d4656e4e1..9d1ba7f4f 100644
--- a/paimon-common/src/main/java/org/apache/flink/table/store/data/columnar/writable/WritableShortVector.java
+++ b/paimon-common/src/main/java/org/apache/paimon/data/columnar/writable/WritableShortVector.java
@@ -16,9 +16,9 @@
* limitations under the License.
*/
-package org.apache.flink.table.store.data.columnar.writable;
+package org.apache.paimon.data.columnar.writable;
-import org.apache.flink.table.store.data.columnar.ShortColumnVector;
+import org.apache.paimon.data.columnar.ShortColumnVector;
/** Writable {@link ShortColumnVector}. */
public interface WritableShortVector extends WritableColumnVector, ShortColumnVector {
diff --git a/paimon-common/src/main/java/org/apache/flink/table/store/data/columnar/writable/WritableTimestampVector.java b/paimon-common/src/main/java/org/apache/paimon/data/columnar/writable/WritableTimestampVector.java
similarity index 86%
rename from paimon-common/src/main/java/org/apache/flink/table/store/data/columnar/writable/WritableTimestampVector.java
rename to paimon-common/src/main/java/org/apache/paimon/data/columnar/writable/WritableTimestampVector.java
index 78a937634..81f3ccfc5 100644
--- a/paimon-common/src/main/java/org/apache/flink/table/store/data/columnar/writable/WritableTimestampVector.java
+++ b/paimon-common/src/main/java/org/apache/paimon/data/columnar/writable/WritableTimestampVector.java
@@ -16,10 +16,10 @@
* limitations under the License.
*/
-package org.apache.flink.table.store.data.columnar.writable;
+package org.apache.paimon.data.columnar.writable;
-import org.apache.flink.table.store.data.Timestamp;
-import org.apache.flink.table.store.data.columnar.TimestampColumnVector;
+import org.apache.paimon.data.Timestamp;
+import org.apache.paimon.data.columnar.TimestampColumnVector;
/** Writable {@link TimestampColumnVector}. */
public interface WritableTimestampVector extends WritableColumnVector, TimestampColumnVector {
diff --git a/paimon-common/src/main/java/org/apache/flink/table/store/data/serializer/AbstractRowDataSerializer.java b/paimon-common/src/main/java/org/apache/paimon/data/serializer/AbstractRowDataSerializer.java
similarity index 88%
rename from paimon-common/src/main/java/org/apache/flink/table/store/data/serializer/AbstractRowDataSerializer.java
rename to paimon-common/src/main/java/org/apache/paimon/data/serializer/AbstractRowDataSerializer.java
index 7eac46672..6870d7f8a 100644
--- a/paimon-common/src/main/java/org/apache/flink/table/store/data/serializer/AbstractRowDataSerializer.java
+++ b/paimon-common/src/main/java/org/apache/paimon/data/serializer/AbstractRowDataSerializer.java
@@ -16,10 +16,10 @@
* limitations under the License.
*/
-package org.apache.flink.table.store.data.serializer;
+package org.apache.paimon.data.serializer;
-import org.apache.flink.table.store.data.BinaryRow;
-import org.apache.flink.table.store.data.InternalRow;
+import org.apache.paimon.data.BinaryRow;
+import org.apache.paimon.data.InternalRow;
import java.io.IOException;
diff --git a/paimon-common/src/main/java/org/apache/flink/table/store/data/serializer/BinaryRowSerializer.java b/paimon-common/src/main/java/org/apache/paimon/data/serializer/BinaryRowSerializer.java
similarity index 97%
rename from paimon-common/src/main/java/org/apache/flink/table/store/data/serializer/BinaryRowSerializer.java
rename to paimon-common/src/main/java/org/apache/paimon/data/serializer/BinaryRowSerializer.java
index 324872be4..e5619ba2a 100644
--- a/paimon-common/src/main/java/org/apache/flink/table/store/data/serializer/BinaryRowSerializer.java
+++ b/paimon-common/src/main/java/org/apache/paimon/data/serializer/BinaryRowSerializer.java
@@ -16,17 +16,18 @@
* limitations under the License.
*/
-package org.apache.flink.table.store.data.serializer;
+package org.apache.paimon.data.serializer;
-import org.apache.flink.table.store.data.AbstractPagedInputView;
-import org.apache.flink.table.store.data.AbstractPagedOutputView;
-import org.apache.flink.table.store.data.BinaryRow;
import org.apache.flink.table.store.io.DataInputView;
import org.apache.flink.table.store.io.DataOutputView;
import org.apache.flink.table.store.memory.MemorySegment;
import org.apache.flink.table.store.memory.MemorySegmentUtils;
import org.apache.flink.table.store.memory.MemorySegmentWritable;
+import org.apache.paimon.data.AbstractPagedInputView;
+import org.apache.paimon.data.AbstractPagedOutputView;
+import org.apache.paimon.data.BinaryRow;
+
import java.io.IOException;
import static org.apache.flink.table.store.utils.Preconditions.checkArgument;
diff --git a/paimon-common/src/main/java/org/apache/flink/table/store/data/serializer/BinarySerializer.java b/paimon-common/src/main/java/org/apache/paimon/data/serializer/BinarySerializer.java
similarity index 97%
rename from paimon-common/src/main/java/org/apache/flink/table/store/data/serializer/BinarySerializer.java
rename to paimon-common/src/main/java/org/apache/paimon/data/serializer/BinarySerializer.java
index 01872e357..f28d02a45 100644
--- a/paimon-common/src/main/java/org/apache/flink/table/store/data/serializer/BinarySerializer.java
+++ b/paimon-common/src/main/java/org/apache/paimon/data/serializer/BinarySerializer.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.flink.table.store.data.serializer;
+package org.apache.paimon.data.serializer;
import org.apache.flink.table.store.io.DataInputView;
import org.apache.flink.table.store.io.DataOutputView;
diff --git a/paimon-common/src/main/java/org/apache/flink/table/store/data/serializer/BinaryStringSerializer.java b/paimon-common/src/main/java/org/apache/paimon/data/serializer/BinaryStringSerializer.java
similarity index 95%
rename from paimon-common/src/main/java/org/apache/flink/table/store/data/serializer/BinaryStringSerializer.java
rename to paimon-common/src/main/java/org/apache/paimon/data/serializer/BinaryStringSerializer.java
index 226318bdc..d95fbb17d 100644
--- a/paimon-common/src/main/java/org/apache/flink/table/store/data/serializer/BinaryStringSerializer.java
+++ b/paimon-common/src/main/java/org/apache/paimon/data/serializer/BinaryStringSerializer.java
@@ -16,13 +16,14 @@
* limitations under the License.
*/
-package org.apache.flink.table.store.data.serializer;
+package org.apache.paimon.data.serializer;
-import org.apache.flink.table.store.data.BinaryString;
import org.apache.flink.table.store.io.DataInputView;
import org.apache.flink.table.store.io.DataOutputView;
import org.apache.flink.table.store.memory.MemorySegmentUtils;
+import org.apache.paimon.data.BinaryString;
+
import java.io.IOException;
/** Serializer for {@link BinaryString}. */
diff --git a/paimon-common/src/main/java/org/apache/flink/table/store/data/serializer/BooleanSerializer.java b/paimon-common/src/main/java/org/apache/paimon/data/serializer/BooleanSerializer.java
similarity index 96%
rename from paimon-common/src/main/java/org/apache/flink/table/store/data/serializer/BooleanSerializer.java
rename to paimon-common/src/main/java/org/apache/paimon/data/serializer/BooleanSerializer.java
index a37c4c677..938403e26 100644
--- a/paimon-common/src/main/java/org/apache/flink/table/store/data/serializer/BooleanSerializer.java
+++ b/paimon-common/src/main/java/org/apache/paimon/data/serializer/BooleanSerializer.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.flink.table.store.data.serializer;
+package org.apache.paimon.data.serializer;
import org.apache.flink.table.store.io.DataInputView;
import org.apache.flink.table.store.io.DataOutputView;
diff --git a/paimon-common/src/main/java/org/apache/flink/table/store/data/serializer/ByteSerializer.java b/paimon-common/src/main/java/org/apache/paimon/data/serializer/ByteSerializer.java
similarity index 96%
rename from paimon-common/src/main/java/org/apache/flink/table/store/data/serializer/ByteSerializer.java
rename to paimon-common/src/main/java/org/apache/paimon/data/serializer/ByteSerializer.java
index 253701398..43abd9ad1 100644
--- a/paimon-common/src/main/java/org/apache/flink/table/store/data/serializer/ByteSerializer.java
+++ b/paimon-common/src/main/java/org/apache/paimon/data/serializer/ByteSerializer.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.flink.table.store.data.serializer;
+package org.apache.paimon.data.serializer;
import org.apache.flink.table.store.io.DataInputView;
import org.apache.flink.table.store.io.DataOutputView;
diff --git a/paimon-common/src/main/java/org/apache/flink/table/store/data/serializer/DecimalSerializer.java b/paimon-common/src/main/java/org/apache/paimon/data/serializer/DecimalSerializer.java
similarity index 96%
rename from paimon-common/src/main/java/org/apache/flink/table/store/data/serializer/DecimalSerializer.java
rename to paimon-common/src/main/java/org/apache/paimon/data/serializer/DecimalSerializer.java
index ae8b3c8b6..df2b6e839 100644
--- a/paimon-common/src/main/java/org/apache/flink/table/store/data/serializer/DecimalSerializer.java
+++ b/paimon-common/src/main/java/org/apache/paimon/data/serializer/DecimalSerializer.java
@@ -16,12 +16,13 @@
* limitations under the License.
*/
-package org.apache.flink.table.store.data.serializer;
+package org.apache.paimon.data.serializer;
-import org.apache.flink.table.store.data.Decimal;
import org.apache.flink.table.store.io.DataInputView;
import org.apache.flink.table.store.io.DataOutputView;
+import org.apache.paimon.data.Decimal;
+
import java.io.IOException;
/** Serializer for {@link Decimal}. */
diff --git a/paimon-common/src/main/java/org/apache/flink/table/store/data/serializer/DoubleSerializer.java b/paimon-common/src/main/java/org/apache/paimon/data/serializer/DoubleSerializer.java
similarity index 96%
rename from paimon-common/src/main/java/org/apache/flink/table/store/data/serializer/DoubleSerializer.java
rename to paimon-common/src/main/java/org/apache/paimon/data/serializer/DoubleSerializer.java
index b5b455118..8e96dd899 100644
--- a/paimon-common/src/main/java/org/apache/flink/table/store/data/serializer/DoubleSerializer.java
+++ b/paimon-common/src/main/java/org/apache/paimon/data/serializer/DoubleSerializer.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.flink.table.store.data.serializer;
+package org.apache.paimon.data.serializer;
import org.apache.flink.table.store.io.DataInputView;
import org.apache.flink.table.store.io.DataOutputView;
diff --git a/paimon-common/src/main/java/org/apache/flink/table/store/data/serializer/FloatSerializer.java b/paimon-common/src/main/java/org/apache/paimon/data/serializer/FloatSerializer.java
similarity index 96%
rename from paimon-common/src/main/java/org/apache/flink/table/store/data/serializer/FloatSerializer.java
rename to paimon-common/src/main/java/org/apache/paimon/data/serializer/FloatSerializer.java
index b3c972305..e9f698cf5 100644
--- a/paimon-common/src/main/java/org/apache/flink/table/store/data/serializer/FloatSerializer.java
+++ b/paimon-common/src/main/java/org/apache/paimon/data/serializer/FloatSerializer.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.flink.table.store.data.serializer;
+package org.apache.paimon.data.serializer;
import org.apache.flink.table.store.io.DataInputView;
import org.apache.flink.table.store.io.DataOutputView;
diff --git a/paimon-common/src/main/java/org/apache/flink/table/store/data/serializer/IntSerializer.java b/paimon-common/src/main/java/org/apache/paimon/data/serializer/IntSerializer.java
similarity index 96%
rename from paimon-common/src/main/java/org/apache/flink/table/store/data/serializer/IntSerializer.java
rename to paimon-common/src/main/java/org/apache/paimon/data/serializer/IntSerializer.java
index 1e5df250d..774fcdaba 100644
--- a/paimon-common/src/main/java/org/apache/flink/table/store/data/serializer/IntSerializer.java
+++ b/paimon-common/src/main/java/org/apache/paimon/data/serializer/IntSerializer.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.flink.table.store.data.serializer;
+package org.apache.paimon.data.serializer;
import org.apache.flink.table.store.io.DataInputView;
import org.apache.flink.table.store.io.DataOutputView;
diff --git a/paimon-common/src/main/java/org/apache/flink/table/store/data/serializer/InternalArraySerializer.java b/paimon-common/src/main/java/org/apache/paimon/data/serializer/InternalArraySerializer.java
similarity index 94%
rename from paimon-common/src/main/java/org/apache/flink/table/store/data/serializer/InternalArraySerializer.java
rename to paimon-common/src/main/java/org/apache/paimon/data/serializer/InternalArraySerializer.java
index 0d7afa961..dcd68dfc4 100644
--- a/paimon-common/src/main/java/org/apache/flink/table/store/data/serializer/InternalArraySerializer.java
+++ b/paimon-common/src/main/java/org/apache/paimon/data/serializer/InternalArraySerializer.java
@@ -16,20 +16,21 @@
* limitations under the License.
*/
-package org.apache.flink.table.store.data.serializer;
-
-import org.apache.flink.table.store.data.BinaryArray;
-import org.apache.flink.table.store.data.BinaryArrayWriter;
-import org.apache.flink.table.store.data.BinaryWriter;
-import org.apache.flink.table.store.data.GenericArray;
-import org.apache.flink.table.store.data.InternalArray;
-import org.apache.flink.table.store.data.InternalRow;
+package org.apache.paimon.data.serializer;
+
import org.apache.flink.table.store.io.DataInputView;
import org.apache.flink.table.store.io.DataOutputView;
import org.apache.flink.table.store.memory.MemorySegment;
import org.apache.flink.table.store.memory.MemorySegmentUtils;
import org.apache.flink.table.store.types.DataType;
+import org.apache.paimon.data.BinaryArray;
+import org.apache.paimon.data.BinaryArrayWriter;
+import org.apache.paimon.data.BinaryWriter;
+import org.apache.paimon.data.GenericArray;
+import org.apache.paimon.data.InternalArray;
+import org.apache.paimon.data.InternalRow;
+
import java.io.IOException;
import java.lang.reflect.Array;
import java.util.Arrays;
diff --git a/paimon-common/src/main/java/org/apache/flink/table/store/data/serializer/InternalMapSerializer.java b/paimon-common/src/main/java/org/apache/paimon/data/serializer/InternalMapSerializer.java
similarity index 95%
rename from paimon-common/src/main/java/org/apache/flink/table/store/data/serializer/InternalMapSerializer.java
rename to paimon-common/src/main/java/org/apache/paimon/data/serializer/InternalMapSerializer.java
index bdadc550e..f9ecc70f0 100644
--- a/paimon-common/src/main/java/org/apache/flink/table/store/data/serializer/InternalMapSerializer.java
+++ b/paimon-common/src/main/java/org/apache/paimon/data/serializer/InternalMapSerializer.java
@@ -16,20 +16,21 @@
* limitations under the License.
*/
-package org.apache.flink.table.store.data.serializer;
-
-import org.apache.flink.table.store.data.BinaryArray;
-import org.apache.flink.table.store.data.BinaryArrayWriter;
-import org.apache.flink.table.store.data.BinaryMap;
-import org.apache.flink.table.store.data.BinaryWriter;
-import org.apache.flink.table.store.data.InternalArray;
-import org.apache.flink.table.store.data.InternalMap;
+package org.apache.paimon.data.serializer;
+
import org.apache.flink.table.store.io.DataInputView;
import org.apache.flink.table.store.io.DataOutputView;
import org.apache.flink.table.store.memory.MemorySegment;
import org.apache.flink.table.store.memory.MemorySegmentUtils;
import org.apache.flink.table.store.types.DataType;
+import org.apache.paimon.data.BinaryArray;
+import org.apache.paimon.data.BinaryArrayWriter;
+import org.apache.paimon.data.BinaryMap;
+import org.apache.paimon.data.BinaryWriter;
+import org.apache.paimon.data.InternalArray;
+import org.apache.paimon.data.InternalMap;
+
import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
diff --git a/paimon-common/src/main/java/org/apache/flink/table/store/data/serializer/InternalRowSerializer.java b/paimon-common/src/main/java/org/apache/paimon/data/serializer/InternalRowSerializer.java
similarity index 93%
rename from paimon-common/src/main/java/org/apache/flink/table/store/data/serializer/InternalRowSerializer.java
rename to paimon-common/src/main/java/org/apache/paimon/data/serializer/InternalRowSerializer.java
index cb133f342..15d77901b 100644
--- a/paimon-common/src/main/java/org/apache/flink/table/store/data/serializer/InternalRowSerializer.java
+++ b/paimon-common/src/main/java/org/apache/paimon/data/serializer/InternalRowSerializer.java
@@ -16,21 +16,22 @@
* limitations under the License.
*/
-package org.apache.flink.table.store.data.serializer;
-
-import org.apache.flink.table.store.data.AbstractPagedInputView;
-import org.apache.flink.table.store.data.AbstractPagedOutputView;
-import org.apache.flink.table.store.data.BinaryRow;
-import org.apache.flink.table.store.data.BinaryRowWriter;
-import org.apache.flink.table.store.data.BinaryWriter;
-import org.apache.flink.table.store.data.GenericRow;
-import org.apache.flink.table.store.data.InternalRow;
-import org.apache.flink.table.store.data.NestedRow;
+package org.apache.paimon.data.serializer;
+
import org.apache.flink.table.store.io.DataInputView;
import org.apache.flink.table.store.io.DataOutputView;
import org.apache.flink.table.store.types.DataType;
import org.apache.flink.table.store.types.RowType;
+import org.apache.paimon.data.AbstractPagedInputView;
+import org.apache.paimon.data.AbstractPagedOutputView;
+import org.apache.paimon.data.BinaryRow;
+import org.apache.paimon.data.BinaryRowWriter;
+import org.apache.paimon.data.BinaryWriter;
+import org.apache.paimon.data.GenericRow;
+import org.apache.paimon.data.InternalRow;
+import org.apache.paimon.data.NestedRow;
+
import java.io.IOException;
import java.util.Arrays;
import java.util.stream.IntStream;
diff --git a/paimon-common/src/main/java/org/apache/flink/table/store/data/serializer/InternalSerializers.java b/paimon-common/src/main/java/org/apache/paimon/data/serializer/InternalSerializers.java
similarity index 98%
rename from paimon-common/src/main/java/org/apache/flink/table/store/data/serializer/InternalSerializers.java
rename to paimon-common/src/main/java/org/apache/paimon/data/serializer/InternalSerializers.java
index df52fce2d..ef09e0feb 100644
--- a/paimon-common/src/main/java/org/apache/flink/table/store/data/serializer/InternalSerializers.java
+++ b/paimon-common/src/main/java/org/apache/paimon/data/serializer/InternalSerializers.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.flink.table.store.data.serializer;
+package org.apache.paimon.data.serializer;
import org.apache.flink.table.store.types.ArrayType;
import org.apache.flink.table.store.types.DataType;
diff --git a/paimon-common/src/main/java/org/apache/flink/table/store/data/serializer/ListSerializer.java b/paimon-common/src/main/java/org/apache/paimon/data/serializer/ListSerializer.java
similarity index 98%
rename from paimon-common/src/main/java/org/apache/flink/table/store/data/serializer/ListSerializer.java
rename to paimon-common/src/main/java/org/apache/paimon/data/serializer/ListSerializer.java
index f6e3906cb..fa432844f 100644
--- a/paimon-common/src/main/java/org/apache/flink/table/store/data/serializer/ListSerializer.java
+++ b/paimon-common/src/main/java/org/apache/paimon/data/serializer/ListSerializer.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.flink.table.store.data.serializer;
+package org.apache.paimon.data.serializer;
import org.apache.flink.table.store.io.DataInputView;
import org.apache.flink.table.store.io.DataOutputView;
diff --git a/paimon-common/src/main/java/org/apache/flink/table/store/data/serializer/LongSerializer.java b/paimon-common/src/main/java/org/apache/paimon/data/serializer/LongSerializer.java
similarity index 96%
rename from paimon-common/src/main/java/org/apache/flink/table/store/data/serializer/LongSerializer.java
rename to paimon-common/src/main/java/org/apache/paimon/data/serializer/LongSerializer.java
index b4aba1d98..1ff14989a 100644
--- a/paimon-common/src/main/java/org/apache/flink/table/store/data/serializer/LongSerializer.java
+++ b/paimon-common/src/main/java/org/apache/paimon/data/serializer/LongSerializer.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.flink.table.store.data.serializer;
+package org.apache.paimon.data.serializer;
import org.apache.flink.table.store.io.DataInputView;
import org.apache.flink.table.store.io.DataOutputView;
diff --git a/paimon-common/src/main/java/org/apache/flink/table/store/data/serializer/NullableSerializer.java b/paimon-common/src/main/java/org/apache/paimon/data/serializer/NullableSerializer.java
similarity index 99%
rename from paimon-common/src/main/java/org/apache/flink/table/store/data/serializer/NullableSerializer.java
rename to paimon-common/src/main/java/org/apache/paimon/data/serializer/NullableSerializer.java
index 4a1999156..d7c221550 100644
--- a/paimon-common/src/main/java/org/apache/flink/table/store/data/serializer/NullableSerializer.java
+++ b/paimon-common/src/main/java/org/apache/paimon/data/serializer/NullableSerializer.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.flink.table.store.data.serializer;
+package org.apache.paimon.data.serializer;
import org.apache.flink.table.store.io.DataInputDeserializer;
import org.apache.flink.table.store.io.DataInputView;
diff --git a/paimon-common/src/main/java/org/apache/flink/table/store/data/serializer/PagedTypeSerializer.java b/paimon-common/src/main/java/org/apache/paimon/data/serializer/PagedTypeSerializer.java
similarity index 94%
rename from paimon-common/src/main/java/org/apache/flink/table/store/data/serializer/PagedTypeSerializer.java
rename to paimon-common/src/main/java/org/apache/paimon/data/serializer/PagedTypeSerializer.java
index 56edf75f2..f916d01b5 100644
--- a/paimon-common/src/main/java/org/apache/flink/table/store/data/serializer/PagedTypeSerializer.java
+++ b/paimon-common/src/main/java/org/apache/paimon/data/serializer/PagedTypeSerializer.java
@@ -16,11 +16,11 @@
* limitations under the License.
*/
-package org.apache.flink.table.store.data.serializer;
+package org.apache.paimon.data.serializer;
-import org.apache.flink.table.store.data.AbstractPagedInputView;
-import org.apache.flink.table.store.data.AbstractPagedOutputView;
-import org.apache.flink.table.store.data.BinaryRow;
+import org.apache.paimon.data.AbstractPagedInputView;
+import org.apache.paimon.data.AbstractPagedOutputView;
+import org.apache.paimon.data.BinaryRow;
import java.io.IOException;
diff --git a/paimon-common/src/main/java/org/apache/flink/table/store/data/serializer/RowCompactedSerializer.java b/paimon-common/src/main/java/org/apache/paimon/data/serializer/RowCompactedSerializer.java
similarity index 96%
rename from paimon-common/src/main/java/org/apache/flink/table/store/data/serializer/RowCompactedSerializer.java
rename to paimon-common/src/main/java/org/apache/paimon/data/serializer/RowCompactedSerializer.java
index d199fc932..6dd1cf758 100644
--- a/paimon-common/src/main/java/org/apache/flink/table/store/data/serializer/RowCompactedSerializer.java
+++ b/paimon-common/src/main/java/org/apache/paimon/data/serializer/RowCompactedSerializer.java
@@ -16,19 +16,8 @@
* limitations under the License.
*/
-package org.apache.flink.table.store.data.serializer;
-
-import org.apache.flink.table.store.annotation.VisibleForTesting;
-import org.apache.flink.table.store.data.BinaryArray;
-import org.apache.flink.table.store.data.BinaryMap;
-import org.apache.flink.table.store.data.BinaryString;
-import org.apache.flink.table.store.data.Decimal;
-import org.apache.flink.table.store.data.GenericRow;
-import org.apache.flink.table.store.data.InternalArray;
-import org.apache.flink.table.store.data.InternalMap;
-import org.apache.flink.table.store.data.InternalRow;
-import org.apache.flink.table.store.data.InternalRow.FieldGetter;
-import org.apache.flink.table.store.data.Timestamp;
+package org.apache.paimon.data.serializer;
+
import org.apache.flink.table.store.io.DataInputView;
import org.apache.flink.table.store.io.DataOutputView;
import org.apache.flink.table.store.memory.MemorySegment;
@@ -37,6 +26,18 @@ import org.apache.flink.table.store.types.RowKind;
import org.apache.flink.table.store.types.RowType;
import org.apache.flink.table.store.utils.VarLengthIntUtils;
+import org.apache.paimon.annotation.VisibleForTesting;
+import org.apache.paimon.data.BinaryArray;
+import org.apache.paimon.data.BinaryMap;
+import org.apache.paimon.data.BinaryString;
+import org.apache.paimon.data.Decimal;
+import org.apache.paimon.data.GenericRow;
+import org.apache.paimon.data.InternalArray;
+import org.apache.paimon.data.InternalMap;
+import org.apache.paimon.data.InternalRow;
+import org.apache.paimon.data.InternalRow.FieldGetter;
+import org.apache.paimon.data.Timestamp;
+
import javax.annotation.Nullable;
import java.io.IOException;
@@ -44,12 +45,12 @@ import java.io.Serializable;
import java.util.Arrays;
import java.util.Objects;
-import static org.apache.flink.table.store.data.BinaryRow.HEADER_SIZE_IN_BITS;
import static org.apache.flink.table.store.memory.MemorySegmentUtils.bitGet;
import static org.apache.flink.table.store.memory.MemorySegmentUtils.bitSet;
import static org.apache.flink.table.store.types.DataTypeChecks.getPrecision;
import static org.apache.flink.table.store.types.DataTypeChecks.getScale;
import static org.apache.flink.table.store.utils.Preconditions.checkArgument;
+import static org.apache.paimon.data.BinaryRow.HEADER_SIZE_IN_BITS;
/** A {@link Serializer} for {@link InternalRow} using compacted binary. */
public class RowCompactedSerializer implements Serializer<InternalRow> {
diff --git a/paimon-common/src/main/java/org/apache/flink/table/store/data/serializer/Serializer.java b/paimon-common/src/main/java/org/apache/paimon/data/serializer/Serializer.java
similarity index 97%
rename from paimon-common/src/main/java/org/apache/flink/table/store/data/serializer/Serializer.java
rename to paimon-common/src/main/java/org/apache/paimon/data/serializer/Serializer.java
index 637088c6b..4d343a822 100644
--- a/paimon-common/src/main/java/org/apache/flink/table/store/data/serializer/Serializer.java
+++ b/paimon-common/src/main/java/org/apache/paimon/data/serializer/Serializer.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.flink.table.store.data.serializer;
+package org.apache.paimon.data.serializer;
import org.apache.flink.table.store.io.DataInputView;
import org.apache.flink.table.store.io.DataOutputView;
diff --git a/paimon-common/src/main/java/org/apache/flink/table/store/data/serializer/SerializerSingleton.java b/paimon-common/src/main/java/org/apache/paimon/data/serializer/SerializerSingleton.java
similarity index 95%
rename from paimon-common/src/main/java/org/apache/flink/table/store/data/serializer/SerializerSingleton.java
rename to paimon-common/src/main/java/org/apache/paimon/data/serializer/SerializerSingleton.java
index 1a774f900..5ffd4aa5b 100644
--- a/paimon-common/src/main/java/org/apache/flink/table/store/data/serializer/SerializerSingleton.java
+++ b/paimon-common/src/main/java/org/apache/paimon/data/serializer/SerializerSingleton.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.flink.table.store.data.serializer;
+package org.apache.paimon.data.serializer;
/** Singleton {@link Serializer}. */
public abstract class SerializerSingleton<T> implements Serializer<T> {
diff --git a/paimon-common/src/main/java/org/apache/flink/table/store/data/serializer/ShortSerializer.java b/paimon-common/src/main/java/org/apache/paimon/data/serializer/ShortSerializer.java
similarity index 96%
rename from paimon-common/src/main/java/org/apache/flink/table/store/data/serializer/ShortSerializer.java
rename to paimon-common/src/main/java/org/apache/paimon/data/serializer/ShortSerializer.java
index b1da09ab5..4477ec85b 100644
--- a/paimon-common/src/main/java/org/apache/flink/table/store/data/serializer/ShortSerializer.java
+++ b/paimon-common/src/main/java/org/apache/paimon/data/serializer/ShortSerializer.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.flink.table.store.data.serializer;
+package org.apache.paimon.data.serializer;
import org.apache.flink.table.store.io.DataInputView;
import org.apache.flink.table.store.io.DataOutputView;
diff --git a/paimon-common/src/main/java/org/apache/flink/table/store/data/serializer/TimestampSerializer.java b/paimon-common/src/main/java/org/apache/paimon/data/serializer/TimestampSerializer.java
similarity index 96%
rename from paimon-common/src/main/java/org/apache/flink/table/store/data/serializer/TimestampSerializer.java
rename to paimon-common/src/main/java/org/apache/paimon/data/serializer/TimestampSerializer.java
index ab188e373..a19138b32 100644
--- a/paimon-common/src/main/java/org/apache/flink/table/store/data/serializer/TimestampSerializer.java
+++ b/paimon-common/src/main/java/org/apache/paimon/data/serializer/TimestampSerializer.java
@@ -16,12 +16,13 @@
* limitations under the License.
*/
-package org.apache.flink.table.store.data.serializer;
+package org.apache.paimon.data.serializer;
-import org.apache.flink.table.store.data.Timestamp;
import org.apache.flink.table.store.io.DataInputView;
import org.apache.flink.table.store.io.DataOutputView;
+import org.apache.paimon.data.Timestamp;
+
import java.io.IOException;
/**
diff --git a/paimon-common/src/main/java/org/apache/flink/table/store/data/serializer/VersionedSerializer.java b/paimon-common/src/main/java/org/apache/paimon/data/serializer/VersionedSerializer.java
similarity index 97%
rename from paimon-common/src/main/java/org/apache/flink/table/store/data/serializer/VersionedSerializer.java
rename to paimon-common/src/main/java/org/apache/paimon/data/serializer/VersionedSerializer.java
index 9faedb2d3..f53a5ea92 100644
--- a/paimon-common/src/main/java/org/apache/flink/table/store/data/serializer/VersionedSerializer.java
+++ b/paimon-common/src/main/java/org/apache/paimon/data/serializer/VersionedSerializer.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.flink.table.store.data.serializer;
+package org.apache.paimon.data.serializer;
import java.io.IOException;
diff --git a/paimon-common/src/main/java/org/apache/paimon/format/FieldStatsCollector.java b/paimon-common/src/main/java/org/apache/paimon/format/FieldStatsCollector.java
index 3c4e7b31e..fea1428c0 100644
--- a/paimon-common/src/main/java/org/apache/paimon/format/FieldStatsCollector.java
+++ b/paimon-common/src/main/java/org/apache/paimon/format/FieldStatsCollector.java
@@ -18,12 +18,13 @@
package org.apache.paimon.format;
-import org.apache.flink.table.store.data.InternalRow;
-import org.apache.flink.table.store.data.serializer.InternalSerializers;
-import org.apache.flink.table.store.data.serializer.Serializer;
import org.apache.flink.table.store.types.RowType;
import org.apache.flink.table.store.utils.RowDataToObjectArrayConverter;
+import org.apache.paimon.data.InternalRow;
+import org.apache.paimon.data.serializer.InternalSerializers;
+import org.apache.paimon.data.serializer.Serializer;
+
/** Collector to extract statistics of each fields from a series of records. */
public class FieldStatsCollector {
diff --git a/paimon-common/src/main/java/org/apache/paimon/format/FormatReaderFactory.java b/paimon-common/src/main/java/org/apache/paimon/format/FormatReaderFactory.java
index 18beddb0d..6fccf7aec 100644
--- a/paimon-common/src/main/java/org/apache/paimon/format/FormatReaderFactory.java
+++ b/paimon-common/src/main/java/org/apache/paimon/format/FormatReaderFactory.java
@@ -18,11 +18,12 @@
package org.apache.paimon.format;
-import org.apache.flink.table.store.data.InternalRow;
import org.apache.flink.table.store.fs.FileIO;
import org.apache.flink.table.store.fs.Path;
import org.apache.flink.table.store.reader.RecordReader;
+import org.apache.paimon.data.InternalRow;
+
import java.io.IOException;
import java.io.Serializable;
diff --git a/paimon-common/src/main/java/org/apache/paimon/format/FormatWriter.java b/paimon-common/src/main/java/org/apache/paimon/format/FormatWriter.java
index 054fd32c4..3a9ccba38 100644
--- a/paimon-common/src/main/java/org/apache/paimon/format/FormatWriter.java
+++ b/paimon-common/src/main/java/org/apache/paimon/format/FormatWriter.java
@@ -18,7 +18,7 @@
package org.apache.paimon.format;
-import org.apache.flink.table.store.data.InternalRow;
+import org.apache.paimon.data.InternalRow;
import java.io.IOException;
diff --git a/paimon-common/src/test/java/org/apache/flink/table/store/datagen/RandomGeneratorVisitor.java b/paimon-common/src/test/java/org/apache/flink/table/store/datagen/RandomGeneratorVisitor.java
index 746a3b6d1..cd70e52b5 100644
--- a/paimon-common/src/test/java/org/apache/flink/table/store/datagen/RandomGeneratorVisitor.java
+++ b/paimon-common/src/test/java/org/apache/flink/table/store/datagen/RandomGeneratorVisitor.java
@@ -18,11 +18,6 @@
package org.apache.flink.table.store.datagen;
-import org.apache.flink.table.store.data.BinaryString;
-import org.apache.flink.table.store.data.Decimal;
-import org.apache.flink.table.store.data.GenericArray;
-import org.apache.flink.table.store.data.GenericMap;
-import org.apache.flink.table.store.data.Timestamp;
import org.apache.flink.table.store.options.ConfigOption;
import org.apache.flink.table.store.options.ConfigOptions;
import org.apache.flink.table.store.options.Options;
@@ -47,6 +42,12 @@ import org.apache.flink.table.store.types.VarBinaryType;
import org.apache.flink.table.store.types.VarCharType;
import org.apache.flink.table.store.utils.Preconditions;
+import org.apache.paimon.data.BinaryString;
+import org.apache.paimon.data.Decimal;
+import org.apache.paimon.data.GenericArray;
+import org.apache.paimon.data.GenericMap;
+import org.apache.paimon.data.Timestamp;
+
import java.math.BigDecimal;
import java.math.MathContext;
import java.math.RoundingMode;
diff --git a/paimon-common/src/test/java/org/apache/flink/table/store/datagen/RowDataGenerator.java b/paimon-common/src/test/java/org/apache/flink/table/store/datagen/RowDataGenerator.java
index b68b05091..8685d7a6d 100644
--- a/paimon-common/src/test/java/org/apache/flink/table/store/datagen/RowDataGenerator.java
+++ b/paimon-common/src/test/java/org/apache/flink/table/store/datagen/RowDataGenerator.java
@@ -18,8 +18,8 @@
package org.apache.flink.table.store.datagen;
-import org.apache.flink.table.store.data.GenericRow;
-import org.apache.flink.table.store.data.InternalRow;
+import org.apache.paimon.data.GenericRow;
+import org.apache.paimon.data.InternalRow;
/** Data generator for Flink's internal {@link InternalRow} type. */
public class RowDataGenerator implements DataGenerator<InternalRow> {
diff --git a/paimon-common/src/test/java/org/apache/flink/table/store/utils/RowDataUtilsTest.java b/paimon-common/src/test/java/org/apache/flink/table/store/utils/RowDataUtilsTest.java
index 12bbe8d88..0ae3d0d5b 100644
--- a/paimon-common/src/test/java/org/apache/flink/table/store/utils/RowDataUtilsTest.java
+++ b/paimon-common/src/test/java/org/apache/flink/table/store/utils/RowDataUtilsTest.java
@@ -18,11 +18,6 @@
package org.apache.flink.table.store.utils;
-import org.apache.flink.table.store.data.BinaryRow;
-import org.apache.flink.table.store.data.Decimal;
-import org.apache.flink.table.store.data.InternalRow;
-import org.apache.flink.table.store.data.Timestamp;
-import org.apache.flink.table.store.data.serializer.InternalRowSerializer;
import org.apache.flink.table.store.datagen.DataGenerator;
import org.apache.flink.table.store.datagen.RandomGeneratorVisitor;
import org.apache.flink.table.store.datagen.RowDataGenerator;
@@ -31,6 +26,11 @@ import org.apache.flink.table.store.types.DataTypeRoot;
import org.apache.flink.table.store.types.DataTypes;
import org.apache.flink.table.store.types.RowType;
+import org.apache.paimon.data.BinaryRow;
+import org.apache.paimon.data.Decimal;
+import org.apache.paimon.data.InternalRow;
+import org.apache.paimon.data.Timestamp;
+import org.apache.paimon.data.serializer.InternalRowSerializer;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git a/paimon-common/src/test/java/org/apache/flink/table/store/data/BinaryRowTest.java b/paimon-common/src/test/java/org/apache/paimon/data/BinaryRowTest.java
similarity index 98%
rename from paimon-common/src/test/java/org/apache/flink/table/store/data/BinaryRowTest.java
rename to paimon-common/src/test/java/org/apache/paimon/data/BinaryRowTest.java
index cf57cb70e..773929918 100644
--- a/paimon-common/src/test/java/org/apache/flink/table/store/data/BinaryRowTest.java
+++ b/paimon-common/src/test/java/org/apache/paimon/data/BinaryRowTest.java
@@ -16,14 +16,8 @@
* limitations under the License.
*/
-package org.apache.flink.table.store.data;
-
-import org.apache.flink.table.store.data.serializer.BinaryRowSerializer;
-import org.apache.flink.table.store.data.serializer.InternalArraySerializer;
-import org.apache.flink.table.store.data.serializer.InternalMapSerializer;
-import org.apache.flink.table.store.data.serializer.InternalRowSerializer;
-import org.apache.flink.table.store.data.serializer.InternalSerializers;
-import org.apache.flink.table.store.data.serializer.Serializer;
+package org.apache.paimon.data;
+
import org.apache.flink.table.store.memory.MemorySegment;
import org.apache.flink.table.store.types.DataType;
import org.apache.flink.table.store.types.DataTypes;
@@ -33,6 +27,12 @@ import org.apache.flink.table.store.types.RowType;
import org.apache.flink.table.store.types.VarCharType;
import org.apache.flink.table.store.utils.InstantiationUtil;
+import org.apache.paimon.data.serializer.BinaryRowSerializer;
+import org.apache.paimon.data.serializer.InternalArraySerializer;
+import org.apache.paimon.data.serializer.InternalMapSerializer;
+import org.apache.paimon.data.serializer.InternalRowSerializer;
+import org.apache.paimon.data.serializer.InternalSerializers;
+import org.apache.paimon.data.serializer.Serializer;
import org.junit.jupiter.api.Test;
import java.io.EOFException;
@@ -50,9 +50,9 @@ import java.util.Random;
import java.util.Set;
import java.util.function.Consumer;
-import static org.apache.flink.table.store.data.BinaryString.fromBytes;
-import static org.apache.flink.table.store.data.BinaryString.fromString;
-import static org.apache.flink.table.store.data.MapDataUtil.convertToJavaMap;
+import static org.apache.paimon.data.BinaryString.fromBytes;
+import static org.apache.paimon.data.BinaryString.fromString;
+import static org.apache.paimon.data.MapDataUtil.convertToJavaMap;
import static org.assertj.core.api.Assertions.assertThat;
/** Test of {@link BinaryRow} and {@link BinaryRowWriter}. */
diff --git a/paimon-common/src/test/java/org/apache/flink/table/store/data/BinaryStringTest.java b/paimon-common/src/test/java/org/apache/paimon/data/BinaryStringTest.java
similarity index 99%
rename from paimon-common/src/test/java/org/apache/flink/table/store/data/BinaryStringTest.java
rename to paimon-common/src/test/java/org/apache/paimon/data/BinaryStringTest.java
index 471c5015c..5c4a9debd 100644
--- a/paimon-common/src/test/java/org/apache/flink/table/store/data/BinaryStringTest.java
+++ b/paimon-common/src/test/java/org/apache/paimon/data/BinaryStringTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.flink.table.store.data;
+package org.apache.paimon.data;
import org.apache.flink.table.store.memory.MemorySegment;
import org.apache.flink.table.store.utils.SortUtil;
@@ -33,9 +33,9 @@ import java.util.List;
import java.util.Random;
import static java.nio.charset.StandardCharsets.UTF_8;
-import static org.apache.flink.table.store.data.BinaryString.blankString;
-import static org.apache.flink.table.store.data.BinaryString.fromBytes;
import static org.apache.flink.table.store.utils.DecimalUtils.castFrom;
+import static org.apache.paimon.data.BinaryString.blankString;
+import static org.apache.paimon.data.BinaryString.fromBytes;
import static org.assertj.core.api.Assertions.assertThat;
/**
diff --git a/paimon-common/src/test/java/org/apache/flink/table/store/data/DataFormatTestUtil.java b/paimon-common/src/test/java/org/apache/paimon/data/DataFormatTestUtil.java
similarity index 99%
rename from paimon-common/src/test/java/org/apache/flink/table/store/data/DataFormatTestUtil.java
rename to paimon-common/src/test/java/org/apache/paimon/data/DataFormatTestUtil.java
index 48b184411..1d20aa618 100644
--- a/paimon-common/src/test/java/org/apache/flink/table/store/data/DataFormatTestUtil.java
+++ b/paimon-common/src/test/java/org/apache/paimon/data/DataFormatTestUtil.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.flink.table.store.data;
+package org.apache.paimon.data;
import org.apache.flink.table.store.memory.MemorySegment;
import org.apache.flink.table.store.types.RowType;
diff --git a/paimon-common/src/test/java/org/apache/flink/table/store/data/DecimalTest.java b/paimon-common/src/test/java/org/apache/paimon/data/DecimalTest.java
similarity index 99%
rename from paimon-common/src/test/java/org/apache/flink/table/store/data/DecimalTest.java
rename to paimon-common/src/test/java/org/apache/paimon/data/DecimalTest.java
index 025409341..2109ec128 100644
--- a/paimon-common/src/test/java/org/apache/flink/table/store/data/DecimalTest.java
+++ b/paimon-common/src/test/java/org/apache/paimon/data/DecimalTest.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.flink.table.store.data;
+package org.apache.paimon.data;
import org.junit.jupiter.api.Test;
diff --git a/paimon-common/src/test/java/org/apache/flink/table/store/data/MapDataUtil.java b/paimon-common/src/test/java/org/apache/paimon/data/MapDataUtil.java
similarity index 97%
rename from paimon-common/src/test/java/org/apache/flink/table/store/data/MapDataUtil.java
rename to paimon-common/src/test/java/org/apache/paimon/data/MapDataUtil.java
index 1f1557e7d..7b37ee03b 100644
--- a/paimon-common/src/test/java/org/apache/flink/table/store/data/MapDataUtil.java
+++ b/paimon-common/src/test/java/org/apache/paimon/data/MapDataUtil.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.flink.table.store.data;
+package org.apache.paimon.data;
import org.apache.flink.table.store.types.DataType;
diff --git a/paimon-common/src/test/java/org/apache/flink/table/store/data/NestedRowTest.java b/paimon-common/src/test/java/org/apache/paimon/data/NestedRowTest.java
similarity index 95%
rename from paimon-common/src/test/java/org/apache/flink/table/store/data/NestedRowTest.java
rename to paimon-common/src/test/java/org/apache/paimon/data/NestedRowTest.java
index 0d0efcbd1..60b36afdf 100644
--- a/paimon-common/src/test/java/org/apache/flink/table/store/data/NestedRowTest.java
+++ b/paimon-common/src/test/java/org/apache/paimon/data/NestedRowTest.java
@@ -15,15 +15,15 @@
* limitations under the License.
*/
-package org.apache.flink.table.store.data;
+package org.apache.paimon.data;
-import org.apache.flink.table.store.data.serializer.InternalRowSerializer;
import org.apache.flink.table.store.memory.MemorySegment;
import org.apache.flink.table.store.types.DataTypes;
+import org.apache.paimon.data.serializer.InternalRowSerializer;
import org.junit.jupiter.api.Test;
-import static org.apache.flink.table.store.data.DataFormatTestUtil.splitBytes;
+import static org.apache.paimon.data.DataFormatTestUtil.splitBytes;
import static org.assertj.core.api.Assertions.assertThat;
/** Test for {@link NestedRow}s. */
diff --git a/paimon-common/src/test/java/org/apache/flink/table/store/data/RowDataTest.java b/paimon-common/src/test/java/org/apache/paimon/data/RowDataTest.java
similarity index 97%
rename from paimon-common/src/test/java/org/apache/flink/table/store/data/RowDataTest.java
rename to paimon-common/src/test/java/org/apache/paimon/data/RowDataTest.java
index 0ac3bcbd2..9f24184d5 100644
--- a/paimon-common/src/test/java/org/apache/flink/table/store/data/RowDataTest.java
+++ b/paimon-common/src/test/java/org/apache/paimon/data/RowDataTest.java
@@ -15,16 +15,16 @@
* limitations under the License.
*/
-package org.apache.flink.table.store.data;
+package org.apache.paimon.data;
-import org.apache.flink.table.store.data.serializer.InternalArraySerializer;
-import org.apache.flink.table.store.data.serializer.InternalMapSerializer;
-import org.apache.flink.table.store.data.serializer.InternalRowSerializer;
import org.apache.flink.table.store.types.DataTypes;
import org.apache.flink.table.store.types.IntType;
import org.apache.flink.table.store.types.RowKind;
import org.apache.flink.table.store.types.RowType;
+import org.apache.paimon.data.serializer.InternalArraySerializer;
+import org.apache.paimon.data.serializer.InternalMapSerializer;
+import org.apache.paimon.data.serializer.InternalRowSerializer;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git a/paimon-common/src/test/java/org/apache/flink/table/store/data/TimestampTest.java b/paimon-common/src/test/java/org/apache/paimon/data/TimestampTest.java
similarity index 99%
rename from paimon-common/src/test/java/org/apache/flink/table/store/data/TimestampTest.java
rename to paimon-common/src/test/java/org/apache/paimon/data/TimestampTest.java
index a704427af..8caa92b48 100644
--- a/paimon-common/src/test/java/org/apache/flink/table/store/data/TimestampTest.java
+++ b/paimon-common/src/test/java/org/apache/paimon/data/TimestampTest.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.flink.table.store.data;
+package org.apache.paimon.data;
import org.junit.jupiter.api.Test;
diff --git a/paimon-common/src/test/java/org/apache/flink/table/store/data/serializer/BinarySerializerTest.java b/paimon-common/src/test/java/org/apache/paimon/data/serializer/BinarySerializerTest.java
similarity index 97%
rename from paimon-common/src/test/java/org/apache/flink/table/store/data/serializer/BinarySerializerTest.java
rename to paimon-common/src/test/java/org/apache/paimon/data/serializer/BinarySerializerTest.java
index 2be1cc8be..e433267b3 100644
--- a/paimon-common/src/test/java/org/apache/flink/table/store/data/serializer/BinarySerializerTest.java
+++ b/paimon-common/src/test/java/org/apache/paimon/data/serializer/BinarySerializerTest.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.flink.table.store.data.serializer;
+package org.apache.paimon.data.serializer;
import java.util.Arrays;
import java.util.Random;
diff --git a/paimon-common/src/test/java/org/apache/flink/table/store/data/serializer/BinaryStringSerializerTest.java b/paimon-common/src/test/java/org/apache/paimon/data/serializer/BinaryStringSerializerTest.java
similarity index 93%
rename from paimon-common/src/test/java/org/apache/flink/table/store/data/serializer/BinaryStringSerializerTest.java
rename to paimon-common/src/test/java/org/apache/paimon/data/serializer/BinaryStringSerializerTest.java
index df68b477f..d60ffa9bf 100644
--- a/paimon-common/src/test/java/org/apache/flink/table/store/data/serializer/BinaryStringSerializerTest.java
+++ b/paimon-common/src/test/java/org/apache/paimon/data/serializer/BinaryStringSerializerTest.java
@@ -16,9 +16,9 @@
* limitations under the License.
*/
-package org.apache.flink.table.store.data.serializer;
+package org.apache.paimon.data.serializer;
-import org.apache.flink.table.store.data.BinaryString;
+import org.apache.paimon.data.BinaryString;
import java.util.Arrays;
diff --git a/paimon-common/src/test/java/org/apache/flink/table/store/data/serializer/BooleanSerializerTest.java b/paimon-common/src/test/java/org/apache/paimon/data/serializer/BooleanSerializerTest.java
similarity index 96%
rename from paimon-common/src/test/java/org/apache/flink/table/store/data/serializer/BooleanSerializerTest.java
rename to paimon-common/src/test/java/org/apache/paimon/data/serializer/BooleanSerializerTest.java
index 9cb374548..23d1b04ef 100644
--- a/paimon-common/src/test/java/org/apache/flink/table/store/data/serializer/BooleanSerializerTest.java
+++ b/paimon-common/src/test/java/org/apache/paimon/data/serializer/BooleanSerializerTest.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.flink.table.store.data.serializer;
+package org.apache.paimon.data.serializer;
import java.util.Random;
diff --git a/paimon-common/src/test/java/org/apache/flink/table/store/data/serializer/ByteSerializerTest.java b/paimon-common/src/test/java/org/apache/paimon/data/serializer/ByteSerializerTest.java
similarity index 96%
rename from paimon-common/src/test/java/org/apache/flink/table/store/data/serializer/ByteSerializerTest.java
rename to paimon-common/src/test/java/org/apache/paimon/data/serializer/ByteSerializerTest.java
index 23078174c..707540175 100644
--- a/paimon-common/src/test/java/org/apache/flink/table/store/data/serializer/ByteSerializerTest.java
+++ b/paimon-common/src/test/java/org/apache/paimon/data/serializer/ByteSerializerTest.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.flink.table.store.data.serializer;
+package org.apache.paimon.data.serializer;
import java.util.Random;
diff --git a/paimon-common/src/test/java/org/apache/flink/table/store/data/serializer/DecimalSerializerTest.java b/paimon-common/src/test/java/org/apache/paimon/data/serializer/DecimalSerializerTest.java
similarity index 93%
rename from paimon-common/src/test/java/org/apache/flink/table/store/data/serializer/DecimalSerializerTest.java
rename to paimon-common/src/test/java/org/apache/paimon/data/serializer/DecimalSerializerTest.java
index 8c668810a..c81a54c69 100644
--- a/paimon-common/src/test/java/org/apache/flink/table/store/data/serializer/DecimalSerializerTest.java
+++ b/paimon-common/src/test/java/org/apache/paimon/data/serializer/DecimalSerializerTest.java
@@ -16,9 +16,9 @@
* limitations under the License.
*/
-package org.apache.flink.table.store.data.serializer;
+package org.apache.paimon.data.serializer;
-import org.apache.flink.table.store.data.Decimal;
+import org.apache.paimon.data.Decimal;
/** Test for {@link DecimalSerializer}. */
public class DecimalSerializerTest extends SerializerTestBase<Decimal> {
diff --git a/paimon-common/src/test/java/org/apache/flink/table/store/data/serializer/DoubleSerializerTest.java b/paimon-common/src/test/java/org/apache/paimon/data/serializer/DoubleSerializerTest.java
similarity index 96%
rename from paimon-common/src/test/java/org/apache/flink/table/store/data/serializer/DoubleSerializerTest.java
rename to paimon-common/src/test/java/org/apache/paimon/data/serializer/DoubleSerializerTest.java
index d46358f8a..1cbf4d52e 100644
--- a/paimon-common/src/test/java/org/apache/flink/table/store/data/serializer/DoubleSerializerTest.java
+++ b/paimon-common/src/test/java/org/apache/paimon/data/serializer/DoubleSerializerTest.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.flink.table.store.data.serializer;
+package org.apache.paimon.data.serializer;
import java.util.Random;
diff --git a/paimon-common/src/test/java/org/apache/flink/table/store/data/serializer/FloatSerializerTest.java b/paimon-common/src/test/java/org/apache/paimon/data/serializer/FloatSerializerTest.java
similarity index 96%
rename from paimon-common/src/test/java/org/apache/flink/table/store/data/serializer/FloatSerializerTest.java
rename to paimon-common/src/test/java/org/apache/paimon/data/serializer/FloatSerializerTest.java
index 993badf32..2a85ce638 100644
--- a/paimon-common/src/test/java/org/apache/flink/table/store/data/serializer/FloatSerializerTest.java
+++ b/paimon-common/src/test/java/org/apache/paimon/data/serializer/FloatSerializerTest.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.flink.table.store.data.serializer;
+package org.apache.paimon.data.serializer;
import java.util.Random;
diff --git a/paimon-common/src/test/java/org/apache/flink/table/store/data/serializer/IntSerializerTest.java b/paimon-common/src/test/java/org/apache/paimon/data/serializer/IntSerializerTest.java
similarity index 96%
rename from paimon-common/src/test/java/org/apache/flink/table/store/data/serializer/IntSerializerTest.java
rename to paimon-common/src/test/java/org/apache/paimon/data/serializer/IntSerializerTest.java
index c6a97528a..303b370b5 100644
--- a/paimon-common/src/test/java/org/apache/flink/table/store/data/serializer/IntSerializerTest.java
+++ b/paimon-common/src/test/java/org/apache/paimon/data/serializer/IntSerializerTest.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.flink.table.store.data.serializer;
+package org.apache.paimon.data.serializer;
import java.util.Random;
diff --git a/paimon-common/src/test/java/org/apache/flink/table/store/data/serializer/InternalArraySerializerTest.java b/paimon-common/src/test/java/org/apache/paimon/data/serializer/InternalArraySerializerTest.java
similarity index 90%
rename from paimon-common/src/test/java/org/apache/flink/table/store/data/serializer/InternalArraySerializerTest.java
rename to paimon-common/src/test/java/org/apache/paimon/data/serializer/InternalArraySerializerTest.java
index dd743b9ef..c7f2c7469 100644
--- a/paimon-common/src/test/java/org/apache/flink/table/store/data/serializer/InternalArraySerializerTest.java
+++ b/paimon-common/src/test/java/org/apache/paimon/data/serializer/InternalArraySerializerTest.java
@@ -16,18 +16,19 @@
* limitations under the License.
*/
-package org.apache.flink.table.store.data.serializer;
+package org.apache.paimon.data.serializer;
-import org.apache.flink.table.store.data.BinaryArray;
-import org.apache.flink.table.store.data.BinaryArrayWriter;
-import org.apache.flink.table.store.data.BinaryString;
-import org.apache.flink.table.store.data.GenericArray;
-import org.apache.flink.table.store.data.InternalArray;
-import org.apache.flink.table.store.data.columnar.ColumnarArray;
-import org.apache.flink.table.store.data.columnar.heap.HeapBytesVector;
import org.apache.flink.table.store.memory.MemorySegment;
import org.apache.flink.table.store.types.DataTypes;
+import org.apache.paimon.data.BinaryArray;
+import org.apache.paimon.data.BinaryArrayWriter;
+import org.apache.paimon.data.BinaryString;
+import org.apache.paimon.data.GenericArray;
+import org.apache.paimon.data.InternalArray;
+import org.apache.paimon.data.columnar.ColumnarArray;
+import org.apache.paimon.data.columnar.heap.HeapBytesVector;
+
import java.lang.reflect.Proxy;
import java.nio.charset.StandardCharsets;
import java.util.Arrays;
diff --git a/paimon-common/src/test/java/org/apache/flink/table/store/data/serializer/InternalMapSerializerTest.java b/paimon-common/src/test/java/org/apache/paimon/data/serializer/InternalMapSerializerTest.java
similarity index 88%
rename from paimon-common/src/test/java/org/apache/flink/table/store/data/serializer/InternalMapSerializerTest.java
rename to paimon-common/src/test/java/org/apache/paimon/data/serializer/InternalMapSerializerTest.java
index d8373bd02..1bdd0832f 100644
--- a/paimon-common/src/test/java/org/apache/flink/table/store/data/serializer/InternalMapSerializerTest.java
+++ b/paimon-common/src/test/java/org/apache/paimon/data/serializer/InternalMapSerializerTest.java
@@ -16,25 +16,25 @@
* limitations under the License.
*/
-package org.apache.flink.table.store.data.serializer;
+package org.apache.paimon.data.serializer;
-import org.apache.flink.table.store.data.BinaryArray;
-import org.apache.flink.table.store.data.BinaryArrayWriter;
-import org.apache.flink.table.store.data.BinaryMap;
-import org.apache.flink.table.store.data.BinaryString;
-import org.apache.flink.table.store.data.GenericArray;
-import org.apache.flink.table.store.data.GenericMap;
-import org.apache.flink.table.store.data.InternalArray;
-import org.apache.flink.table.store.data.InternalMap;
+import org.apache.paimon.data.BinaryArray;
+import org.apache.paimon.data.BinaryArrayWriter;
+import org.apache.paimon.data.BinaryMap;
+import org.apache.paimon.data.BinaryString;
+import org.apache.paimon.data.GenericArray;
+import org.apache.paimon.data.GenericMap;
+import org.apache.paimon.data.InternalArray;
+import org.apache.paimon.data.InternalMap;
import java.util.Arrays;
import java.util.HashMap;
import java.util.Map;
import java.util.Objects;
-import static org.apache.flink.table.store.data.serializer.InternalMapSerializer.convertToJavaMap;
import static org.apache.flink.table.store.types.DataTypes.INT;
import static org.apache.flink.table.store.types.DataTypes.STRING;
+import static org.apache.paimon.data.serializer.InternalMapSerializer.convertToJavaMap;
/** Test for {@link InternalMapSerializer}. */
public class InternalMapSerializerTest extends SerializerTestBase<InternalMap> {
diff --git a/paimon-common/src/test/java/org/apache/flink/table/store/data/serializer/InternalRowSerializerTest.java b/paimon-common/src/test/java/org/apache/paimon/data/serializer/InternalRowSerializerTest.java
similarity index 95%
rename from paimon-common/src/test/java/org/apache/flink/table/store/data/serializer/InternalRowSerializerTest.java
rename to paimon-common/src/test/java/org/apache/paimon/data/serializer/InternalRowSerializerTest.java
index e3ff57f5e..7c6558df1 100644
--- a/paimon-common/src/test/java/org/apache/flink/table/store/data/serializer/InternalRowSerializerTest.java
+++ b/paimon-common/src/test/java/org/apache/paimon/data/serializer/InternalRowSerializerTest.java
@@ -16,23 +16,23 @@
* limitations under the License.
*/
-package org.apache.flink.table.store.data.serializer;
-
-import org.apache.flink.table.store.data.BinaryArray;
-import org.apache.flink.table.store.data.BinaryArrayWriter;
-import org.apache.flink.table.store.data.BinaryMap;
-import org.apache.flink.table.store.data.BinaryRow;
-import org.apache.flink.table.store.data.BinaryString;
-import org.apache.flink.table.store.data.GenericRow;
-import org.apache.flink.table.store.data.InternalRow;
+package org.apache.paimon.data.serializer;
+
import org.apache.flink.table.store.types.DataType;
import org.apache.flink.table.store.types.DataTypes;
+import org.apache.paimon.data.BinaryArray;
+import org.apache.paimon.data.BinaryArrayWriter;
+import org.apache.paimon.data.BinaryMap;
+import org.apache.paimon.data.BinaryRow;
+import org.apache.paimon.data.BinaryString;
+import org.apache.paimon.data.GenericRow;
+import org.apache.paimon.data.InternalRow;
import org.junit.jupiter.api.Test;
import java.util.Objects;
-import static org.apache.flink.table.store.data.BinaryString.fromString;
+import static org.apache.paimon.data.BinaryString.fromString;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
diff --git a/paimon-common/src/test/java/org/apache/flink/table/store/data/serializer/ListSerializerTest.java b/paimon-common/src/test/java/org/apache/paimon/data/serializer/ListSerializerTest.java
similarity index 97%
rename from paimon-common/src/test/java/org/apache/flink/table/store/data/serializer/ListSerializerTest.java
rename to paimon-common/src/test/java/org/apache/paimon/data/serializer/ListSerializerTest.java
index 4c4306288..06a762503 100644
--- a/paimon-common/src/test/java/org/apache/flink/table/store/data/serializer/ListSerializerTest.java
+++ b/paimon-common/src/test/java/org/apache/paimon/data/serializer/ListSerializerTest.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.flink.table.store.data.serializer;
+package org.apache.paimon.data.serializer;
import java.util.ArrayList;
import java.util.Collections;
diff --git a/paimon-common/src/test/java/org/apache/flink/table/store/data/serializer/LongSerializerTest.java b/paimon-common/src/test/java/org/apache/paimon/data/serializer/LongSerializerTest.java
similarity index 96%
rename from paimon-common/src/test/java/org/apache/flink/table/store/data/serializer/LongSerializerTest.java
rename to paimon-common/src/test/java/org/apache/paimon/data/serializer/LongSerializerTest.java
index a75061dc7..f93e4f683 100644
--- a/paimon-common/src/test/java/org/apache/flink/table/store/data/serializer/LongSerializerTest.java
+++ b/paimon-common/src/test/java/org/apache/paimon/data/serializer/LongSerializerTest.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.flink.table.store.data.serializer;
+package org.apache.paimon.data.serializer;
import java.util.Random;
diff --git a/paimon-common/src/test/java/org/apache/flink/table/store/data/serializer/NullableSerializerTest.java b/paimon-common/src/test/java/org/apache/paimon/data/serializer/NullableSerializerTest.java
similarity index 97%
rename from paimon-common/src/test/java/org/apache/flink/table/store/data/serializer/NullableSerializerTest.java
rename to paimon-common/src/test/java/org/apache/paimon/data/serializer/NullableSerializerTest.java
index b97551a7f..b33cae75d 100644
--- a/paimon-common/src/test/java/org/apache/flink/table/store/data/serializer/NullableSerializerTest.java
+++ b/paimon-common/src/test/java/org/apache/paimon/data/serializer/NullableSerializerTest.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.flink.table.store.data.serializer;
+package org.apache.paimon.data.serializer;
import org.junit.jupiter.api.Test;
diff --git a/paimon-common/src/test/java/org/apache/flink/table/store/data/serializer/RowCompactedSerializerTest.java b/paimon-common/src/test/java/org/apache/paimon/data/serializer/RowCompactedSerializerTest.java
similarity index 92%
rename from paimon-common/src/test/java/org/apache/flink/table/store/data/serializer/RowCompactedSerializerTest.java
rename to paimon-common/src/test/java/org/apache/paimon/data/serializer/RowCompactedSerializerTest.java
index 3752800b5..6bce9f09e 100644
--- a/paimon-common/src/test/java/org/apache/flink/table/store/data/serializer/RowCompactedSerializerTest.java
+++ b/paimon-common/src/test/java/org/apache/paimon/data/serializer/RowCompactedSerializerTest.java
@@ -16,20 +16,21 @@
* limitations under the License.
*/
-package org.apache.flink.table.store.data.serializer;
+package org.apache.paimon.data.serializer;
-import org.apache.flink.table.store.data.BinaryString;
-import org.apache.flink.table.store.data.GenericRow;
-import org.apache.flink.table.store.data.InternalRow;
import org.apache.flink.table.store.types.DataType;
import org.apache.flink.table.store.types.DataTypes;
import org.apache.flink.table.store.types.RowType;
-import static org.apache.flink.table.store.data.BinaryString.fromString;
-import static org.apache.flink.table.store.data.serializer.InternalRowSerializerTest.createArray;
-import static org.apache.flink.table.store.data.serializer.InternalRowSerializerTest.createMap;
-import static org.apache.flink.table.store.data.serializer.InternalRowSerializerTest.createRow;
-import static org.apache.flink.table.store.data.serializer.InternalRowSerializerTest.deepEqualsInternalRow;
+import org.apache.paimon.data.BinaryString;
+import org.apache.paimon.data.GenericRow;
+import org.apache.paimon.data.InternalRow;
+
+import static org.apache.paimon.data.BinaryString.fromString;
+import static org.apache.paimon.data.serializer.InternalRowSerializerTest.createArray;
+import static org.apache.paimon.data.serializer.InternalRowSerializerTest.createMap;
+import static org.apache.paimon.data.serializer.InternalRowSerializerTest.createRow;
+import static org.apache.paimon.data.serializer.InternalRowSerializerTest.deepEqualsInternalRow;
/** Test for {@link RowCompactedSerializer}. */
abstract class RowCompactedSerializerTest extends SerializerTestInstance<InternalRow> {
diff --git a/paimon-common/src/test/java/org/apache/flink/table/store/data/serializer/SerializerTestBase.java b/paimon-common/src/test/java/org/apache/paimon/data/serializer/SerializerTestBase.java
similarity index 99%
rename from paimon-common/src/test/java/org/apache/flink/table/store/data/serializer/SerializerTestBase.java
rename to paimon-common/src/test/java/org/apache/paimon/data/serializer/SerializerTestBase.java
index b6da7dddf..4fc0353de 100644
--- a/paimon-common/src/test/java/org/apache/flink/table/store/data/serializer/SerializerTestBase.java
+++ b/paimon-common/src/test/java/org/apache/paimon/data/serializer/SerializerTestBase.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.flink.table.store.data.serializer;
+package org.apache.paimon.data.serializer;
import org.apache.flink.table.store.io.DataInputDeserializer;
import org.apache.flink.table.store.io.DataInputView;
diff --git a/paimon-common/src/test/java/org/apache/flink/table/store/data/serializer/SerializerTestInstance.java b/paimon-common/src/test/java/org/apache/paimon/data/serializer/SerializerTestInstance.java
similarity index 96%
rename from paimon-common/src/test/java/org/apache/flink/table/store/data/serializer/SerializerTestInstance.java
rename to paimon-common/src/test/java/org/apache/paimon/data/serializer/SerializerTestInstance.java
index edb7b34ba..6cfdc9b76 100644
--- a/paimon-common/src/test/java/org/apache/flink/table/store/data/serializer/SerializerTestInstance.java
+++ b/paimon-common/src/test/java/org/apache/paimon/data/serializer/SerializerTestInstance.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.flink.table.store.data.serializer;
+package org.apache.paimon.data.serializer;
/** A {@link SerializerTestBase} passing serializer by constructor. */
public abstract class SerializerTestInstance<T> extends SerializerTestBase<T> {
diff --git a/paimon-common/src/test/java/org/apache/flink/table/store/data/serializer/ShortSerializerTest.java b/paimon-common/src/test/java/org/apache/paimon/data/serializer/ShortSerializerTest.java
similarity index 96%
rename from paimon-common/src/test/java/org/apache/flink/table/store/data/serializer/ShortSerializerTest.java
rename to paimon-common/src/test/java/org/apache/paimon/data/serializer/ShortSerializerTest.java
index 6603bf7ae..0ae8c8e75 100644
--- a/paimon-common/src/test/java/org/apache/flink/table/store/data/serializer/ShortSerializerTest.java
+++ b/paimon-common/src/test/java/org/apache/paimon/data/serializer/ShortSerializerTest.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.flink.table.store.data.serializer;
+package org.apache.paimon.data.serializer;
import java.util.Random;
diff --git a/paimon-common/src/test/java/org/apache/flink/table/store/data/serializer/TimestampSerializerTest.java b/paimon-common/src/test/java/org/apache/paimon/data/serializer/TimestampSerializerTest.java
similarity index 95%
rename from paimon-common/src/test/java/org/apache/flink/table/store/data/serializer/TimestampSerializerTest.java
rename to paimon-common/src/test/java/org/apache/paimon/data/serializer/TimestampSerializerTest.java
index 53419f953..7d67459a4 100644
--- a/paimon-common/src/test/java/org/apache/flink/table/store/data/serializer/TimestampSerializerTest.java
+++ b/paimon-common/src/test/java/org/apache/paimon/data/serializer/TimestampSerializerTest.java
@@ -16,9 +16,9 @@
* limitations under the License.
*/
-package org.apache.flink.table.store.data.serializer;
+package org.apache.paimon.data.serializer;
-import org.apache.flink.table.store.data.Timestamp;
+import org.apache.paimon.data.Timestamp;
/** Test for {@link TimestampSerializer}. */
public abstract class TimestampSerializerTest extends SerializerTestBase<Timestamp> {
diff --git a/paimon-common/src/test/java/org/apache/paimon/format/FileStatsExtractorTestBase.java b/paimon-common/src/test/java/org/apache/paimon/format/FileStatsExtractorTestBase.java
index 2a7cac4d6..d9f721ed1 100644
--- a/paimon-common/src/test/java/org/apache/paimon/format/FileStatsExtractorTestBase.java
+++ b/paimon-common/src/test/java/org/apache/paimon/format/FileStatsExtractorTestBase.java
@@ -18,14 +18,6 @@
package org.apache.paimon.format;
-import org.apache.flink.table.store.data.BinaryString;
-import org.apache.flink.table.store.data.Decimal;
-import org.apache.flink.table.store.data.GenericArray;
-import org.apache.flink.table.store.data.GenericMap;
-import org.apache.flink.table.store.data.GenericRow;
-import org.apache.flink.table.store.data.InternalArray;
-import org.apache.flink.table.store.data.InternalMap;
-import org.apache.flink.table.store.data.Timestamp;
import org.apache.flink.table.store.fs.FileIO;
import org.apache.flink.table.store.fs.Path;
import org.apache.flink.table.store.fs.PositionOutputStream;
@@ -44,6 +36,14 @@ import org.apache.flink.table.store.types.TimestampType;
import org.apache.flink.table.store.types.VarBinaryType;
import org.apache.flink.table.store.types.VarCharType;
+import org.apache.paimon.data.BinaryString;
+import org.apache.paimon.data.Decimal;
+import org.apache.paimon.data.GenericArray;
+import org.apache.paimon.data.GenericMap;
+import org.apache.paimon.data.GenericRow;
+import org.apache.paimon.data.InternalArray;
+import org.apache.paimon.data.InternalMap;
+import org.apache.paimon.data.Timestamp;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.io.TempDir;
diff --git a/paimon-docs/src/main/java/org/apache/paimon/docs/configuration/ConfigOptionsDocGenerator.java b/paimon-docs/src/main/java/org/apache/paimon/docs/configuration/ConfigOptionsDocGenerator.java
index a4989bc2d..89506c73e 100644
--- a/paimon-docs/src/main/java/org/apache/paimon/docs/configuration/ConfigOptionsDocGenerator.java
+++ b/paimon-docs/src/main/java/org/apache/paimon/docs/configuration/ConfigOptionsDocGenerator.java
@@ -18,10 +18,6 @@
package org.apache.paimon.docs.configuration;
-import org.apache.flink.table.store.annotation.ConfigGroup;
-import org.apache.flink.table.store.annotation.ConfigGroups;
-import org.apache.flink.table.store.annotation.Documentation;
-import org.apache.flink.table.store.annotation.VisibleForTesting;
import org.apache.flink.table.store.options.ConfigOption;
import org.apache.flink.table.store.options.description.DescribedEnum;
import org.apache.flink.table.store.options.description.Description;
@@ -33,6 +29,10 @@ import org.apache.flink.table.store.utils.Pair;
import org.apache.flink.table.store.utils.ThrowingConsumer;
import org.apache.flink.table.store.utils.TimeUtils;
+import org.apache.paimon.annotation.ConfigGroup;
+import org.apache.paimon.annotation.ConfigGroups;
+import org.apache.paimon.annotation.Documentation;
+import org.apache.paimon.annotation.VisibleForTesting;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/paimon-docs/src/test/java/org/apache/paimon/docs/configuration/ConfigOptionsDocGeneratorTest.java b/paimon-docs/src/test/java/org/apache/paimon/docs/configuration/ConfigOptionsDocGeneratorTest.java
index 9c6f74d08..356961d85 100644
--- a/paimon-docs/src/test/java/org/apache/paimon/docs/configuration/ConfigOptionsDocGeneratorTest.java
+++ b/paimon-docs/src/test/java/org/apache/paimon/docs/configuration/ConfigOptionsDocGeneratorTest.java
@@ -18,9 +18,6 @@
package org.apache.paimon.docs.configuration;
-import org.apache.flink.table.store.annotation.ConfigGroup;
-import org.apache.flink.table.store.annotation.ConfigGroups;
-import org.apache.flink.table.store.annotation.Documentation;
import org.apache.flink.table.store.options.ConfigOption;
import org.apache.flink.table.store.options.ConfigOptions;
import org.apache.flink.table.store.options.MemorySize;
@@ -30,6 +27,9 @@ import org.apache.flink.table.store.options.description.HtmlFormatter;
import org.apache.flink.table.store.options.description.InlineElement;
import org.apache.flink.table.store.utils.Pair;
+import org.apache.paimon.annotation.ConfigGroup;
+import org.apache.paimon.annotation.ConfigGroups;
+import org.apache.paimon.annotation.Documentation;
import org.apache.paimon.docs.configuration.data.TestCommonOptions;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.io.TempDir;
diff --git a/paimon-docs/src/test/java/org/apache/paimon/docs/configuration/ConfigOptionsDocsCompletenessITCase.java b/paimon-docs/src/test/java/org/apache/paimon/docs/configuration/ConfigOptionsDocsCompletenessITCase.java
index 077f54ed8..773ce46ce 100644
--- a/paimon-docs/src/test/java/org/apache/paimon/docs/configuration/ConfigOptionsDocsCompletenessITCase.java
+++ b/paimon-docs/src/test/java/org/apache/paimon/docs/configuration/ConfigOptionsDocsCompletenessITCase.java
@@ -18,10 +18,10 @@
package org.apache.paimon.docs.configuration;
-import org.apache.flink.table.store.annotation.Documentation;
import org.apache.flink.table.store.options.ConfigOption;
import org.apache.flink.table.store.utils.Pair;
+import org.apache.paimon.annotation.Documentation;
import org.jsoup.Jsoup;
import org.jsoup.nodes.Document;
import org.junit.jupiter.api.Test;
diff --git a/paimon-docs/src/test/java/org/apache/paimon/docs/configuration/data/TestCommonOptions.java b/paimon-docs/src/test/java/org/apache/paimon/docs/configuration/data/TestCommonOptions.java
index 5100b0c69..faa591096 100644
--- a/paimon-docs/src/test/java/org/apache/paimon/docs/configuration/data/TestCommonOptions.java
+++ b/paimon-docs/src/test/java/org/apache/paimon/docs/configuration/data/TestCommonOptions.java
@@ -18,10 +18,11 @@
package org.apache.paimon.docs.configuration.data;
-import org.apache.flink.table.store.annotation.Documentation;
import org.apache.flink.table.store.options.ConfigOption;
import org.apache.flink.table.store.options.ConfigOptions;
+import org.apache.paimon.annotation.Documentation;
+
/** Collection of test {@link ConfigOptions ConfigOptions}. */
@SuppressWarnings("unused") // this class is only accessed reflectively
public class TestCommonOptions {
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 af27e44ae..65073e571 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
@@ -30,7 +30,6 @@ 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.flink.table.store.annotation.VisibleForTesting;
import org.apache.flink.table.store.catalog.CatalogContext;
import org.apache.flink.table.store.file.schema.Schema;
import org.apache.flink.table.store.file.schema.TableSchema;
@@ -40,6 +39,7 @@ import org.apache.flink.table.store.table.FileStoreTableFactory;
import org.apache.flink.table.store.utils.Preconditions;
import org.apache.flink.table.types.logical.RowType;
+import org.apache.paimon.annotation.VisibleForTesting;
import org.apache.paimon.connector.log.LogStoreTableFactory;
import org.apache.paimon.connector.sink.TableStoreSink;
import org.apache.paimon.connector.source.SystemTableSource;
diff --git a/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/connector/BinaryRowTypeSerializer.java b/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/connector/BinaryRowTypeSerializer.java
index ae3ce108d..71408352e 100644
--- a/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/connector/BinaryRowTypeSerializer.java
+++ b/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/connector/BinaryRowTypeSerializer.java
@@ -23,10 +23,11 @@ import org.apache.flink.api.common.typeutils.TypeSerializerSchemaCompatibility;
import org.apache.flink.api.common.typeutils.TypeSerializerSnapshot;
import org.apache.flink.core.memory.DataInputView;
import org.apache.flink.core.memory.DataOutputView;
-import org.apache.flink.table.store.data.BinaryRow;
-import org.apache.flink.table.store.data.serializer.BinaryRowSerializer;
import org.apache.flink.table.store.memory.MemorySegment;
+import org.apache.paimon.data.BinaryRow;
+import org.apache.paimon.data.serializer.BinaryRowSerializer;
+
import java.io.IOException;
import java.util.Objects;
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 8e892c571..591f1cb85 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
@@ -42,7 +42,6 @@ import org.apache.flink.table.catalog.stats.CatalogTableStatistics;
import org.apache.flink.table.descriptors.DescriptorProperties;
import org.apache.flink.table.expressions.Expression;
import org.apache.flink.table.factories.Factory;
-import org.apache.flink.table.store.annotation.VisibleForTesting;
import org.apache.flink.table.store.file.catalog.Catalog;
import org.apache.flink.table.store.file.catalog.Identifier;
import org.apache.flink.table.store.file.schema.Schema;
@@ -51,6 +50,8 @@ import org.apache.flink.table.store.table.FileStoreTable;
import org.apache.flink.table.store.table.Table;
import org.apache.flink.table.types.logical.RowType;
+import org.apache.paimon.annotation.VisibleForTesting;
+
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
diff --git a/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/connector/FlinkRowData.java b/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/connector/FlinkRowData.java
index 87d48fd6c..7a96fc2c7 100644
--- a/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/connector/FlinkRowData.java
+++ b/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/connector/FlinkRowData.java
@@ -25,14 +25,15 @@ import org.apache.flink.table.data.RawValueData;
import org.apache.flink.table.data.RowData;
import org.apache.flink.table.data.StringData;
import org.apache.flink.table.data.TimestampData;
-import org.apache.flink.table.store.data.BinaryString;
-import org.apache.flink.table.store.data.Decimal;
-import org.apache.flink.table.store.data.InternalArray;
-import org.apache.flink.table.store.data.InternalMap;
-import org.apache.flink.table.store.data.InternalRow;
-import org.apache.flink.table.store.data.Timestamp;
import org.apache.flink.types.RowKind;
+import org.apache.paimon.data.BinaryString;
+import org.apache.paimon.data.Decimal;
+import org.apache.paimon.data.InternalArray;
+import org.apache.paimon.data.InternalMap;
+import org.apache.paimon.data.InternalRow;
+import org.apache.paimon.data.Timestamp;
+
import static org.apache.paimon.connector.FlinkRowWrapper.fromFlinkRowKind;
/** Convert to Flink row data. */
diff --git a/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/connector/FlinkRowWrapper.java b/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/connector/FlinkRowWrapper.java
index e2cf67b98..e36337ad1 100644
--- a/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/connector/FlinkRowWrapper.java
+++ b/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/connector/FlinkRowWrapper.java
@@ -21,15 +21,16 @@ package org.apache.paimon.connector;
import org.apache.flink.table.data.DecimalData;
import org.apache.flink.table.data.GenericRowData;
import org.apache.flink.table.data.StringData;
-import org.apache.flink.table.store.data.BinaryString;
-import org.apache.flink.table.store.data.Decimal;
-import org.apache.flink.table.store.data.InternalArray;
-import org.apache.flink.table.store.data.InternalMap;
-import org.apache.flink.table.store.data.InternalRow;
-import org.apache.flink.table.store.data.Timestamp;
import org.apache.flink.table.store.types.RowKind;
import org.apache.flink.table.types.logical.LogicalType;
+import org.apache.paimon.data.BinaryString;
+import org.apache.paimon.data.Decimal;
+import org.apache.paimon.data.InternalArray;
+import org.apache.paimon.data.InternalMap;
+import org.apache.paimon.data.InternalRow;
+import org.apache.paimon.data.Timestamp;
+
import static org.apache.paimon.connector.FlinkRowData.toFlinkRowKind;
import static org.apache.paimon.connector.LogicalTypeConversion.toDataType;
diff --git a/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/connector/PredicateConverter.java b/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/connector/PredicateConverter.java
index f00e90bf1..497f1a521 100644
--- a/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/connector/PredicateConverter.java
+++ b/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/connector/PredicateConverter.java
@@ -28,7 +28,6 @@ import org.apache.flink.table.expressions.TypeLiteralExpression;
import org.apache.flink.table.expressions.ValueLiteralExpression;
import org.apache.flink.table.functions.BuiltInFunctionDefinitions;
import org.apache.flink.table.functions.FunctionDefinition;
-import org.apache.flink.table.store.data.BinaryString;
import org.apache.flink.table.store.file.predicate.Predicate;
import org.apache.flink.table.store.file.predicate.PredicateBuilder;
import org.apache.flink.table.store.utils.TypeUtils;
@@ -37,6 +36,8 @@ import org.apache.flink.table.types.logical.LogicalType;
import org.apache.flink.table.types.logical.LogicalTypeFamily;
import org.apache.flink.table.types.logical.RowType;
+import org.apache.paimon.data.BinaryString;
+
import java.util.ArrayList;
import java.util.List;
import java.util.Optional;
diff --git a/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/connector/RocksDBOptions.java b/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/connector/RocksDBOptions.java
index 75281e4ec..938e8814d 100644
--- a/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/connector/RocksDBOptions.java
+++ b/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/connector/RocksDBOptions.java
@@ -18,12 +18,12 @@
package org.apache.paimon.connector;
-import org.apache.flink.table.store.annotation.Documentation;
import org.apache.flink.table.store.options.ConfigOption;
import org.apache.flink.table.store.options.MemorySize;
import org.apache.flink.table.store.options.Options;
import org.apache.flink.table.store.options.description.Description;
+import org.apache.paimon.annotation.Documentation;
import org.rocksdb.BlockBasedTableConfig;
import org.rocksdb.BloomFilter;
import org.rocksdb.ColumnFamilyOptions;
diff --git a/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/connector/VersionedSerializerWrapper.java b/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/connector/VersionedSerializerWrapper.java
index 821d7b79c..ce0981966 100644
--- a/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/connector/VersionedSerializerWrapper.java
+++ b/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/connector/VersionedSerializerWrapper.java
@@ -19,7 +19,8 @@
package org.apache.paimon.connector;
import org.apache.flink.core.io.SimpleVersionedSerializer;
-import org.apache.flink.table.store.data.serializer.VersionedSerializer;
+
+import org.apache.paimon.data.serializer.VersionedSerializer;
import java.io.IOException;
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 ecf90e934..21c1b6e9f 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
@@ -23,8 +23,8 @@ 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.flink.table.store.annotation.VisibleForTesting;
+import org.apache.paimon.annotation.VisibleForTesting;
import org.apache.paimon.connector.log.LogSinkProvider;
import org.apache.paimon.connector.sink.LogSinkFunction;
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 38e19b36c..1854dd105 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
@@ -25,10 +25,10 @@ import org.apache.flink.connector.kafka.source.reader.deserializer.KafkaRecordDe
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.flink.table.store.annotation.VisibleForTesting;
import org.apache.flink.table.types.DataType;
import org.apache.kafka.common.TopicPartition;
+import org.apache.paimon.annotation.VisibleForTesting;
import org.apache.paimon.connector.log.LogSourceProvider;
import javax.annotation.Nullable;
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 688963b8c..d31757108 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
@@ -23,7 +23,6 @@ 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.flink.table.store.data.InternalRow;
import org.apache.flink.table.store.file.predicate.Predicate;
import org.apache.flink.table.store.file.predicate.PredicateFilter;
import org.apache.flink.table.store.file.schema.TableSchema;
@@ -39,6 +38,7 @@ import org.apache.flink.shaded.guava30.com.google.common.primitives.Ints;
import org.apache.paimon.connector.FlinkRowData;
import org.apache.paimon.connector.FlinkRowWrapper;
+import org.apache.paimon.data.InternalRow;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/connector/lookup/LookupTable.java b/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/connector/lookup/LookupTable.java
index ef54b4eeb..67e760f1b 100644
--- a/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/connector/lookup/LookupTable.java
+++ b/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/connector/lookup/LookupTable.java
@@ -18,9 +18,10 @@
package org.apache.paimon.connector.lookup;
-import org.apache.flink.table.store.data.InternalRow;
import org.apache.flink.table.store.types.RowType;
+import org.apache.paimon.data.InternalRow;
+
import java.io.IOException;
import java.util.HashSet;
import java.util.Iterator;
diff --git a/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/connector/lookup/PrimaryKeyLookupTable.java b/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/connector/lookup/PrimaryKeyLookupTable.java
index 95e9b5a06..47b47cdea 100644
--- a/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/connector/lookup/PrimaryKeyLookupTable.java
+++ b/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/connector/lookup/PrimaryKeyLookupTable.java
@@ -18,13 +18,14 @@
package org.apache.paimon.connector.lookup;
-import org.apache.flink.table.store.data.InternalRow;
-import org.apache.flink.table.store.data.serializer.InternalSerializers;
import org.apache.flink.table.store.types.RowKind;
import org.apache.flink.table.store.types.RowType;
import org.apache.flink.table.store.utils.KeyProjectedRow;
import org.apache.flink.table.store.utils.TypeUtils;
+import org.apache.paimon.data.InternalRow;
+import org.apache.paimon.data.serializer.InternalSerializers;
+
import java.io.IOException;
import java.util.Collections;
import java.util.Iterator;
diff --git a/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/connector/lookup/RocksDBSetState.java b/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/connector/lookup/RocksDBSetState.java
index 5aed1281c..5302c7524 100644
--- a/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/connector/lookup/RocksDBSetState.java
+++ b/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/connector/lookup/RocksDBSetState.java
@@ -18,9 +18,8 @@
package org.apache.paimon.connector.lookup;
-import org.apache.flink.table.store.data.InternalRow;
-import org.apache.flink.table.store.data.serializer.Serializer;
-
+import org.apache.paimon.data.InternalRow;
+import org.apache.paimon.data.serializer.Serializer;
import org.rocksdb.ColumnFamilyHandle;
import org.rocksdb.RocksDB;
import org.rocksdb.RocksDBException;
diff --git a/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/connector/lookup/RocksDBState.java b/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/connector/lookup/RocksDBState.java
index 30e3c4ac7..24c06e220 100644
--- a/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/connector/lookup/RocksDBState.java
+++ b/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/connector/lookup/RocksDBState.java
@@ -18,14 +18,14 @@
package org.apache.paimon.connector.lookup;
-import org.apache.flink.table.store.data.InternalRow;
-import org.apache.flink.table.store.data.serializer.Serializer;
import org.apache.flink.table.store.io.DataInputDeserializer;
import org.apache.flink.table.store.io.DataOutputSerializer;
import org.apache.flink.shaded.guava30.com.google.common.cache.Cache;
import org.apache.flink.shaded.guava30.com.google.common.cache.CacheBuilder;
+import org.apache.paimon.data.InternalRow;
+import org.apache.paimon.data.serializer.Serializer;
import org.rocksdb.ColumnFamilyHandle;
import org.rocksdb.RocksDB;
import org.rocksdb.WriteOptions;
diff --git a/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/connector/lookup/RocksDBStateFactory.java b/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/connector/lookup/RocksDBStateFactory.java
index b12f9d16c..5891b449b 100644
--- a/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/connector/lookup/RocksDBStateFactory.java
+++ b/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/connector/lookup/RocksDBStateFactory.java
@@ -18,10 +18,9 @@
package org.apache.paimon.connector.lookup;
-import org.apache.flink.table.store.data.InternalRow;
-import org.apache.flink.table.store.data.serializer.Serializer;
-
import org.apache.paimon.connector.RocksDBOptions;
+import org.apache.paimon.data.InternalRow;
+import org.apache.paimon.data.serializer.Serializer;
import org.rocksdb.ColumnFamilyDescriptor;
import org.rocksdb.ColumnFamilyHandle;
import org.rocksdb.ColumnFamilyOptions;
diff --git a/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/connector/lookup/RocksDBValueState.java b/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/connector/lookup/RocksDBValueState.java
index c147cb2eb..a9004379d 100644
--- a/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/connector/lookup/RocksDBValueState.java
+++ b/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/connector/lookup/RocksDBValueState.java
@@ -18,9 +18,8 @@
package org.apache.paimon.connector.lookup;
-import org.apache.flink.table.store.data.InternalRow;
-import org.apache.flink.table.store.data.serializer.Serializer;
-
+import org.apache.paimon.data.InternalRow;
+import org.apache.paimon.data.serializer.Serializer;
import org.rocksdb.ColumnFamilyHandle;
import org.rocksdb.RocksDB;
import org.rocksdb.RocksDBException;
diff --git a/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/connector/lookup/SecondaryIndexLookupTable.java b/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/connector/lookup/SecondaryIndexLookupTable.java
index d1f3ae279..1b619f386 100644
--- a/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/connector/lookup/SecondaryIndexLookupTable.java
+++ b/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/connector/lookup/SecondaryIndexLookupTable.java
@@ -18,13 +18,14 @@
package org.apache.paimon.connector.lookup;
-import org.apache.flink.table.store.data.InternalRow;
-import org.apache.flink.table.store.data.serializer.InternalSerializers;
import org.apache.flink.table.store.types.RowKind;
import org.apache.flink.table.store.types.RowType;
import org.apache.flink.table.store.utils.KeyProjectedRow;
import org.apache.flink.table.store.utils.TypeUtils;
+import org.apache.paimon.data.InternalRow;
+import org.apache.paimon.data.serializer.InternalSerializers;
+
import java.io.IOException;
import java.util.ArrayList;
import java.util.Iterator;
diff --git a/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/connector/sink/BucketStreamPartitioner.java b/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/connector/sink/BucketStreamPartitioner.java
index a18087263..2941edda8 100644
--- a/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/connector/sink/BucketStreamPartitioner.java
+++ b/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/connector/sink/BucketStreamPartitioner.java
@@ -23,12 +23,12 @@ import org.apache.flink.runtime.plugable.SerializationDelegate;
import org.apache.flink.streaming.runtime.partitioner.StreamPartitioner;
import org.apache.flink.streaming.runtime.streamrecord.StreamRecord;
import org.apache.flink.table.data.RowData;
-import org.apache.flink.table.store.data.InternalRow;
import org.apache.flink.table.store.file.schema.TableSchema;
import org.apache.flink.table.store.table.sink.BucketComputer;
import org.apache.flink.table.store.table.sink.PartitionComputer;
import org.apache.paimon.connector.FlinkRowWrapper;
+import org.apache.paimon.data.InternalRow;
import java.util.Objects;
import java.util.function.Function;
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 2bcc5077c..fc129034f 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
@@ -30,14 +30,14 @@ 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.flink.table.store.data.BinaryRow;
-import org.apache.flink.table.store.data.InternalRow;
import org.apache.flink.table.store.file.Snapshot;
import org.apache.flink.table.store.file.utils.SnapshotManager;
import org.apache.flink.table.store.table.FileStoreTable;
import org.apache.flink.table.store.table.sink.SinkRecord;
import org.apache.paimon.connector.BinaryRowTypeSerializer;
+import org.apache.paimon.data.BinaryRow;
+import org.apache.paimon.data.InternalRow;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/connector/sink/OffsetRowDataHashStreamPartitioner.java b/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/connector/sink/OffsetRowDataHashStreamPartitioner.java
index 780f6e2f6..b26699269 100644
--- a/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/connector/sink/OffsetRowDataHashStreamPartitioner.java
+++ b/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/connector/sink/OffsetRowDataHashStreamPartitioner.java
@@ -23,11 +23,11 @@ import org.apache.flink.runtime.plugable.SerializationDelegate;
import org.apache.flink.streaming.runtime.partitioner.StreamPartitioner;
import org.apache.flink.streaming.runtime.streamrecord.StreamRecord;
import org.apache.flink.table.data.RowData;
-import org.apache.flink.table.store.data.serializer.InternalRowSerializer;
import org.apache.flink.table.store.file.utils.OffsetRow;
import org.apache.flink.table.store.types.RowType;
import org.apache.paimon.connector.FlinkRowWrapper;
+import org.apache.paimon.data.serializer.InternalRowSerializer;
/**
* {@link StreamPartitioner} to partition {@link RowData} according to its hash value from an {@link
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 995ff8dfa..3109d8935 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
@@ -22,8 +22,6 @@ 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.flink.table.store.data.BinaryRow;
-import org.apache.flink.table.store.data.serializer.InternalRowSerializer;
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;
@@ -31,6 +29,8 @@ import org.apache.flink.table.store.table.FileStoreTable;
import org.apache.flink.table.store.utils.Preconditions;
import org.apache.paimon.connector.FlinkRowWrapper;
+import org.apache.paimon.data.BinaryRow;
+import org.apache.paimon.data.serializer.InternalRowSerializer;
import java.io.IOException;
import java.util.List;
diff --git a/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/connector/sink/StoreSinkWrite.java b/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/connector/sink/StoreSinkWrite.java
index d48dd6417..6c8983d52 100644
--- a/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/connector/sink/StoreSinkWrite.java
+++ b/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/connector/sink/StoreSinkWrite.java
@@ -21,12 +21,13 @@ 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.runtime.state.StateSnapshotContext;
-import org.apache.flink.table.store.data.BinaryRow;
-import org.apache.flink.table.store.data.InternalRow;
import org.apache.flink.table.store.file.io.DataFileMeta;
import org.apache.flink.table.store.table.FileStoreTable;
import org.apache.flink.table.store.table.sink.SinkRecord;
+import org.apache.paimon.data.BinaryRow;
+import org.apache.paimon.data.InternalRow;
+
import java.io.IOException;
import java.io.Serializable;
import java.util.List;
diff --git a/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/connector/sink/StoreSinkWriteImpl.java b/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/connector/sink/StoreSinkWriteImpl.java
index a4328ab70..2baa8be89 100644
--- a/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/connector/sink/StoreSinkWriteImpl.java
+++ b/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/connector/sink/StoreSinkWriteImpl.java
@@ -21,8 +21,6 @@ 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.runtime.state.StateSnapshotContext;
-import org.apache.flink.table.store.data.BinaryRow;
-import org.apache.flink.table.store.data.InternalRow;
import org.apache.flink.table.store.file.disk.IOManagerImpl;
import org.apache.flink.table.store.file.io.DataFileMeta;
import org.apache.flink.table.store.table.FileStoreTable;
@@ -30,6 +28,8 @@ import org.apache.flink.table.store.table.sink.CommitMessage;
import org.apache.flink.table.store.table.sink.SinkRecord;
import org.apache.flink.table.store.table.sink.TableWriteImpl;
+import org.apache.paimon.data.BinaryRow;
+import org.apache.paimon.data.InternalRow;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/connector/source/FileStoreSourceSplitReader.java b/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/connector/source/FileStoreSourceSplitReader.java
index 6cae5ebb0..087a0c7b7 100644
--- a/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/connector/source/FileStoreSourceSplitReader.java
+++ b/paimon-flink/paimon-flink-common/src/main/java/org/apache/paimon/connector/source/FileStoreSourceSplitReader.java
@@ -27,13 +27,13 @@ import org.apache.flink.connector.file.src.util.MutableRecordAndPosition;
import org.apache.flink.connector.file.src.util.Pool;
import org.apache.flink.connector.file.src.util.RecordAndPosition;
import org.apache.flink.table.data.RowData;
-import org.apache.flink.table.store.data.InternalRow;
import org.apache.flink.table.store.reader.RecordReader;
import org.apache.flink.table.store.reader.RecordReader.RecordIterator;
import org.apache.flink.table.store.table.source.Split;
import org.apache.flink.table.store.table.source.TableRead;
import org.apache.paimon.connector.FlinkRowData;
+import org.apache.paimon.data.InternalRow;
import javax.annotation.Nullable;
diff --git a/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/connector/BinaryRowTypeSerializerTest.java b/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/connector/BinaryRowTypeSerializerTest.java
index 8d8c50c6a..a45b3d748 100644
--- a/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/connector/BinaryRowTypeSerializerTest.java
+++ b/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/connector/BinaryRowTypeSerializerTest.java
@@ -20,7 +20,8 @@ package org.apache.paimon.connector;
import org.apache.flink.api.common.typeutils.SerializerTestBase;
import org.apache.flink.api.common.typeutils.TypeSerializer;
-import org.apache.flink.table.store.data.BinaryRow;
+
+import org.apache.paimon.data.BinaryRow;
import java.util.Random;
diff --git a/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/connector/PredicateConverterTest.java b/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/connector/PredicateConverterTest.java
index 3688d1770..181bf7e76 100644
--- a/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/connector/PredicateConverterTest.java
+++ b/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/connector/PredicateConverterTest.java
@@ -25,7 +25,6 @@ import org.apache.flink.table.expressions.ResolvedExpression;
import org.apache.flink.table.expressions.ValueLiteralExpression;
import org.apache.flink.table.functions.BuiltInFunctionDefinitions;
import org.apache.flink.table.functions.FunctionDefinition;
-import org.apache.flink.table.store.data.BinaryString;
import org.apache.flink.table.store.file.predicate.Predicate;
import org.apache.flink.table.store.file.predicate.PredicateBuilder;
import org.apache.flink.table.types.DataType;
@@ -36,6 +35,7 @@ import org.apache.flink.table.types.logical.RowType;
import org.apache.flink.table.types.logical.VarCharType;
import org.apache.flink.types.Row;
+import org.apache.paimon.data.BinaryString;
import org.apache.paimon.format.FieldStats;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
diff --git a/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/connector/action/ActionITCaseBase.java b/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/connector/action/ActionITCaseBase.java
index 896787dde..337d175a1 100644
--- a/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/connector/action/ActionITCaseBase.java
+++ b/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/connector/action/ActionITCaseBase.java
@@ -19,9 +19,6 @@
package org.apache.paimon.connector.action;
import org.apache.flink.table.store.catalog.CatalogContext;
-import org.apache.flink.table.store.data.DataFormatTestUtil;
-import org.apache.flink.table.store.data.GenericRow;
-import org.apache.flink.table.store.data.InternalRow;
import org.apache.flink.table.store.file.catalog.Catalog;
import org.apache.flink.table.store.file.catalog.CatalogFactory;
import org.apache.flink.table.store.file.catalog.Identifier;
@@ -37,6 +34,9 @@ import org.apache.flink.table.store.table.source.TableRead;
import org.apache.flink.table.store.types.RowType;
import org.apache.paimon.connector.util.AbstractTestBase;
+import org.apache.paimon.data.DataFormatTestUtil;
+import org.apache.paimon.data.GenericRow;
+import org.apache.paimon.data.InternalRow;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
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 36c25055e..a2bbd019e 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
@@ -23,7 +23,6 @@ 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.flink.table.store.data.BinaryString;
import org.apache.flink.table.store.file.Snapshot;
import org.apache.flink.table.store.table.FileStoreTable;
import org.apache.flink.table.store.table.source.DataSplit;
@@ -35,6 +34,7 @@ import org.apache.flink.table.store.types.RowType;
import org.apache.flink.table.store.utils.CommonTestUtils;
import org.apache.paimon.connector.FlinkConnectorOptions;
+import org.apache.paimon.data.BinaryString;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.Timeout;
diff --git a/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/connector/action/DeleteActionITCase.java b/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/connector/action/DeleteActionITCase.java
index 4971f8bed..ad9f88c78 100644
--- a/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/connector/action/DeleteActionITCase.java
+++ b/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/connector/action/DeleteActionITCase.java
@@ -18,7 +18,6 @@
package org.apache.paimon.connector.action;
-import org.apache.flink.table.store.data.BinaryString;
import org.apache.flink.table.store.file.Snapshot;
import org.apache.flink.table.store.file.utils.BlockingIterator;
import org.apache.flink.table.store.table.FileStoreTable;
@@ -27,6 +26,7 @@ import org.apache.flink.table.store.types.DataTypes;
import org.apache.flink.table.store.types.RowType;
import org.apache.flink.types.Row;
+import org.apache.paimon.data.BinaryString;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.Arguments;
diff --git a/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/connector/action/DropPartitionActionITCase.java b/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/connector/action/DropPartitionActionITCase.java
index dbb9aaf10..31c310e1c 100644
--- a/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/connector/action/DropPartitionActionITCase.java
+++ b/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/connector/action/DropPartitionActionITCase.java
@@ -18,7 +18,6 @@
package org.apache.paimon.connector.action;
-import org.apache.flink.table.store.data.BinaryString;
import org.apache.flink.table.store.file.Snapshot;
import org.apache.flink.table.store.table.FileStoreTable;
import org.apache.flink.table.store.table.source.DataTableScan;
@@ -26,6 +25,7 @@ import org.apache.flink.table.store.types.DataType;
import org.apache.flink.table.store.types.DataTypes;
import org.apache.flink.table.store.types.RowType;
+import org.apache.paimon.data.BinaryString;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.ValueSource;
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 0dcc3e69f..a623fe1c0 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
@@ -36,7 +36,6 @@ import org.apache.flink.table.runtime.connector.source.ScanRuntimeProviderContex
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.flink.table.store.data.GenericRow;
import org.apache.flink.table.store.table.sink.SinkRecord;
import org.apache.flink.table.store.types.RowKind;
import org.apache.flink.table.types.DataType;
@@ -46,6 +45,7 @@ import org.apache.flink.table.types.logical.RowType;
import org.apache.flink.table.types.utils.TypeConversions;
import org.apache.paimon.connector.log.LogStoreTableFactory;
+import org.apache.paimon.data.GenericRow;
import java.util.Arrays;
import java.util.Collections;
@@ -58,10 +58,10 @@ 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.flink.table.store.data.BinaryRow.EMPTY_ROW;
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;
+import static org.apache.paimon.data.BinaryRow.EMPTY_ROW;
/** Utils for the test of {@link KafkaLogStoreFactory}. */
public class KafkaLogTestUtils {
diff --git a/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/connector/lookup/LookupTableTest.java b/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/connector/lookup/LookupTableTest.java
index d1a095861..7e296b30c 100644
--- a/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/connector/lookup/LookupTableTest.java
+++ b/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/connector/lookup/LookupTableTest.java
@@ -18,13 +18,13 @@
package org.apache.paimon.connector.lookup;
-import org.apache.flink.table.store.data.GenericRow;
-import org.apache.flink.table.store.data.InternalRow;
import org.apache.flink.table.store.options.Options;
import org.apache.flink.table.store.types.IntType;
import org.apache.flink.table.store.types.RowKind;
import org.apache.flink.table.store.types.RowType;
+import org.apache.paimon.data.GenericRow;
+import org.apache.paimon.data.InternalRow;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git a/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/connector/sink/CommitterOperatorTest.java b/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/connector/sink/CommitterOperatorTest.java
index 2da3db628..c04204e6a 100644
--- a/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/connector/sink/CommitterOperatorTest.java
+++ b/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/connector/sink/CommitterOperatorTest.java
@@ -23,7 +23,6 @@ import org.apache.flink.api.common.typeutils.TypeSerializer;
import org.apache.flink.runtime.checkpoint.OperatorSubtaskState;
import org.apache.flink.streaming.api.watermark.Watermark;
import org.apache.flink.streaming.util.OneInputStreamOperatorTestHarness;
-import org.apache.flink.table.store.data.GenericRow;
import org.apache.flink.table.store.file.manifest.ManifestCommittableSerializer;
import org.apache.flink.table.store.file.utils.SnapshotManager;
import org.apache.flink.table.store.fs.local.LocalFileIO;
@@ -32,6 +31,7 @@ import org.apache.flink.table.store.table.sink.CommitMessage;
import org.apache.flink.table.store.table.sink.StreamTableWrite;
import org.apache.paimon.connector.VersionedSerializerWrapper;
+import org.apache.paimon.data.GenericRow;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
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 7de87b40c..faa414a51 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
@@ -19,7 +19,6 @@
package org.apache.paimon.connector.sink;
import org.apache.flink.table.store.CoreOptions;
-import org.apache.flink.table.store.data.InternalRow;
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;
@@ -35,6 +34,7 @@ import org.apache.flink.table.store.types.DataTypes;
import org.apache.flink.table.store.types.RowType;
import org.apache.flink.table.store.utils.CloseableIterator;
+import org.apache.paimon.data.InternalRow;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.io.TempDir;
diff --git a/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/connector/sink/CompactorSinkITCase.java b/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/connector/sink/CompactorSinkITCase.java
index 3aabd750d..58369d495 100644
--- a/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/connector/sink/CompactorSinkITCase.java
+++ b/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/connector/sink/CompactorSinkITCase.java
@@ -22,8 +22,6 @@ import org.apache.flink.api.common.RuntimeExecutionMode;
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.data.BinaryString;
-import org.apache.flink.table.store.data.GenericRow;
import org.apache.flink.table.store.file.Snapshot;
import org.apache.flink.table.store.file.schema.Schema;
import org.apache.flink.table.store.file.schema.SchemaManager;
@@ -43,6 +41,8 @@ import org.apache.flink.table.store.types.RowType;
import org.apache.paimon.connector.source.CompactorSourceBuilder;
import org.apache.paimon.connector.util.AbstractTestBase;
+import org.apache.paimon.data.BinaryString;
+import org.apache.paimon.data.GenericRow;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git a/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/connector/sink/FileStoreShuffleBucketTest.java b/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/connector/sink/FileStoreShuffleBucketTest.java
index 8c3fc3ea7..436432d6d 100644
--- a/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/connector/sink/FileStoreShuffleBucketTest.java
+++ b/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/connector/sink/FileStoreShuffleBucketTest.java
@@ -25,8 +25,6 @@ import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment;
import org.apache.flink.table.data.GenericRowData;
import org.apache.flink.table.data.RowData;
import org.apache.flink.table.runtime.typeutils.InternalTypeInfo;
-import org.apache.flink.table.store.data.BinaryRow;
-import org.apache.flink.table.store.data.InternalRow;
import org.apache.flink.table.store.file.io.DataFileMeta;
import org.apache.flink.table.store.fs.local.LocalFileIO;
import org.apache.flink.table.store.table.FileStoreTable;
@@ -36,6 +34,8 @@ import org.apache.flink.table.types.logical.RowType;
import org.apache.paimon.connector.CatalogITCaseBase;
import org.apache.paimon.connector.FlinkConnectorOptions;
+import org.apache.paimon.data.BinaryRow;
+import org.apache.paimon.data.InternalRow;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git a/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/connector/source/CompactorSourceITCase.java b/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/connector/source/CompactorSourceITCase.java
index ce11e32a2..35b8e57ec 100644
--- a/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/connector/source/CompactorSourceITCase.java
+++ b/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/connector/source/CompactorSourceITCase.java
@@ -21,10 +21,6 @@ package org.apache.paimon.connector.source;
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.data.BinaryRow;
-import org.apache.flink.table.store.data.BinaryRowWriter;
-import org.apache.flink.table.store.data.BinaryString;
-import org.apache.flink.table.store.data.GenericRow;
import org.apache.flink.table.store.file.io.DataFileMetaSerializer;
import org.apache.flink.table.store.file.schema.Schema;
import org.apache.flink.table.store.file.schema.SchemaManager;
@@ -41,6 +37,10 @@ import org.apache.flink.table.store.types.RowType;
import org.apache.flink.util.CloseableIterator;
import org.apache.paimon.connector.util.AbstractTestBase;
+import org.apache.paimon.data.BinaryRow;
+import org.apache.paimon.data.BinaryRowWriter;
+import org.apache.paimon.data.BinaryString;
+import org.apache.paimon.data.GenericRow;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git a/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/connector/source/FileStoreSourceSplitReaderTest.java b/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/connector/source/FileStoreSourceSplitReaderTest.java
index 5fde50fbd..1fa67a848 100644
--- a/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/connector/source/FileStoreSourceSplitReaderTest.java
+++ b/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/connector/source/FileStoreSourceSplitReaderTest.java
@@ -24,7 +24,6 @@ import org.apache.flink.connector.base.source.reader.splitreader.SplitsAddition;
import org.apache.flink.connector.base.source.reader.splitreader.SplitsChange;
import org.apache.flink.connector.file.src.util.RecordAndPosition;
import org.apache.flink.table.data.RowData;
-import org.apache.flink.table.store.data.GenericRow;
import org.apache.flink.table.store.file.KeyValue;
import org.apache.flink.table.store.file.io.DataFileMeta;
import org.apache.flink.table.store.file.schema.Schema;
@@ -38,6 +37,7 @@ import org.apache.flink.table.types.logical.IntType;
import org.apache.flink.table.types.logical.RowType;
import org.apache.flink.types.RowKind;
+import org.apache.paimon.data.GenericRow;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.io.TempDir;
diff --git a/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/connector/source/FileStoreSourceSplitSerializerTest.java b/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/connector/source/FileStoreSourceSplitSerializerTest.java
index 7c5dbeeb7..8709ef469 100644
--- a/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/connector/source/FileStoreSourceSplitSerializerTest.java
+++ b/paimon-flink/paimon-flink-common/src/test/java/org/apache/paimon/connector/source/FileStoreSourceSplitSerializerTest.java
@@ -19,11 +19,11 @@
package org.apache.paimon.connector.source;
import org.apache.flink.core.io.SimpleVersionedSerialization;
-import org.apache.flink.table.store.data.BinaryRow;
import org.apache.flink.table.store.file.io.DataFileMeta;
import org.apache.flink.table.store.file.stats.StatsTestUtils;
import org.apache.flink.table.store.table.source.DataSplit;
+import org.apache.paimon.data.BinaryRow;
import org.junit.jupiter.api.Test;
import java.io.IOException;
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 4d6043e57..3c20db9ce 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
@@ -20,9 +20,6 @@ package org.apache.paimon.connector.source;
import org.apache.flink.api.java.tuple.Tuple2;
import org.apache.flink.table.store.CoreOptions;
-import org.apache.flink.table.store.data.BinaryRow;
-import org.apache.flink.table.store.data.GenericRow;
-import org.apache.flink.table.store.data.InternalRow;
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;
@@ -51,6 +48,9 @@ import org.apache.flink.table.store.types.IntType;
import org.apache.flink.table.store.types.RowKind;
import org.apache.flink.table.store.types.RowType;
+import org.apache.paimon.data.BinaryRow;
+import org.apache.paimon.data.GenericRow;
+import org.apache.paimon.data.InternalRow;
import org.apache.paimon.format.FileFormat;
import java.util.ArrayList;
diff --git a/paimon-format/src/main/java/org/apache/paimon/format/avro/AbstractAvroBulkFormat.java b/paimon-format/src/main/java/org/apache/paimon/format/avro/AbstractAvroBulkFormat.java
index ec245fb1a..431274381 100644
--- a/paimon-format/src/main/java/org/apache/paimon/format/avro/AbstractAvroBulkFormat.java
+++ b/paimon-format/src/main/java/org/apache/paimon/format/avro/AbstractAvroBulkFormat.java
@@ -18,7 +18,6 @@
package org.apache.paimon.format.avro;
-import org.apache.flink.table.store.data.InternalRow;
import org.apache.flink.table.store.fs.FileIO;
import org.apache.flink.table.store.fs.Path;
... 2019 lines suppressed ...