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/15 10:04:18 UTC
lucene-solr:master: SOLR-9410: Make ReRankQParserPlugin's private
ReRankWeight a public class of its own.
Repository: lucene-solr
Updated Branches:
refs/heads/master 7ddd57b2a -> 1af873f53
SOLR-9410: Make ReRankQParserPlugin's private ReRankWeight a public class of its own.
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/1af873f5
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/1af873f5
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/1af873f5
Branch: refs/heads/master
Commit: 1af873f53ec553da381d3a8261c07a2235db9457
Parents: 7ddd57b
Author: Christine Poerschke <cp...@apache.org>
Authored: Mon Aug 15 10:45:01 2016 +0100
Committer: Christine Poerschke <cp...@apache.org>
Committed: Mon Aug 15 10:45:01 2016 +0100
----------------------------------------------------------------------
solr/CHANGES.txt | 2 +
.../apache/solr/search/ReRankQParserPlugin.java | 21 +--------
.../org/apache/solr/search/ReRankWeight.java | 48 ++++++++++++++++++++
3 files changed, 52 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/1af873f5/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 0859d1b..130c348 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -274,6 +274,8 @@ Other Changes
* SOLR-9092: For the delete replica command we attempt to send the core admin delete request only
if that node is actually up. (Jessica Cheng Mallet, Varun Thacker)
+* SOLR-9410: Make ReRankQParserPlugin's private ReRankWeight a public class of its own. (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/1af873f5/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 a903968..2c462a0 100644
--- a/solr/core/src/java/org/apache/solr/search/ReRankQParserPlugin.java
+++ b/solr/core/src/java/org/apache/solr/search/ReRankQParserPlugin.java
@@ -25,8 +25,6 @@ import com.carrotsearch.hppc.IntIntHashMap;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.LeafReaderContext;
-import org.apache.lucene.search.FilterWeight;
-import org.apache.lucene.search.Explanation;
import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.search.LeafCollector;
import org.apache.lucene.search.MatchAllDocsQuery;
@@ -188,23 +186,8 @@ public class ReRankQParserPlugin extends QParserPlugin {
}
public Weight createWeight(IndexSearcher searcher, boolean needsScores, float boost) throws IOException{
- return new ReRankWeight(mainQuery, reRankQueryRescorer, searcher, needsScores, boost);
- }
- }
-
- private class ReRankWeight extends FilterWeight {
- private IndexSearcher searcher;
- final private Rescorer reRankQueryRescorer;
-
- public ReRankWeight(Query mainQuery, Rescorer reRankQueryRescorer, IndexSearcher searcher, boolean needsScores, float boost) throws IOException {
- super(mainQuery, mainQuery.createWeight(searcher, needsScores, boost));
- this.searcher = searcher;
- this.reRankQueryRescorer = reRankQueryRescorer;
- }
-
- public Explanation explain(LeafReaderContext context, int doc) throws IOException {
- Explanation mainExplain = in.explain(context, doc);
- return reRankQueryRescorer.explain(searcher, mainExplain, context.docBase+doc);
+ final Weight mainWeight = mainQuery.createWeight(searcher, needsScores, boost);
+ return new ReRankWeight(mainQuery, reRankQueryRescorer, searcher, mainWeight);
}
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/1af873f5/solr/core/src/java/org/apache/solr/search/ReRankWeight.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/search/ReRankWeight.java b/solr/core/src/java/org/apache/solr/search/ReRankWeight.java
new file mode 100644
index 0000000..9c11a89
--- /dev/null
+++ b/solr/core/src/java/org/apache/solr/search/ReRankWeight.java
@@ -0,0 +1,48 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.solr.search;
+
+import java.io.IOException;
+
+import org.apache.lucene.index.LeafReaderContext;
+import org.apache.lucene.search.Explanation;
+import org.apache.lucene.search.FilterWeight;
+import org.apache.lucene.search.IndexSearcher;
+import org.apache.lucene.search.Query;
+import org.apache.lucene.search.Rescorer;
+import org.apache.lucene.search.Weight;
+
+/**
+ * A {@code Weight} used by reranking queries.
+ */
+public class ReRankWeight extends FilterWeight {
+
+ final private IndexSearcher searcher;
+ final private Rescorer reRankQueryRescorer;
+
+ public ReRankWeight(Query mainQuery, Rescorer reRankQueryRescorer, IndexSearcher searcher, Weight mainWeight) throws IOException {
+ super(mainQuery, mainWeight);
+ this.searcher = searcher;
+ this.reRankQueryRescorer = reRankQueryRescorer;
+ }
+
+ public Explanation explain(LeafReaderContext context, int doc) throws IOException {
+ final Explanation mainExplain = in.explain(context, doc);
+ return reRankQueryRescorer.explain(searcher, mainExplain, context.docBase+doc);
+ }
+
+}