You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by cp...@apache.org on 2016/04/15 17:36:45 UTC
lucene-solr:branch_6x: SOLR-8938: add -x as short-form of
--excluderegex ZkCLI arg
Repository: lucene-solr
Updated Branches:
refs/heads/branch_6x b2a9a787b -> d69274b5d
SOLR-8938: add -x as short-form of --excluderegex ZkCLI arg
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/d69274b5
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/d69274b5
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/d69274b5
Branch: refs/heads/branch_6x
Commit: d69274b5d6d9d21086b877f90f0db7611dab3b5f
Parents: b2a9a78
Author: Christine Poerschke <cp...@apache.org>
Authored: Fri Apr 15 15:52:53 2016 +0100
Committer: Christine Poerschke <cp...@apache.org>
Committed: Fri Apr 15 16:22:45 2016 +0100
----------------------------------------------------------------------
solr/CHANGES.txt | 2 +-
solr/core/src/java/org/apache/solr/cloud/ZkCLI.java | 3 ++-
solr/core/src/test/org/apache/solr/cloud/ZkCLITest.java | 4 +++-
3 files changed, 6 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/d69274b5/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 9daa66e..72bbccc 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -60,7 +60,7 @@ New Features
graph traversal to find the shortest path(s) in an unweighted, directed graph stored in a
SolrCloud collection. (Joel Bernstein)
-* SOLR-8938: Add optional -excluderegex argument to ZkCLI. (Christine Poerschke)
+* SOLR-8938: Add optional --excluderegex argument to ZkCLI. (Christine Poerschke)
* SOLR-8976: Add SolrJ support for REBALANCELEADERS Collections API (Anshum Gupta)
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/d69274b5/solr/core/src/java/org/apache/solr/cloud/ZkCLI.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/cloud/ZkCLI.java b/solr/core/src/java/org/apache/solr/cloud/ZkCLI.java
index 402a83f..14f6c71 100644
--- a/solr/core/src/java/org/apache/solr/cloud/ZkCLI.java
+++ b/solr/core/src/java/org/apache/solr/cloud/ZkCLI.java
@@ -67,6 +67,7 @@ public class ZkCLI {
private static final String SOLRHOME = "solrhome";
private static final String BOOTSTRAP = "bootstrap";
static final String UPCONFIG = "upconfig";
+ static final String EXCLUDE_REGEX_SHORT = "x";
static final String EXCLUDE_REGEX = "excluderegex";
static final String EXCLUDE_REGEX_DEFAULT = ZkConfigManager.UPLOAD_FILENAME_EXCLUDE_REGEX;
private static final String COLLECTION = "collection";
@@ -122,7 +123,7 @@ public class ZkCLI {
options.addOption("c", COLLECTION, true,
"for " + LINKCONFIG + ": name of the collection");
- options.addOption(EXCLUDE_REGEX, true,
+ options.addOption(EXCLUDE_REGEX_SHORT, EXCLUDE_REGEX, true,
"for " + UPCONFIG + ": files matching this regular expression won't be uploaded");
options
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/d69274b5/solr/core/src/test/org/apache/solr/cloud/ZkCLITest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/cloud/ZkCLITest.java b/solr/core/src/test/org/apache/solr/cloud/ZkCLITest.java
index 81b810b..1109f9e 100644
--- a/solr/core/src/test/org/apache/solr/cloud/ZkCLITest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/ZkCLITest.java
@@ -103,6 +103,7 @@ public class ZkCLITest extends SolrTestCaseJ4 {
@Test
public void testCmdConstants() throws Exception {
assertEquals("upconfig", ZkCLI.UPCONFIG);
+ assertEquals("x", ZkCLI.EXCLUDE_REGEX_SHORT);
assertEquals("excluderegex", ZkCLI.EXCLUDE_REGEX);
assertEquals(ZkConfigManager.UPLOAD_FILENAME_EXCLUDE_REGEX, ZkCLI.EXCLUDE_REGEX_DEFAULT);
}
@@ -208,10 +209,11 @@ public class ZkCLITest extends SolrTestCaseJ4 {
"-confdir", ExternalPaths.TECHPRODUCTS_CONFIGSET,
"-confname", confsetname};
} else {
+ final String excluderegexOption = (random().nextBoolean() ? "--"+ZkCLI.EXCLUDE_REGEX : "-"+ZkCLI.EXCLUDE_REGEX_SHORT);
upconfigArgs = new String[] {
"-zkhost", zkServer.getZkAddress(),
"-cmd", ZkCLI.UPCONFIG,
- "-"+ZkCLI.EXCLUDE_REGEX, ZkCLI.EXCLUDE_REGEX_DEFAULT,
+ excluderegexOption, ZkCLI.EXCLUDE_REGEX_DEFAULT,
"-confdir", ExternalPaths.TECHPRODUCTS_CONFIGSET,
"-confname", confsetname};
}