From 7c8bcedc25d4ca9e6ecd41b54f8e7666030fbbed Mon Sep 17 00:00:00 2001 From: Gabriel Fukushima Date: Fri, 24 Jan 2025 16:06:48 +1000 Subject: [PATCH] spotless Signed-off-by: Gabriel Fukushima --- .../server/kvstore/KvStoreDatabase.java | 33 ++++++++++--------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/storage/src/main/java/tech/pegasys/teku/storage/server/kvstore/KvStoreDatabase.java b/storage/src/main/java/tech/pegasys/teku/storage/server/kvstore/KvStoreDatabase.java index 5fa0ce5726e..459127d08be 100644 --- a/storage/src/main/java/tech/pegasys/teku/storage/server/kvstore/KvStoreDatabase.java +++ b/storage/src/main/java/tech/pegasys/teku/storage/server/kvstore/KvStoreDatabase.java @@ -922,7 +922,7 @@ public boolean pruneOldestBlobSidecars( final UInt64 lastSlotToPrune, final int pruneLimit, final DataArchiveWriter> archiveWriter) { - return pruneBlobSidecars(pruneLimit, lastSlotToPrune , archiveWriter, false ); + return pruneBlobSidecars(pruneLimit, lastSlotToPrune, archiveWriter, false); } @Override @@ -930,23 +930,24 @@ public boolean pruneOldestNonCanonicalBlobSidecars( final UInt64 lastSlotToPrune, final int pruneLimit, final DataArchiveWriter> archiveWriter) { - return pruneBlobSidecars(pruneLimit, lastSlotToPrune, archiveWriter, true ); - + return pruneBlobSidecars(pruneLimit, lastSlotToPrune, archiveWriter, true); } private boolean pruneBlobSidecars( - final int pruneLimit, - final UInt64 lastSlotToPrune, final DataArchiveWriter> archiveWriter, - final boolean nonCanonicalBlobSidecars) { + final int pruneLimit, + final UInt64 lastSlotToPrune, + final DataArchiveWriter> archiveWriter, + final boolean nonCanonicalBlobSidecars) { int pruned = 0; Optional earliestBlobSidecarSlot = getEarliestBlobSidecarSlot(); try (final Stream prunableBlobKeys = - streamNonCanonicalBlobSidecarKeys(earliestBlobSidecarSlot.orElse(UInt64.ZERO), lastSlotToPrune)) { + streamNonCanonicalBlobSidecarKeys( + earliestBlobSidecarSlot.orElse(UInt64.ZERO), lastSlotToPrune)) { // Group the BlobSidecars by slot. Potential for higher memory usage // if it hasn't been pruned in a while final Map> prunableMap = - prunableBlobKeys.collect(groupingBy(SlotAndBlockRootAndBlobIndex::getSlot)); + prunableBlobKeys.collect(groupingBy(SlotAndBlockRootAndBlobIndex::getSlot)); // pruneLimit is the number of slots to prune, not the number of BlobSidecars final List slots = prunableMap.keySet().stream().sorted().limit(pruneLimit).toList(); @@ -956,14 +957,14 @@ private boolean pruneBlobSidecars( // Retrieve the BlobSidecars for archiving. final List blobSidecars = - keys.stream() - .map( - nonCanonicalBlobSidecars - ? this::getNonCanonicalBlobSidecar - : this::getBlobSidecar) - .filter(Optional::isPresent) - .map(Optional::get) - .toList(); + keys.stream() + .map( + nonCanonicalBlobSidecars + ? this::getNonCanonicalBlobSidecar + : this::getBlobSidecar) + .filter(Optional::isPresent) + .map(Optional::get) + .toList(); // Just warn if we failed to find all the BlobSidecars. if (keys.size() != blobSidecars.size()) {