Skip to content

[core] Avoid cross-file blob and vector compaction for data evolution #7938

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JingsongLi merged 3 commits into from
May 23, 2026
+121 −17
Merged

[core] Avoid cross-file blob and vector compaction for data evolution #7938

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
eb72fac
[core] Avoid cross-file blob compaction for data evolution
leaves12138 May 22, 2026
6d20e27
[core] Avoid cross-file blob compaction for data evolution
leaves12138 May 22, 2026
b597fac
[core] Address dedicated compact planner review comments
leaves12138 May 23, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
62 changes: 46 additions & 16 deletions ...src/main/java/org/apache/paimon/append/dataevolution/DataEvolutionCompactCoordinator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -356,30 +356,60 @@ private List<DataEvolutionCompactTask> triggerTask(
Map<DataFileMeta, List<DataFileMeta>> dataFileToBlobFiles,
Map<DataFileMeta, List<DataFileMeta>> dataFileToVectorStoreFiles) {
List<DataEvolutionCompactTask> tasks = new ArrayList<>();
if (dataFiles.size() >= compactMinFileNum) {
boolean triggerNormalFile = dataFiles.size() >= compactMinFileNum;
if (triggerNormalFile) {
tasks.add(new DataEvolutionCompactTask(partition, dataFiles, false));
}

if (compactBlob) {
List<DataFileMeta> blobFiles = new ArrayList<>();
for (DataFileMeta dataFile : dataFiles) {
blobFiles.addAll(
dataFileToBlobFiles.getOrDefault(dataFile, Collections.emptyList()));
}
for (List<DataFileMeta> blobFilesToCompact : blobFileGroupsToCompact(blobFiles)) {
tasks.add(new DataEvolutionCompactTask(partition, blobFilesToCompact, true));
if (triggerNormalFile) {
List<DataFileMeta> blobFiles = new ArrayList<>();
for (DataFileMeta dataFile : dataFiles) {
blobFiles.addAll(
dataFileToBlobFiles.getOrDefault(
dataFile, Collections.emptyList()));
}
for (List<DataFileMeta> blobFilesToCompact :
blobFileGroupsToCompact(blobFiles)) {
tasks.add(
new DataEvolutionCompactTask(partition, blobFilesToCompact, true));
}
} else {
for (DataFileMeta dataFile : dataFiles) {
for (List<DataFileMeta> blobFilesToCompact :
blobFileGroupsToCompact(
dataFileToBlobFiles.getOrDefault(
dataFile, Collections.emptyList()))) {
tasks.add(
new DataEvolutionCompactTask(
partition, blobFilesToCompact, true));
}
}
}
}

if (compactVector) {
List<DataFileMeta> vectorStoreFiles = new ArrayList<>();
for (DataFileMeta dataFile : dataFiles) {
vectorStoreFiles.addAll(
dataFileToVectorStoreFiles.getOrDefault(
dataFile, Collections.emptyList()));
}
if (vectorStoreFiles.size() >= compactMinFileNum) {
tasks.add(new DataEvolutionCompactTask(partition, vectorStoreFiles, false));
if (triggerNormalFile) {
List<DataFileMeta> vectorStoreFiles = new ArrayList<>();
for (DataFileMeta dataFile : dataFiles) {
vectorStoreFiles.addAll(
dataFileToVectorStoreFiles.getOrDefault(
dataFile, Collections.emptyList()));
}
if (vectorStoreFiles.size() >= compactMinFileNum) {
tasks.add(new DataEvolutionCompactTask(partition, vectorStoreFiles, false));
}
} else {
for (DataFileMeta dataFile : dataFiles) {
List<DataFileMeta> vectorStoreFiles =
dataFileToVectorStoreFiles.getOrDefault(
dataFile, Collections.emptyList());
if (vectorStoreFiles.size() >= compactMinFileNum) {
tasks.add(
new DataEvolutionCompactTask(
partition, vectorStoreFiles, false));
}
}
}
}
return tasks;
Expand Down
76 changes: 75 additions & 1 deletion ...test/java/org/apache/paimon/append/dataevolution/DataEvolutionCompactCoordinatorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,8 @@ public void testCompactPlannerWithBlobFiles() {

List<DataEvolutionCompactTask> tasks = planner.compactPlan(entries);

// Should have compaction tasks for both data files and blob files
// Should have compaction tasks for data files and blob files within the data compaction
// range.
assertThat(tasks.size()).isEqualTo(2);

assertThat(tasks.get(0).compactBefore())
Expand All @@ -190,6 +191,56 @@ public void testCompactPlannerWithBlobFiles() {
entries.get(5).file());
}

@Test
public void testCompactPlannerDoesNotCompactBlobFilesAcrossDataFiles() {
List<ManifestEntry> entries = new ArrayList<>();
entries.add(makeEntry("file1.parquet", 0L, 100L, 100));
entries.add(makeBlobEntry("file1.blob", 0L, 100L, 100, "pic"));
entries.add(makeEntry("file2.parquet", 100L, 100L, 100));
entries.add(makeBlobEntry("file2.blob", 100L, 100L, 100, "pic"));

DataEvolutionCompactCoordinator.CompactPlanner planner =
blobPlanner(1024, 1024, 100, rowType(new DataField(1, "pic", DataTypes.BLOB())));

List<DataEvolutionCompactTask> tasks = planner.compactPlan(entries);

assertThat(tasks).isEmpty();

planner = blobPlanner(1024, 1024, 2, rowType(new DataField(1, "pic", DataTypes.BLOB())));
tasks = planner.compactPlan(entries);

assertThat(tasks).hasSize(2);
assertThat(tasks.get(0).compactBefore())
.containsExactly(entries.get(0).file(), entries.get(2).file());
assertThat(tasks.get(1).compactBefore())
.containsExactly(entries.get(1).file(), entries.get(3).file());
}

@Test
public void testCompactPlannerDoesNotCompactVectorStoreFilesAcrossDataFiles() {
List<ManifestEntry> entries = new ArrayList<>();
entries.add(makeEntry("file1.parquet", 0L, 100L, 100));
entries.add(makeVectorStoreEntry("file1.vector.json", 0L, 100L, 100));
entries.add(makeEntry("file2.parquet", 100L, 100L, 100));
entries.add(makeVectorStoreEntry("file2.vector.json", 100L, 100L, 100));

DataEvolutionCompactCoordinator.CompactPlanner planner =
vectorStorePlanner(1024, 1024, 100);

List<DataEvolutionCompactTask> tasks = planner.compactPlan(entries);

assertThat(tasks).isEmpty();

planner = vectorStorePlanner(1024, 1024, 2);
tasks = planner.compactPlan(entries);

assertThat(tasks).hasSize(2);
assertThat(tasks.get(0).compactBefore())
.containsExactly(entries.get(0).file(), entries.get(2).file());
assertThat(tasks.get(1).compactBefore())
.containsExactly(entries.get(1).file(), entries.get(3).file());
}

@Test
public void testCompactPlannerSkipsSingleFilePerBlobField() {
List<ManifestEntry> entries = new ArrayList<>();
Expand Down Expand Up @@ -468,6 +519,23 @@ private ManifestEntry makeBlobEntry(
writeCol == null ? null : Collections.singletonList(writeCol)));
}

private ManifestEntry makeVectorStoreEntry(
String fileName, long firstRowId, long rowCount, long fileSize) {
return ManifestEntry.create(
FileKind.ADD,
BinaryRow.EMPTY_ROW,
0,
0,
createDataFileMeta(
fileName,
firstRowId,
rowCount,
0,
fileSize,
0,
Collections.singletonList("vec")));
}

private DataFileMeta createDataFileMeta(
String fileName, long firstRowId, long rowCount, long maxSeq, long fileSize) {
return createDataFileMeta(fileName, firstRowId, rowCount, maxSeq, fileSize, 0, null);
Expand Down Expand Up @@ -537,6 +605,12 @@ private DataEvolutionCompactCoordinator.CompactPlanner blobPlanner(
fieldIds(currentRowType));
}

private DataEvolutionCompactCoordinator.CompactPlanner vectorStorePlanner(
long targetFileSize, long openFileCost, long compactMinFileNum) {
return new DataEvolutionCompactCoordinator.CompactPlanner(
false, true, targetFileSize, openFileCost, compactMinFileNum);
}

private RowType rowType(DataField... fields) {
return new RowType(Arrays.asList(fields));
}
Expand Down