Author: catholicon
Date: Thu May 10 19:56:29 2018
New Revision: 1831375
URL: http://svn.apache.org/viewvc?rev=1831375&view=rev
Log:
OAK-7490: oak-run console lc rmdata command uses second parameter for index
path (and defaults to /oak:index/lucene)
(backport r1831374 from trunk)
Modified:
jackrabbit/oak/branches/1.8/ (props changed)
jackrabbit/oak/branches/1.8/oak-run/src/main/groovy/org/apache/jackrabbit/oak/console/commands/LuceneCommand.groovy
jackrabbit/oak/branches/1.8/oak-run/src/main/groovy/org/apache/jackrabbit/oak/console/commands/LuceneCommand.properties
Propchange: jackrabbit/oak/branches/1.8/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 10 19:56:29 2018
@@ -1,3 +1,3 @@
/jackrabbit/oak/branches/1.0:1665962
-/jackrabbit/oak/trunk:1820660-1820661,1820729,1820734,1820859,1820861,1820878,1820888,1820947,1821130,1821140-1821141,1821240,1821249,1821258,1821325,1821358,1821361-1821362,1821370,1821375,1821393,1821477,1821487,1821516,1821665,1821668,1821681,1822121,1822201,1822207,1822723,1822808,1822850,1822934,1823135,1823163,1823169,1824196,1824198,1824962,1825362,1825381,1825442,1825448,1825466,1825470-1825471,1825475,1825523,1825525,1825619-1825621,1825651,1825654,1825992,1826079,1826090,1826096,1826237,1826338,1826516,1826532,1826640,1826932,1826957,1827472,1827486,1827977,1829569,1829987,1830019,1830160,1830748
+/jackrabbit/oak/trunk:1820660-1820661,1820729,1820734,1820859,1820861,1820878,1820888,1820947,1821130,1821140-1821141,1821240,1821249,1821258,1821325,1821358,1821361-1821362,1821370,1821375,1821393,1821477,1821487,1821516,1821665,1821668,1821681,1822121,1822201,1822207,1822723,1822808,1822850,1822934,1823135,1823163,1823169,1824196,1824198,1824962,1825362,1825381,1825442,1825448,1825466,1825470-1825471,1825475,1825523,1825525,1825619-1825621,1825651,1825654,1825992,1826079,1826090,1826096,1826237,1826338,1826516,1826532,1826640,1826932,1826957,1827472,1827486,1827977,1829569,1829987,1830019,1830160,1830748,1831374
/jackrabbit/trunk:1345480
Modified:
jackrabbit/oak/branches/1.8/oak-run/src/main/groovy/org/apache/jackrabbit/oak/console/commands/LuceneCommand.groovy
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-run/src/main/groovy/org/apache/jackrabbit/oak/console/commands/LuceneCommand.groovy?rev=1831375&r1=1831374&r2=1831375&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.8/oak-run/src/main/groovy/org/apache/jackrabbit/oak/console/commands/LuceneCommand.groovy
(original)
+++
jackrabbit/oak/branches/1.8/oak-run/src/main/groovy/org/apache/jackrabbit/oak/console/commands/LuceneCommand.groovy
Thu May 10 19:56:29 2018
@@ -97,7 +97,12 @@ class LuceneCommand extends ComplexComma
}
def do_rmdata = {args ->
- String idxPath = args && args.size() == 2 ? args[1] :
'/oak:index/lucene'
+ if (!args || args.size() != 1) {
+ io.out.println("Please provide a single argument (index-path).
Current arg list: ${args}")
+ return
+ }
+
+ String idxPath = args[0]
NodeStore ns = getSession().getStore();
OakNodeBuilder nb = ns.root.builder()
Modified:
jackrabbit/oak/branches/1.8/oak-run/src/main/groovy/org/apache/jackrabbit/oak/console/commands/LuceneCommand.properties
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-run/src/main/groovy/org/apache/jackrabbit/oak/console/commands/LuceneCommand.properties?rev=1831375&r1=1831374&r2=1831375&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.8/oak-run/src/main/groovy/org/apache/jackrabbit/oak/console/commands/LuceneCommand.properties
(original)
+++
jackrabbit/oak/branches/1.8/oak-run/src/main/groovy/org/apache/jackrabbit/oak/console/commands/LuceneCommand.properties
Thu May 10 19:56:29 2018
@@ -18,5 +18,5 @@
#
command.description=Provide Lucene related operations
-command.usage=[info <idx path>|dump <dest path> <idx path>|rmdata <idx path>]
-command.help=Provide Lucene related operations. <idx path> is optional and
defaults to /oak:index/lucene
+command.usage=[info [<idx path>] | dump [<dest path>] [<idx path>] | rmdata
<idx path>]
+command.help=Provide Lucene related operations. <idx path> is optional and
defaults to /oak:index/lucene for info and dump.
