Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/lucene-solr

This commit is contained in:
Mike McCandless 2016-03-01 05:01:41 -05:00
parent 37cf22895f e44eebf39d
commit b6ec95961d
4 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
solr/CHANGES.txt
View File

@ -226,6 +226,8 @@ Bug Fixes
* SOLR-8748: OverseerTaskProcessor limits number of concurrent tasks to just 10 even though the thread pool * SOLR-8748: OverseerTaskProcessor limits number of concurrent tasks to just 10 even though the thread pool
size is 100. The limit has now been increased to 100. (Scott Blum, shalin) size is 100. The limit has now been increased to 100. (Scott Blum, shalin)
* SOLR-8375: ReplicaAssigner rejects valid nodes (Kelvin Tan, noble)
Optimizations Optimizations
---------------------- ----------------------
* SOLR-7876: Speed up queries and operations that use many terms when timeAllowed has not been * SOLR-7876: Speed up queries and operations that use many terms when timeAllowed has not been

9
solr/core/src/java/org/apache/solr/cloud/rule/ReplicaAssigner.java
View File

@ -44,11 +44,8 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import static java.util.Collections.singletonList; import static java.util.Collections.singletonList;
import static org.apache.solr.cloud.rule.Rule.MatchStatus.NODE_CAN_BE_ASSIGNED; import static org.apache.solr.cloud.rule.Rule.MatchStatus.*;
import static org.apache.solr.cloud.rule.Rule.Phase.ASSIGN; import static org.apache.solr.cloud.rule.Rule.Phase.*;
import static org.apache.solr.cloud.rule.Rule.Phase.FUZZY_ASSIGN;
import static org.apache.solr.cloud.rule.Rule.Phase.FUZZY_VERIFY;
import static org.apache.solr.cloud.rule.Rule.Phase.VERIFY;
import static org.apache.solr.common.util.StrUtils.formatString; import static org.apache.solr.common.util.StrUtils.formatString;
import static org.apache.solr.common.util.Utils.getDeepCopy; import static org.apache.solr.common.util.Utils.getDeepCopy;
@ -280,7 +277,7 @@ public class ReplicaAssigner {
Rule rule = rules.get(rulePermutation[i]); Rule rule = rules.get(rulePermutation[i]);
Rule.MatchStatus matchStatus = rule.tryAssignNodeToShard(e.getValue(), Rule.MatchStatus matchStatus = rule.tryAssignNodeToShard(e.getValue(),
copyOfCurrentState, nodeVsTagsCopy, e.getKey().shard, fuzzyPhase ? FUZZY_VERIFY : VERIFY); copyOfCurrentState, nodeVsTagsCopy, e.getKey().shard, fuzzyPhase ? FUZZY_VERIFY : VERIFY);
if (matchStatus != NODE_CAN_BE_ASSIGNED) return null; if (matchStatus != NODE_CAN_BE_ASSIGNED && matchStatus != NOT_APPLICABLE) return null;
} }
} }
return result; return result;

6
solr/example/files/conf/params.json
View File

@ -22,9 +22,13 @@
"debug":"true", "debug":"true",
"hl.simple.pre":"HL_START", "hl.simple.pre":"HL_START",
"hl.simple.post":"HL_END", "hl.simple.post":"HL_END",
"echoParams": "explicit",
"_appends_": {
"fq": "{!switch v=$type tag=type case='*:*' case.all='*:*' case.unknown='-doc_type:[* TO *]' default=$type_fq}"
},
"":{"v":0}}, "":{"v":0}},
"velocity":{ "velocity":{
"wt":"velocity", "wt":"velocity",
"v.template":"browse", "v.template":"browse",
"v.layout":"layout", "v.layout":"layout",
"":{"v":0}}}} "":{"v":0}}}}

11
solr/example/files/conf/solrconfig.xml
View File

@ -804,15 +804,8 @@
</requestHandler> </requestHandler>
<requestHandler name="/browse" class="solr.SearchHandler" useParams="query,facets,velocity,browse"> <!--These useParams values are available in params.json-->
<lst name="defaults"> <requestHandler name="/browse" class="solr.SearchHandler" useParams="query,facets,velocity,browse"/>
<str name="echoParams">explicit</str>
</lst>
<lst name="appends">
<str name="fq">{!switch v=$type tag=type case='*:*' case.all='*:*' case.unknown='-doc_type:[* TO *]' default=$type_fq}</str>
</lst>
</requestHandler>
<initParams path="/update/**,/query,/select,/tvrh,/elevate,/spell,/browse"> <initParams path="/update/**,/query,/select,/tvrh,/elevate,/spell,/browse">