You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sa...@apache.org on 2016/06/17 21:33:20 UTC
[1/3] lucene-solr:branch_5_5: SOLR-9118: HashQParserPlugin should
trim partition keys
Repository: lucene-solr
Updated Branches:
refs/heads/branch_5_5 8f04a8843 -> b76c442bb
refs/heads/branch_5x 912c3da3e -> 36649beb0
SOLR-9118: HashQParserPlugin should trim partition keys
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/a14ef4fa
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/a14ef4fa
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/a14ef4fa
Branch: refs/heads/branch_5_5
Commit: a14ef4fa8a96038a4d27c67bdec31449136a2119
Parents: 8f04a88
Author: jbernste <jb...@apache.org>
Authored: Tue May 17 14:10:34 2016 -0400
Committer: Steve Rowe <sa...@apache.org>
Committed: Fri Jun 17 17:30:31 2016 -0400
----------------------------------------------------------------------
solr/core/src/java/org/apache/solr/search/HashQParserPlugin.java | 1 +
.../src/test/org/apache/solr/search/TestHashQParserPlugin.java | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a14ef4fa/solr/core/src/java/org/apache/solr/search/HashQParserPlugin.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/search/HashQParserPlugin.java b/solr/core/src/java/org/apache/solr/search/HashQParserPlugin.java
index d2b394e..ac91065 100644
--- a/solr/core/src/java/org/apache/solr/search/HashQParserPlugin.java
+++ b/solr/core/src/java/org/apache/solr/search/HashQParserPlugin.java
@@ -84,6 +84,7 @@ public class HashQParserPlugin extends QParserPlugin {
int workers = localParams.getInt("workers");
int worker = localParams.getInt("worker");
String keys = params.get("partitionKeys");
+ keys = keys.replace(" ", "");
return new HashQuery(keys, workers, worker);
}
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a14ef4fa/solr/core/src/test/org/apache/solr/search/TestHashQParserPlugin.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/search/TestHashQParserPlugin.java b/solr/core/src/test/org/apache/solr/search/TestHashQParserPlugin.java
index 36e4fb1..8431588 100644
--- a/solr/core/src/test/org/apache/solr/search/TestHashQParserPlugin.java
+++ b/solr/core/src/test/org/apache/solr/search/TestHashQParserPlugin.java
@@ -199,7 +199,7 @@ public class TestHashQParserPlugin extends SolrTestCaseJ4 {
params = new ModifiableSolrParams();
params.add("q", "*:*");
params.add("fq", "{!hash worker=0 workers=2 cost="+getCost(random)+"}");
- params.add("partitionKeys", "a_s,a_i,a_l");
+ params.add("partitionKeys", "a_s, a_i, a_l");
params.add("rows","50");
set1 = new HashSet();
response = h.query(req(params));
@@ -217,7 +217,7 @@ public class TestHashQParserPlugin extends SolrTestCaseJ4 {
params = new ModifiableSolrParams();
params.add("q", "*:*");
params.add("fq", "{!hash worker=1 workers=2 cost="+getCost(random)+"}");
- params.add("partitionKeys", "a_s,a_i,a_l");
+ params.add("partitionKeys", "a_s, a_i, a_l");
params.add("rows","50");
set2 = new HashSet();
response = h.query(req(params));
[3/3] lucene-solr:branch_5x: SOLR-9118: HashQParserPlugin should trim
partition keys
Posted by sa...@apache.org.
SOLR-9118: HashQParserPlugin should trim partition keys
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/36649beb
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/36649beb
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/36649beb
Branch: refs/heads/branch_5x
Commit: 36649beb0f7cef6d65ec2dd494a37219fbd7f9e3
Parents: 912c3da
Author: jbernste <jb...@apache.org>
Authored: Tue May 17 14:10:34 2016 -0400
Committer: Steve Rowe <sa...@apache.org>
Committed: Fri Jun 17 17:33:10 2016 -0400
----------------------------------------------------------------------
solr/core/src/java/org/apache/solr/search/HashQParserPlugin.java | 1 +
.../src/test/org/apache/solr/search/TestHashQParserPlugin.java | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/36649beb/solr/core/src/java/org/apache/solr/search/HashQParserPlugin.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/search/HashQParserPlugin.java b/solr/core/src/java/org/apache/solr/search/HashQParserPlugin.java
index d2b394e..ac91065 100644
--- a/solr/core/src/java/org/apache/solr/search/HashQParserPlugin.java
+++ b/solr/core/src/java/org/apache/solr/search/HashQParserPlugin.java
@@ -84,6 +84,7 @@ public class HashQParserPlugin extends QParserPlugin {
int workers = localParams.getInt("workers");
int worker = localParams.getInt("worker");
String keys = params.get("partitionKeys");
+ keys = keys.replace(" ", "");
return new HashQuery(keys, workers, worker);
}
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/36649beb/solr/core/src/test/org/apache/solr/search/TestHashQParserPlugin.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/search/TestHashQParserPlugin.java b/solr/core/src/test/org/apache/solr/search/TestHashQParserPlugin.java
index 36e4fb1..8431588 100644
--- a/solr/core/src/test/org/apache/solr/search/TestHashQParserPlugin.java
+++ b/solr/core/src/test/org/apache/solr/search/TestHashQParserPlugin.java
@@ -199,7 +199,7 @@ public class TestHashQParserPlugin extends SolrTestCaseJ4 {
params = new ModifiableSolrParams();
params.add("q", "*:*");
params.add("fq", "{!hash worker=0 workers=2 cost="+getCost(random)+"}");
- params.add("partitionKeys", "a_s,a_i,a_l");
+ params.add("partitionKeys", "a_s, a_i, a_l");
params.add("rows","50");
set1 = new HashSet();
response = h.query(req(params));
@@ -217,7 +217,7 @@ public class TestHashQParserPlugin extends SolrTestCaseJ4 {
params = new ModifiableSolrParams();
params.add("q", "*:*");
params.add("fq", "{!hash worker=1 workers=2 cost="+getCost(random)+"}");
- params.add("partitionKeys", "a_s,a_i,a_l");
+ params.add("partitionKeys", "a_s, a_i, a_l");
params.add("rows","50");
set2 = new HashSet();
response = h.query(req(params));
[2/3] lucene-solr:branch_5_5: SOLR-9118: Add 5.5.2 CHANGES entry
Posted by sa...@apache.org.
SOLR-9118: Add 5.5.2 CHANGES entry
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/b76c442b
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/b76c442b
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/b76c442b
Branch: refs/heads/branch_5_5
Commit: b76c442bbb452247fb1094e110b5d184bd8e170b
Parents: a14ef4f
Author: Steve Rowe <sa...@apache.org>
Authored: Fri Jun 17 17:33:01 2016 -0400
Committer: Steve Rowe <sa...@apache.org>
Committed: Fri Jun 17 17:33:01 2016 -0400
----------------------------------------------------------------------
solr/CHANGES.txt | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b76c442b/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index e7f479b..bcc09c4 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -64,6 +64,8 @@ Bug Fixes
* SOLR-9093: Fix NullPointerException in TopGroupsShardResponseProcessor. (Christine Poerschke)
+* SOLR-9118: HashQParserPlugin should trim partition keys (Joel Bernstein)
+
======================= 5.5.1 =======================
Bug Fixes