Author: chetanm
Date: Fri Jan 5 13:13:38 2018
New Revision: 1820292
URL: http://svn.apache.org/viewvc?rev=1820292&view=rev
Log:
OAK-7124 - Support MemoryNodeStore with NodeStoreFixtureProvider
Modified:
jackrabbit/oak/trunk/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/run/cli/CommonOptions.java
jackrabbit/oak/trunk/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/run/cli/NodeStoreFixtureProvider.java
Modified:
jackrabbit/oak/trunk/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/run/cli/CommonOptions.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/run/cli/CommonOptions.java?rev=1820292&r1=1820291&r2=1820292&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/run/cli/CommonOptions.java
(original)
+++
jackrabbit/oak/trunk/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/run/cli/CommonOptions.java
Fri Jan 5 13:13:38 2018
@@ -30,7 +30,7 @@ import joptsimple.OptionSpec;
import static java.util.Arrays.asList;
public class CommonOptions implements OptionsBean {
- public static final String DEFAULT_CONNECTION_STRING =
"{<path-to-repository> | <mongodb-uri>} | <rdb-uri>}";
+ public static final String DEFAULT_CONNECTION_STRING =
"{<path-to-repository> | <mongodb-uri>} | <rdb-uri> | memory}";
private final OptionSpec<Void> help;
private final OptionSpec<Void> readWriteOption;
private final OptionSpec<String> nonOption;
@@ -79,6 +79,10 @@ public class CommonOptions implements Op
return isMongo() || isRDB();
}
+ public boolean isMemory(){
+ return getStoreArg().equalsIgnoreCase("memory");
+ }
+
public boolean isMetricsEnabled() {
return options.has(metrics);
}
Modified:
jackrabbit/oak/trunk/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/run/cli/NodeStoreFixtureProvider.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/run/cli/NodeStoreFixtureProvider.java?rev=1820292&r1=1820291&r2=1820292&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/run/cli/NodeStoreFixtureProvider.java
(original)
+++
jackrabbit/oak/trunk/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/run/cli/NodeStoreFixtureProvider.java
Fri Jan 5 13:13:38 2018
@@ -31,6 +31,7 @@ import com.codahale.metrics.MetricRegist
import com.google.common.io.Closer;
import com.google.common.util.concurrent.MoreExecutors;
import org.apache.jackrabbit.oak.plugins.document.DocumentNodeStore;
+import org.apache.jackrabbit.oak.plugins.memory.MemoryNodeStore;
import org.apache.jackrabbit.oak.plugins.metric.MetricStatisticsProvider;
import org.apache.jackrabbit.oak.segment.file.InvalidFileStoreVersionException;
import org.apache.jackrabbit.oak.spi.blob.BlobStore;
@@ -63,7 +64,9 @@ public class NodeStoreFixtureProvider {
wb.register(StatisticsProvider.class, statisticsProvider, emptyMap());
NodeStore store;
- if (commonOpts.isMongo() || commonOpts.isRDB()) {
+ if (commonOpts.isMemory()) {
+ store = new MemoryNodeStore();
+ } else if (commonOpts.isMongo() || commonOpts.isRDB()) {
DocumentNodeStore dns =
DocumentFixtureProvider.configureDocumentMk(options, blobStore, wb, closer,
readOnly);
store = dns;
if (blobStore == null) {
