You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by no...@apache.org on 2016/03/18 09:30:28 UTC
[41/50] lucene-solr:apiv2: SOLR-8860: Remove back-compat handling of
router format made in SOLR-4221 in 4.5.0
SOLR-8860: Remove back-compat handling of router format made in SOLR-4221 in 4.5.0
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/ae846bfb
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/ae846bfb
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/ae846bfb
Branch: refs/heads/apiv2
Commit: ae846bfb492fd91e30daac017c6587083e278236
Parents: 3cdde08
Author: Shalin Shekhar Mangar <sh...@apache.org>
Authored: Thu Mar 17 09:21:30 2016 +0530
Committer: Shalin Shekhar Mangar <sh...@apache.org>
Committed: Thu Mar 17 09:21:30 2016 +0530
----------------------------------------------------------------------
solr/CHANGES.txt | 2 ++
.../org/apache/solr/common/cloud/DocRouter.java | 27 +++++++-------------
2 files changed, 11 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/ae846bfb/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index ffcfabd..b5aa670 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -61,6 +61,8 @@ Other Changes
* SOLR-7516: Improve javadocs for JavaBinCodec, ObjectResolver and enforce the single-usage policy.
(Jason Gerlowski, Benoit Vanalderweireldt, shalin)
+* SOLR-8860: Remove back-compat handling of router format made in SOLR-4221 in 4.5.0. (shalin)
+
================== 6.0.0 ==================
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/ae846bfb/solr/solrj/src/java/org/apache/solr/common/cloud/DocRouter.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/java/org/apache/solr/common/cloud/DocRouter.java b/solr/solrj/src/java/org/apache/solr/common/cloud/DocRouter.java
index e64c064..6fffb3a 100644
--- a/solr/solrj/src/java/org/apache/solr/common/cloud/DocRouter.java
+++ b/solr/solrj/src/java/org/apache/solr/common/cloud/DocRouter.java
@@ -48,33 +48,24 @@ public abstract class DocRouter {
throw new SolrException(SolrException.ErrorCode.SERVER_ERROR, "Unknown document router '"+ routerName + "'");
}
- protected String getRouteField(DocCollection coll){
- if(coll == null) return null;
- Object o = coll.get(DOC_ROUTER);
- if (o instanceof String) {
- return null;
- //old format. cannot have a routefield. Ignore it
- }
- Map m = (Map) o;
- if(m == null) return null;
+ protected String getRouteField(DocCollection coll) {
+ if (coll == null) return null;
+ Map m = (Map) coll.get(DOC_ROUTER);
+ if (m == null) return null;
return (String) m.get("field");
-
}
- public static Map<String,Object> getRouterSpec(ZkNodeProps props){
- Map<String,Object> map = new LinkedHashMap<>();
+ public static Map<String, Object> getRouterSpec(ZkNodeProps props) {
+ Map<String, Object> map = new LinkedHashMap<>();
for (String s : props.keySet()) {
- if(s.startsWith("router.")){
+ if (s.startsWith("router.")) {
map.put(s.substring(7), props.get(s));
}
}
- Object o = props.get("router");
- if (o instanceof String) {
- map.put("name", o);
- } else if (map.get("name") == null) {
+ if (map.get("name") == null) {
map.put("name", DEFAULT_NAME);
}
- return map;
+ return map;
}
// currently just an implementation detail...