You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by da...@apache.org on 2026/04/21 18:58:17 UTC
(jackrabbit-oak) branch trunk updated: OAK-12161 : removed guava's cachestats and did the final cleanup (#2864)
This is an automated email from the ASF dual-hosted git repository.
rishabhdaim pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
The following commit(s) were added to refs/heads/trunk by this push:
new 1bc6f423a4 OAK-12161 : removed guava's cachestats and did the final cleanup (#2864)
1bc6f423a4 is described below
commit 1bc6f423a4eb04fb1e46530ece79b50d8eb24964
Author: Rishabh Kumar <ri...@gmail.com>
AuthorDate: Wed Apr 22 00:28:11 2026 +0530
OAK-12161 : removed guava's cachestats and did the final cleanup (#2864)
* OAK-12161 : removed guava's cachestats and did the final cleanup
* OAK-12162 : renamed cachecounters to cachestatssnapshot to reduce changeset
* OAK-12162 : renamed cachestats to CacheStatsAdapter
* OAK-12162 : reverted cachestats to CacheStatsAdapter renaming
* OAK-12162 : moved cachestats and cachestatssnapshot in same package as that of abstractcachestats
* OAK-12162 : read lastSnapshot with lock inside stats()
* OAK-12162 : moved cachestatssnapshot back to api package
* OAK-12162 : used Math.addExact() in place of Long.sum()
* OAK-12162 : updated package major version
* OAK-12162 : fixed error while picking oak-elastic-search jar
---
.../oak/plugins/blob/CachingBlobStore.java | 9 +-
.../jackrabbit/oak/plugins/blob/FileCache.java | 4 +-
.../plugins/blob/datastore/DataStoreBlobStore.java | 10 +-
.../jackrabbit/oak/cache/AbstractCacheStats.java | 20 ++-
.../apache/jackrabbit/oak/cache/CacheStats.java | 71 ++++----
.../jackrabbit/oak/cache/EmpiricalWeigher.java | 15 +-
.../oak/cache/api/CacheStatsAdapter.java | 93 ----------
.../oak/cache/api/CacheStatsSnapshot.java | 62 ++++++-
.../jackrabbit/oak/cache/api/package-info.java | 2 +-
.../cache/impl/caffeine/CaffeineCacheAdapter.java | 1 -
.../apache/jackrabbit/oak/cache/package-info.java | 2 +-
.../oak/cache/AbstractCacheStatsTest.java | 4 +-
.../jackrabbit/oak/cache/CacheStatsTest.java | 188 ---------------------
.../oak/cache/impl/CacheBuilderTest.java | 4 +-
.../oak/cache/impl/ConsolidatedCacheStats.java | 2 +-
.../oak/cache/impl/CacheStatsMetricsTest.java | 6 +-
oak-it-osgi/test-bundles.xml | 2 +-
.../index/lucene/LuceneIndexProviderService.java | 4 +-
.../indexer/document/DocumentStoreIndexerBase.java | 4 +-
.../plugins/index/search/ExtractedTextCache.java | 9 +-
.../oak/segment/CachingSegmentReader.java | 6 +-
.../apache/jackrabbit/oak/segment/ReaderCache.java | 13 +-
.../apache/jackrabbit/oak/segment/RecordCache.java | 15 +-
.../jackrabbit/oak/segment/RecordCacheStats.java | 8 +-
.../jackrabbit/oak/segment/SegmentCache.java | 6 +-
.../jackrabbit/oak/segment/WriterCacheManager.java | 24 +--
.../jackrabbit/oak/segment/file/PriorityCache.java | 6 +-
.../persistentcache/SegmentCacheStats.java | 6 +-
.../persistence/persistentcache/package-info.java | 2 +-
.../oak/segment/file/PriorityCacheTest.java | 2 +-
.../jackrabbit/oak/plugins/document/DiffCache.java | 4 +-
.../oak/plugins/document/DocumentNodeStore.java | 12 +-
.../plugins/document/DocumentNodeStoreBuilder.java | 19 +--
.../plugins/document/DocumentNodeStoreService.java | 3 +-
.../oak/plugins/document/DocumentStore.java | 4 +-
.../oak/plugins/document/JournalDiffLoader.java | 4 +-
.../oak/plugins/document/LocalDiffCache.java | 9 +-
.../oak/plugins/document/MemoryDiffCache.java | 9 +-
.../oak/plugins/document/TieredDiffCache.java | 4 +-
.../plugins/document/cache/NodeDocumentCache.java | 12 +-
.../document/memory/MemoryDocumentStore.java | 4 +-
.../plugins/document/mongo/MongoDocumentStore.java | 4 +-
.../oak/plugins/document/rdb/RDBDocumentStore.java | 4 +-
.../util/LeaseCheckDocumentStoreWrapper.java | 4 +-
.../document/util/LoggingDocumentStoreWrapper.java | 11 +-
.../util/SynchronizingDocumentStoreWrapper.java | 4 +-
.../util/ThrottlingDocumentStoreWrapper.java | 4 +-
.../document/util/TimingDocumentStoreWrapper.java | 6 +-
.../oak/plugins/document/AmnesiaDiffCache.java | 4 +-
.../plugins/document/CountingDocumentStore.java | 4 +-
.../plugins/document/DocumentMKBuilderTest.java | 8 +-
.../document/DocumentNodeStoreBuilderTest.java | 4 +-
.../document/DocumentNodeStoreDiffTest.java | 8 +-
.../oak/plugins/document/DocumentStoreWrapper.java | 4 +-
.../oak/plugins/document/LocalDiffCacheTest.java | 16 +-
.../oak/plugins/document/MemoryDiffCacheTest.java | 4 +-
.../oak/plugins/document/NodeStoreDiffTest.java | 4 +-
.../oak/plugins/document/TieredDiffCacheTest.java | 4 +-
.../document/cache/CacheChangesTrackerTest.java | 6 +-
.../document/cache/NodeDocumentCacheTest.java | 4 +-
specs/guava-cache-removal/TASKS.md | 4 +-
61 files changed, 266 insertions(+), 529 deletions(-)
diff --git a/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/CachingBlobStore.java b/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/CachingBlobStore.java
index 7ccede1857..6350752245 100644
--- a/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/CachingBlobStore.java
+++ b/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/CachingBlobStore.java
@@ -16,9 +16,8 @@
*/
package org.apache.jackrabbit.oak.plugins.blob;
-import org.apache.jackrabbit.oak.cache.AbstractCacheStats;
import org.apache.jackrabbit.oak.cache.CacheLIRS;
-import org.apache.jackrabbit.oak.cache.api.CacheStatsAdapter;
+import org.apache.jackrabbit.oak.cache.CacheStats;
import org.apache.jackrabbit.oak.cache.api.LoadingCache;
import org.apache.jackrabbit.oak.cache.api.Weigher;
import org.apache.jackrabbit.oak.commons.StringUtils;
@@ -48,7 +47,7 @@ public abstract class CachingBlobStore extends AbstractBlobStore {
return (int) weight;
};
- private final AbstractCacheStats cacheStats;
+ private final CacheStats cacheStats;
public static final String MEM_CACHE_NAME = "BlobStore-MemCache";
@@ -62,7 +61,7 @@ public abstract class CachingBlobStore extends AbstractBlobStore {
weigher(weigher::weigh).
build().asOakCache();
- cacheStats = new CacheStatsAdapter(cache, MEM_CACHE_NAME, weigher, cacheSize);
+ cacheStats = new CacheStats(cache, MEM_CACHE_NAME, weigher, cacheSize);
}
public CachingBlobStore() {
@@ -79,7 +78,7 @@ public abstract class CachingBlobStore extends AbstractBlobStore {
return blobCacheSize;
}
- public AbstractCacheStats getCacheStats() {
+ public CacheStats getCacheStats() {
return cacheStats;
}
}
diff --git a/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/FileCache.java b/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/FileCache.java
index 94fa0bfed6..e1a4c9f0f2 100644
--- a/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/FileCache.java
+++ b/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/FileCache.java
@@ -39,7 +39,7 @@ import org.apache.jackrabbit.guava.common.cache.RemovalCause;
import org.apache.jackrabbit.oak.cache.CacheLIRS;
import org.apache.jackrabbit.oak.cache.api.Cache;
import org.apache.jackrabbit.oak.cache.api.CacheLoader;
-import org.apache.jackrabbit.oak.cache.api.CacheStatsAdapter;
+import org.apache.jackrabbit.oak.cache.CacheStats;
import org.apache.jackrabbit.oak.cache.api.Weigher;
import org.apache.jackrabbit.oak.commons.StringUtils;
import org.apache.jackrabbit.oak.commons.concurrent.ExecutorCloser;
@@ -423,7 +423,7 @@ public class FileCache implements Closeable {
}
}
-class FileCacheStats extends CacheStatsAdapter implements DataStoreCacheStatsMBean {
+class FileCacheStats extends CacheStats implements DataStoreCacheStatsMBean {
private static final long BLOCK_SIZE = 4 * 1024;
private final Weigher<Object, Object> weigher;
private final Cache<Object, Object> cache;
diff --git a/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/DataStoreBlobStore.java b/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/DataStoreBlobStore.java
index 6a44a2c855..e757dec37d 100644
--- a/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/DataStoreBlobStore.java
+++ b/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/DataStoreBlobStore.java
@@ -52,10 +52,8 @@ import org.apache.jackrabbit.oak.api.blob.BlobAccessProvider;
import org.apache.jackrabbit.oak.api.blob.BlobDownloadOptions;
import org.apache.jackrabbit.oak.api.blob.BlobUpload;
import org.apache.jackrabbit.oak.api.blob.BlobUploadOptions;
-import org.apache.jackrabbit.oak.cache.AbstractCacheStats;
import org.apache.jackrabbit.oak.cache.api.Cache;
-import org.apache.jackrabbit.oak.cache.api.CacheBuilder;
-import org.apache.jackrabbit.oak.cache.api.CacheStatsAdapter;
+import org.apache.jackrabbit.oak.cache.CacheStats;
import org.apache.jackrabbit.oak.cache.api.Weigher;
import org.apache.jackrabbit.oak.commons.StringUtils;
import org.apache.jackrabbit.oak.commons.collections.IteratorUtils;
@@ -134,7 +132,7 @@ public class DataStoreBlobStore
}
};
- private final AbstractCacheStats cacheStats;
+ private final CacheStats cacheStats;
public static final String MEM_CACHE_NAME = "BlobStore-MemCache";
@@ -159,7 +157,7 @@ public class DataStoreBlobStore
.maximumWeight(cacheSize)
.weigher(weigher::weigh)
.build().asOakCache();
- this.cacheStats = new CacheStatsAdapter(cache, MEM_CACHE_NAME, weigher, cacheSize);
+ this.cacheStats = new CacheStats(cache, MEM_CACHE_NAME, weigher, cacheSize);
}
//~----------------------------------< DataStore >
@@ -828,7 +826,7 @@ public class DataStoreBlobStore
return delegate;
}
- public AbstractCacheStats getCacheStats() {
+ public CacheStats getCacheStats() {
return cacheStats;
}
diff --git a/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/AbstractCacheStats.java b/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/AbstractCacheStats.java
index ba2b8c381c..e2e90fd073 100644
--- a/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/AbstractCacheStats.java
+++ b/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/AbstractCacheStats.java
@@ -25,8 +25,8 @@ import java.util.Objects;
import java.util.StringJoiner;
import java.util.concurrent.TimeUnit;
-import org.apache.jackrabbit.guava.common.cache.CacheStats;
import org.apache.jackrabbit.oak.api.jmx.CacheStatsMBean;
+import org.apache.jackrabbit.oak.cache.api.CacheStatsSnapshot;
import org.apache.jackrabbit.oak.commons.jmx.AnnotatedStandardMBean;
import org.jetbrains.annotations.NotNull;
@@ -38,8 +38,8 @@ public abstract class AbstractCacheStats extends AnnotatedStandardMBean implemen
@NotNull
private final String name;
- private CacheStats lastSnapshot =
- new CacheStats(0, 0, 0, 0, 0, 0);
+ private CacheStatsSnapshot lastSnapshot =
+ new CacheStatsSnapshot(0, 0, 0, 0, 0, 0);
/**
* Create a new {@code CacheStatsMBean} for a cache with the given {@code name}.
@@ -51,19 +51,21 @@ public abstract class AbstractCacheStats extends AnnotatedStandardMBean implemen
}
/**
- * Call back invoked to retrieve the most recent {@code CacheStats} instance of the
+ * Call back invoked to retrieve the most recent {@link CacheStatsSnapshot} of the
* underlying cache.
*/
- protected abstract CacheStats getCurrentStats();
+ protected abstract CacheStatsSnapshot getCurrentStats();
- private CacheStats stats() {
- return getCurrentStats().minus(lastSnapshot);
+ private CacheStatsSnapshot stats() {
+ CacheStatsSnapshot baseline;
+ synchronized (this) {
+ baseline = lastSnapshot;
+ }
+ return getCurrentStats().minus(baseline);
}
@Override
public synchronized void resetStats() {
- // Cache stats cannot be rest at Guava level. Instead we
- // take a snapshot and then subtract it from future stats calls
lastSnapshot = getCurrentStats();
}
diff --git a/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/CacheStats.java b/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/CacheStats.java
index 3860b91dfd..d621b9c35b 100644
--- a/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/CacheStats.java
+++ b/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/CacheStats.java
@@ -1,68 +1,67 @@
/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*/
package org.apache.jackrabbit.oak.cache;
import java.util.Map;
-import java.util.Objects;
-
-import org.apache.jackrabbit.guava.common.cache.Cache;
-import org.apache.jackrabbit.guava.common.cache.Weigher;
+import org.apache.jackrabbit.oak.cache.api.Cache;
+import org.apache.jackrabbit.oak.cache.api.CacheStatsSnapshot;
+import org.apache.jackrabbit.oak.cache.api.Weigher;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
/**
- * Cache statistics.
+ * Exposes a {@link Cache}'s statistics via the {@link org.apache.jackrabbit.oak.api.jmx.CacheStatsMBean}
+ * interface.
*/
public class CacheStats extends AbstractCacheStats {
+
private final Cache<Object, Object> cache;
private final Weigher<Object, Object> weigher;
private final long maxWeight;
/**
- * Construct the cache stats object.
- *
- * @param cache the cache
- * @param name the name of the cache
- * @param weigher the weigher used to estimate the current weight
- * @param maxWeight the maximum weight
+ * Creates an adapter for the given cache.
+ *
+ * @param cache the cache whose statistics to expose (must not be null)
+ * @param name the JMX bean name (must not be null)
+ * @param weigher optional weigher used to estimate current cache weight; {@code null} if unknown
+ * @param maxWeight configured maximum weight for the cache; {@code -1} if unbounded
*/
@SuppressWarnings("unchecked")
- public CacheStats(
- @NotNull Cache<?, ?> cache,
+ public <K, V> CacheStats(
+ @NotNull Cache<K, V> cache,
@NotNull String name,
- @Nullable Weigher<?, ?> weigher,
+ @Nullable Weigher<K, V> weigher,
long maxWeight) {
super(name);
- this.cache = (Cache<Object, Object>) Objects.requireNonNull(cache);
+ this.cache = (Cache<Object, Object>) cache;
this.weigher = (Weigher<Object, Object>) weigher;
this.maxWeight = maxWeight;
}
@Override
- protected org.apache.jackrabbit.guava.common.cache.CacheStats getCurrentStats() {
+ protected CacheStatsSnapshot getCurrentStats() {
return cache.stats();
}
@Override
public long getElementCount() {
- return cache.size();
+ return cache.asMap().size();
}
@Override
@@ -70,13 +69,11 @@ public class CacheStats extends AbstractCacheStats {
if (weigher == null) {
return -1;
}
- long size = 0;
- for (Map.Entry<?, ?> e : cache.asMap().entrySet()) {
- Object k = e.getKey();
- Object v = e.getValue();
- size += weigher.weigh(k, v);
+ long total = 0;
+ for (Map.Entry<Object, Object> e : cache.asMap().entrySet()) {
+ total += weigher.weigh(e.getKey(), e.getValue());
}
- return size;
+ return total;
}
@Override
diff --git a/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/EmpiricalWeigher.java b/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/EmpiricalWeigher.java
index fea96ae9bb..7e7f5dbd03 100644
--- a/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/EmpiricalWeigher.java
+++ b/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/EmpiricalWeigher.java
@@ -27,8 +27,7 @@ import org.slf4j.LoggerFactory;
* Determines the weight of object based on the memory taken by them. The memory estimates
* are based on empirical data and not exact
*/
-public class EmpiricalWeigher extends GuavaCompatibleEmpiricalWeigher
- implements Weigher<CacheValue, CacheValue> {
+public class EmpiricalWeigher implements Weigher<CacheValue, CacheValue> {
static final Logger LOG = LoggerFactory.getLogger(EmpiricalWeigher.class);
@@ -45,15 +44,3 @@ public class EmpiricalWeigher extends GuavaCompatibleEmpiricalWeigher
}
}
-
-/**
- * Compatibility base class that keeps {@link EmpiricalWeigher} assignable to the
- * legacy Guava-shim {@link org.apache.jackrabbit.guava.common.cache.Weigher} type while the public API migrates to
- * {@link Weigher}.
- *
- * <p>TODO OAK-12162: remove this compatibility base in
- * OAK-12162 once downstream callers no longer require {@link org.apache.jackrabbit.guava.common.cache.Weigher}
- * assignability.</p>
- */
-abstract class GuavaCompatibleEmpiricalWeigher implements org.apache.jackrabbit.guava.common.cache.Weigher<CacheValue, CacheValue> {
-}
diff --git a/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/api/CacheStatsAdapter.java b/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/api/CacheStatsAdapter.java
deleted file mode 100644
index e1bef78253..0000000000
--- a/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/api/CacheStatsAdapter.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.jackrabbit.oak.cache.api;
-
-import java.util.Map;
-
-import org.apache.jackrabbit.oak.cache.AbstractCacheStats;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-/**
- * Exposes an {@link Cache}'s statistics via the {@link org.apache.jackrabbit.oak.api.jmx.CacheStatsMBean}
- * interface by bridging {@link CacheStatsSnapshot} to the Guava shim {@link org.apache.jackrabbit.guava.common.cache.CacheStats} expected
- * by {@link AbstractCacheStats}.
- *
- * <p>The Guava return type from {@link #getCurrentStats()} is kept until TASK-16 updates
- * the base class to use {@link CacheStatsSnapshot} directly.</p>
- *
- * <p>TODO OAK-TASK16: per {@code TASKS.md}, remove this temporary adapter in
- * TASK-16 once {@link AbstractCacheStats} consumes {@link CacheStatsSnapshot}
- * directly.</p>
- */
-public class CacheStatsAdapter extends AbstractCacheStats {
-
- private final Cache<Object, Object> cache;
- private final Weigher<Object, Object> weigher;
- private final long maxWeight;
-
- /**
- * Creates an adapter for the given cache.
- *
- * @param cache the cache whose statistics to expose (must not be null)
- * @param name the JMX bean name (must not be null)
- * @param weigher optional weigher used to estimate current cache weight; {@code null} if unknown
- * @param maxWeight configured maximum weight for the cache; {@code -1} if unbounded
- */
- @SuppressWarnings("unchecked")
- public <K, V> CacheStatsAdapter(
- @NotNull Cache<K, V> cache,
- @NotNull String name,
- @Nullable Weigher<K, V> weigher,
- long maxWeight) {
- super(name);
- this.cache = (Cache<Object, Object>) cache;
- this.weigher = (Weigher<Object, Object>) weigher;
- this.maxWeight = maxWeight;
- }
-
- @Override
- protected org.apache.jackrabbit.guava.common.cache.CacheStats getCurrentStats() {
- CacheStatsSnapshot s = cache.stats();
- return new org.apache.jackrabbit.guava.common.cache.CacheStats(
- s.hitCount(), s.missCount(),
- s.loadSuccessCount(), s.loadFailureCount(),
- s.totalLoadTime(), s.evictionCount());
- }
-
- @Override
- public long getElementCount() {
- return cache.asMap().size();
- }
-
- @Override
- public long estimateCurrentWeight() {
- if (weigher == null) {
- return -1;
- }
- long total = 0;
- for (Map.Entry<Object, Object> e : cache.asMap().entrySet()) {
- total += weigher.weigh(e.getKey(), e.getValue());
- }
- return total;
- }
-
- @Override
- public long getMaxTotalWeight() {
- return maxWeight;
- }
-}
diff --git a/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/api/CacheStatsSnapshot.java b/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/api/CacheStatsSnapshot.java
index ec6f8e0e0a..c2f4a14e1f 100644
--- a/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/api/CacheStatsSnapshot.java
+++ b/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/api/CacheStatsSnapshot.java
@@ -71,6 +71,47 @@ public record CacheStatsSnapshot(
return requests == 0 ? 0.0 : (double) missCount / requests;
}
+ /**
+ * Returns the total number of load attempts (successes + failures).
+ *
+ * @return load count
+ */
+ public long loadCount() {
+ return loadSuccessCount + loadFailureCount;
+ }
+
+ /**
+ * Returns the number of load attempts that threw an exception.
+ * Alias for {@link #loadFailureCount()}, matching the JMX interface naming.
+ *
+ * @return load exception count
+ */
+ public long loadExceptionCount() {
+ return loadFailureCount;
+ }
+
+ /**
+ * Returns the ratio of load attempts that threw an exception, or {@code 0.0}
+ * if no loads have been attempted.
+ *
+ * @return load exception rate between 0.0 and 1.0
+ */
+ public double loadExceptionRate() {
+ long loads = loadCount();
+ return loads == 0 ? 0.0 : (double) loadFailureCount / loads;
+ }
+
+ /**
+ * Returns the average time spent loading a new value, in nanoseconds, or
+ * {@code 0.0} if no loads have been attempted.
+ *
+ * @return average load penalty in nanoseconds
+ */
+ public double averageLoadPenalty() {
+ long loads = loadCount();
+ return loads == 0 ? 0.0 : (double) totalLoadTime / loads;
+ }
+
/**
* Returns the difference between this snapshot and an earlier {@code other}
* snapshot, useful for computing per-interval deltas.
@@ -89,4 +130,23 @@ public record CacheStatsSnapshot(
Math.max(0, evictionCount - other.evictionCount)
);
}
-}
+
+ /**
+ * Returns the sum of this snapshot and an earlier {@code other}
+ * snapshot, useful for computing total deltas.
+ *
+ * @param other the earlier snapshot to add (must not be null)
+ * @return a new snapshot representing the total
+ */
+ @NotNull
+ public CacheStatsSnapshot plus(@NotNull CacheStatsSnapshot other) {
+ return new CacheStatsSnapshot(
+ Math.addExact(hitCount, other.hitCount),
+ Math.addExact(missCount, other.missCount),
+ Math.addExact(loadSuccessCount, other.loadSuccessCount),
+ Math.addExact(loadFailureCount, other.loadFailureCount),
+ Math.addExact(totalLoadTime, other.totalLoadTime),
+ Math.addExact(evictionCount, other.evictionCount)
+ );
+ }
+}
\ No newline at end of file
diff --git a/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/api/package-info.java b/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/api/package-info.java
index 4bd384ffb3..ce415459cc 100644
--- a/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/api/package-info.java
+++ b/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/api/package-info.java
@@ -19,7 +19,7 @@
* <em>For Oak internal use only. Do not use outside Oak components.</em>
*/
@Internal(since = "1.0.0")
-@Version("1.0.0")
+@Version("2.0.0")
package org.apache.jackrabbit.oak.cache.api;
import org.apache.jackrabbit.oak.commons.annotations.Internal;
diff --git a/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/impl/caffeine/CaffeineCacheAdapter.java b/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/impl/caffeine/CaffeineCacheAdapter.java
index 92510a885e..cc11a8cd3a 100644
--- a/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/impl/caffeine/CaffeineCacheAdapter.java
+++ b/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/impl/caffeine/CaffeineCacheAdapter.java
@@ -20,7 +20,6 @@ import java.util.Map;
import java.util.concurrent.ConcurrentMap;
import java.util.function.Function;
-import com.github.benmanes.caffeine.cache.Policy;
import com.github.benmanes.caffeine.cache.RemovalCause;
import org.apache.jackrabbit.oak.cache.api.CacheStatsSnapshot;
import org.apache.jackrabbit.oak.cache.api.Cache;
diff --git a/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/package-info.java b/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/package-info.java
index 61515af957..a9a2f2e433 100644
--- a/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/package-info.java
+++ b/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/package-info.java
@@ -19,7 +19,7 @@
* <em>For Oak internal use only. Do not use outside Oak components.</em>
*/
@Internal(since = "1.1.1")
-@Version("2.1")
+@Version("3.0")
package org.apache.jackrabbit.oak.cache;
import org.apache.jackrabbit.oak.commons.annotations.Internal;
diff --git a/oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/AbstractCacheStatsTest.java b/oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/AbstractCacheStatsTest.java
index 4d3fb779d4..7afb7d601c 100644
--- a/oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/AbstractCacheStatsTest.java
+++ b/oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/AbstractCacheStatsTest.java
@@ -38,7 +38,7 @@ public class AbstractCacheStatsTest {
@Before
public void setUp() {
cache = new CacheLIRS<>(null, MAX_WEIGHT, 1, 1, 0, null, null, null);
- stats = new CacheStats(cache, CACHE_NAME, null, MAX_WEIGHT);
+ stats = new CacheStats(cache.asOakCache(), CACHE_NAME, null, MAX_WEIGHT);
}
@Test
@@ -95,7 +95,7 @@ public class AbstractCacheStatsTest {
CacheLIRS<String, String> smallCache = CacheLIRS.<String, String>newBuilder()
.maximumSize(5)
.build();
- CacheStats smallStats = new CacheStats(smallCache, "small", null, 5);
+ CacheStats smallStats = new CacheStats(smallCache.asOakCache(), "small", null, 5);
for (int i = 0; i < 30; i++) {
smallCache.put("k" + i, "v" + i);
}
diff --git a/oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/CacheStatsTest.java b/oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/CacheStatsTest.java
deleted file mode 100644
index 2f0e3e4894..0000000000
--- a/oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/CacheStatsTest.java
+++ /dev/null
@@ -1,188 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-package org.apache.jackrabbit.oak.cache;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-import java.util.concurrent.Callable;
-import java.util.concurrent.ExecutionException;
-
-import org.apache.jackrabbit.guava.common.cache.Cache;
-import org.apache.jackrabbit.guava.common.cache.CacheBuilder;
-import org.apache.jackrabbit.guava.common.cache.Weigher;
-import org.jetbrains.annotations.NotNull;
-import org.junit.Before;
-import org.junit.Test;
-
-public class CacheStatsTest {
- private static final String NAME = "cache stats";
- private static final int KEYS = 100;
-
- private final Weigher<Integer, Integer> weigher = new Weigher<Integer, Integer>() {
- @Override
- public int weigh(@NotNull Integer key, @NotNull Integer value) {
- return 1;
- }
- };
-
- private final Cache<Integer, Integer> cache = CacheBuilder.newBuilder()
- .recordStats()
- .maximumWeight(Long.MAX_VALUE)
- .weigher(weigher)
- .build();
-
- private final CacheStats cacheStats =
- new CacheStats(cache, NAME, weigher, Long.MAX_VALUE);
-
- private int misses;
- private int fails;
- private long loadTime;
-
- @Before
- public void setup() {
- for (int k = 0; k < KEYS; k++) {
- cache.put(k, k);
- }
-
- for (int k = 0; k < 100; k++) {
- final int key = 4 * k;
- try {
- cache.get(key, new Callable<Integer>() {
- @Override
- public Integer call() throws Exception {
- long t0 = System.nanoTime();
- try {
- if (key % 10 == 0) {
- fails++;
- throw new Exception("simulated load failure");
- } else {
- misses++;
- return key;
- }
- } finally {
- loadTime += System.nanoTime() - t0;
- }
-
- }
- });
- } catch (ExecutionException ignore) { }
- }
- }
-
- @Test
- public void name() throws Exception {
- assertEquals(NAME, cacheStats.getName());
- }
-
- @Test
- public void getRequestCount() {
- assertEquals(KEYS, cacheStats.getRequestCount());
- }
-
- @Test
- public void getHitCount() {
- assertEquals(KEYS - misses - fails, cacheStats.getHitCount());
- }
-
- @Test
- public void getHitRate() {
- assertEquals((KEYS - (double) misses - fails)/KEYS, cacheStats.getHitRate(), Double.MIN_VALUE);
- }
-
- @Test
- public void getMissCount() {
- assertEquals(misses + fails, cacheStats.getMissCount());
- }
-
- @Test
- public void getMissRate() {
- assertEquals(((double)misses + fails)/KEYS, cacheStats.getMissRate(), Double.MIN_VALUE);
- }
-
- @Test
- public void getLoadCount() {
- assertEquals(misses + fails, cacheStats.getLoadCount());
- }
-
- @Test
- public void getLoadSuccessCount() {
- assertEquals(misses, cacheStats.getLoadSuccessCount());
- }
-
- @Test
- public void getLoadExceptionCount() {
- assertEquals(fails, cacheStats.getLoadExceptionCount());
- }
-
- @Test
- public void getLoadExceptionRate() {
- assertEquals((double)fails/(misses + fails), cacheStats.getLoadExceptionRate(), Double.MIN_VALUE);
- }
-
- @Test
- public void getTotalLoadTime() {
- assertTrue(loadTime <= cacheStats.getTotalLoadTime());
- }
-
- @Test
- public void getAverageLoadPenalty() {
- assertTrue(((double)loadTime/(misses + fails)) <= cacheStats.getAverageLoadPenalty());
- }
-
- @Test
- public void getEvictionCount() {
- assertEquals(0, cacheStats.getEvictionCount());
- }
-
- @Test
- public void getElementCount() {
- assertEquals(KEYS + misses, cacheStats.getElementCount());
- }
-
- @Test
- public void getMaxTotalWeight() {
- assertEquals(Long.MAX_VALUE, cacheStats.getMaxTotalWeight());
- }
-
- @Test
- public void estimateCurrentWeight() {
- assertEquals(KEYS + misses, cacheStats.estimateCurrentWeight());
- }
-
- @Test
- public void resetStats() {
- cacheStats.resetStats();
- assertEquals(0, cacheStats.getRequestCount());
- assertEquals(0, cacheStats.getHitCount());
- assertEquals(1.0, cacheStats.getHitRate(), Double.MIN_VALUE);
- assertEquals(0, cacheStats.getMissCount());
- assertEquals(0.0, cacheStats.getMissRate(), Double.MIN_VALUE);
- assertEquals(0, cacheStats.getLoadCount());
- assertEquals(0, cacheStats.getLoadSuccessCount());
- assertEquals(0, cacheStats.getLoadExceptionCount());
- assertEquals(0, cacheStats.getLoadExceptionRate(), Double.MIN_VALUE);
- assertEquals(0, cacheStats.getTotalLoadTime());
- assertEquals(0, cacheStats.getAverageLoadPenalty(), Double.MIN_VALUE);
- assertEquals(0, cacheStats.getEvictionCount());
- assertEquals(KEYS + misses, cacheStats.getElementCount());
- assertEquals(Long.MAX_VALUE, cacheStats.getMaxTotalWeight());
- assertEquals(KEYS + misses, cacheStats.estimateCurrentWeight());
- }
-}
diff --git a/oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheBuilderTest.java b/oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheBuilderTest.java
index f63ef05033..c27aec6f34 100644
--- a/oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheBuilderTest.java
+++ b/oak-core-spi/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheBuilderTest.java
@@ -26,7 +26,7 @@ import org.apache.jackrabbit.oak.cache.api.CacheStatsSnapshot;
import org.apache.jackrabbit.oak.cache.api.LoadingCache;
import org.apache.jackrabbit.oak.cache.api.EvictionCause;
import org.apache.jackrabbit.oak.cache.api.CacheBuilder;
-import org.apache.jackrabbit.oak.cache.api.CacheStatsAdapter;
+import org.apache.jackrabbit.oak.cache.CacheStats;
import org.apache.jackrabbit.oak.cache.impl.caffeine.CaffeineCacheAdapter;
import org.apache.jackrabbit.oak.cache.impl.caffeine.CaffeineLoadingCacheAdapter;
import org.junit.Assert;
@@ -212,7 +212,7 @@ public class CacheBuilderTest {
.weigher((k, v) -> k.length() + v.length())
.recordStats()
.build();
- CacheStatsAdapter stats = new CacheStatsAdapter(
+ CacheStats stats = new CacheStats(
cache, "testCache", (k, v) -> k.length() + v.length(), 100);
cache.put("aa", "bbb");
diff --git a/oak-core/src/main/java/org/apache/jackrabbit/oak/cache/impl/ConsolidatedCacheStats.java b/oak-core/src/main/java/org/apache/jackrabbit/oak/cache/impl/ConsolidatedCacheStats.java
index 10234e879f..7bdc2d6bc4 100644
--- a/oak-core/src/main/java/org/apache/jackrabbit/oak/cache/impl/ConsolidatedCacheStats.java
+++ b/oak-core/src/main/java/org/apache/jackrabbit/oak/cache/impl/ConsolidatedCacheStats.java
@@ -44,7 +44,7 @@ import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.Deactivate;
-import static org.apache.jackrabbit.oak.cache.CacheStats.timeInWords;
+import static org.apache.jackrabbit.oak.cache.AbstractCacheStats.timeInWords;
import static org.apache.jackrabbit.oak.commons.IOUtils.humanReadableByteCount;
import static org.apache.jackrabbit.oak.spi.whiteboard.WhiteboardUtils.registerMBean;
diff --git a/oak-core/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheStatsMetricsTest.java b/oak-core/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheStatsMetricsTest.java
index 46afc9ece7..9a3deb4304 100644
--- a/oak-core/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheStatsMetricsTest.java
+++ b/oak-core/src/test/java/org/apache/jackrabbit/oak/cache/impl/CacheStatsMetricsTest.java
@@ -26,6 +26,7 @@ import com.codahale.metrics.MetricRegistry;
import org.apache.jackrabbit.oak.api.jmx.CacheStatsMBean;
import org.apache.jackrabbit.oak.cache.AbstractCacheStats;
+import org.apache.jackrabbit.oak.cache.api.CacheStatsSnapshot;
import org.jetbrains.annotations.NotNull;
import org.junit.Test;
@@ -94,9 +95,8 @@ public class CacheStatsMetricsTest {
}
@Override
- protected org.apache.jackrabbit.guava.common.cache.CacheStats getCurrentStats() {
- return new org.apache.jackrabbit.guava.common.cache.CacheStats(
- HIT_COUNT, MISS_COUNT, MISS_COUNT, 0, LOAD_TIME, EVICTION_COUNT);
+ protected CacheStatsSnapshot getCurrentStats() {
+ return new CacheStatsSnapshot(HIT_COUNT, MISS_COUNT, MISS_COUNT, 0, LOAD_TIME, EVICTION_COUNT);
}
@Override
diff --git a/oak-it-osgi/test-bundles.xml b/oak-it-osgi/test-bundles.xml
index bacc80251f..5553b240fa 100644
--- a/oak-it-osgi/test-bundles.xml
+++ b/oak-it-osgi/test-bundles.xml
@@ -54,7 +54,7 @@
<include>org.apache.jackrabbit:oak-segment-azure</include>
<include>org.apache.jackrabbit:oak-jcr</include>
<include>org.apache.jackrabbit:oak-lucene</include>
- <include>org.apache.jackrabbit:oak-search-elastic</include>
+ <include>org.apache.jackrabbit:oak-search-elastic:jar</include>
<include>org.apache.tika:tika-core</include>
<include>org.apache.jackrabbit:oak-blob</include>
<include>org.apache.jackrabbit:oak-blob-cloud-azure</include>
diff --git a/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProviderService.java b/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProviderService.java
index 0b9019e67a..342c6ac031 100644
--- a/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProviderService.java
+++ b/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProviderService.java
@@ -34,7 +34,7 @@ import org.apache.commons.lang3.StringUtils;
import org.apache.commons.io.FilenameUtils;
import org.apache.jackrabbit.oak.api.jmx.CacheStatsMBean;
import org.apache.jackrabbit.oak.api.jmx.CheckpointMBean;
-import org.apache.jackrabbit.oak.cache.AbstractCacheStats;
+import org.apache.jackrabbit.oak.cache.CacheStats;
import org.apache.jackrabbit.oak.commons.internal.concurrent.ExecutorHelper;
import org.apache.jackrabbit.oak.osgi.OsgiWhiteboard;
import org.apache.jackrabbit.oak.plugins.document.spi.JournalPropertyService;
@@ -686,7 +686,7 @@ public class LuceneIndexProviderService {
if (extractedTextProvider != null){
registerExtractedTextProvider(extractedTextProvider);
}
- AbstractCacheStats stats = extractedTextCache.getCacheStats();
+ CacheStats stats = extractedTextCache.getCacheStats();
if (stats != null){
oakRegs.add(registerMBean(whiteboard,
CacheStatsMBean.class, stats,
diff --git a/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/DocumentStoreIndexerBase.java b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/DocumentStoreIndexerBase.java
index bf173b3c9e..6ac22bb57f 100644
--- a/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/DocumentStoreIndexerBase.java
+++ b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/DocumentStoreIndexerBase.java
@@ -21,7 +21,7 @@ package org.apache.jackrabbit.oak.index.indexer.document;
import com.codahale.metrics.MetricRegistry;
import com.mongodb.ConnectionString;
import org.apache.jackrabbit.oak.api.CommitFailedException;
-import org.apache.jackrabbit.oak.cache.AbstractCacheStats;
+import org.apache.jackrabbit.oak.cache.CacheStats;
import org.apache.jackrabbit.oak.commons.PathUtils;
import org.apache.jackrabbit.oak.commons.concurrent.ExecutorCloser;
import org.apache.jackrabbit.oak.commons.pio.Closer;
@@ -407,7 +407,7 @@ public abstract class DocumentStoreIndexerBase implements Closeable {
}
}
ExtractedTextCache extractedTextCache = indexerProvider.getTextCache();
- AbstractCacheStats cacheStats = extractedTextCache == null ? null : extractedTextCache.getCacheStats();
+ CacheStats cacheStats = extractedTextCache == null ? null : extractedTextCache.getCacheStats();
log.info("Text extraction cache statistics: {}", cacheStats == null ? "N/A" : cacheStats.cacheInfoAsString());
progressReporter.reindexingTraversalEnd();
diff --git a/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/ExtractedTextCache.java b/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/ExtractedTextCache.java
index dc3d39571c..515dca7607 100644
--- a/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/ExtractedTextCache.java
+++ b/oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/ExtractedTextCache.java
@@ -38,10 +38,9 @@ import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
import org.apache.jackrabbit.oak.api.Blob;
-import org.apache.jackrabbit.oak.cache.AbstractCacheStats;
import org.apache.jackrabbit.oak.cache.api.Cache;
import org.apache.jackrabbit.oak.cache.api.CacheBuilder;
-import org.apache.jackrabbit.oak.cache.api.CacheStatsAdapter;
+import org.apache.jackrabbit.oak.cache.CacheStats;
import org.apache.jackrabbit.oak.cache.api.Weigher;
import org.apache.jackrabbit.oak.commons.IOUtils;
import org.apache.jackrabbit.oak.commons.internal.concurrent.ExecutorHelper;
@@ -87,7 +86,7 @@ public class ExtractedTextCache {
private final ConcurrentHashMap<String, String> timeoutMap;
private final File indexDir;
- private final AbstractCacheStats cacheStats;
+ private final CacheStats cacheStats;
private final boolean alwaysUsePreExtractedCache;
private volatile ExecutorService executorService;
private volatile int timeoutCount;
@@ -111,7 +110,7 @@ public class ExtractedTextCache {
.expireAfterAccess(Duration.ofSeconds(expiryTimeInSecs))
.recordStats()
.build();
- cacheStats = new CacheStatsAdapter(cache, "ExtractedTextCache",
+ cacheStats = new CacheStats(cache, "ExtractedTextCache",
EmpiricalWeigher.INSTANCE, maxWeight);
} else {
cache = null;
@@ -250,7 +249,7 @@ public class ExtractedTextCache {
}
@Nullable
- public AbstractCacheStats getCacheStats() {
+ public CacheStats getCacheStats() {
return cacheStats;
}
diff --git a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/CachingSegmentReader.java b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/CachingSegmentReader.java
index e887a43828..a3200eb2b5 100644
--- a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/CachingSegmentReader.java
+++ b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/CachingSegmentReader.java
@@ -27,7 +27,7 @@ import java.util.function.Supplier;
import org.apache.jackrabbit.oak.api.PropertyState;
import org.apache.jackrabbit.oak.api.Type;
-import org.apache.jackrabbit.oak.cache.AbstractCacheStats;
+import org.apache.jackrabbit.oak.cache.CacheStats;
import org.apache.jackrabbit.oak.plugins.memory.PropertyStates;
import org.apache.jackrabbit.oak.segment.util.SafeEncode;
import org.apache.jackrabbit.oak.spi.blob.BlobStore;
@@ -227,12 +227,12 @@ public class CachingSegmentReader implements SegmentReader {
}
@NotNull
- public AbstractCacheStats getStringCacheStats() {
+ public CacheStats getStringCacheStats() {
return stringCache.getStats();
}
@NotNull
- public AbstractCacheStats getTemplateCacheStats() {
+ public CacheStats getTemplateCacheStats() {
return templateCache.getStats();
}
}
diff --git a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/ReaderCache.java b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/ReaderCache.java
index 9d52fce314..5b684edf03 100644
--- a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/ReaderCache.java
+++ b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/ReaderCache.java
@@ -25,18 +25,13 @@ import static org.apache.jackrabbit.oak.segment.CacheWeights.OBJECT_HEADER_SIZE;
import java.util.Arrays;
import java.util.function.Function;
-import org.apache.jackrabbit.oak.cache.api.Weigher;
-import org.apache.jackrabbit.guava.common.cache.CacheStats;
-import org.apache.jackrabbit.oak.cache.AbstractCacheStats;
import org.apache.jackrabbit.oak.cache.CacheLIRS;
import org.apache.jackrabbit.oak.cache.api.Cache;
-import org.apache.jackrabbit.oak.cache.api.CacheStatsAdapter;
+import org.apache.jackrabbit.oak.cache.CacheStats;
import org.apache.jackrabbit.oak.cache.api.Weigher;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
-
-
/**
* A cache consisting of a fast and slow component. The fast cache for small items is based
* on an array, and a slow one uses a LIRS cache.
@@ -62,7 +57,7 @@ public abstract class ReaderCache<T> {
private final Cache<CacheKey, T> cache;
@NotNull
- private final AbstractCacheStats cacheStats;
+ private final CacheStats cacheStats;
/**
* Create a new string cache.
@@ -84,11 +79,11 @@ public abstract class ReaderCache<T> {
.weigher(weigher::weigh)
.build()
.asOakCache();
- cacheStats = new CacheStatsAdapter(cache, name, weigher, maxWeight);
+ cacheStats = new CacheStats(cache, name, weigher, maxWeight);
}
@NotNull
- public AbstractCacheStats getStats() {
+ public CacheStats getStats() {
return cacheStats;
}
diff --git a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/RecordCache.java b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/RecordCache.java
index 61f0702935..7601673743 100644
--- a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/RecordCache.java
+++ b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/RecordCache.java
@@ -23,9 +23,8 @@ import static java.util.Objects.requireNonNull;
import java.util.concurrent.atomic.LongAdder;
import java.util.function.Supplier;
-import org.apache.jackrabbit.guava.common.cache.CacheStats;
import org.apache.jackrabbit.oak.cache.api.CacheBuilder;
-import org.apache.jackrabbit.oak.cache.api.EvictionListener;
+import org.apache.jackrabbit.oak.cache.api.CacheStatsSnapshot;
import org.apache.jackrabbit.oak.cache.api.Weigher;
import org.jetbrains.annotations.NotNull;
@@ -52,7 +51,7 @@ public abstract class RecordCache<K> implements Cache<K, RecordId> {
* @return access statistics for this cache
*/
@NotNull
- public abstract CacheStats getStats();
+ public abstract CacheStatsSnapshot getStats();
/**
* Factory method for creating {@code RecordCache} instances. The returned
@@ -111,8 +110,8 @@ public abstract class RecordCache<K> implements Cache<K, RecordId> {
}
@Override
- public @NotNull CacheStats getStats() {
- return new CacheStats(0, missCount.sum(), 0, 0, 0, 0);
+ public @NotNull CacheStatsSnapshot getStats() {
+ return new CacheStatsSnapshot(0, missCount.sum(), 0, 0, 0, 0);
}
@Override
@@ -147,10 +146,10 @@ public abstract class RecordCache<K> implements Cache<K, RecordId> {
private final LongAdder loadCount = new LongAdder();
@Override
- public @NotNull CacheStats getStats() {
- org.apache.jackrabbit.oak.cache.api.CacheStatsSnapshot snapshot = cache.stats();
+ public @NotNull CacheStatsSnapshot getStats() {
+ CacheStatsSnapshot snapshot = cache.stats();
// any addition to the cache counts as load by our definition
- return new CacheStats(snapshot.hitCount(), snapshot.missCount(),
+ return new CacheStatsSnapshot(snapshot.hitCount(), snapshot.missCount(),
loadCount.sum(), 0, 0, snapshot.evictionCount());
}
diff --git a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/RecordCacheStats.java b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/RecordCacheStats.java
index b5e92fce00..8ddef87152 100644
--- a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/RecordCacheStats.java
+++ b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/RecordCacheStats.java
@@ -22,8 +22,8 @@ import static java.util.Objects.requireNonNull;
import java.util.function.Supplier;
-import org.apache.jackrabbit.guava.common.cache.CacheStats;
import org.apache.jackrabbit.oak.cache.AbstractCacheStats;
+import org.apache.jackrabbit.oak.cache.api.CacheStatsSnapshot;
import org.jetbrains.annotations.NotNull;
/**
@@ -32,7 +32,7 @@ import org.jetbrains.annotations.NotNull;
public class RecordCacheStats extends AbstractCacheStats {
@NotNull
- private final Supplier<CacheStats> stats;
+ private final Supplier<CacheStatsSnapshot> stats;
@NotNull
private final Supplier<Long> elementCount;
@@ -42,7 +42,7 @@ public class RecordCacheStats extends AbstractCacheStats {
public RecordCacheStats(
@NotNull String name,
- @NotNull Supplier<CacheStats> stats,
+ @NotNull Supplier<CacheStatsSnapshot> stats,
@NotNull Supplier<Long> elementCount,
@NotNull Supplier<Long> weight) {
super(name);
@@ -52,7 +52,7 @@ public class RecordCacheStats extends AbstractCacheStats {
}
@Override
- protected CacheStats getCurrentStats() {
+ protected CacheStatsSnapshot getCurrentStats() {
return stats.get();
}
diff --git a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentCache.java b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentCache.java
index daf04a6bc2..ae41962289 100644
--- a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentCache.java
+++ b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentCache.java
@@ -28,10 +28,10 @@ import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicLong;
import java.util.function.Supplier;
-import org.apache.jackrabbit.guava.common.cache.CacheStats;
import org.apache.jackrabbit.oak.cache.AbstractCacheStats;
import org.apache.jackrabbit.oak.cache.api.Cache;
import org.apache.jackrabbit.oak.cache.api.CacheBuilder;
+import org.apache.jackrabbit.oak.cache.api.CacheStatsSnapshot;
import org.apache.jackrabbit.oak.cache.api.EvictionCause;
import org.apache.jackrabbit.oak.segment.CacheWeights.SegmentCacheWeigher;
import org.jetbrains.annotations.NotNull;
@@ -304,8 +304,8 @@ public abstract class SegmentCache {
}
@Override
- protected CacheStats getCurrentStats() {
- return new CacheStats(
+ protected CacheStatsSnapshot getCurrentStats() {
+ return new CacheStatsSnapshot(
hitCount.get(),
missCount.get(),
loadSuccessCount.get(),
diff --git a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/WriterCacheManager.java b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/WriterCacheManager.java
index a0d4ba9b33..16d54af499 100644
--- a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/WriterCacheManager.java
+++ b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/WriterCacheManager.java
@@ -29,8 +29,8 @@ import java.util.concurrent.ConcurrentMap;
import java.util.function.Predicate;
import java.util.function.Supplier;
-import org.apache.jackrabbit.guava.common.cache.CacheStats;
import org.apache.jackrabbit.oak.api.jmx.CacheStatsMBean;
+import org.apache.jackrabbit.oak.cache.api.CacheStatsSnapshot;
import org.apache.jackrabbit.oak.commons.collections.IteratorUtils;
import org.apache.jackrabbit.oak.segment.file.PriorityCache;
import org.apache.jackrabbit.oak.stats.StatisticsProvider;
@@ -351,17 +351,14 @@ public abstract class WriterCacheManager {
}
@NotNull
- private static <T> Supplier<CacheStats> accumulateRecordCacheStats(
+ private static <T> Supplier<CacheStatsSnapshot> accumulateRecordCacheStats(
final Iterable<RecordCache<T>> caches) {
- return new Supplier<CacheStats>() {
- @Override
- public CacheStats get() {
- CacheStats stats = new CacheStats(0, 0, 0, 0, 0, 0);
- for (RecordCache<?> cache : caches) {
- stats = stats.plus(cache.getStats());
- }
- return stats;
+ return () -> {
+ CacheStatsSnapshot stats = new CacheStatsSnapshot(0, 0, 0, 0, 0, 0);
+ for (RecordCache<?> cache : caches) {
+ stats = stats.plus(cache.getStats());
}
+ return stats;
};
}
@@ -399,12 +396,7 @@ public abstract class WriterCacheManager {
@Override
public CacheStatsMBean getNodeCacheStats() {
return new RecordCacheStats("Node deduplication cache stats",
- new Supplier<CacheStats>() {
- @Override
- public CacheStats get() {
- return nodeCache().getStats();
- }
- },
+ () -> nodeCache().getStats(),
new Supplier<Long>() {
@Override
public Long get() {
diff --git a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/PriorityCache.java b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/PriorityCache.java
index 209d158029..58dc75f6c3 100644
--- a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/PriorityCache.java
+++ b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/file/PriorityCache.java
@@ -37,7 +37,7 @@ import org.apache.jackrabbit.oak.segment.CacheWeights;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
-import org.apache.jackrabbit.guava.common.cache.CacheStats;
+import org.apache.jackrabbit.oak.cache.api.CacheStatsSnapshot;
import org.apache.jackrabbit.oak.cache.api.Weigher;
/**
@@ -400,8 +400,8 @@ public class PriorityCache<K, V> {
* @return access statistics for this cache
*/
@NotNull
- public CacheStats getStats() {
- return new CacheStats(hitCount.sum(), missCount.sum(), loadCount.sum(),
+ public CacheStatsSnapshot getStats() {
+ return new CacheStatsSnapshot(hitCount.sum(), missCount.sum(), loadCount.sum(),
loadExceptionCount.sum(), 0, evictionCount.sum());
}
diff --git a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/spi/persistence/persistentcache/SegmentCacheStats.java b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/spi/persistence/persistentcache/SegmentCacheStats.java
index 541e31aa82..49aec4196e 100644
--- a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/spi/persistence/persistentcache/SegmentCacheStats.java
+++ b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/spi/persistence/persistentcache/SegmentCacheStats.java
@@ -23,8 +23,8 @@ import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicLong;
import java.util.function.Supplier;
-import org.apache.jackrabbit.guava.common.cache.CacheStats;
import org.apache.jackrabbit.oak.cache.AbstractCacheStats;
+import org.apache.jackrabbit.oak.cache.api.CacheStatsSnapshot;
import org.jetbrains.annotations.NotNull;
public class SegmentCacheStats extends AbstractCacheStats {
@@ -67,8 +67,8 @@ public class SegmentCacheStats extends AbstractCacheStats {
}
@Override
- protected CacheStats getCurrentStats() {
- return new CacheStats(
+ protected CacheStatsSnapshot getCurrentStats() {
+ return new CacheStatsSnapshot(
hitCount.get(),
missCount.get(),
loadSuccessCount.get(),
diff --git a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/spi/persistence/persistentcache/package-info.java b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/spi/persistence/persistentcache/package-info.java
index 0ad0171f1b..96eb50916c 100644
--- a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/spi/persistence/persistentcache/package-info.java
+++ b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/spi/persistence/persistentcache/package-info.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
@Internal(since = "1.0.0")
-@Version("6.1.0")
+@Version("7.0.0")
package org.apache.jackrabbit.oak.segment.spi.persistence.persistentcache;
import org.apache.jackrabbit.oak.commons.annotations.Internal;
diff --git a/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/file/PriorityCacheTest.java b/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/file/PriorityCacheTest.java
index bfb8850ee9..2873379f6b 100644
--- a/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/file/PriorityCacheTest.java
+++ b/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/file/PriorityCacheTest.java
@@ -191,7 +191,7 @@ public class PriorityCacheTest {
assertEquals(0, cache.getStats().evictionCount());
assertEquals(success, cache.size());
- assertEquals(failure, cache.getStats().loadExceptionCount());
+ assertEquals(failure, cache.getStats().loadFailureCount());
}
}
diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DiffCache.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DiffCache.java
index 4b4de76757..c3128cc273 100644
--- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DiffCache.java
+++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DiffCache.java
@@ -16,7 +16,7 @@
*/
package org.apache.jackrabbit.oak.plugins.document;
-import org.apache.jackrabbit.oak.cache.AbstractCacheStats;
+import org.apache.jackrabbit.oak.cache.CacheStats;
import org.apache.jackrabbit.oak.commons.json.JsopReader;
import org.apache.jackrabbit.oak.commons.json.JsopTokenizer;
import org.jetbrains.annotations.NotNull;
@@ -69,7 +69,7 @@ abstract class DiffCache {
* @return the statistics for this cache.
*/
@NotNull
- abstract Iterable<AbstractCacheStats> getStats();
+ abstract Iterable<CacheStats> getStats();
/**
* Invalidates all the entries in the cache.
diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java
index 1078b92c6f..9943dc9cdd 100644
--- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java
+++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java
@@ -76,7 +76,7 @@ import org.apache.jackrabbit.oak.cache.api.Cache;
import org.apache.jackrabbit.oak.api.Blob;
import org.apache.jackrabbit.oak.api.CommitFailedException;
import org.apache.jackrabbit.oak.api.PropertyState;
-import org.apache.jackrabbit.oak.cache.AbstractCacheStats;
+import org.apache.jackrabbit.oak.cache.CacheStats;
import org.apache.jackrabbit.oak.commons.PerfLogger;
import org.apache.jackrabbit.oak.commons.collections.IterableUtils;
import org.apache.jackrabbit.oak.commons.collections.ListUtils;
@@ -419,7 +419,7 @@ public final class DocumentNodeStore
* Key: PathRev, value: DocumentNodeState
*/
private final Cache<PathRev, DocumentNodeState> nodeCache;
- private final AbstractCacheStats nodeCacheStats;
+ private final CacheStats nodeCacheStats;
/**
* Child node cache.
@@ -427,7 +427,7 @@ public final class DocumentNodeStore
* Key: PathRev, value: Children
*/
private final Cache<NamePathRev, DocumentNodeState.Children> nodeChildrenCache;
- private final AbstractCacheStats nodeChildrenCacheStats;
+ private final CacheStats nodeChildrenCacheStats;
/**
* The change log to keep track of commits for diff operations.
@@ -1292,16 +1292,16 @@ public final class DocumentNodeStore
return clusterNodeInfo;
}
- public AbstractCacheStats getNodeCacheStats() {
+ public CacheStats getNodeCacheStats() {
return nodeCacheStats;
}
- public AbstractCacheStats getNodeChildrenCacheStats() {
+ public CacheStats getNodeChildrenCacheStats() {
return nodeChildrenCacheStats;
}
@NotNull
- public Iterable<AbstractCacheStats> getDiffCacheStats() {
+ public Iterable<CacheStats> getDiffCacheStats() {
return diffCache.getStats();
}
diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreBuilder.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreBuilder.java
index 3fd1bc87e9..06a88b6dfb 100644
--- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreBuilder.java
+++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreBuilder.java
@@ -38,8 +38,7 @@ import java.util.function.Supplier;
import org.apache.jackrabbit.oak.cache.CacheLIRS;
import org.apache.jackrabbit.oak.cache.api.Cache;
import org.apache.jackrabbit.oak.cache.api.CacheBuilder;
-import org.apache.jackrabbit.oak.cache.api.CacheStatsAdapter;
-import org.apache.jackrabbit.oak.cache.api.EvictionCause;
+import org.apache.jackrabbit.oak.cache.CacheStats;
import org.apache.jackrabbit.oak.cache.api.Weigher;
import org.apache.jackrabbit.oak.cache.AbstractCacheStats;
import org.apache.jackrabbit.oak.cache.CacheValue;
@@ -985,8 +984,8 @@ public class DocumentNodeStoreBuilder<T extends DocumentNodeStoreBuilder<T>> {
return buildCache(CacheType.CHILDREN, getChildrenCacheSize(), store, null);
}
- public org.apache.jackrabbit.oak.cache.api.Cache<CacheValue, StringValue> buildMemoryDiffCache() {
- return org.apache.jackrabbit.oak.cache.api.CacheBuilder
+ public Cache<CacheValue, StringValue> buildMemoryDiffCache() {
+ return CacheBuilder
.<CacheValue, StringValue>newBuilder()
.maximumWeight(getMemoryDiffCacheSize())
.weigher((k, v) -> weigher.weigh(k, v))
@@ -994,8 +993,8 @@ public class DocumentNodeStoreBuilder<T extends DocumentNodeStoreBuilder<T>> {
.build();
}
- public org.apache.jackrabbit.oak.cache.api.Cache<RevisionsKey, LocalDiffCache.Diff> buildLocalDiffCache() {
- return org.apache.jackrabbit.oak.cache.api.CacheBuilder
+ public Cache<RevisionsKey, LocalDiffCache.Diff> buildLocalDiffCache() {
+ return CacheBuilder
.<RevisionsKey, LocalDiffCache.Diff>newBuilder()
.maximumWeight(getLocalDiffCacheSize())
.weigher((k, v) -> weigher.weigh(k, v))
@@ -1013,17 +1012,17 @@ public class DocumentNodeStoreBuilder<T extends DocumentNodeStoreBuilder<T>> {
public NodeDocumentCache buildNodeDocumentCache(DocumentStore docStore, NodeDocumentLocks locks) {
Cache<CacheValue, NodeDocument> nodeDocumentsCache = buildDocumentCache(docStore);
- AbstractCacheStats nodeDocumentsCacheStats = newCacheStatsAdapter(nodeDocumentsCache, "Document-Documents", getDocumentCacheSize());
+ CacheStats nodeDocumentsCacheStats = newCacheStatsAdapter(nodeDocumentsCache, "Document-Documents", getDocumentCacheSize());
Cache<StringValue, NodeDocument> prevDocumentsCache = buildPrevDocumentsCache(docStore);
- AbstractCacheStats prevDocumentsCacheStats = newCacheStatsAdapter(prevDocumentsCache, "Document-PrevDocuments", getPrevDocumentCacheSize());
+ CacheStats prevDocumentsCacheStats = newCacheStatsAdapter(prevDocumentsCache, "Document-PrevDocuments", getPrevDocumentCacheSize());
return new NodeDocumentCache(nodeDocumentsCache, nodeDocumentsCacheStats, prevDocumentsCache, prevDocumentsCacheStats, locks);
}
@SuppressWarnings({"unchecked", "rawtypes"})
- AbstractCacheStats newCacheStatsAdapter(Cache<?, ?> cache, String name, long maxWeight) {
- return new CacheStatsAdapter((Cache) cache, name, (Weigher) weigher, maxWeight);
+ CacheStats newCacheStatsAdapter(Cache<?, ?> cache, String name, long maxWeight) {
+ return new CacheStats((Cache) cache, name, (Weigher) weigher, maxWeight);
}
/**
diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreService.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreService.java
index 58b78df936..6e9f95ecd2 100644
--- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreService.java
+++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreService.java
@@ -60,6 +60,7 @@ import org.apache.jackrabbit.oak.api.jmx.CacheStatsMBean;
import org.apache.jackrabbit.oak.api.jmx.CheckpointMBean;
import org.apache.jackrabbit.oak.api.jmx.PersistentCacheStatsMBean;
import org.apache.jackrabbit.oak.cache.AbstractCacheStats;
+import org.apache.jackrabbit.oak.cache.CacheStats;
import org.apache.jackrabbit.oak.commons.pio.Closer;
import org.apache.jackrabbit.oak.plugins.document.VersionGarbageCollector.VersionGCStats;
import org.apache.jackrabbit.oak.plugins.document.mongo.MongoDocumentNodeStoreBuilder;
@@ -878,7 +879,7 @@ public class DocumentNodeStoreService {
}
DocumentStore ds = store.getDocumentStore();
if (ds.getCacheStats() != null) {
- for (AbstractCacheStats cacheStats : ds.getCacheStats()) {
+ for (CacheStats cacheStats : ds.getCacheStats()) {
registerCacheStatsMBean(cacheStats);
}
}
diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentStore.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentStore.java
index cfb42d65c0..889446fdc8 100644
--- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentStore.java
+++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentStore.java
@@ -22,7 +22,7 @@ import java.util.Map;
import java.util.Set;
import java.util.stream.Collectors;
-import org.apache.jackrabbit.oak.cache.AbstractCacheStats;
+import org.apache.jackrabbit.oak.cache.CacheStats;
import org.apache.jackrabbit.oak.plugins.document.UpdateOp.Condition;
import org.apache.jackrabbit.oak.plugins.document.cache.CacheInvalidationStats;
import org.apache.jackrabbit.oak.plugins.document.util.Utils;
@@ -431,7 +431,7 @@ public interface DocumentStore {
* @return status information about the cache
*/
@Nullable
- Iterable<AbstractCacheStats> getCacheStats();
+ Iterable<CacheStats> getCacheStats();
/**
* @return description of the underlying storage.
diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/JournalDiffLoader.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/JournalDiffLoader.java
index 2da34f667d..3667f40ce2 100644
--- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/JournalDiffLoader.java
+++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/JournalDiffLoader.java
@@ -20,7 +20,7 @@ import java.io.IOException;
import java.util.Map;
import java.util.concurrent.TimeUnit;
-import org.apache.jackrabbit.oak.cache.AbstractCacheStats;
+import org.apache.jackrabbit.oak.cache.CacheStats;
import org.apache.jackrabbit.oak.commons.sort.StringSort;
import org.apache.jackrabbit.oak.commons.time.Stopwatch;
import org.apache.jackrabbit.oak.plugins.document.util.StringValue;
@@ -298,7 +298,7 @@ class JournalDiffLoader implements DiffCache.Loader {
@NotNull
@Override
- Iterable<AbstractCacheStats> getStats() {
+ Iterable<CacheStats> getStats() {
return cache.getStats();
}
diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/LocalDiffCache.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/LocalDiffCache.java
index da42b338ef..7a5d7f518b 100644
--- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/LocalDiffCache.java
+++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/LocalDiffCache.java
@@ -20,10 +20,9 @@ import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
-import org.apache.jackrabbit.oak.cache.AbstractCacheStats;
import org.apache.jackrabbit.oak.cache.CacheValue;
import org.apache.jackrabbit.oak.cache.api.Cache;
-import org.apache.jackrabbit.oak.cache.api.CacheStatsAdapter;
+import org.apache.jackrabbit.oak.cache.CacheStats;
import org.apache.jackrabbit.oak.commons.json.JsopBuilder;
import org.apache.jackrabbit.oak.commons.json.JsopReader;
import org.apache.jackrabbit.oak.commons.json.JsopTokenizer;
@@ -46,11 +45,11 @@ public class LocalDiffCache extends DiffCache {
private static int MAX_ENTRY_SIZE = 16 * 1024 * 1024;
private final Cache<RevisionsKey, Diff> diffCache;
- private final AbstractCacheStats diffCacheStats;
+ private final CacheStats diffCacheStats;
LocalDiffCache(DocumentNodeStoreBuilder<?> builder) {
this.diffCache = builder.buildLocalDiffCache();
- this.diffCacheStats = new CacheStatsAdapter(diffCache,
+ this.diffCacheStats = new CacheStats(diffCache,
"Document-LocalDiff",
(k, v) -> builder.getWeigher().weigh(k, v), builder.getLocalDiffCacheSize());
}
@@ -108,7 +107,7 @@ public class LocalDiffCache extends DiffCache {
@NotNull
@Override
- public Iterable<AbstractCacheStats> getStats() {
+ public Iterable<CacheStats> getStats() {
return Collections.singleton(diffCacheStats);
}
diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/MemoryDiffCache.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/MemoryDiffCache.java
index 8f27d8164c..cde4a196e8 100644
--- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/MemoryDiffCache.java
+++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/MemoryDiffCache.java
@@ -18,10 +18,9 @@ package org.apache.jackrabbit.oak.plugins.document;
import java.util.Collections;
-import org.apache.jackrabbit.oak.cache.AbstractCacheStats;
import org.apache.jackrabbit.oak.cache.CacheValue;
import org.apache.jackrabbit.oak.cache.api.Cache;
-import org.apache.jackrabbit.oak.cache.api.CacheStatsAdapter;
+import org.apache.jackrabbit.oak.cache.CacheStats;
import org.apache.jackrabbit.oak.plugins.document.util.StringValue;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -51,12 +50,12 @@ public class MemoryDiffCache extends DiffCache {
* Key: PathRev, value: StringValue
*/
protected final Cache<CacheValue, StringValue> diffCache;
- protected final AbstractCacheStats diffCacheStats;
+ protected final CacheStats diffCacheStats;
protected MemoryDiffCache(DocumentNodeStoreBuilder<?> builder) {
diffCache = builder.buildMemoryDiffCache();
- diffCacheStats = new CacheStatsAdapter(diffCache, "Document-MemoryDiff",
+ diffCacheStats = new CacheStats(diffCache, "Document-MemoryDiff",
(k, v) -> builder.getWeigher().weigh(k, v), builder.getMemoryDiffCacheSize());
}
@@ -97,7 +96,7 @@ public class MemoryDiffCache extends DiffCache {
@NotNull
@Override
- public Iterable<AbstractCacheStats> getStats() {
+ public Iterable<CacheStats> getStats() {
return Collections.singleton(diffCacheStats);
}
diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/TieredDiffCache.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/TieredDiffCache.java
index 1d817b7a46..4e528dc0b5 100644
--- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/TieredDiffCache.java
+++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/TieredDiffCache.java
@@ -16,9 +16,9 @@
*/
package org.apache.jackrabbit.oak.plugins.document;
-import org.apache.jackrabbit.oak.cache.AbstractCacheStats;
import org.apache.jackrabbit.oak.cache.api.Cache;
import org.apache.jackrabbit.oak.cache.api.CacheBuilder;
+import org.apache.jackrabbit.oak.cache.CacheStats;
import org.apache.jackrabbit.oak.commons.collections.IterableUtils;
import org.apache.jackrabbit.oak.plugins.document.util.RevisionsKey;
import org.jetbrains.annotations.NotNull;
@@ -93,7 +93,7 @@ class TieredDiffCache extends DiffCache {
@NotNull
@Override
- public Iterable<AbstractCacheStats> getStats() {
+ public Iterable<CacheStats> getStats() {
return IterableUtils.chainedIterable(localCache.getStats(), memoryCache.getStats());
}
diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/cache/NodeDocumentCache.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/cache/NodeDocumentCache.java
index 4ff05d0952..7ac1ddf5cd 100644
--- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/cache/NodeDocumentCache.java
+++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/cache/NodeDocumentCache.java
@@ -32,9 +32,9 @@ import java.util.concurrent.locks.Lock;
import java.util.function.Function;
import java.util.function.Predicate;
-import org.apache.jackrabbit.oak.cache.AbstractCacheStats;
import org.apache.jackrabbit.oak.cache.api.Cache;
import org.apache.jackrabbit.oak.cache.CacheValue;
+import org.apache.jackrabbit.oak.cache.CacheStats;
import org.apache.jackrabbit.oak.commons.collections.IterableUtils;
import org.apache.jackrabbit.oak.plugins.document.Document;
import org.apache.jackrabbit.oak.plugins.document.NodeDocument;
@@ -50,7 +50,7 @@ public class NodeDocumentCache implements Closeable {
private final Cache<CacheValue, NodeDocument> nodeDocumentsCache;
- private final AbstractCacheStats nodeDocumentsCacheStats;
+ private final CacheStats nodeDocumentsCacheStats;
/**
* The previous documents cache
@@ -58,16 +58,16 @@ public class NodeDocumentCache implements Closeable {
* Key: StringValue, value: NodeDocument
*/
private final Cache<StringValue, NodeDocument> prevDocumentsCache;
- private final AbstractCacheStats prevDocumentsCacheStats;
+ private final CacheStats prevDocumentsCacheStats;
private final NodeDocumentLocks locks;
private final List<CacheChangesTracker> changeTrackers;
public NodeDocumentCache(@NotNull Cache<CacheValue, NodeDocument> nodeDocumentsCache,
- @NotNull AbstractCacheStats nodeDocumentsCacheStats,
+ @NotNull CacheStats nodeDocumentsCacheStats,
@NotNull Cache<StringValue, NodeDocument> prevDocumentsCache,
- @NotNull AbstractCacheStats prevDocumentsCacheStats,
+ @NotNull CacheStats prevDocumentsCacheStats,
@NotNull NodeDocumentLocks locks) {
this.nodeDocumentsCache = nodeDocumentsCache;
this.nodeDocumentsCacheStats = nodeDocumentsCacheStats;
@@ -319,7 +319,7 @@ public class NodeDocumentCache implements Closeable {
return IterableUtils.chainedIterable(nodeDocumentsCache.asMap().values(), prevDocumentsCache.asMap().values());
}
- public Iterable<AbstractCacheStats> getCacheStats() {
+ public Iterable<CacheStats> getCacheStats() {
return Arrays.asList(nodeDocumentsCacheStats, prevDocumentsCacheStats);
}
diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/memory/MemoryDocumentStore.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/memory/MemoryDocumentStore.java
index b53fefe041..d28d169602 100644
--- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/memory/MemoryDocumentStore.java
+++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/memory/MemoryDocumentStore.java
@@ -33,7 +33,7 @@ import java.util.concurrent.locks.ReadWriteLock;
import java.util.concurrent.locks.ReentrantReadWriteLock;
import java.util.stream.Collectors;
-import org.apache.jackrabbit.oak.cache.AbstractCacheStats;
+import org.apache.jackrabbit.oak.cache.CacheStats;
import org.apache.jackrabbit.oak.commons.properties.SystemPropertySupplier;
import org.apache.jackrabbit.oak.plugins.document.Collection;
import org.apache.jackrabbit.oak.plugins.document.Document;
@@ -444,7 +444,7 @@ public class MemoryDocumentStore implements DocumentStore {
}
@Override
- public Iterable<AbstractCacheStats> getCacheStats() {
+ public Iterable<CacheStats> getCacheStats() {
return null;
}
diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentStore.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentStore.java
index ba1afcb9c7..c878e01234 100644
--- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentStore.java
+++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentStore.java
@@ -42,8 +42,8 @@ import java.util.stream.Collectors;
import java.util.stream.StreamSupport;
import org.apache.commons.io.IOUtils;
-import org.apache.jackrabbit.oak.cache.AbstractCacheStats;
import org.apache.jackrabbit.oak.cache.CacheValue;
+import org.apache.jackrabbit.oak.cache.CacheStats;
import org.apache.jackrabbit.oak.commons.collections.IterableUtils;
import org.apache.jackrabbit.oak.commons.collections.IteratorUtils;
import org.apache.jackrabbit.oak.commons.collections.ListUtils;
@@ -2081,7 +2081,7 @@ public class MongoDocumentStore implements DocumentStore {
}
@Override
- public Iterable<AbstractCacheStats> getCacheStats() {
+ public Iterable<CacheStats> getCacheStats() {
return nodesCache.getCacheStats();
}
diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java
index 621f753c3b..41aa3c9cea 100755
--- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java
+++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStore.java
@@ -59,8 +59,8 @@ import java.util.zip.GZIPOutputStream;
import javax.sql.DataSource;
-import org.apache.jackrabbit.oak.cache.AbstractCacheStats;
import org.apache.jackrabbit.oak.cache.CacheValue;
+import org.apache.jackrabbit.oak.cache.CacheStats;
import org.apache.jackrabbit.oak.commons.collections.IteratorUtils;
import org.apache.jackrabbit.oak.commons.collections.ListUtils;
import org.apache.jackrabbit.oak.commons.collections.SetUtils;
@@ -836,7 +836,7 @@ public class RDBDocumentStore implements DocumentStore {
}
@Override
- public Iterable<AbstractCacheStats> getCacheStats() {
+ public Iterable<CacheStats> getCacheStats() {
return nodesCache.getCacheStats();
}
diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/LeaseCheckDocumentStoreWrapper.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/LeaseCheckDocumentStoreWrapper.java
index 3223c5db29..8ffb8796b1 100644
--- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/LeaseCheckDocumentStoreWrapper.java
+++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/LeaseCheckDocumentStoreWrapper.java
@@ -22,7 +22,7 @@ import java.util.List;
import java.util.Map;
import java.util.function.Supplier;
-import org.apache.jackrabbit.oak.cache.AbstractCacheStats;
+import org.apache.jackrabbit.oak.cache.CacheStats;
import org.apache.jackrabbit.oak.plugins.document.ClusterNodeInfo;
import org.apache.jackrabbit.oak.plugins.document.Collection;
import org.apache.jackrabbit.oak.plugins.document.Document;
@@ -213,7 +213,7 @@ public final class LeaseCheckDocumentStoreWrapper implements DocumentStore {
}
@Override
- public Iterable<AbstractCacheStats> getCacheStats() {
+ public Iterable<CacheStats> getCacheStats() {
return leaseChecking(delegate::getCacheStats);
}
diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/LoggingDocumentStoreWrapper.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/LoggingDocumentStoreWrapper.java
index 1db5af0944..79a2c8c3fc 100644
--- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/LoggingDocumentStoreWrapper.java
+++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/LoggingDocumentStoreWrapper.java
@@ -20,7 +20,7 @@ import java.util.List;
import java.util.Map;
import java.util.concurrent.Callable;
-import org.apache.jackrabbit.oak.cache.AbstractCacheStats;
+import org.apache.jackrabbit.oak.cache.CacheStats;
import org.apache.jackrabbit.oak.commons.json.JsopBuilder;
import org.apache.jackrabbit.oak.plugins.document.Collection;
import org.apache.jackrabbit.oak.plugins.document.Document;
@@ -366,15 +366,10 @@ public class LoggingDocumentStoreWrapper implements DocumentStore {
}
@Override
- public Iterable<AbstractCacheStats> getCacheStats() {
+ public Iterable<CacheStats> getCacheStats() {
try {
logMethod("getCacheStats");
- return logResult(new Callable<Iterable<AbstractCacheStats>>() {
- @Override
- public Iterable<AbstractCacheStats> call() throws Exception {
- return store.getCacheStats();
- }
- });
+ return logResult(store::getCacheStats);
} catch (Exception e) {
logException(e);
throw convert(e);
diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/SynchronizingDocumentStoreWrapper.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/SynchronizingDocumentStoreWrapper.java
index b870da9a23..8b59b5d416 100644
--- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/SynchronizingDocumentStoreWrapper.java
+++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/SynchronizingDocumentStoreWrapper.java
@@ -19,7 +19,7 @@ package org.apache.jackrabbit.oak.plugins.document.util;
import java.util.List;
import java.util.Map;
-import org.apache.jackrabbit.oak.cache.AbstractCacheStats;
+import org.apache.jackrabbit.oak.cache.CacheStats;
import org.apache.jackrabbit.oak.plugins.document.Collection;
import org.apache.jackrabbit.oak.plugins.document.Document;
import org.apache.jackrabbit.oak.plugins.document.DocumentStore;
@@ -154,7 +154,7 @@ public class SynchronizingDocumentStoreWrapper implements DocumentStore {
}
@Override
- public synchronized Iterable<AbstractCacheStats> getCacheStats() {
+ public synchronized Iterable<CacheStats> getCacheStats() {
return store.getCacheStats();
}
diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/ThrottlingDocumentStoreWrapper.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/ThrottlingDocumentStoreWrapper.java
index d1f6417fd2..d0c6471cbd 100644
--- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/ThrottlingDocumentStoreWrapper.java
+++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/ThrottlingDocumentStoreWrapper.java
@@ -16,7 +16,7 @@
*/
package org.apache.jackrabbit.oak.plugins.document.util;
-import org.apache.jackrabbit.oak.cache.AbstractCacheStats;
+import org.apache.jackrabbit.oak.cache.CacheStats;
import org.apache.jackrabbit.oak.plugins.document.Collection;
import org.apache.jackrabbit.oak.plugins.document.Document;
import org.apache.jackrabbit.oak.plugins.document.DocumentStore;
@@ -233,7 +233,7 @@ public class ThrottlingDocumentStoreWrapper implements DocumentStore {
}
@Override
- public Iterable<AbstractCacheStats> getCacheStats() {
+ public Iterable<CacheStats> getCacheStats() {
return store.getCacheStats();
}
diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/TimingDocumentStoreWrapper.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/TimingDocumentStoreWrapper.java
index 4e3dbbb708..974ef43171 100644
--- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/TimingDocumentStoreWrapper.java
+++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/TimingDocumentStoreWrapper.java
@@ -25,7 +25,7 @@ import java.util.Map.Entry;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicInteger;
-import org.apache.jackrabbit.oak.cache.AbstractCacheStats;
+import org.apache.jackrabbit.oak.cache.CacheStats;
import org.apache.jackrabbit.oak.plugins.document.Collection;
import org.apache.jackrabbit.oak.plugins.document.Document;
import org.apache.jackrabbit.oak.plugins.document.DocumentStore;
@@ -423,10 +423,10 @@ public class TimingDocumentStoreWrapper implements DocumentStore {
@Override
- public Iterable<AbstractCacheStats> getCacheStats() {
+ public Iterable<CacheStats> getCacheStats() {
try {
long start = now();
- Iterable<AbstractCacheStats> result = base.getCacheStats();
+ Iterable<CacheStats> result = base.getCacheStats();
updateAndLogTimes("getCacheStats", start, 0, 0);
return result;
} catch (Exception e) {
diff --git a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/AmnesiaDiffCache.java b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/AmnesiaDiffCache.java
index 2d69c7fb79..14f18f395a 100644
--- a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/AmnesiaDiffCache.java
+++ b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/AmnesiaDiffCache.java
@@ -18,7 +18,7 @@ package org.apache.jackrabbit.oak.plugins.document;
import java.util.Collections;
-import org.apache.jackrabbit.oak.cache.AbstractCacheStats;
+import org.apache.jackrabbit.oak.cache.CacheStats;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -61,7 +61,7 @@ class AmnesiaDiffCache extends DiffCache {
@NotNull
@Override
- public Iterable<AbstractCacheStats> getStats() {
+ public Iterable<CacheStats> getStats() {
return Collections.emptyList();
}
diff --git a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/CountingDocumentStore.java b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/CountingDocumentStore.java
index 6289c23252..fe200862d7 100644
--- a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/CountingDocumentStore.java
+++ b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/CountingDocumentStore.java
@@ -21,7 +21,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import org.apache.jackrabbit.oak.cache.AbstractCacheStats;
+import org.apache.jackrabbit.oak.cache.CacheStats;
import org.apache.jackrabbit.oak.plugins.document.cache.CacheInvalidationStats;
import org.jetbrains.annotations.NotNull;
@@ -215,7 +215,7 @@ public class CountingDocumentStore implements DocumentStore {
}
@Override
- public Iterable<AbstractCacheStats> getCacheStats() {
+ public Iterable<CacheStats> getCacheStats() {
return delegate.getCacheStats();
}
diff --git a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMKBuilderTest.java b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMKBuilderTest.java
index 4a9295fafa..324473fabf 100644
--- a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMKBuilderTest.java
+++ b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentMKBuilderTest.java
@@ -18,7 +18,7 @@ package org.apache.jackrabbit.oak.plugins.document;
import com.mongodb.client.MongoClient;
-import org.apache.jackrabbit.oak.cache.AbstractCacheStats;
+import org.apache.jackrabbit.oak.cache.CacheStats;
import org.apache.jackrabbit.oak.commons.collections.IterableUtils;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -74,11 +74,11 @@ public class DocumentMKBuilderTest extends AbstractMongoConnectionTest {
@Test
public void lazyInit() throws Exception {
- Iterable<AbstractCacheStats> cacheStats = mk.getDocumentStore().getCacheStats();
+ Iterable<CacheStats> cacheStats = mk.getDocumentStore().getCacheStats();
assertNotNull(cacheStats);
assertEquals(2, IterableUtils.size(cacheStats));
- AbstractCacheStats docCacheStats = IterableUtils.get(cacheStats, 0);
- AbstractCacheStats prevDocCacheStats = IterableUtils.get(cacheStats, 1);
+ CacheStats docCacheStats = IterableUtils.get(cacheStats, 0);
+ CacheStats prevDocCacheStats = IterableUtils.get(cacheStats, 1);
assertEquals("Document-Documents", docCacheStats.getName());
assertEquals("Document-PrevDocuments", prevDocCacheStats.getName());
assertEquals(expectedDocCacheSize, docCacheStats.getMaxTotalWeight());
diff --git a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreBuilderTest.java b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreBuilderTest.java
index 0ba38ed82b..ae10d8fd09 100644
--- a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreBuilderTest.java
+++ b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreBuilderTest.java
@@ -18,7 +18,7 @@ package org.apache.jackrabbit.oak.plugins.document;
import java.lang.reflect.Method;
-import org.apache.jackrabbit.oak.cache.AbstractCacheStats;
+import org.apache.jackrabbit.oak.cache.CacheStats;
import org.apache.jackrabbit.oak.plugins.document.cache.NodeDocumentCache;
import org.apache.jackrabbit.oak.plugins.document.locks.StripedNodeDocumentLocks;
import org.apache.jackrabbit.oak.plugins.document.memory.MemoryDocumentStore;
@@ -50,7 +50,7 @@ public class DocumentNodeStoreBuilderTest {
DocumentStore store = new MemoryDocumentStore();
NodeDocumentCache cache = DocumentNodeStoreBuilder.newDocumentNodeStoreBuilder()
.buildNodeDocumentCache(store, new StripedNodeDocumentLocks());
- Iterable<AbstractCacheStats> stats = cache.getCacheStats();
+ Iterable<CacheStats> stats = cache.getCacheStats();
Assert.assertNotNull(stats);
Assert.assertTrue(stats.iterator().hasNext());
}
diff --git a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreDiffTest.java b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreDiffTest.java
index 527239c9c4..e90dcb221a 100644
--- a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreDiffTest.java
+++ b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreDiffTest.java
@@ -17,7 +17,7 @@
package org.apache.jackrabbit.oak.plugins.document;
import org.apache.jackrabbit.oak.api.CommitFailedException;
-import org.apache.jackrabbit.oak.cache.AbstractCacheStats;
+import org.apache.jackrabbit.oak.cache.CacheStats;
import org.apache.jackrabbit.oak.spi.commit.CommitInfo;
import org.apache.jackrabbit.oak.spi.commit.EmptyHook;
import org.apache.jackrabbit.oak.spi.state.DefaultNodeStateDiff;
@@ -63,14 +63,14 @@ public class DocumentNodeStoreDiffTest extends AbstractMongoConnectionTest {
merge(store, builder);
}
- Iterable<AbstractCacheStats> stats = store.getDiffCacheStats();
- for (AbstractCacheStats cs : stats) {
+ Iterable<CacheStats> stats = store.getDiffCacheStats();
+ for (CacheStats cs : stats) {
cs.resetStats();
}
// must not cause cache misses
Diff.perform(before, after);
- for (AbstractCacheStats cs : stats) {
+ for (CacheStats cs : stats) {
assertEquals(0, cs.getMissCount());
}
}
diff --git a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentStoreWrapper.java b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentStoreWrapper.java
index aadc7ee8cc..a53007342b 100644
--- a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentStoreWrapper.java
+++ b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentStoreWrapper.java
@@ -19,7 +19,7 @@ package org.apache.jackrabbit.oak.plugins.document;
import java.util.List;
import java.util.Map;
-import org.apache.jackrabbit.oak.cache.AbstractCacheStats;
+import org.apache.jackrabbit.oak.cache.CacheStats;
import org.apache.jackrabbit.oak.plugins.document.cache.CacheInvalidationStats;
import org.jetbrains.annotations.NotNull;
@@ -150,7 +150,7 @@ public class DocumentStoreWrapper implements DocumentStore {
}
@Override
- public Iterable<AbstractCacheStats> getCacheStats() {
+ public Iterable<CacheStats> getCacheStats() {
return store.getCacheStats();
}
diff --git a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/LocalDiffCacheTest.java b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/LocalDiffCacheTest.java
index 6bf7c3bd43..38ddb3040f 100644
--- a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/LocalDiffCacheTest.java
+++ b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/LocalDiffCacheTest.java
@@ -22,7 +22,7 @@ import java.util.HashMap;
import java.util.Map;
import org.apache.jackrabbit.oak.api.CommitFailedException;
-import org.apache.jackrabbit.oak.cache.AbstractCacheStats;
+import org.apache.jackrabbit.oak.cache.CacheStats;
import org.apache.jackrabbit.oak.plugins.document.LocalDiffCache.Diff;
import org.apache.jackrabbit.oak.plugins.document.memory.MemoryDocumentStore;
import org.apache.jackrabbit.oak.spi.commit.CommitInfo;
@@ -56,7 +56,7 @@ public class LocalDiffCacheTest {
o.reset();
DiffCache cache = store.getDiffCache();
- Iterable<AbstractCacheStats> stats = cache.getStats();
+ Iterable<CacheStats> stats = cache.getStats();
NodeBuilder builder = store.getRoot().builder();
builder.child("a").child("a2").setProperty("foo", "bar");
@@ -118,24 +118,24 @@ public class LocalDiffCacheTest {
.open();
}
- private static long getHitCount(Iterable<AbstractCacheStats> stats) {
+ private static long getHitCount(Iterable<CacheStats> stats) {
long hitCount = 0;
- for (AbstractCacheStats cs : stats) {
+ for (CacheStats cs : stats) {
hitCount += cs.getHitCount();
}
return hitCount;
}
- private static long getMissCount(Iterable<AbstractCacheStats> stats) {
+ private static long getMissCount(Iterable<CacheStats> stats) {
long missCount = 0;
- for (AbstractCacheStats cs : stats) {
+ for (CacheStats cs : stats) {
missCount += cs.getMissCount();
}
return missCount;
}
- private static void resetStats(Iterable<AbstractCacheStats> stats) {
- for (AbstractCacheStats cs : stats) {
+ private static void resetStats(Iterable<CacheStats> stats) {
+ for (CacheStats cs : stats) {
cs.resetStats();
}
}
diff --git a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/MemoryDiffCacheTest.java b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/MemoryDiffCacheTest.java
index d37ae5a3cb..a96980e08d 100644
--- a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/MemoryDiffCacheTest.java
+++ b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/MemoryDiffCacheTest.java
@@ -18,7 +18,7 @@ package org.apache.jackrabbit.oak.plugins.document;
import java.util.UUID;
-import org.apache.jackrabbit.oak.cache.AbstractCacheStats;
+import org.apache.jackrabbit.oak.cache.CacheStats;
import org.junit.Rule;
import org.junit.Test;
@@ -68,7 +68,7 @@ public class MemoryDiffCacheTest {
DiffCache cache = new MemoryDiffCache(builderProvider.newBuilder()
.setCacheSegmentCount(1)
.memoryCacheDistribution(0, 0, 0, 99, 0));
- Iterable<AbstractCacheStats> statsIterable = cache.getStats();
+ Iterable<CacheStats> statsIterable = cache.getStats();
assertNotNull(statsIterable);
assertTrue(statsIterable.iterator().hasNext());
}
diff --git a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/NodeStoreDiffTest.java b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/NodeStoreDiffTest.java
index 3e6f1e4e06..c30cde3396 100644
--- a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/NodeStoreDiffTest.java
+++ b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/NodeStoreDiffTest.java
@@ -25,7 +25,7 @@ import java.util.List;
import java.util.Set;
import org.apache.jackrabbit.oak.api.CommitFailedException;
-import org.apache.jackrabbit.oak.cache.AbstractCacheStats;
+import org.apache.jackrabbit.oak.cache.CacheStats;
import org.apache.jackrabbit.oak.commons.PathUtils;
import org.apache.jackrabbit.oak.plugins.commit.AnnotatingConflictHandler;
import org.apache.jackrabbit.oak.plugins.commit.ConflictHook;
@@ -228,7 +228,7 @@ public class NodeStoreDiffTest {
private long diffCacheRequests(DocumentNodeStore ns) {
long num = 0;
- for (AbstractCacheStats stats : ns.getDiffCacheStats()) {
+ for (CacheStats stats : ns.getDiffCacheStats()) {
num += stats.getRequestCount();
}
return num;
diff --git a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/TieredDiffCacheTest.java b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/TieredDiffCacheTest.java
index cbb2e1ae94..0923ca8750 100644
--- a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/TieredDiffCacheTest.java
+++ b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/TieredDiffCacheTest.java
@@ -18,7 +18,7 @@ package org.apache.jackrabbit.oak.plugins.document;
import java.lang.reflect.Field;
-import org.apache.jackrabbit.oak.cache.AbstractCacheStats;
+import org.apache.jackrabbit.oak.cache.CacheStats;
import org.junit.Rule;
import org.junit.Test;
@@ -88,7 +88,7 @@ public class TieredDiffCacheTest {
@Test
public void getStatsReturnsNonEmptyIterable() {
TieredDiffCache cache = buildCache();
- Iterable<AbstractCacheStats> stats = cache.getStats();
+ Iterable<CacheStats> stats = cache.getStats();
assertNotNull(stats);
assertTrue(stats.iterator().hasNext());
}
diff --git a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/cache/CacheChangesTrackerTest.java b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/cache/CacheChangesTrackerTest.java
index 1702a88de3..bd43c91cd0 100644
--- a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/cache/CacheChangesTrackerTest.java
+++ b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/cache/CacheChangesTrackerTest.java
@@ -27,8 +27,8 @@ import java.util.Set;
import org.apache.jackrabbit.oak.cache.CacheLIRS;
import org.apache.jackrabbit.oak.cache.api.Cache;
-import org.apache.jackrabbit.oak.cache.AbstractCacheStats;
import org.apache.jackrabbit.oak.cache.CacheValue;
+import org.apache.jackrabbit.oak.cache.CacheStats;
import org.apache.jackrabbit.oak.plugins.document.Collection;
import org.apache.jackrabbit.oak.plugins.document.DocumentStore;
import org.apache.jackrabbit.oak.plugins.document.NodeDocument;
@@ -153,8 +153,8 @@ public class CacheChangesTrackerTest {
private NodeDocumentCache createCache() {
Cache<CacheValue, NodeDocument> nodeDocumentsCache = (new CacheLIRS<CacheValue, NodeDocument>(10)).asOakCache();
Cache<StringValue, NodeDocument> prevDocumentsCache = (new CacheLIRS<StringValue, NodeDocument>(10)).asOakCache();
- AbstractCacheStats nodeDocumentsCacheStats = Mockito.mock(AbstractCacheStats.class);
- AbstractCacheStats prevDocumentsCacheStats = Mockito.mock(AbstractCacheStats.class);
+ CacheStats nodeDocumentsCacheStats = Mockito.mock(CacheStats.class);
+ CacheStats prevDocumentsCacheStats = Mockito.mock(CacheStats.class);
NodeDocumentLocks locks = new StripedNodeDocumentLocks();
return new NodeDocumentCache(nodeDocumentsCache, nodeDocumentsCacheStats, prevDocumentsCache, prevDocumentsCacheStats, locks);
}
diff --git a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/cache/NodeDocumentCacheTest.java b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/cache/NodeDocumentCacheTest.java
index eafe2607a9..14f4f98850 100644
--- a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/cache/NodeDocumentCacheTest.java
+++ b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/cache/NodeDocumentCacheTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.jackrabbit.oak.plugins.document.cache;
-import org.apache.jackrabbit.oak.cache.AbstractCacheStats;
+import org.apache.jackrabbit.oak.cache.CacheStats;
import org.apache.jackrabbit.oak.plugins.document.Document;
import org.apache.jackrabbit.oak.plugins.document.DocumentStore;
import org.apache.jackrabbit.oak.plugins.document.NodeDocument;
@@ -126,7 +126,7 @@ public class NodeDocumentCacheTest {
@Test
public void getCacheStatsReturnsNonEmptyIterable() {
- Iterable<AbstractCacheStats> statsIterable = cache.getCacheStats();
+ Iterable<CacheStats> statsIterable = cache.getCacheStats();
assertNotNull(statsIterable);
assertTrue(statsIterable.iterator().hasNext());
}
diff --git a/specs/guava-cache-removal/TASKS.md b/specs/guava-cache-removal/TASKS.md
index 303b525642..93d0fbb2bf 100644
--- a/specs/guava-cache-removal/TASKS.md
+++ b/specs/guava-cache-removal/TASKS.md
@@ -20,9 +20,7 @@ This document decomposes the Oak Cache API migration plan (PLAN.md) into indepen
**Remaining:**
-- OAK-12157, OAK-12158 (oak-segment-tar) — not yet started
-- OAK-12159 (oak-blob-plugins) — not yet started
-- OAK-12161, OAK-12162 — blocked on OAK-12157, OAK-12158, OAK-12159
+- OAK-12162 — in progress on branch OAK-12161
## Dependency Graph