Skip to content

Every time use KeyValueStorage.Batch, close it in finally #4576

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
StevenLuMT merged 1 commit into from
Apr 9, 2025
Merged

Every time use KeyValueStorage.Batch, close it in finally #4576

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
27 changes: 13 additions & 14 deletions ...per-server/src/main/java/org/apache/bookkeeper/bookie/storage/ldb/EntryLocationIndex.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,10 +147,10 @@ private long getLastEntryInLedgerInternal(long ledgerId) throws IOException {
}

public void addLocation(long ledgerId, long entryId, long location) throws IOException {
Batch batch = locationsDb.newBatch();
addLocation(batch, ledgerId, entryId, location);
batch.flush();
batch.close();
try (Batch batch = locationsDb.newBatch()) {
addLocation(batch, ledgerId, entryId, location);
batch.flush();
}
}

public Batch newBatch() {
Expand Down Expand Up @@ -178,18 +178,17 @@ public void updateLocations(Iterable<EntryLocation> newLocations) throws IOExcep
log.debug("Update locations -- {}", Iterables.size(newLocations));
}

Batch batch = newBatch();
// Update all the ledger index pages with the new locations
for (EntryLocation e : newLocations) {
if (log.isDebugEnabled()) {
log.debug("Update location - ledger: {} -- entry: {}", e.ledger, e.entry);
}
try (Batch batch = newBatch()) {
// Update all the ledger index pages with the new locations
for (EntryLocation e : newLocations) {
if (log.isDebugEnabled()) {
log.debug("Update location - ledger: {} -- entry: {}", e.ledger, e.entry);
}

addLocation(batch, e.ledger, e.entry, e.location);
addLocation(batch, e.ledger, e.entry, e.location);
}
batch.flush();
}

batch.flush();
batch.close();
}

public void delete(long ledgerId) throws IOException {
Expand Down