svn commit: r1770678 - in /jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/node: SegmentFactory.java SegmentTarFactory.java

[tomekr]

Author: tomekr
Date: Mon Nov 21 12:51:50 2016
New Revision: 1770678

URL: http://svn.apache.org/viewvc?rev=1770678&view=rev
Log:
OAK-5133: StoreArgument class getter method opens repo in read/write and unsafe 
MMAP mode

Modified:
    
jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/node/SegmentFactory.java
    
jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/node/SegmentTarFactory.java

Modified: 
jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/node/SegmentFactory.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/node/SegmentFactory.java?rev=1770678&r1=1770677&r2=1770678&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/node/SegmentFactory.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/node/SegmentFactory.java
 Mon Nov 21 12:51:50 2016
@@ -105,14 +105,11 @@ public class SegmentFactory implements N
     public boolean hasExternalBlobReferences() throws IOException {
         Builder builder = FileStore.builder(new File(dir, "segmentstore"));
         builder.withMaxFileSize(256);
-        if (disableMmap) {
-            builder.withMemoryMapping(false);
-        } else {
-            builder.withDefaultMemoryMapping();
-        }
+        builder.withMemoryMapping(false);
+
         FileStore fs;
         try {
-            fs = builder.build();
+            fs = builder.buildReadOnly();
         } catch (InvalidFileStoreVersionException e) {
             throw new IOException(e);
         }

Modified: 
jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/node/SegmentTarFactory.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/node/SegmentTarFactory.java?rev=1770678&r1=1770677&r2=1770678&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/node/SegmentTarFactory.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/node/SegmentTarFactory.java
 Mon Nov 21 12:51:50 2016
@@ -31,6 +31,7 @@ import org.apache.jackrabbit.oak.segment
 import org.apache.jackrabbit.oak.segment.file.FileStore;
 import org.apache.jackrabbit.oak.segment.file.FileStoreBuilder;
 import org.apache.jackrabbit.oak.segment.file.InvalidFileStoreVersionException;
+import org.apache.jackrabbit.oak.segment.file.ReadOnlyFileStore;
 import org.apache.jackrabbit.oak.spi.blob.BlobStore;
 import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
 import org.apache.jackrabbit.oak.spi.state.NodeState;
@@ -105,11 +106,7 @@ public class SegmentTarFactory implement
     public boolean hasExternalBlobReferences() throws IOException {
         final FileStoreBuilder builder = fileStoreBuilder(new File(dir, 
"segmentstore"));
         builder.withMaxFileSize(256);
-        if (disableMmap) {
-            builder.withMemoryMapping(false);
-        } else {
-            builder.withDefaultMemoryMapping();
-        }
+        builder.withMemoryMapping(false);
         final FileStore fs;
         try {
             fs = builder.build();