OAK-12153 : removed guava cache from oak-search

Author: rishabhdaim

oak-core-spi/src/main/java/org/apache/jackrabbit/oak/cache/api/CacheBuilder.java

@@ -16,7 +16,9 @@
  */
 package org.apache.jackrabbit.oak.cache.api;
 
+import java.time.Clock;
 import java.time.Duration;
+import java.util.concurrent.TimeUnit;
 import java.util.function.Supplier;
 
 import com.github.benmanes.caffeine.cache.Caffeine;
@@ -186,6 +188,18 @@ public CacheBuilder<K, V> ticker(@NotNull Supplier<Long> ticker) {
         return this;
     }
 
+    /**
+     * Sets the clock used to measure time for expiry and refresh.
+     * Convenience overload for {@link #ticker(Supplier)}; converts milliseconds to nanoseconds internally.
+     *
+     * @param clock the clock to use (must not be null)
+     * @return this builder
+     */
+    @NotNull
+    public CacheBuilder<K, V> ticker(@NotNull Clock clock) {
+        return ticker(() -> TimeUnit.MILLISECONDS.toNanos(clock.millis()));
+    }
+
     /**
      * Builds and returns a cache with no auto-loading behaviour.
      *

oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexProviderService.java

@@ -34,7 +34,7 @@
 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.CacheStats;
+import org.apache.jackrabbit.oak.cache.AbstractCacheStats;
 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 @@ private void initializeExtractedTextCache(BundleContext bundleContext, Configura
         if (extractedTextProvider != null){
             registerExtractedTextProvider(extractedTextProvider);
         }
-        CacheStats stats = extractedTextCache.getCacheStats();
+        AbstractCacheStats stats = extractedTextCache.getCacheStats();
         if (stats != null){
             oakRegs.add(registerMBean(whiteboard,
                     CacheStatsMBean.class, stats,

oak-search/pom.xml

@@ -93,6 +93,12 @@
             <version>${project.version}</version>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>org.apache.jackrabbit</groupId>
+            <artifactId>oak-core-spi</artifactId>
+            <version>${project.version}</version>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>org.apache.jackrabbit</groupId>
             <artifactId>oak-store-spi</artifactId>

oak-search/src/main/java/org/apache/jackrabbit/oak/plugins/index/search/ExtractedTextCache.java

@@ -23,6 +23,7 @@
 
 import java.io.File;
 import java.io.FileInputStream;
+import java.time.Duration;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.util.Map.Entry;
@@ -36,11 +37,12 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 
-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.apache.jackrabbit.oak.api.Blob;
-import org.apache.jackrabbit.oak.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.CacheStatsAdapter;
+import org.apache.jackrabbit.oak.cache.api.Weigher;
 import org.apache.jackrabbit.oak.commons.IOUtils;
 import org.apache.jackrabbit.oak.commons.internal.concurrent.ExecutorHelper;
 import org.apache.jackrabbit.oak.plugins.index.fulltext.ExtractedText;
@@ -85,7 +87,7 @@ public class ExtractedTextCache {
 
     private final ConcurrentHashMap<String, String> timeoutMap;
     private final File indexDir;
-    private final CacheStats cacheStats;
+    private final AbstractCacheStats cacheStats;
     private final boolean alwaysUsePreExtractedCache;
     private volatile ExecutorService executorService;
     private volatile int timeoutCount;
@@ -103,13 +105,13 @@ public ExtractedTextCache(long maxWeight, long expiryTimeInSecs, boolean alwaysU
     public ExtractedTextCache(long maxWeight, long expiryTimeInSecs, boolean alwaysUsePreExtractedCache,
                               File indexDir, StatisticsProvider statisticsProvider) {
         if (maxWeight > 0) {
-            cache = CacheBuilder.newBuilder()
+            cache = CacheBuilder.<String, String>newBuilder()
                     .weigher(EmpiricalWeigher.INSTANCE)
                     .maximumWeight(maxWeight)
-                    .expireAfterAccess(expiryTimeInSecs, TimeUnit.SECONDS)
+                    .expireAfterAccess(Duration.ofSeconds(expiryTimeInSecs))
                     .recordStats()
                     .build();
-            cacheStats = new CacheStats(cache, "ExtractedTextCache",
+            cacheStats = new CacheStatsAdapter(cache, "ExtractedTextCache",
                     EmpiricalWeigher.INSTANCE, maxWeight);
         } else {
             cache = null;
@@ -248,7 +250,7 @@ public int getTimeoutCount() {
     }
 
     @Nullable
-    public CacheStats getCacheStats() {
+    public AbstractCacheStats getCacheStats() {
         return cacheStats;
     }