You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ds...@apache.org on 2016/07/19 16:46:00 UTC
[1/2] lucene-solr:master: LUCENE-7384: Remove defunct
ScoringWrapperSpans.
Repository: lucene-solr
Updated Branches:
refs/heads/master b4c8f5678 -> 180f9562a
LUCENE-7384: Remove defunct ScoringWrapperSpans.
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/abb81e4d
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/abb81e4d
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/abb81e4d
Branch: refs/heads/master
Commit: abb81e4dedd05606f91be809d702be0ca8be1caf
Parents: b4c8f56
Author: David Smiley <ds...@apache.org>
Authored: Tue Jul 19 12:45:09 2016 -0400
Committer: David Smiley <ds...@apache.org>
Committed: Tue Jul 19 12:45:09 2016 -0400
----------------------------------------------------------------------
lucene/CHANGES.txt | 7 ++
.../search/spans/ScoringWrapperSpans.java | 95 --------------------
.../lucene/search/spans/SpanNotQuery.java | 2 +-
.../apache/lucene/search/spans/SpanOrQuery.java | 2 +-
4 files changed, 9 insertions(+), 97 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/abb81e4d/lucene/CHANGES.txt
----------------------------------------------------------------------
diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txt
index 34e91b6..ec395a3 100644
--- a/lucene/CHANGES.txt
+++ b/lucene/CHANGES.txt
@@ -32,6 +32,10 @@ Other
======================= Lucene 6.2.0 =======================
+API Changes
+
+* ScoringWrapperSpans was removed since it had no purpose or effect as of Lucene 5.5.
+
New Features
* LUCENE-7302: IndexWriter methods that change the index now return a
@@ -148,6 +152,9 @@ Other
* LUCENE-7372: Factor out an org.apache.lucene.search.FilterWeight class.
(Christine Poerschke, Adrien Grand, David Smiley)
+* LUCENE-7384: Removed ScoringWrapperSpans. And tweaked SpanWeight.buildSimWeight() to
+ reuse the existing Similarity instead of creating a new one. (David Smiley)
+
======================= Lucene 6.1.0 =======================
New Features
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/abb81e4d/lucene/core/src/java/org/apache/lucene/search/spans/ScoringWrapperSpans.java
----------------------------------------------------------------------
diff --git a/lucene/core/src/java/org/apache/lucene/search/spans/ScoringWrapperSpans.java b/lucene/core/src/java/org/apache/lucene/search/spans/ScoringWrapperSpans.java
deleted file mode 100644
index d38ae83..0000000
--- a/lucene/core/src/java/org/apache/lucene/search/spans/ScoringWrapperSpans.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * 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.lucene.search.spans;
-
-
-import java.io.IOException;
-
-import org.apache.lucene.search.similarities.Similarity;
-import org.apache.lucene.search.TwoPhaseIterator;
-
-/**
- * A Spans that wraps another Spans with a different SimScorer
- */
-public class ScoringWrapperSpans extends Spans {
-
- private final Spans in;
-
- /**
- * Creates a new ScoringWrapperSpans
- * @param spans the scorer to wrap
- * @param simScorer the SimScorer to use for scoring
- */
- public ScoringWrapperSpans(Spans spans, Similarity.SimScorer simScorer) {
- this.in = spans;
- }
-
- @Override
- public int nextStartPosition() throws IOException {
- return in.nextStartPosition();
- }
-
- @Override
- public int startPosition() {
- return in.startPosition();
- }
-
- @Override
- public int endPosition() {
- return in.endPosition();
- }
-
- @Override
- public int width() {
- return in.width();
- }
-
- @Override
- public void collect(SpanCollector collector) throws IOException {
- in.collect(collector);
- }
-
- @Override
- public int docID() {
- return in.docID();
- }
-
- @Override
- public int nextDoc() throws IOException {
- return in.nextDoc();
- }
-
- @Override
- public int advance(int target) throws IOException {
- return in.advance(target);
- }
-
- @Override
- public long cost() {
- return in.cost();
- }
-
- @Override
- public TwoPhaseIterator asTwoPhaseIterator() {
- return in.asTwoPhaseIterator();
- }
-
- @Override
- public float positionsCost() {
- return in.positionsCost();
- }
-}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/abb81e4d/lucene/core/src/java/org/apache/lucene/search/spans/SpanNotQuery.java
----------------------------------------------------------------------
diff --git a/lucene/core/src/java/org/apache/lucene/search/spans/SpanNotQuery.java b/lucene/core/src/java/org/apache/lucene/search/spans/SpanNotQuery.java
index 0984bd9..05d3f8e 100644
--- a/lucene/core/src/java/org/apache/lucene/search/spans/SpanNotQuery.java
+++ b/lucene/core/src/java/org/apache/lucene/search/spans/SpanNotQuery.java
@@ -126,7 +126,7 @@ public final class SpanNotQuery extends SpanQuery {
Spans excludeSpans = excludeWeight.getSpans(context, requiredPostings);
if (excludeSpans == null) {
- return new ScoringWrapperSpans(includeSpans, getSimScorer(context));
+ return includeSpans;
}
TwoPhaseIterator excludeTwoPhase = excludeSpans.asTwoPhaseIterator();
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/abb81e4d/lucene/core/src/java/org/apache/lucene/search/spans/SpanOrQuery.java
----------------------------------------------------------------------
diff --git a/lucene/core/src/java/org/apache/lucene/search/spans/SpanOrQuery.java b/lucene/core/src/java/org/apache/lucene/search/spans/SpanOrQuery.java
index e273dd9..15abc7d 100644
--- a/lucene/core/src/java/org/apache/lucene/search/spans/SpanOrQuery.java
+++ b/lucene/core/src/java/org/apache/lucene/search/spans/SpanOrQuery.java
@@ -161,7 +161,7 @@ public final class SpanOrQuery extends SpanQuery {
if (subSpans.size() == 0) {
return null;
} else if (subSpans.size() == 1) {
- return new ScoringWrapperSpans(subSpans.get(0), getSimScorer(context));
+ return subSpans.get(0);
}
DisiPriorityQueue byDocQueue = new DisiPriorityQueue(subSpans.size());
[2/2] lucene-solr:master: LUCENE-7384: Tweak
SpanWeight.buildSimWeight to reuse the existing similarity.
Posted by ds...@apache.org.
LUCENE-7384: Tweak SpanWeight.buildSimWeight to reuse the existing similarity.
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/180f9562
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/180f9562
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/180f9562
Branch: refs/heads/master
Commit: 180f9562aa9c1e271d8dce48ac5695d0612bf808
Parents: abb81e4
Author: David Smiley <ds...@apache.org>
Authored: Tue Jul 19 12:45:28 2016 -0400
Committer: David Smiley <ds...@apache.org>
Committed: Tue Jul 19 12:45:28 2016 -0400
----------------------------------------------------------------------
.../core/src/java/org/apache/lucene/search/spans/SpanWeight.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/180f9562/lucene/core/src/java/org/apache/lucene/search/spans/SpanWeight.java
----------------------------------------------------------------------
diff --git a/lucene/core/src/java/org/apache/lucene/search/spans/SpanWeight.java b/lucene/core/src/java/org/apache/lucene/search/spans/SpanWeight.java
index c0b231e..4d08172 100644
--- a/lucene/core/src/java/org/apache/lucene/search/spans/SpanWeight.java
+++ b/lucene/core/src/java/org/apache/lucene/search/spans/SpanWeight.java
@@ -99,7 +99,7 @@ public abstract class SpanWeight extends Weight {
i++;
}
CollectionStatistics collectionStats = searcher.collectionStatistics(query.getField());
- return searcher.getSimilarity(true).computeWeight(boost, collectionStats, termStats);
+ return similarity.computeWeight(boost, collectionStats, termStats);
}
/**