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 2014/09/03 02:35:29 UTC
svn commit: r1622156 - in /lucene/dev/trunk/solr/core/src:
java/org/apache/solr/core/SolrConfig.java
test-files/solr/collection1/conf/solrconfig-paramset.xml
test/org/apache/solr/core/TestParamSet.java
Author: noble
Date: Wed Sep 3 00:35:29 2014
New Revision: 1622156
URL: http://svn.apache.org/r1622156
Log:
SOLR-6365 multiparamset bug
Modified:
lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/SolrConfig.java
lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-paramset.xml
lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/TestParamSet.java
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/SolrConfig.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/SolrConfig.java?rev=1622156&r1=1622155&r2=1622156&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/SolrConfig.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/SolrConfig.java Wed Sep 3 00:35:29 2014
@@ -312,7 +312,7 @@ public class SolrConfig extends Config {
addHttpRequestToContext = getBool(
"requestDispatcher/requestParsers/@addHttpRequestToContext", false );
- loadPluginInfo(ParamSet.class,ParamSet.TYPE);
+ loadPluginInfo(ParamSet.class,ParamSet.TYPE, MULTI_OK);
List<PluginInfo> paramSetInfos = pluginStore.get(ParamSet.class.getName()) ;
if(paramSetInfos!=null){
Map<String,ParamSet> paramSets = new HashMap<>();
Modified: lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-paramset.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-paramset.xml?rev=1622156&r1=1622155&r2=1622156&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-paramset.xml (original)
+++ lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/solrconfig-paramset.xml Wed Sep 3 00:35:29 2014
@@ -26,7 +26,7 @@
<directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
<requestHandler name="standard" class="solr.StandardRequestHandler"/>
<requestHandler name="/update" class="solr.UpdateRequestHandler"/>
- <paramSet name="a" path="/dump3,/root/*,/root1/**">
+ <paramSet name="a" path="/dump3,/dump6,/root/*,/root1/**">
<lst name="defaults">
<str name="a">A</str>
</lst>
@@ -37,7 +37,13 @@
<str name="c">C</str>
</lst>
</paramSet>
+ <paramSet path="/dump6">
+ <lst name="defaults">
+ <str name="p">P</str>
+ </lst>
+ </paramSet>
<requestHandler name="/dump3" class="DumpRequestHandler"/>
+ <requestHandler name="/dump6" class="DumpRequestHandler"/>
<requestHandler name="/dump4" class="DumpRequestHandler"/>
<requestHandler name="/root/dump5" class="DumpRequestHandler"/>
<requestHandler name="/root1/anotherlevel/dump6" class="DumpRequestHandler"/>
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/TestParamSet.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/TestParamSet.java?rev=1622156&r1=1622155&r2=1622156&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/TestParamSet.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/TestParamSet.java Wed Sep 3 00:35:29 2014
@@ -49,6 +49,22 @@ public class TestParamSet extends SolrT
}
@Test
+ public void testMultiParamSet(){
+ SolrRequestHandler handler = h.getCore().getRequestHandler("/dump6");
+ SolrQueryResponse rsp = new SolrQueryResponse();
+ handler.handleRequest(req("initArgs", "true"), rsp);
+ NamedList nl = (NamedList) rsp.getValues().get("initArgs");
+ NamedList def = (NamedList) nl.get(PluginInfo.DEFAULTS);
+ assertEquals("A", def.get("a"));
+ assertEquals("P", def.get("p"));
+ def = (NamedList) nl.get(PluginInfo.INVARIANTS);
+ assertEquals("B", def.get("b"));
+ def = (NamedList) nl.get(PluginInfo.APPENDS);
+ assertEquals("C", def.get("c"));
+
+ }
+
+ @Test
public void testComponentWithParamSetRequestParam(){
for (String s : Arrays.asList("/dump4")) {
SolrRequestHandler handler = h.getCore().getRequestHandler(s);