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/17 20:15:02 UTC
lucene-solr:branch_6x: committed as part of 09aa951
Repository: lucene-solr
Updated Branches:
refs/heads/branch_6x 54e827e9b -> 4570ae800
committed as part of 09aa951
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/4570ae80
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/4570ae80
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/4570ae80
Branch: refs/heads/branch_6x
Commit: 4570ae80011e8e1ac1565d0586d4a588ab48fe6c
Parents: 54e827e
Author: Mike McCandless <mi...@apache.org>
Authored: Wed Mar 2 09:05:41 2016 -0500
Committer: Noble Paul <no...@apache.org>
Committed: Fri Mar 18 00:44:40 2016 +0530
----------------------------------------------------------------------
.../apache/solr/handler/component/SearchHandler.java | 13 ++++---------
1 file changed, 4 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/4570ae80/solr/core/src/java/org/apache/solr/handler/component/SearchHandler.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/handler/component/SearchHandler.java b/solr/core/src/java/org/apache/solr/handler/component/SearchHandler.java
index 2e0f0da..eb15cee 100644
--- a/solr/core/src/java/org/apache/solr/handler/component/SearchHandler.java
+++ b/solr/core/src/java/org/apache/solr/handler/component/SearchHandler.java
@@ -376,15 +376,10 @@ public class SearchHandler extends RequestHandlerBase implements SolrCoreAware ,
// for distributed queries that don't include shards.qt, use the original path
// as the default but operators need to update their luceneMatchVersion to enable
// this behavior since it did not work this way prior to 5.1
- if (req.getCore().getSolrConfig().luceneMatchVersion.onOrAfter(Version.LUCENE_5_1_0)) {
- String reqPath = (String) req.getContext().get(PATH);
- if (!"/select".equals(reqPath)) {
- params.set(CommonParams.QT, reqPath);
- } // else if path is /select, then the qt gets passed thru if set
- } else {
- // this is the pre-5.1 behavior, which translates to sending the shard request to /select
- params.remove(CommonParams.QT);
- }
+ String reqPath = (String) req.getContext().get(PATH);
+ if (!"/select".equals(reqPath)) {
+ params.set(CommonParams.QT, reqPath);
+ } // else if path is /select, then the qt gets passed thru if set
}
shardHandler1.submit(sreq, shard, params, rb.preferredHostAddress);
}