svn commit: r1836783 - in /jackrabbit/oak/trunk/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/run/cli: BlobStoreFixtureProvider.java BlobStoreOptions.java

[amitj]

Author: amitj
Date: Fri Jul 27 07:28:27 2018
New Revision: 1836783

URL: http://svn.apache.org/viewvc?rev=1836783&view=rev
Log:
OAK-7665: Add a datastore read-write option to BlobStoreOptions when NodeStore 
read only

- Added ds-read-write option to specify opening DataStore in read-write mode

Modified:
    
jackrabbit/oak/trunk/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/run/cli/BlobStoreFixtureProvider.java
    
jackrabbit/oak/trunk/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/run/cli/BlobStoreOptions.java

Modified: 
jackrabbit/oak/trunk/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/run/cli/BlobStoreFixtureProvider.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/run/cli/BlobStoreFixtureProvider.java?rev=1836783&r1=1836782&r2=1836783&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/run/cli/BlobStoreFixtureProvider.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/run/cli/BlobStoreFixtureProvider.java
 Fri Jul 27 07:28:27 2018
@@ -103,7 +103,8 @@ public class BlobStoreFixtureProvider {
             delegate.init(null);
         }
         DataStoreBlobStore blobStore = new DataStoreBlobStore(delegate);
-        return new DataStoreFixture(blobStore, closer, 
!options.getCommonOpts().isReadWrite());
+        return new DataStoreFixture(blobStore, closer,
+            (!options.getCommonOpts().isReadWrite() && !bsopts.isReadWrite()));
     }
 
     static Properties loadConfig(String cfgPath) throws IOException {

Modified: 
jackrabbit/oak/trunk/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/run/cli/BlobStoreOptions.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/run/cli/BlobStoreOptions.java?rev=1836783&r1=1836782&r2=1836783&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/run/cli/BlobStoreOptions.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/run/cli/BlobStoreOptions.java
 Fri Jul 27 07:28:27 2018
@@ -35,6 +35,8 @@ public class BlobStoreOptions implements
     private final OptionSpec<String> azureOption;
     private final OptionSpec<String> fdsPathOption;
     private final OptionSpec<String> fakeDsPathOption;
+    private final OptionSpec<Void> readWriteOption;
+
     private OptionSet options;
 
     public BlobStoreOptions(OptionParser parser){
@@ -49,6 +51,9 @@ public class BlobStoreOptions implements
                 .withRequiredArg().ofType(String.class);
         azureOption = parser.acceptsAll(asList("azureblobds", "azureds"), 
"AzureBlobStorageDataStore config path")
                 .withRequiredArg().ofType(String.class);
+        readWriteOption = parser.accepts("ds-read-write",
+            "Connect to datastore in read-write mode. Use this option if only 
the datastore has to be opened "
+                + " in read-write mode and not the node store (i.e. 
--read-write not to be specified)");
     }
 
     @Override
@@ -110,4 +115,8 @@ public class BlobStoreOptions implements
         }
         return Type.NONE;
     }
+
+    public boolean isReadWrite(){
+        return options.has(readWriteOption);
+    }
 }