feat(core): support sort manifest entries by partition#7866
Open
baiyangtx wants to merge 14 commits into
Open
Conversation
Aitozi
approved these changes
May 21, 2026
Contributor
Aitozi
left a comment
There was a problem hiding this comment.
LGTM +1, Please resolve the conflict
Contributor
|
CC @JingsongLi for another look |
Contributor
|
Hi @baiyangtx @Aitozi , please take a look to #7842 , I didn't look closely, maybe the abilities of these two PR implementations are the same. |
Contributor
Author
Thanks @discivigour for working on this too. My PR #7866 takes a different approach — sorting inline during the existing full compaction path, rather than a separate post-commit sort pipeline. Key differences:
Happy to align with the community's direction, but I believe the inline approach is simpler and less invasive. |
added 14 commits
May 22, 2026 14:44
- Sort delta entries during commit - Sort base entries via full merge See merge request: !854
The manifest entry sorting feature introduced in the parent commit used FileKind.DELETE in mergeUnsorted() and mergeSortedByPartition() without importing org.apache.paimon.manifest.FileKind, causing all modules that depend on paimon-core to fail compilation.
The sorting refactor eliminated the single call to sequentialBatchedExecute, but left the static import, causing Checkstyle to fail the build.
- FileStoreCommitImpl: use options.xxx() instead of local variables (manifestTargetSize, manifestMergeMinCount, etc. don't exist) - FileStoreCommitImpl: replace coreOptions with options - ManifestFileMerger: replace entry.toBytes() with entrySerializer.serializeToBytes() (toBytes() doesn't exist on apache/master) - ManifestFileMerger: extract createPartitionRecordComparator() to handle partition row comparison (InternalRowUtils.compare takes DataTypeRoot, not RowType; newRecordComparator takes boolean[], not boolean) - Remove stale reader Function referencing deleted readForFullCompaction - Add missing DataType import, remove unused Function/singletonList imports
createPartitionRecordComparator now returns RecordComparator instead of Comparator<BinaryRow>, since RecordComparator extends Comparator<InternalRow> and newRecordComparator already returns RecordComparator. This avoids a type incompatibility at the assignment site where the result was used as RecordComparator.
Manifest sorting changes the read order of results across partitions. The test compared results using containsExactly which requires exact order; changed to containsExactlyInAnyOrder to match the same approach used in CompactProcedureTestBase.scala.
Manifest sorting changes read order; the test expected sorted output. Added explicit sort by id to make the test order-independent.
… assertion - testFullCompactionReadManifestsInParallel: removed parallel read assertions since reads are now sequential in mergeSortedByPartition - BlobTableTest/MultipleBlobTableTest: disable MANIFEST_MERGE_SORTED and MANIFEST_DELTA_SORTED since blob/vector-store code depends on original file ordering
…rtions The manifest sorting feature changes the order of results. All containsExactlyElementsOf in IncrementalClusterActionITCase need to be changed to containsExactlyInAnyOrderElementsOf, not just the one in the assertResult helper.
…in Spark tests CompactProcedureTestBase and RescaleProcedureTest had additional containsExactlyElementsOf calls that were not updated in the original PR. All changed to containsExactlyInAnyOrderElementsOf.
- LanceFormatTest: add ORDER BY a to LIMIT queries - SparkWriteITCase.testWriteWithDefaultValue: add ORDER BY a to all SELECT queries whose results are compared via toString()
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Purpose
Manifest entries are currently written in arrival order, which scatters entries belonging
to the same partition across multiple manifest files. This leads to:
to find all entries for a single partition.
This PR introduces manifest entry sorting by partition, so that entries for the same
partition are clustered together within manifest files.
Changes
New configuration options:
manifest.merge.sortedtruemanifest.merge.sort-on-commitfalsemanifest.delta.sortedtrueCore implementation:
ManifestFileMerger: IntroducesmergeSortedByPartition()andmergeUnsorted().When
manifest.merge.sortedis enabled, entries are collected into aBinaryExternalSortBuffer(with spill-to-disk support), then written inpartition-major order:
(partition, bucket, level).ManifestFileMerger.createManifestEntryComparator(): Comparator used forsorting delta manifests, falling back to pure-Java comparison when codegen
is unavailable.
FileStoreCommitImpl: Wires sort parameters into all three paths —commit manifest merge, delta file writing, and manifest compaction.
Tests