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 ch...@apache.org on 2017/07/10 08:46:54 UTC
svn commit: r1801422 - in /jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/index: IndexHelper.java LuceneIndexHelper.java

Author: chetanm
Date: Mon Jul 10 08:46:54 2017
New Revision: 1801422

URL: http://svn.apache.org/viewvc?rev=1801422&view=rev
Log:
OAK-6271 - Support for importing index files

Add an accessor for GarbageCollectorBlobStore to IndexHelper itself

Modified:
    jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/index/IndexHelper.java
    jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/index/LuceneIndexHelper.java

Modified: jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/index/IndexHelper.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/index/IndexHelper.java?rev=1801422&r1=1801421&r2=1801422&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/index/IndexHelper.java (original)
+++ jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/index/IndexHelper.java Mon Jul 10 08:46:54 2017
@@ -31,6 +31,7 @@ import java.util.concurrent.ThreadPoolEx
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 
+import javax.annotation.CheckForNull;
 import javax.annotation.Nonnull;
 
 import com.google.common.collect.ImmutableList;
@@ -50,6 +51,7 @@ import org.apache.jackrabbit.oak.plugins
 import org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexInfoProvider;
 import org.apache.jackrabbit.oak.plugins.index.property.PropertyIndexInfoProvider;
 import org.apache.jackrabbit.oak.spi.blob.BlobStore;
+import org.apache.jackrabbit.oak.spi.blob.GarbageCollectableBlobStore;
 import org.apache.jackrabbit.oak.spi.mount.MountInfoProvider;
 import org.apache.jackrabbit.oak.spi.mount.Mounts;
 import org.apache.jackrabbit.oak.spi.state.NodeStore;
@@ -135,8 +137,9 @@ class IndexHelper implements Closeable{
         return statisticsProvider;
     }
 
-    public BlobStore getBlobStore() {
-        return blobStore;
+    @CheckForNull
+    public GarbageCollectableBlobStore getGCBlobStore() {
+        return blobStore instanceof GarbageCollectableBlobStore ? (GarbageCollectableBlobStore) blobStore : null;
     }
 
     public LuceneIndexHelper getLuceneIndexHelper(){

Modified: jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/index/LuceneIndexHelper.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/index/LuceneIndexHelper.java?rev=1801422&r1=1801421&r2=1801422&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/index/LuceneIndexHelper.java (original)
+++ jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/index/LuceneIndexHelper.java Mon Jul 10 08:46:54 2017
@@ -61,9 +61,7 @@ class LuceneIndexHelper implements Close
             );
         }
 
-        if (indexHelper.getBlobStore() instanceof GarbageCollectableBlobStore) {
-            editor.setBlobStore((GarbageCollectableBlobStore) indexHelper.getBlobStore());
-        }
+        editor.setBlobStore(indexHelper.getGCBlobStore());
 
         return editor;
     }