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 am...@apache.org on 2018/09/13 04:00:11 UTC

svn commit: r1840774 - in /jackrabbit/oak/trunk/oak-run/src: main/java/org/apache/jackrabbit/oak/run/DataStoreCommand.java test/java/org/apache/jackrabbit/oak/run/DataStoreCommandTest.java

Author: amitj
Date: Thu Sep 13 04:00:11 2018
New Revision: 1840774

URL: http://svn.apache.org/viewvc?rev=1840774&view=rev
Log:
OAK-7716: Enable datastore command for Azure segment store

- Use ReadOnlyFileStore for segment tar

Modified:
    jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/DataStoreCommand.java
    jackrabbit/oak/trunk/oak-run/src/test/java/org/apache/jackrabbit/oak/run/DataStoreCommandTest.java

Modified: jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/DataStoreCommand.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/DataStoreCommand.java?rev=1840774&r1=1840773&r2=1840774&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/DataStoreCommand.java (original)
+++ jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/DataStoreCommand.java Thu Sep 13 04:00:11 2018
@@ -53,7 +53,7 @@ import org.apache.jackrabbit.oak.run.cli
 import org.apache.jackrabbit.oak.run.commons.Command;
 import org.apache.jackrabbit.oak.run.commons.LoggingInitializer;
 import org.apache.jackrabbit.oak.segment.SegmentBlobReferenceRetriever;
-import org.apache.jackrabbit.oak.segment.file.FileStore;
+import org.apache.jackrabbit.oak.segment.file.ReadOnlyFileStore;
 import org.apache.jackrabbit.oak.spi.blob.GarbageCollectableBlobStore;
 import org.apache.jackrabbit.oak.spi.cluster.ClusterRepositoryInfo;
 import org.apache.jackrabbit.oak.spi.state.ChildNodeEntry;
@@ -180,7 +180,7 @@ public class DataStoreCommand implements
             if (dataStoreOpts.isVerbose()) {
                 retriever = new NodeTraverserReferenceRetriever(fixture.getStore());
             } else {
-                FileStore fileStore = getService(fixture.getWhiteboard(), FileStore.class);
+                ReadOnlyFileStore fileStore = getService(fixture.getWhiteboard(), ReadOnlyFileStore.class);
                 retriever = new SegmentBlobReferenceRetriever(fileStore);
             }
         }

Modified: jackrabbit/oak/trunk/oak-run/src/test/java/org/apache/jackrabbit/oak/run/DataStoreCommandTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/test/java/org/apache/jackrabbit/oak/run/DataStoreCommandTest.java?rev=1840774&r1=1840773&r2=1840774&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-run/src/test/java/org/apache/jackrabbit/oak/run/DataStoreCommandTest.java (original)
+++ jackrabbit/oak/trunk/oak-run/src/test/java/org/apache/jackrabbit/oak/run/DataStoreCommandTest.java Thu Sep 13 04:00:11 2018
@@ -137,11 +137,8 @@ public class DataStoreCommandTest {
     public void setup() throws Exception {
         setupDataStore = blobFixture.init(temporaryFolder);
         store = storeFixture.init(setupDataStore, temporaryFolder.newFolder());
-        if (store instanceof SegmentNodeStore) {
-            additionalParams = "--read-write";
-        } else {
-            additionalParams = "--ds-read-write";
-        }
+        additionalParams = "--ds-read-write";
+
         String repoId = ClusterRepositoryInfo.getOrCreateId(store);
         setupDataStore.addMetadataRecord(new ByteArrayInputStream(new byte[0]),
             REPOSITORY.getNameFromId(repoId));