[jackrabbit-oak] 04/04: OAK-9922 Parallel Compaction Address further comments

[adulceanu]

This is an automated email from the ASF dual-hosted git repository.

adulceanu pushed a commit to branch issues/OAK-9922
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git

commit bf1c1a093b7554260aa2d54d7a6917b64852fc34
Author: Lucas Weitzendorf <lweitzend...@adobe.com>
AuthorDate: Fri Dec 16 13:21:33 2022 +0100

    OAK-9922 Parallel Compaction
    Address further comments
---
 .../apache/jackrabbit/oak/segment/DefaultSegmentWriterBuilder.java | 4 ++--
 .../org/apache/jackrabbit/oak/segment/SegmentBufferWriterPool.java | 7 +------
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git 
a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/DefaultSegmentWriterBuilder.java
 
b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/DefaultSegmentWriterBuilder.java
index 5097d40680..b5d7e22b9e 100644
--- 
a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/DefaultSegmentWriterBuilder.java
+++ 
b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/DefaultSegmentWriterBuilder.java
@@ -56,7 +56,7 @@ public final class DefaultSegmentWriterBuilder {
     private final String name;
 
     @NotNull
-    private Supplier<GCGeneration> generation = 
Suppliers.ofInstance(GCGeneration.NULL);
+    private Supplier<GCGeneration> generation = () -> GCGeneration.NULL;
 
     private PoolType poolType = null;
 
@@ -99,7 +99,7 @@ public final class DefaultSegmentWriterBuilder {
      */
     @NotNull
     public DefaultSegmentWriterBuilder withGeneration(@NotNull GCGeneration 
generation) {
-        this.generation = Suppliers.ofInstance(checkNotNull(generation));
+        this.generation = () -> checkNotNull(generation);
         return this;
     }
 
diff --git 
a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentBufferWriterPool.java
 
b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentBufferWriterPool.java
index 984f66ae02..b982f94043 100644
--- 
a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentBufferWriterPool.java
+++ 
b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentBufferWriterPool.java
@@ -173,12 +173,7 @@ public abstract class SegmentBufferWriterPool implements 
WriteOperationHandler {
         @NotNull
         private SegmentBufferWriter getWriter(@NotNull Thread thread, @NotNull 
GCGeneration gcGeneration) {
             SimpleImmutableEntry<?,?> key = new SimpleImmutableEntry<>(thread, 
gcGeneration);
-            SegmentBufferWriter writer = writers.get(key);
-            if (writer == null) {
-                writer = newWriter(gcGeneration);
-                writers.put(key, writer);
-            }
-            return writer;
+            return writers.computeIfAbsent(key, f -> newWriter(gcGeneration));
         }
     }