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 2017/05/15 09:49:23 UTC
svn commit: r1795158 - in /jackrabbit/oak/trunk/oak-run/src:
main/java/org/apache/jackrabbit/oak/run/
test/java/org/apache/jackrabbit/oak/run/
Author: chetanm
Date: Mon May 15 09:49:23 2017
New Revision: 1795158
URL: http://svn.apache.org/viewvc?rev=1795158&view=rev
Log:
OAK-6081 - Indexing tooling via oak-run
Rename existing IndexCommand to JsonIndexCommand so as to enable use
of IndexCommand for tooling planned in this issue
Added:
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/JsonIndexCommand.java (contents, props changed)
- copied, changed from r1795150, jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/IndexCommand.java
jackrabbit/oak/trunk/oak-run/src/test/java/org/apache/jackrabbit/oak/run/JsonIndexTest.java (contents, props changed)
- copied, changed from r1795150, jackrabbit/oak/trunk/oak-run/src/test/java/org/apache/jackrabbit/oak/run/IndexTest.java
Removed:
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/IndexCommand.java
jackrabbit/oak/trunk/oak-run/src/test/java/org/apache/jackrabbit/oak/run/IndexTest.java
Modified:
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/AvailableModes.java
Modified: jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/AvailableModes.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/AvailableModes.java?rev=1795158&r1=1795157&r2=1795158&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/AvailableModes.java (original)
+++ jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/AvailableModes.java Mon May 15 09:49:23 2017
@@ -40,7 +40,7 @@ public final class AvailableModes {
.put("graph", new GraphCommand())
.put("help", new HelpCommand())
.put("history", new HistoryCommand())
- .put(IndexCommand.INDEX, new IndexCommand())
+ .put(JsonIndexCommand.INDEX, new JsonIndexCommand())
.put(PersistentCacheCommand.PERSISTENTCACHE, new PersistentCacheCommand())
.put("revisions", new RevisionsCommand())
.put("recovery", new RecoveryCommand())
Copied: jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/JsonIndexCommand.java (from r1795150, jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/IndexCommand.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/JsonIndexCommand.java?p2=jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/JsonIndexCommand.java&p1=jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/IndexCommand.java&r1=1795150&r2=1795158&rev=1795158&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/IndexCommand.java (original)
+++ jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/JsonIndexCommand.java Mon May 15 09:49:23 2017
@@ -76,8 +76,8 @@ import org.apache.jackrabbit.oak.spi.que
import org.apache.jackrabbit.oak.spi.state.NodeStore;
import org.apache.jackrabbit.oak.stats.StatisticsProvider;
-public class IndexCommand implements Command {
- public static final String INDEX = "index";
+public class JsonIndexCommand implements Command {
+ public static final String INDEX = "json-index";
PrintStream output = System.out;
Session session;
Propchange: jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/JsonIndexCommand.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: jackrabbit/oak/trunk/oak-run/src/test/java/org/apache/jackrabbit/oak/run/JsonIndexTest.java (from r1795150, jackrabbit/oak/trunk/oak-run/src/test/java/org/apache/jackrabbit/oak/run/IndexTest.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/test/java/org/apache/jackrabbit/oak/run/JsonIndexTest.java?p2=jackrabbit/oak/trunk/oak-run/src/test/java/org/apache/jackrabbit/oak/run/JsonIndexTest.java&p1=jackrabbit/oak/trunk/oak-run/src/test/java/org/apache/jackrabbit/oak/run/IndexTest.java&r1=1795150&r2=1795158&rev=1795158&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-run/src/test/java/org/apache/jackrabbit/oak/run/IndexTest.java (original)
+++ jackrabbit/oak/trunk/oak-run/src/test/java/org/apache/jackrabbit/oak/run/JsonIndexTest.java Mon May 15 09:49:23 2017
@@ -30,7 +30,7 @@ import org.apache.jackrabbit.oak.segment
import org.apache.jackrabbit.oak.spi.state.NodeStore;
import org.junit.Test;
-public class IndexTest {
+public class JsonIndexTest {
@Test
public void simple() throws Exception {
@@ -102,11 +102,11 @@ public class IndexTest {
@Test
public void readWrite() throws Exception {
- IndexCommand index = new IndexCommand();
+ JsonIndexCommand index = new JsonIndexCommand();
try (NodeStoreFixture fixture = memoryFixture();
) {
NodeStore store = fixture.getStore();
- index.session = IndexCommand.openSession(store);
+ index.session = JsonIndexCommand.openSession(store);
assertCommand(index,
combineLines(""),
"{'addNode':'/foo', 'node':{'jcr:primaryType': 'nt:unstructured', 'x': 1, 'y':{}}}",
@@ -177,10 +177,10 @@ public class IndexTest {
}
void assertCommand(String expected, String... commands) throws Exception {
- assertCommand(new IndexCommand(), expected, commands);
+ assertCommand(new JsonIndexCommand(), expected, commands);
}
- void assertCommand(IndexCommand index, String expected, String... commands) throws Exception {
+ void assertCommand(JsonIndexCommand index, String expected, String... commands) throws Exception {
ByteArrayOutputStream w = new ByteArrayOutputStream();
PrintStream out = new PrintStream(w, false, "UTF-8");
index.output = out;
Propchange: jackrabbit/oak/trunk/oak-run/src/test/java/org/apache/jackrabbit/oak/run/JsonIndexTest.java
------------------------------------------------------------------------------
svn:eol-style = native