This is an automated email from the ASF dual-hosted git repository. daim pushed a commit to branch OAK-12064 in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
commit 3b70107f1e1ecaebf6c66527de4c414354e035b9 Author: rishabhdaim <[email protected]> AuthorDate: Wed Jan 21 14:01:28 2026 +0530 OAK-12064 : replaced guava striped with oak-commons StripedLocks --- .../jackrabbit/oak/plugins/index/lucene/hybrid/DocumentQueue.java | 4 ++-- .../oak/plugins/document/locks/StripedNodeDocumentLocks.java | 7 +++---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/DocumentQueue.java b/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/DocumentQueue.java index a5bbe693a0..60e63d4e0a 100644 --- a/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/DocumentQueue.java +++ b/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/hybrid/DocumentQueue.java @@ -35,10 +35,10 @@ import java.util.concurrent.locks.Lock; import org.apache.commons.collections4.ListValuedMap; import org.apache.commons.collections4.multimap.ArrayListValuedHashMap; -import org.apache.jackrabbit.guava.common.util.concurrent.Striped; import org.apache.jackrabbit.oak.commons.PerfLogger; import org.apache.jackrabbit.oak.commons.concurrent.NotifyingFutureTask; import org.apache.jackrabbit.oak.commons.conditions.Validate; +import org.apache.jackrabbit.oak.commons.internal.concurrent.StripedLocks; import org.apache.jackrabbit.oak.plugins.index.lucene.IndexTracker; import org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexNode; import org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexProviderService; @@ -62,7 +62,7 @@ public class DocumentQueue implements Closeable, IndexingQueue { private final CounterStats queueSizeStats; private final MeterStats added; private final MeterStats dropped; - private final Striped<Lock> locks = Striped.lock(64); + private final StripedLocks locks = new StripedLocks(64); private UncaughtExceptionHandler delegate = (t, e) -> {}; /** diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/locks/StripedNodeDocumentLocks.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/locks/StripedNodeDocumentLocks.java index 75aceb678b..6e56de5297 100644 --- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/locks/StripedNodeDocumentLocks.java +++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/locks/StripedNodeDocumentLocks.java @@ -18,11 +18,10 @@ package org.apache.jackrabbit.oak.plugins.document.locks; import java.util.concurrent.locks.Lock; +import org.apache.jackrabbit.oak.commons.internal.concurrent.StripedLocks; import org.apache.jackrabbit.oak.plugins.document.Path; import org.apache.jackrabbit.oak.plugins.document.util.Utils; -import org.apache.jackrabbit.guava.common.util.concurrent.Striped; - public class StripedNodeDocumentLocks implements NodeDocumentLocks { private static final String ROOT = Utils.getIdFromPath(Path.ROOT); @@ -30,8 +29,8 @@ public class StripedNodeDocumentLocks implements NodeDocumentLocks { /** * Locks to ensure cache consistency on reads, writes and invalidation. */ - private final Striped<Lock> locks = Striped.lock(4096); - private final Lock rootLock = Striped.lock(1).get(ROOT); + private final StripedLocks locks = new StripedLocks(4096); + private final Lock rootLock = new StripedLocks(1).get(ROOT); @Override public Lock acquire(String key) {
