You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by cp...@apache.org on 2016/08/11 09:07:54 UTC
lucene-solr:branch_6x: SOLR-9331: Remove ReRankQuery's length
constructor argument and member.
Repository: lucene-solr
Updated Branches:
refs/heads/branch_6x 8412af551 -> 025279096
SOLR-9331: Remove ReRankQuery's length constructor argument and member.
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/02527909
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/02527909
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/02527909
Branch: refs/heads/branch_6x
Commit: 02527909625763871f0cf5a4aea353462299cda1
Parents: 8412af5
Author: Christine Poerschke <cp...@apache.org>
Authored: Wed Aug 10 16:01:19 2016 +0100
Committer: Christine Poerschke <cp...@apache.org>
Committed: Thu Aug 11 09:51:35 2016 +0100
----------------------------------------------------------------------
solr/CHANGES.txt | 2 ++
.../org/apache/solr/search/ReRankQParserPlugin.java | 14 ++++----------
2 files changed, 6 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/02527909/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 68dfaf0..36eeac9 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -223,6 +223,8 @@ Other Changes
* SOLR-9367: Improved TestInjection's randomization logic to use LuceneTestCase.random() (hossman)
+* SOLR-9331: Remove ReRankQuery's length constructor argument and member. (Christine Poerschke)
+
================== 6.1.0 ==================
Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this release.
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/02527909/solr/core/src/java/org/apache/solr/search/ReRankQParserPlugin.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/search/ReRankQParserPlugin.java b/solr/core/src/java/org/apache/solr/search/ReRankQParserPlugin.java
index 6c5ac30..af863f0 100644
--- a/solr/core/src/java/org/apache/solr/search/ReRankQParserPlugin.java
+++ b/solr/core/src/java/org/apache/solr/search/ReRankQParserPlugin.java
@@ -42,7 +42,6 @@ import org.apache.lucene.search.TopScoreDocCollector;
import org.apache.lucene.search.Weight;
import org.apache.lucene.util.BytesRef;
import org.apache.solr.common.SolrException;
-import org.apache.solr.common.params.CommonParams;
import org.apache.solr.common.params.SolrParams;
import org.apache.solr.handler.component.MergeStrategy;
import org.apache.solr.handler.component.QueryElevationComponent;
@@ -91,10 +90,7 @@ public class ReRankQParserPlugin extends QParserPlugin {
double reRankWeight = localParams.getDouble(RERANK_WEIGHT, RERANK_WEIGHT_DEFAULT);
- int start = params.getInt(CommonParams.START,CommonParams.START_DEFAULT);
- int rows = params.getInt(CommonParams.ROWS,CommonParams.ROWS_DEFAULT);
- int length = start+rows;
- return new ReRankQuery(reRankQuery, reRankDocs, reRankWeight, length);
+ return new ReRankQuery(reRankQuery, reRankDocs, reRankWeight);
}
}
@@ -121,7 +117,6 @@ public class ReRankQParserPlugin extends QParserPlugin {
private Query mainQuery = defaultQuery;
final private Query reRankQuery;
final private int reRankDocs;
- final private int length;
final private double reRankWeight;
final private Rescorer reRankQueryRescorer;
private Map<BytesRef, Integer> boostedPriority;
@@ -142,11 +137,10 @@ public class ReRankQParserPlugin extends QParserPlugin {
reRankDocs == rrq.reRankDocs;
}
- public ReRankQuery(Query reRankQuery, int reRankDocs, double reRankWeight, int length) {
+ public ReRankQuery(Query reRankQuery, int reRankDocs, double reRankWeight) {
this.reRankQuery = reRankQuery;
this.reRankDocs = reRankDocs;
this.reRankWeight = reRankWeight;
- this.length = length;
this.reRankQueryRescorer = new ReRankQueryRescorer(reRankQuery, reRankWeight);
}
@@ -171,7 +165,7 @@ public class ReRankQParserPlugin extends QParserPlugin {
}
}
- return new ReRankCollector(reRankDocs, length, reRankQueryRescorer, cmd, searcher, boostedPriority);
+ return new ReRankCollector(reRankDocs, len, reRankQueryRescorer, cmd, searcher, boostedPriority);
}
@Override
@@ -188,7 +182,7 @@ public class ReRankQParserPlugin extends QParserPlugin {
public Query rewrite(IndexReader reader) throws IOException {
Query q = mainQuery.rewrite(reader);
if (q != mainQuery) {
- return new ReRankQuery(reRankQuery, reRankDocs, reRankWeight, length).wrap(q);
+ return new ReRankQuery(reRankQuery, reRankDocs, reRankWeight).wrap(q);
}
return super.rewrite(reader);
}