Skip to content

[core] Reduce memory for global index-only commits #8896

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

Draft
leaves12138 wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

[core] Reduce memory for global index-only commits #8896

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
138 changes: 84 additions & 54 deletions paimon-core/src/main/java/org/apache/paimon/operation/FileStoreCommitImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,15 @@ public FileStoreCommitImpl(
this.manifestList = manifestListFactory.create();
this.indexManifestFile = indexManifestFileFactory.create();
this.rollback = rollback;
this.scanner = new CommitScanner(scanSupplier, snapshotManager, indexManifestFile, options);
this.scanner =
new CommitScanner(
scanSupplier,
snapshotManager,
indexManifestFile,
manifestFile,
manifestList,
partitionType,
options);
this.commitPreCallbacks = commitPreCallbacks;
this.commitCallbacks = commitCallbacks;
this.retryWaiter =
Expand Down Expand Up @@ -962,67 +970,82 @@ CommitResult tryCommitOnce(
boolean discardDuplicate =
options.commitDiscardDuplicateFiles() && commitKind == CommitKind.APPEND;
boolean checkConflicts = latestSnapshot != null && (discardDuplicate || detectConflicts);
boolean checkGlobalIndexOnly =
checkConflicts
&& commitKind == CommitKind.APPEND
&& deltaFiles.isEmpty()
&& commitPreCallbacks.isEmpty()
&& !conflictDetection.hasRowIdCheckFromSnapshot()
&& conflictDetection.canCheckGlobalIndexOnly(indexFiles);
// By default, if checkConflicts is required, we do not have to do the extra check bucket
// here.
if (!checkConflicts && shouldCheckSameBucket(commitKind)) {
checkSameBucketFromSnapshot(deltaFiles, latestSnapshot);
}
if (checkConflicts) {
// latestSnapshotId is different from the snapshot id we've checked for conflicts,
// so we have to check again
if (changedPartitions == null) {
changedPartitions = changedPartitions(deltaFiles, indexFiles);
}
CommitFailRetryResult commitFailRetry =
retryResult instanceof CommitFailRetryResult
? (CommitFailRetryResult) retryResult
: null;
// An overwrite may replace the base manifest list without recording the replacements
// in its delta manifest, so the cached base cannot always be refreshed incrementally.
if (commitFailRetry != null
&& commitFailRetry.latestSnapshot != null
&& commitFailRetry.baseDataFiles != null
&& !hasOverwriteSinceLastAttempt) {
baseDataFiles = new ArrayList<>(commitFailRetry.baseDataFiles);
List<SimpleFileEntry> incremental =
scanner.readIncrementalChanges(
commitFailRetry.latestSnapshot, latestSnapshot, changedPartitions);
if (!incremental.isEmpty()) {
baseDataFiles.addAll(incremental);
baseDataFiles = new ArrayList<>(FileEntry.mergeEntries(baseDataFiles));
}
Optional<RuntimeException> exception;
if (checkGlobalIndexOnly) {
exception = conflictDetection.checkGlobalIndexOnly(latestSnapshot, indexFiles);
} else {
baseDataFiles =
scanner.readAllEntriesFromChangedPartitions(
latestSnapshot, changedPartitions);
}
if (discardDuplicate) {
Set<FileEntry.Identifier> baseIdentifiers =
baseDataFiles.stream()
.map(FileEntry::identifier)
.collect(Collectors.toSet());
deltaFiles =
deltaFiles.stream()
.filter(entry -> !baseIdentifiers.contains(entry.identifier()))
.collect(Collectors.toList());
}
RowIdColumnConflictChecker rowIdColumnConflictChecker = null;
if (conflictDetection.hasRowIdCheckFromSnapshot()) {
rowIdColumnConflictChecker =
RowIdColumnConflictChecker.fromDataFiles(
schemaManager,
deltaFiles.stream()
.map(ManifestEntry::file)
.collect(Collectors.toList()));
// latestSnapshotId is different from the snapshot id we've checked for conflicts,
// so we have to check again
if (changedPartitions == null) {
changedPartitions = changedPartitions(deltaFiles, indexFiles);
}
CommitFailRetryResult commitFailRetry =
retryResult instanceof CommitFailRetryResult
? (CommitFailRetryResult) retryResult
: null;
// An overwrite may replace the base manifest list without recording the
// replacements in its delta manifest, so the cached base cannot always be
// refreshed incrementally.
if (commitFailRetry != null
&& commitFailRetry.latestSnapshot != null
&& commitFailRetry.baseDataFiles != null
&& !hasOverwriteSinceLastAttempt) {
baseDataFiles = new ArrayList<>(commitFailRetry.baseDataFiles);
List<SimpleFileEntry> incremental =
scanner.readIncrementalChanges(
commitFailRetry.latestSnapshot,
latestSnapshot,
changedPartitions);
if (!incremental.isEmpty()) {
baseDataFiles.addAll(incremental);
baseDataFiles = new ArrayList<>(FileEntry.mergeEntries(baseDataFiles));
}
} else {
baseDataFiles =
scanner.readAllEntriesFromChangedPartitions(
latestSnapshot, changedPartitions);
}
if (discardDuplicate) {
Set<FileEntry.Identifier> baseIdentifiers =
baseDataFiles.stream()
.map(FileEntry::identifier)
.collect(Collectors.toSet());
deltaFiles =
deltaFiles.stream()
.filter(entry -> !baseIdentifiers.contains(entry.identifier()))
.collect(Collectors.toList());
}
RowIdColumnConflictChecker rowIdColumnConflictChecker = null;
if (conflictDetection.hasRowIdCheckFromSnapshot()) {
rowIdColumnConflictChecker =
RowIdColumnConflictChecker.fromDataFiles(
schemaManager,
deltaFiles.stream()
.map(ManifestEntry::file)
.collect(Collectors.toList()));
}
exception =
conflictDetection.checkConflicts(
latestSnapshot,
baseDataFiles,
SimpleFileEntry.from(deltaFiles),
indexFiles,
rowIdColumnConflictChecker,
commitKind);
}
Optional<RuntimeException> exception =
conflictDetection.checkConflicts(
latestSnapshot,
baseDataFiles,
SimpleFileEntry.from(deltaFiles),
indexFiles,
rowIdColumnConflictChecker,
commitKind);
if (exception.isPresent()) {
if (allowRollback && rollback != null) {
if (rollback.tryToRollback(latestSnapshot)) {
Expand All @@ -1033,6 +1056,8 @@ CommitResult tryCommitOnce(
}
}

boolean indexOnlyCommit =
deltaFiles.isEmpty() && changelogFiles.isEmpty() && !indexFiles.isEmpty();
Snapshot newSnapshot;
Pair<String, Long> baseManifestList = null;
Pair<String, Long> deltaManifestList = null;
Expand Down Expand Up @@ -1066,6 +1091,11 @@ CommitResult tryCommitOnce(
mergeBeforeManifests = emptyList();
mergeAfterManifests = emptyList();
oldIndexManifest = null;
} else if (indexOnlyCommit) {
// An index-only commit cannot change table data. Preserve the existing data
// manifests instead of opportunistically sorting or compacting them.
mergeAfterManifests = mergeBeforeManifests;
skipManifestMergeOnRetry = true;
} else {
ManifestMergeReuse manifestMergeReuse =
tryReuseManifestMergeResult(retryResult, mergeBeforeManifests);
Expand Down
Loading
Loading