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 2017/02/22 14:53:56 UTC
lucene-solr:branch_6x: SOLR-10173: Make
HttpShardHandlerFactory.getReplicaListTransformer more extensible. (Ramsey
Haddad via Christine Poerschke)
Repository: lucene-solr
Updated Branches:
refs/heads/branch_6x 43317a33f -> 76e75099f
SOLR-10173: Make HttpShardHandlerFactory.getReplicaListTransformer more extensible. (Ramsey Haddad via Christine Poerschke)
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/76e75099
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/76e75099
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/76e75099
Branch: refs/heads/branch_6x
Commit: 76e75099f980edc74166e04b1f72e286d0e11d79
Parents: 43317a3
Author: Christine Poerschke <cp...@apache.org>
Authored: Wed Feb 22 11:19:56 2017 +0000
Committer: Christine Poerschke <cp...@apache.org>
Committed: Wed Feb 22 14:39:33 2017 +0000
----------------------------------------------------------------------
solr/CHANGES.txt | 3 +++
.../apache/solr/handler/component/HttpShardHandlerFactory.java | 4 ++--
.../apache/solr/handler/component/ReplicaListTransformer.java | 2 +-
.../solr/handler/component/ReplicaListTransformerTest.java | 2 +-
4 files changed, 7 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/76e75099/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 847938e..a8594d3 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -183,6 +183,9 @@ Other Changes
* SOLR-9966: Convert/migrate tests using EasyMock to Mockito (Cao Manh Dat, Uwe Schindler)
+* SOLR-10173: Make HttpShardHandlerFactory.getReplicaListTransformer more extensible.
+ (Ramsey Haddad via Christine Poerschke)
+
================== 6.4.2 ==================
Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this release.
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/76e75099/solr/core/src/java/org/apache/solr/handler/component/HttpShardHandlerFactory.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/handler/component/HttpShardHandlerFactory.java b/solr/core/src/java/org/apache/solr/handler/component/HttpShardHandlerFactory.java
index 95f99f9..0890a37 100644
--- a/solr/core/src/java/org/apache/solr/handler/component/HttpShardHandlerFactory.java
+++ b/solr/core/src/java/org/apache/solr/handler/component/HttpShardHandlerFactory.java
@@ -112,7 +112,7 @@ public class HttpShardHandlerFactory extends ShardHandlerFactory implements org.
private HttpClientMetricNameStrategy metricNameStrategy;
- private final Random r = new Random();
+ protected final Random r = new Random();
private final ReplicaListTransformer shufflingReplicaListTransformer = new ShufflingReplicaListTransformer(r);
@@ -361,7 +361,7 @@ public class HttpShardHandlerFactory extends ShardHandlerFactory implements org.
return s != null && s.startsWith(preferredHostAddress);
}
}
- ReplicaListTransformer getReplicaListTransformer(final SolrQueryRequest req)
+ protected ReplicaListTransformer getReplicaListTransformer(final SolrQueryRequest req)
{
final SolrParams params = req.getParams();
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/76e75099/solr/core/src/java/org/apache/solr/handler/component/ReplicaListTransformer.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/handler/component/ReplicaListTransformer.java b/solr/core/src/java/org/apache/solr/handler/component/ReplicaListTransformer.java
index bf30fa6..b7784e8 100644
--- a/solr/core/src/java/org/apache/solr/handler/component/ReplicaListTransformer.java
+++ b/solr/core/src/java/org/apache/solr/handler/component/ReplicaListTransformer.java
@@ -21,7 +21,7 @@ import java.util.List;
import org.apache.solr.common.cloud.Replica;
import org.apache.solr.common.params.ShardParams;
-interface ReplicaListTransformer {
+public interface ReplicaListTransformer {
/**
* Transforms the passed in list of choices. Transformations can include (but are not limited to)
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/76e75099/solr/core/src/test/org/apache/solr/handler/component/ReplicaListTransformerTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/handler/component/ReplicaListTransformerTest.java b/solr/core/src/test/org/apache/solr/handler/component/ReplicaListTransformerTest.java
index 96d2319..8159971 100644
--- a/solr/core/src/test/org/apache/solr/handler/component/ReplicaListTransformerTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/component/ReplicaListTransformerTest.java
@@ -94,7 +94,7 @@ public class ReplicaListTransformerTest extends LuceneTestCase {
transformer = new HttpShardHandlerFactory() {
@Override
- ReplicaListTransformer getReplicaListTransformer(final SolrQueryRequest req)
+ protected ReplicaListTransformer getReplicaListTransformer(final SolrQueryRequest req)
{
final SolrParams params = req.getParams();