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/18 21:22:50 UTC
svn commit: r1626052 - in /lucene/dev/branches/branch_5x/solr: ./ core/
core/src/java/org/apache/solr/core/ core/src/java/org/apache/solr/util/
core/src/test-files/solr/collection1/conf/
core/src/test/org/apache/solr/core/ example/ example/example-sche...
Author: noble
Date: Thu Sep 18 19:22:49 2014
New Revision: 1626052
URL: http://svn.apache.org/r1626052
Log:
SOLR-6365 <paramSet> renamed to <initParams>
Added:
lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/core/InitParams.java
- copied unchanged from r1626045, lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/InitParams.java
lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/core/TestInitParams.java
- copied unchanged from r1626045, lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/TestInitParams.java
Removed:
lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/core/ParamSet.java
lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/core/TestParamSet.java
Modified:
lucene/dev/branches/branch_5x/solr/ (props changed)
lucene/dev/branches/branch_5x/solr/core/ (props changed)
lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/core/RequestHandlers.java
lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/core/SolrConfig.java
lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/util/SolrPluginUtils.java
lucene/dev/branches/branch_5x/solr/core/src/test-files/solr/collection1/conf/solrconfig-paramset.xml
lucene/dev/branches/branch_5x/solr/example/ (props changed)
lucene/dev/branches/branch_5x/solr/example/example-schemaless/solr/collection1/conf/solrconfig.xml
lucene/dev/branches/branch_5x/solr/example/solr/collection1/conf/solrconfig.xml
Modified: lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/core/RequestHandlers.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/core/RequestHandlers.java?rev=1626052&r1=1626051&r2=1626052&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/core/RequestHandlers.java (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/core/RequestHandlers.java Thu Sep 18 19:22:49 2014
@@ -22,7 +22,6 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.LinkedHashMap;
-import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
@@ -199,21 +198,21 @@ public final class RequestHandlers {
}
private PluginInfo applyParamSet(SolrConfig config, PluginInfo info) {
- List<ParamSet> paramSets= new ArrayList<>();
- String p = info.attributes.get("paramSet");
+ List<InitParams> ags = new ArrayList<>();
+ String p = info.attributes.get(InitParams.TYPE);
if(p!=null) {
- for (String paramSet : StrUtils.splitSmart(p, ',')) {
- if(config.getParamSets().containsKey(paramSet)) paramSets.add(config.getParamSets().get(paramSet));
- else log.warn("INVALID paramSet {} in requestHandler {}", paramSet, info.toString());
+ for (String arg : StrUtils.splitSmart(p, ',')) {
+ if(config.getInitParams().containsKey(arg)) ags.add(config.getInitParams().get(arg));
+ else log.warn("INVALID paramSet {} in requestHandler {}", arg, info.toString());
}
}
- for (ParamSet paramSet : config.getParamSets().values()) {
- if(paramSet.matchPath(info.name)) paramSets.add(paramSet);
+ for (InitParams args : config.getInitParams().values()) {
+ if(args.matchPath(info.name)) ags.add(args);
}
- if(!paramSets.isEmpty()){
+ if(!ags.isEmpty()){
info = new PluginInfo(info.type, info.attributes, info.initArgs.clone(), info.children);
- for (ParamSet paramSet : paramSets) {
- paramSet.apply(info.initArgs);
+ for (InitParams args : ags) {
+ args.apply(info.initArgs);
}
}
return info;
Modified: lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/core/SolrConfig.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/core/SolrConfig.java?rev=1626052&r1=1626051&r2=1626052&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/core/SolrConfig.java (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/core/SolrConfig.java Thu Sep 18 19:22:49 2014
@@ -23,8 +23,6 @@ import org.apache.lucene.search.BooleanQ
import org.apache.lucene.util.Version;
import org.apache.solr.common.SolrException;
import org.apache.solr.common.SolrException.ErrorCode;
-import org.apache.solr.common.util.NamedList;
-import org.apache.solr.common.util.StrUtils;
import org.apache.solr.handler.component.SearchComponent;
import org.apache.solr.request.SolrRequestHandler;
import org.apache.solr.response.QueryResponseWriter;
@@ -59,13 +57,10 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.EnumSet;
import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Locale;
import java.util.Map;
-import java.util.Set;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -312,24 +307,24 @@ public class SolrConfig extends Config {
addHttpRequestToContext = getBool(
"requestDispatcher/requestParsers/@addHttpRequestToContext", false );
- loadPluginInfo(ParamSet.class,ParamSet.TYPE, MULTI_OK);
- List<PluginInfo> paramSetInfos = pluginStore.get(ParamSet.class.getName()) ;
- if(paramSetInfos!=null){
- Map<String,ParamSet> paramSets = new HashMap<>();
- for (PluginInfo p : paramSetInfos) {
- ParamSet paramSet = new ParamSet(p);
- paramSets.put(paramSet.name == null ? String.valueOf(paramSet.hashCode()) : paramSet.name , paramSet );
+ loadPluginInfo(InitParams.class, InitParams.TYPE, MULTI_OK);
+ List<PluginInfo> argsInfos = pluginStore.get(InitParams.class.getName()) ;
+ if(argsInfos!=null){
+ Map<String,InitParams> argsMap = new HashMap<>();
+ for (PluginInfo p : argsInfos) {
+ InitParams args = new InitParams(p);
+ argsMap.put(args.name == null ? String.valueOf(args.hashCode()) : args.name, args);
}
- this.paramSets = Collections.unmodifiableMap(paramSets);
+ this.initParams = Collections.unmodifiableMap(argsMap);
}
solrRequestParsers = new SolrRequestParsers(this);
Config.log.info("Loaded SolrConfig: " + name);
}
- private Map<String,ParamSet> paramSets = Collections.emptyMap();
- public Map<String, ParamSet> getParamSets() {
- return paramSets;
+ private Map<String,InitParams> initParams = Collections.emptyMap();
+ public Map<String, InitParams> getInitParams() {
+ return initParams;
}
protected UpdateHandlerInfo loadUpdatehandlerInfo() {
return new UpdateHandlerInfo(get("updateHandler/@class",null),
Modified: lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/util/SolrPluginUtils.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/util/SolrPluginUtils.java?rev=1626052&r1=1626051&r2=1626052&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/util/SolrPluginUtils.java (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/util/SolrPluginUtils.java Thu Sep 18 19:22:49 2014
@@ -48,7 +48,7 @@ import org.apache.solr.common.params.Sol
import org.apache.solr.common.util.NamedList;
import org.apache.solr.common.util.SimpleOrderedMap;
import org.apache.solr.common.util.StrUtils;
-import org.apache.solr.core.ParamSet;
+import org.apache.solr.core.InitParams;
import org.apache.solr.core.SolrCore;
import org.apache.solr.handler.component.HighlightComponent;
import org.apache.solr.handler.component.ResponseBuilder;
@@ -125,14 +125,14 @@ public class SolrPluginUtils {
*/
public static void setDefaults(SolrQueryRequest req, SolrParams defaults,
SolrParams appends, SolrParams invariants) {
- String paramSetNames = req.getParams().get(ParamSet.TYPE);
- if(paramSetNames !=null){
- for (String name : StrUtils.splitSmart(paramSetNames,',')) {
- ParamSet paramSet = req.getCore().getSolrConfig().getParamSets().get(name);
- if(paramSet!=null){
- if(paramSet.defaults != null) defaults = SolrParams.wrapDefaults(SolrParams.toSolrParams(paramSet.defaults) , defaults);
- if(paramSet.invariants != null) invariants = SolrParams.wrapDefaults(invariants, SolrParams.toSolrParams(paramSet.invariants));
- if(paramSet.appends != null) appends = SolrParams.wrapAppended(appends, SolrParams.toSolrParams(paramSet.appends));
+ String useParams = req.getParams().get("useParam");
+ if(useParams !=null){
+ for (String name : StrUtils.splitSmart(useParams,',')) {
+ InitParams initParams = req.getCore().getSolrConfig().getInitParams().get(name);
+ if(initParams !=null){
+ if(initParams.defaults != null) defaults = SolrParams.wrapDefaults(SolrParams.toSolrParams(initParams.defaults) , defaults);
+ if(initParams.invariants != null) invariants = SolrParams.wrapDefaults(invariants, SolrParams.toSolrParams(initParams.invariants));
+ if(initParams.appends != null) appends = SolrParams.wrapAppended(appends, SolrParams.toSolrParams(initParams.appends));
}
}
}
Modified: lucene/dev/branches/branch_5x/solr/core/src/test-files/solr/collection1/conf/solrconfig-paramset.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/test-files/solr/collection1/conf/solrconfig-paramset.xml?rev=1626052&r1=1626051&r2=1626052&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/test-files/solr/collection1/conf/solrconfig-paramset.xml (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/test-files/solr/collection1/conf/solrconfig-paramset.xml Thu Sep 18 19:22:49 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,/dump6,/root/*,/root1/**">
+ <initParams name="a" path="/dump3,/dump6,/root/*,/root1/**">
<lst name="defaults">
<str name="a">A</str>
</lst>
@@ -36,19 +36,19 @@
<lst name="appends">
<str name="c">C</str>
</lst>
- </paramSet>
- <paramSet path="/dump6">
+ </initParams>
+ <initParams path="/dump6">
<lst name="defaults">
<str name="p">P</str>
</lst>
- </paramSet>
+ </initParams>
<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"/>
- <requestHandler name="/dump1" class="DumpRequestHandler" paramSet="a"/>
- <requestHandler name="/dump2" class="DumpRequestHandler" paramSet="a">
+ <requestHandler name="/dump1" class="DumpRequestHandler" initParams="a"/>
+ <requestHandler name="/dump2" class="DumpRequestHandler" initParams="a">
<lst name="defaults">
<str name="a">A1</str>
</lst>
Modified: lucene/dev/branches/branch_5x/solr/example/example-schemaless/solr/collection1/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/example/example-schemaless/solr/collection1/conf/solrconfig.xml?rev=1626052&r1=1626051&r2=1626052&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/example/example-schemaless/solr/collection1/conf/solrconfig.xml (original)
+++ lucene/dev/branches/branch_5x/solr/example/example-schemaless/solr/collection1/conf/solrconfig.xml Thu Sep 18 19:22:49 2014
@@ -983,17 +983,17 @@
<str>spellcheck</str>
</arr>
</requestHandler>
- <paramSet path="/update/**,/query,/select,/tvrh,/elevate,/spell,/browse">
+ <initParams path="/update/**,/query,/select,/tvrh,/elevate,/spell,/browse">
<lst name="defaults">
<str name="df">_text</str>
</lst>
- </paramSet>
+ </initParams>
- <paramSet path="/update/**">
+ <initParams path="/update/**">
<lst name="defaults">
<str name="update.chain">add-unknown-fields-to-the-schema</str>
</lst>
- </paramSet>
+ </initParams>
<!-- Solr Cell Update Request Handler
Modified: lucene/dev/branches/branch_5x/solr/example/solr/collection1/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/example/solr/collection1/conf/solrconfig.xml?rev=1626052&r1=1626051&r2=1626052&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/example/solr/collection1/conf/solrconfig.xml (original)
+++ lucene/dev/branches/branch_5x/solr/example/solr/collection1/conf/solrconfig.xml Thu Sep 18 19:22:49 2014
@@ -1066,11 +1066,11 @@
-->
<!--<requestHandler name="/update" class="solr.UpdateRequestHandler">
</requestHandler>-->
- <paramSet path="/update/**,/query,/select,/tvrh,/elevate,/spell,/browse">
+ <initParams path="/update/**,/query,/select,/tvrh,/elevate,/spell,/browse">
<lst name="defaults">
<str name="df">text</str>
</lst>
- </paramSet>
+ </initParams>
<!-- The following are implicitly added
<requestHandler name="/update/json" class="solr.UpdateRequestHandler">
<lst name="defaults">