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 2014/09/09 08:34:19 UTC

svn commit: r1623667 - /jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/fixture/OakFixture.java

Author: chetanm
Date: Tue Sep  9 06:34:19 2014
New Revision: 1623667

URL: http://svn.apache.org/r1623667
Log:
OAK-2079 - Refactor BlobStore creation logic in a BlobStoreFixture

Creating BlobStore lazily to avoid unnecessary directory creation

Modified:
    jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/fixture/OakFixture.java

Modified: jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/fixture/OakFixture.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/fixture/OakFixture.java?rev=1623667&r1=1623666&r2=1623667&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/fixture/OakFixture.java (original)
+++ jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/fixture/OakFixture.java Tue Sep  9 06:34:19 2014
@@ -157,7 +157,6 @@ public abstract class OakFixture {
         return new OakFixture(name) {
             private DocumentMK[] kernels;
             private BlobStoreFixture blobStoreFixture;
-            private BlobStore blobStore;
 
             {
                 if (useFileDataStore) {
@@ -165,10 +164,6 @@ public abstract class OakFixture {
                 } else {
                     blobStoreFixture = BlobStoreFixture.create(base, false);
                 }
-
-                if (blobStoreFixture != null) {
-                    blobStore = blobStoreFixture.setUp();
-                }
             }
 
             @Override
@@ -178,9 +173,7 @@ public abstract class OakFixture {
                         setMongoDB(mongo.getDB()).
                         memoryCacheSize(cacheSize).
                         setLogging(false);
-                if (blobStore != null) {
-                    mkBuilder.setBlobStore(blobStore);
-                }
+                setupBlobStore(mkBuilder);
                 return mkBuilder.open();
             }
 
@@ -191,9 +184,7 @@ public abstract class OakFixture {
                         setMongoDB(mongo.getDB()).
                         memoryCacheSize(cacheSize).
                         setClusterId(clusterId).setLogging(false);
-                if (blobStore != null) {
-                    mkBuilder.setBlobStore(blobStore);
-                }
+                setupBlobStore(mkBuilder);
                 DocumentMK dmk = mkBuilder.open();
                 Oak oak;
                 if (useMk) {
@@ -214,9 +205,7 @@ public abstract class OakFixture {
                             setMongoDB(mongo.getDB()).
                             memoryCacheSize(cacheSize).
                             setClusterId(i).setLogging(false);
-                    if (blobStore != null) {
-                        mkBuilder.setBlobStore(blobStore);
-                    }
+                    setupBlobStore(mkBuilder);
                     kernels[i] = mkBuilder.open();
                     Oak oak;
                     if (useMk) {
@@ -248,6 +237,12 @@ public abstract class OakFixture {
                     }
                 }
             }
+
+            private void setupBlobStore(DocumentMK.Builder mkBuilder) {
+                if (blobStoreFixture != null) {
+                    mkBuilder.setBlobStore(blobStoreFixture.setUp());
+                }
+            }
         };
     }