You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by yo...@apache.org on 2013/09/24 23:03:34 UTC
svn commit: r1526008 - in /lucene/dev/branches/lucene_solr_4_5: ./
dev-tools/ lucene/ lucene/analysis/
lucene/analysis/icu/src/java/org/apache/lucene/collation/ lucene/backwards/
lucene/benchmark/ lucene/classification/ lucene/classification/src/ lucen...
Author: yonik
Date: Tue Sep 24 21:03:33 2013
New Revision: 1526008
URL: http://svn.apache.org/r1526008
Log:
SOLR-4221: back compat for router spec
Modified:
lucene/dev/branches/lucene_solr_4_5/ (props changed)
lucene/dev/branches/lucene_solr_4_5/dev-tools/ (props changed)
lucene/dev/branches/lucene_solr_4_5/lucene/ (props changed)
lucene/dev/branches/lucene_solr_4_5/lucene/BUILD.txt (props changed)
lucene/dev/branches/lucene_solr_4_5/lucene/CHANGES.txt (props changed)
lucene/dev/branches/lucene_solr_4_5/lucene/JRE_VERSION_MIGRATION.txt (props changed)
lucene/dev/branches/lucene_solr_4_5/lucene/LICENSE.txt (props changed)
lucene/dev/branches/lucene_solr_4_5/lucene/MIGRATE.txt (props changed)
lucene/dev/branches/lucene_solr_4_5/lucene/NOTICE.txt (props changed)
lucene/dev/branches/lucene_solr_4_5/lucene/README.txt (props changed)
lucene/dev/branches/lucene_solr_4_5/lucene/SYSTEM_REQUIREMENTS.txt (props changed)
lucene/dev/branches/lucene_solr_4_5/lucene/analysis/ (props changed)
lucene/dev/branches/lucene_solr_4_5/lucene/analysis/icu/src/java/org/apache/lucene/collation/ICUCollationKeyFilterFactory.java (props changed)
lucene/dev/branches/lucene_solr_4_5/lucene/backwards/ (props changed)
lucene/dev/branches/lucene_solr_4_5/lucene/benchmark/ (props changed)
lucene/dev/branches/lucene_solr_4_5/lucene/build.xml (props changed)
lucene/dev/branches/lucene_solr_4_5/lucene/classification/ (props changed)
lucene/dev/branches/lucene_solr_4_5/lucene/classification/build.xml (props changed)
lucene/dev/branches/lucene_solr_4_5/lucene/classification/ivy.xml (props changed)
lucene/dev/branches/lucene_solr_4_5/lucene/classification/src/ (props changed)
lucene/dev/branches/lucene_solr_4_5/lucene/codecs/ (props changed)
lucene/dev/branches/lucene_solr_4_5/lucene/common-build.xml (props changed)
lucene/dev/branches/lucene_solr_4_5/lucene/core/ (props changed)
lucene/dev/branches/lucene_solr_4_5/lucene/core/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java (props changed)
lucene/dev/branches/lucene_solr_4_5/lucene/core/src/test/org/apache/lucene/index/index.40.cfs.zip (props changed)
lucene/dev/branches/lucene_solr_4_5/lucene/core/src/test/org/apache/lucene/index/index.40.nocfs.zip (props changed)
lucene/dev/branches/lucene_solr_4_5/lucene/core/src/test/org/apache/lucene/index/index.40.optimized.cfs.zip (props changed)
lucene/dev/branches/lucene_solr_4_5/lucene/core/src/test/org/apache/lucene/index/index.40.optimized.nocfs.zip (props changed)
lucene/dev/branches/lucene_solr_4_5/lucene/core/src/test/org/apache/lucene/search/TestSort.java (props changed)
lucene/dev/branches/lucene_solr_4_5/lucene/core/src/test/org/apache/lucene/search/TestSortDocValues.java (props changed)
lucene/dev/branches/lucene_solr_4_5/lucene/core/src/test/org/apache/lucene/search/TestSortRandom.java (props changed)
lucene/dev/branches/lucene_solr_4_5/lucene/core/src/test/org/apache/lucene/search/TestTopFieldCollector.java (props changed)
lucene/dev/branches/lucene_solr_4_5/lucene/core/src/test/org/apache/lucene/search/TestTotalHitCountCollector.java (props changed)
lucene/dev/branches/lucene_solr_4_5/lucene/demo/ (props changed)
lucene/dev/branches/lucene_solr_4_5/lucene/facet/ (props changed)
lucene/dev/branches/lucene_solr_4_5/lucene/grouping/ (props changed)
lucene/dev/branches/lucene_solr_4_5/lucene/highlighter/ (props changed)
lucene/dev/branches/lucene_solr_4_5/lucene/ivy-settings.xml (props changed)
lucene/dev/branches/lucene_solr_4_5/lucene/join/ (props changed)
lucene/dev/branches/lucene_solr_4_5/lucene/licenses/ (props changed)
lucene/dev/branches/lucene_solr_4_5/lucene/memory/ (props changed)
lucene/dev/branches/lucene_solr_4_5/lucene/misc/ (props changed)
lucene/dev/branches/lucene_solr_4_5/lucene/module-build.xml (props changed)
lucene/dev/branches/lucene_solr_4_5/lucene/queries/ (props changed)
lucene/dev/branches/lucene_solr_4_5/lucene/queries/src/test/org/apache/lucene/queries/function/TestFunctionQuerySort.java (props changed)
lucene/dev/branches/lucene_solr_4_5/lucene/queryparser/ (props changed)
lucene/dev/branches/lucene_solr_4_5/lucene/replicator/ (props changed)
lucene/dev/branches/lucene_solr_4_5/lucene/sandbox/ (props changed)
lucene/dev/branches/lucene_solr_4_5/lucene/site/ (props changed)
lucene/dev/branches/lucene_solr_4_5/lucene/spatial/ (props changed)
lucene/dev/branches/lucene_solr_4_5/lucene/suggest/ (props changed)
lucene/dev/branches/lucene_solr_4_5/lucene/test-framework/ (props changed)
lucene/dev/branches/lucene_solr_4_5/lucene/tools/ (props changed)
lucene/dev/branches/lucene_solr_4_5/solr/ (props changed)
lucene/dev/branches/lucene_solr_4_5/solr/CHANGES.txt (props changed)
lucene/dev/branches/lucene_solr_4_5/solr/LICENSE.txt (props changed)
lucene/dev/branches/lucene_solr_4_5/solr/NOTICE.txt (props changed)
lucene/dev/branches/lucene_solr_4_5/solr/README.txt (props changed)
lucene/dev/branches/lucene_solr_4_5/solr/SYSTEM_REQUIREMENTS.txt (props changed)
lucene/dev/branches/lucene_solr_4_5/solr/build.xml (props changed)
lucene/dev/branches/lucene_solr_4_5/solr/cloud-dev/ (props changed)
lucene/dev/branches/lucene_solr_4_5/solr/common-build.xml (props changed)
lucene/dev/branches/lucene_solr_4_5/solr/contrib/ (props changed)
lucene/dev/branches/lucene_solr_4_5/solr/core/ (props changed)
lucene/dev/branches/lucene_solr_4_5/solr/core/src/test/org/apache/solr/core/TestConfig.java (props changed)
lucene/dev/branches/lucene_solr_4_5/solr/example/ (props changed)
lucene/dev/branches/lucene_solr_4_5/solr/licenses/ (props changed)
lucene/dev/branches/lucene_solr_4_5/solr/licenses/httpclient-LICENSE-ASL.txt (props changed)
lucene/dev/branches/lucene_solr_4_5/solr/licenses/httpclient-NOTICE.txt (props changed)
lucene/dev/branches/lucene_solr_4_5/solr/licenses/httpcore-LICENSE-ASL.txt (props changed)
lucene/dev/branches/lucene_solr_4_5/solr/licenses/httpcore-NOTICE.txt (props changed)
lucene/dev/branches/lucene_solr_4_5/solr/licenses/httpmime-LICENSE-ASL.txt (props changed)
lucene/dev/branches/lucene_solr_4_5/solr/licenses/httpmime-NOTICE.txt (props changed)
lucene/dev/branches/lucene_solr_4_5/solr/scripts/ (props changed)
lucene/dev/branches/lucene_solr_4_5/solr/site/ (props changed)
lucene/dev/branches/lucene_solr_4_5/solr/solrj/ (props changed)
lucene/dev/branches/lucene_solr_4_5/solr/solrj/src/java/org/apache/solr/common/cloud/ClusterState.java
lucene/dev/branches/lucene_solr_4_5/solr/solrj/src/java/org/apache/solr/common/cloud/DocRouter.java
lucene/dev/branches/lucene_solr_4_5/solr/test-framework/ (props changed)
lucene/dev/branches/lucene_solr_4_5/solr/webapp/ (props changed)
Modified: lucene/dev/branches/lucene_solr_4_5/solr/solrj/src/java/org/apache/solr/common/cloud/ClusterState.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_5/solr/solrj/src/java/org/apache/solr/common/cloud/ClusterState.java?rev=1526008&r1=1526007&r2=1526008&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_5/solr/solrj/src/java/org/apache/solr/common/cloud/ClusterState.java (original)
+++ lucene/dev/branches/lucene_solr_4_5/solr/solrj/src/java/org/apache/solr/common/cloud/ClusterState.java Tue Sep 24 21:03:33 2013
@@ -260,8 +260,18 @@ public class ClusterState implements JSO
objs.remove(DocCollection.SHARDS);
}
- Map map = (Map) props.get(DocCollection.DOC_ROUTER);
- DocRouter router = map == null ? DocRouter.DEFAULT : DocRouter.getDocRouter(map.get("name"));
+ Object routerObj = props.get(DocCollection.DOC_ROUTER);
+ DocRouter router;
+ if (routerObj == null) {
+ router = DocRouter.DEFAULT;
+ } else if (routerObj instanceof String) {
+ // back compat with Solr4.4
+ router = DocRouter.getDocRouter((String)routerObj);
+ } else {
+ Map routerProps = (Map)routerObj;
+ router = DocRouter.getDocRouter(routerProps.get("name"));
+ }
+
return new DocCollection(name, slices, props, router);
}
Modified: lucene/dev/branches/lucene_solr_4_5/solr/solrj/src/java/org/apache/solr/common/cloud/DocRouter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_5/solr/solrj/src/java/org/apache/solr/common/cloud/DocRouter.java?rev=1526008&r1=1526007&r2=1526008&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_5/solr/solrj/src/java/org/apache/solr/common/cloud/DocRouter.java (original)
+++ lucene/dev/branches/lucene_solr_4_5/solr/solrj/src/java/org/apache/solr/common/cloud/DocRouter.java Tue Sep 24 21:03:33 2013
@@ -64,9 +64,13 @@ public abstract class DocRouter {
map.put(s.substring(7), props.get(s));
}
}
- if(map.get("name") == null) map.put("name", DEFAULT_NAME);
+ Object o = props.get("router");
+ if (o instanceof String) {
+ map.put("name", o);
+ } else if (map.get("name") == null) {
+ map.put("name", DEFAULT_NAME);
+ }
return map;
-
}
// currently just an implementation detail...