Author: catholicon
Date: Thu May 10 19:58:12 2018
New Revision: 1831376
URL: http://svn.apache.org/viewvc?rev=1831376&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.6/ (props changed)
jackrabbit/oak/branches/1.6/oak-run/src/main/groovy/org/apache/jackrabbit/oak/console/commands/LuceneCommand.groovy
jackrabbit/oak/branches/1.6/oak-run/src/main/groovy/org/apache/jackrabbit/oak/console/commands/LuceneCommand.properties
Propchange: jackrabbit/oak/branches/1.6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 10 19:58:12 2018
@@ -1,3 +1,3 @@
/jackrabbit/oak/branches/1.0:1665962
-/jackrabbit/oak/trunk:1781068,1781075,1781248,1781386,1781846,1781907,1782000,1782029,1782196,1782447,1782476,1782770,1782945,1782966,1782973,1782990,1783061,1783066,1783089,1783104-1783105,1783110,1783619,1783720,1783731,1783733,1783738,1783742,1783773,1783855,1783891,1784023,1784034,1784130,1784162,1784251,1784401,1784551,1784574,1784689,1785095,1785108,1785283,1785838,1785917,1785919,1785946,1786122,1787074,1787145,1787151,1787217,1787425,1788056,1788378,1788387-1788389,1788463,1788476,1788850,1789056,1789534,1790382,1790502-1790503,1792049,1792463,1792483,1792742,1792746,1793013,1793088,1793618,1793627,1793644,1794393,1794417,1794683,1795138,1795314,1795330,1795475,1795488,1795491,1795502,1795594,1795613,1795618,1796144,1796230,1796239,1796274,1796278,1796988,1797378,1798035,1798834,1799219,1799389,1799393,1799924,1800244,1800269,1800606,1800613,1800974,1801011,1801013,1801118-1801119,1801675,1802260,1802262,1802286,1802548,1802905,1802934,1802938,1802973,1803026,1803247-1803249
,1803951,1803953-1803955,1804437,1805851-1805852,1806668,1807308,1807688,1808022,1808125,1808128,1808142,1808240,1808246,1809024,1809026,1809131,1809163,1809253,1809255-1809256,1809289,1809745,1811071-1811072,1811155,1811380,1811655,1811952,1811963,1811986,1813192,1814189,1814332,1814397,1815201,1815426,1815438,1815926,1817326,1817919,1817987-1817988,1817990,1818038,1818042,1818056,1818124,1818554,1818576,1818645,1819048,1819050,1821325,1821358,1821495,1821516,1822850,1825471,1826237,1826338,1826532,1826640,1826932,1826957,1827472,1827486,1827977,1829987,1830019,1830160,1830748
+/jackrabbit/oak/trunk:1781068,1781075,1781248,1781386,1781846,1781907,1782000,1782029,1782196,1782447,1782476,1782770,1782945,1782966,1782973,1782990,1783061,1783066,1783089,1783104-1783105,1783110,1783619,1783720,1783731,1783733,1783738,1783742,1783773,1783855,1783891,1784023,1784034,1784130,1784162,1784251,1784401,1784551,1784574,1784689,1785095,1785108,1785283,1785838,1785917,1785919,1785946,1786122,1787074,1787145,1787151,1787217,1787425,1788056,1788378,1788387-1788389,1788463,1788476,1788850,1789056,1789534,1790382,1790502-1790503,1792049,1792463,1792483,1792742,1792746,1793013,1793088,1793618,1793627,1793644,1794393,1794417,1794683,1795138,1795314,1795330,1795475,1795488,1795491,1795502,1795594,1795613,1795618,1796144,1796230,1796239,1796274,1796278,1796988,1797378,1798035,1798834,1799219,1799389,1799393,1799924,1800244,1800269,1800606,1800613,1800974,1801011,1801013,1801118-1801119,1801675,1802260,1802262,1802286,1802548,1802905,1802934,1802938,1802973,1803026,1803247-1803249
,1803951,1803953-1803955,1804437,1805851-1805852,1806668,1807308,1807688,1808022,1808125,1808128,1808142,1808240,1808246,1809024,1809026,1809131,1809163,1809253,1809255-1809256,1809289,1809745,1811071-1811072,1811155,1811380,1811655,1811952,1811963,1811986,1813192,1814189,1814332,1814397,1815201,1815426,1815438,1815926,1817326,1817919,1817987-1817988,1817990,1818038,1818042,1818056,1818124,1818554,1818576,1818645,1819048,1819050,1821325,1821358,1821495,1821516,1822850,1825471,1826237,1826338,1826532,1826640,1826932,1826957,1827472,1827486,1827977,1829987,1830019,1830160,1830748,1831374
/jackrabbit/trunk:1345480
Modified:
jackrabbit/oak/branches/1.6/oak-run/src/main/groovy/org/apache/jackrabbit/oak/console/commands/LuceneCommand.groovy
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.6/oak-run/src/main/groovy/org/apache/jackrabbit/oak/console/commands/LuceneCommand.groovy?rev=1831376&r1=1831375&r2=1831376&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.6/oak-run/src/main/groovy/org/apache/jackrabbit/oak/console/commands/LuceneCommand.groovy
(original)
+++
jackrabbit/oak/branches/1.6/oak-run/src/main/groovy/org/apache/jackrabbit/oak/console/commands/LuceneCommand.groovy
Thu May 10 19:58:12 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.6/oak-run/src/main/groovy/org/apache/jackrabbit/oak/console/commands/LuceneCommand.properties
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.6/oak-run/src/main/groovy/org/apache/jackrabbit/oak/console/commands/LuceneCommand.properties?rev=1831376&r1=1831375&r2=1831376&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.6/oak-run/src/main/groovy/org/apache/jackrabbit/oak/console/commands/LuceneCommand.properties
(original)
+++
jackrabbit/oak/branches/1.6/oak-run/src/main/groovy/org/apache/jackrabbit/oak/console/commands/LuceneCommand.properties
Thu May 10 19:58:12 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.
