This is an automated email from the ASF dual-hosted git repository. reschke pushed a commit to branch OAK-11642 in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
commit 7890b2bde6f76b07fc29bdca44e35fd71b72c7fc Author: Julian Reschke <[email protected]> AuthorDate: Sun Apr 6 16:00:18 2025 +0100 OAK-11642: oak-segment-tar uses unmaintained concurrentlinkedhashmap-lru --- oak-segment-tar/pom.xml | 13 ------------- .../org/apache/jackrabbit/oak/segment/CommitsTracker.java | 6 +++--- .../jackrabbit/oak/segment/SegmentNodeStoreStats.java | 6 ++---- 3 files changed, 5 insertions(+), 20 deletions(-) diff --git a/oak-segment-tar/pom.xml b/oak-segment-tar/pom.xml index 6361823553..5c1649c90b 100644 --- a/oak-segment-tar/pom.xml +++ b/oak-segment-tar/pom.xml @@ -32,10 +32,6 @@ <name>Oak Segment Tar</name> - <properties> - <concurrentlinkedhashmap.version>1.4.2</concurrentlinkedhashmap.version> - </properties> - <build> <plugins> <plugin> @@ -332,15 +328,6 @@ <scope>provided</scope> </dependency> - <!-- ConcurrentLinkedHashMap --> - - <dependency> - <groupId>com.googlecode.concurrentlinkedhashmap</groupId> - <artifactId>concurrentlinkedhashmap-lru</artifactId> - <version>${concurrentlinkedhashmap.version}</version> - <scope>provided</scope> - </dependency> - <!-- Dependencies on Oak testing modules --> <dependency> diff --git a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/CommitsTracker.java b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/CommitsTracker.java index 4116468ee4..2e3ebd3160 100644 --- a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/CommitsTracker.java +++ b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/CommitsTracker.java @@ -19,8 +19,10 @@ package org.apache.jackrabbit.oak.segment; import java.lang.ref.WeakReference; +import java.util.Collections; import java.util.HashMap; import java.util.Iterator; +import java.util.LinkedHashMap; import java.util.Map; import java.util.Queue; import java.util.concurrent.ConcurrentHashMap; @@ -28,7 +30,6 @@ import java.util.concurrent.ConcurrentLinkedQueue; import java.util.concurrent.ConcurrentMap; import java.util.function.Supplier; -import com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap; import org.apache.jackrabbit.oak.segment.file.tar.GCGeneration; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -199,8 +200,7 @@ class CommitsTracker { } public Map<String, Long> getCommitsCountOthers() { - Map<String, Long> commitsOther = new ConcurrentLinkedHashMap.Builder<String, Long>() - .maximumWeightedCapacity(otherWritersLimit).build(); + Map<String, Long> commitsOther = new LinkedHashMap(otherWritersLimit); long t = System.currentTimeMillis() - 60000; for (Commit commit : commits) { if (commit.getQueued() > t) { diff --git a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentNodeStoreStats.java b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentNodeStoreStats.java index 7e98e0c4c1..2ff710da99 100644 --- a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentNodeStoreStats.java +++ b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentNodeStoreStats.java @@ -145,11 +145,9 @@ public class SegmentNodeStoreStats implements SegmentNodeStoreStatsMBean, Segmen TabularDataSupport tabularData = new TabularDataSupport(new TabularType(typeName, "Most active writers", commitsPerWriterRowType, new String[] { writerDescription })); - if (commitsCountMap.isEmpty()) { - commitsCountMap.put("N/A", 0L); - } + Map<String, Long> map = commitsCountMap.isEmpty() ? Map.of("N/A", 0L) : commitsCountMap; - commitsCountMap.entrySet().stream() + map.entrySet().stream() .sorted(Comparator.<Entry<String, Long>> comparingLong(Entry::getValue).reversed()).map(e -> { Map<String, Object> m = new HashMap<>(); m.put("count", e.getValue());
