Skip to content

[HUDI-6361] retain the commit before inflignt compaction to support schema Evolution #8938

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

Closed
zhuanshenbsj1 wants to merge 2 commits into from
Closed

[HUDI-6361] retain the commit before inflignt compaction to support schema Evolution #8938

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2f2d592
retain the commit before inflignt compaction to support schema Evolution
zhuanshenbsj1 Jun 12, 2023
32cb5fe
adjust Option code
zhuanshenbsj1 Jun 12, 2023
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
20 changes: 17 additions & 3 deletions hudi-common/src/main/java/org/apache/hudi/common/util/CompactionUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -346,21 +346,35 @@ public static Option<Pair<HoodieTimeline, HoodieInstant>> getDeltaCommitsSinceLa
*/
public static Option<HoodieInstant> getOldestInstantToRetainForCompaction(
HoodieActiveTimeline activeTimeline, int maxDeltaCommits) {
Option<HoodieInstant> oldestInstantToRetain = Option.empty();
Option<Pair<HoodieTimeline, HoodieInstant>> deltaCommitsInfoOption =
CompactionUtils.getDeltaCommitsSinceLatestCompaction(activeTimeline);
if (deltaCommitsInfoOption.isPresent()) {
Pair<HoodieTimeline, HoodieInstant> deltaCommitsInfo = deltaCommitsInfoOption.get();
HoodieTimeline deltaCommitTimeline = deltaCommitsInfo.getLeft();
int numDeltaCommits = deltaCommitTimeline.countInstants();
if (numDeltaCommits < maxDeltaCommits) {
return Option.of(deltaCommitsInfo.getRight());
oldestInstantToRetain = Option.of(deltaCommitsInfo.getRight());
} else {
// delta commits with the last one to keep
List<HoodieInstant> instants = deltaCommitTimeline.getInstantsAsStream()
.limit(numDeltaCommits - maxDeltaCommits + 1).collect(Collectors.toList());
return Option.of(instants.get(instants.size() - 1));
oldestInstantToRetain = Option.of(instants.get(instants.size() - 1));
}
}
return Option.empty();

// retain the commit before inflignt compaction to support schema Evolution
Option<HoodieInstant> firstPendingCompactionInstant = activeTimeline.filterPendingCompactionTimeline().firstInstant();
if (firstPendingCompactionInstant.isPresent()) {
Option<HoodieInstant> lastInstantBeforeFirstPendingCompaction = firstPendingCompactionInstant.isPresent()
? activeTimeline.getWriteTimeline().findInstantsBefore(firstPendingCompactionInstant.get().getTimestamp()).filterCompletedInstants().lastInstant()
: Option.empty();
if (lastInstantBeforeFirstPendingCompaction.isPresent()
&& oldestInstantToRetain.map(instant -> instant.compareTo(lastInstantBeforeFirstPendingCompaction.get()) > 0).orElse(true)) {
oldestInstantToRetain = lastInstantBeforeFirstPendingCompaction;
}
}

return oldestInstantToRetain;
}
}
21 changes: 15 additions & 6 deletions hudi-common/src/test/java/org/apache/hudi/common/util/TestCompactionUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,18 +286,27 @@ public void testGetDeltaCommitsSinceLatestCompactionWithEmptyDeltaCommits() {
public void testGetOldestInstantToKeepForCompaction(boolean hasCompletedCompaction) {
HoodieActiveTimeline timeline = prepareTimeline(hasCompletedCompaction);
Option<HoodieInstant> actual = CompactionUtils.getOldestInstantToRetainForCompaction(timeline, 20);

if (hasCompletedCompaction) {

assertEquals(new HoodieInstant(false, HoodieTimeline.COMMIT_ACTION, "06"), actual.get());

actual = CompactionUtils.getOldestInstantToRetainForCompaction(timeline, 3);
assertEquals(new HoodieInstant(false, HoodieTimeline.DELTA_COMMIT_ACTION, "07"), actual.get());

actual = CompactionUtils.getOldestInstantToRetainForCompaction(timeline, 2);
assertEquals(new HoodieInstant(false, HoodieTimeline.DELTA_COMMIT_ACTION, "08"), actual.get());

} else {
assertEquals(new HoodieInstant(false, HoodieTimeline.DELTA_COMMIT_ACTION, "01"), actual.get());

actual = CompactionUtils.getOldestInstantToRetainForCompaction(timeline, 3);
assertEquals(new HoodieInstant(false, HoodieTimeline.DELTA_COMMIT_ACTION, "05"), actual.get());

actual = CompactionUtils.getOldestInstantToRetainForCompaction(timeline, 2);
assertEquals(new HoodieInstant(false, HoodieTimeline.DELTA_COMMIT_ACTION, "05"), actual.get());
}

actual = CompactionUtils.getOldestInstantToRetainForCompaction(timeline, 3);
assertEquals(new HoodieInstant(false, HoodieTimeline.DELTA_COMMIT_ACTION, "07"), actual.get());

actual = CompactionUtils.getOldestInstantToRetainForCompaction(timeline, 2);
assertEquals(new HoodieInstant(false, HoodieTimeline.DELTA_COMMIT_ACTION, "08"), actual.get());
}

@Test
Expand All @@ -317,7 +326,7 @@ private HoodieActiveTimeline prepareTimeline(boolean hasCompletedCompaction) {
Stream.of("01", "02", "03", "04", "05", "07", "08"),
Stream.empty(),
Stream.of(
Pair.of("06", HoodieTimeline.COMMIT_ACTION),
Pair.of("06", HoodieTimeline.COMPACTION_ACTION),
Pair.of("09", HoodieTimeline.DELTA_COMMIT_ACTION)));
}
}
Expand Down