You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by jp...@apache.org on 2017/03/02 13:34:39 UTC
[1/2] lucene-solr:master: LUCENE-7715: NearSpansUnordered
simplifications.
Repository: lucene-solr
Updated Branches:
refs/heads/branch_6x dea29d12f -> 780690b1e
refs/heads/master f57d829fa -> 3087eb500
LUCENE-7715: NearSpansUnordered simplifications.
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/3087eb50
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/3087eb50
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/3087eb50
Branch: refs/heads/master
Commit: 3087eb50066ce9335012b718a310249ac5b9ce5c
Parents: f57d829
Author: Adrien Grand <jp...@gmail.com>
Authored: Thu Mar 2 14:29:43 2017 +0100
Committer: Adrien Grand <jp...@gmail.com>
Committed: Thu Mar 2 14:30:24 2017 +0100
----------------------------------------------------------------------
lucene/CHANGES.txt | 3 +
.../lucene/search/spans/NearSpansUnordered.java | 211 ++++++-------------
2 files changed, 62 insertions(+), 152 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/3087eb50/lucene/CHANGES.txt
----------------------------------------------------------------------
diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txt
index a7bc726..f393dab 100644
--- a/lucene/CHANGES.txt
+++ b/lucene/CHANGES.txt
@@ -253,6 +253,9 @@ Other
* LUCENE-7658: queryparser/xml CoreParser now implements SpanQueryBuilder interface.
(Daniel Collins, Christine Poerschke)
+* LUCENE-7715: NearSpansUnordered simplifications.
+ (Paul Elschot via Adrien Grand)
+
======================= Lucene 6.4.2 =======================
Bug Fixes
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/3087eb50/lucene/core/src/java/org/apache/lucene/search/spans/NearSpansUnordered.java
----------------------------------------------------------------------
diff --git a/lucene/core/src/java/org/apache/lucene/search/spans/NearSpansUnordered.java b/lucene/core/src/java/org/apache/lucene/search/spans/NearSpansUnordered.java
index c3402bc..2a69395 100644
--- a/lucene/core/src/java/org/apache/lucene/search/spans/NearSpansUnordered.java
+++ b/lucene/core/src/java/org/apache/lucene/search/spans/NearSpansUnordered.java
@@ -16,12 +16,9 @@
*/
package org.apache.lucene.search.spans;
-
import java.io.IOException;
-import java.util.ArrayList;
import java.util.List;
-import org.apache.lucene.search.TwoPhaseIterator;
import org.apache.lucene.util.PriorityQueue;
/**
@@ -32,148 +29,74 @@ import org.apache.lucene.util.PriorityQueue;
*/
public class NearSpansUnordered extends ConjunctionSpans {
- private List<SpansCell> subSpanCells; // in query order
private final int allowedSlop;
-
- private SpanPositionQueue spanPositionQueue;
+ private SpanTotalLengthEndPositionWindow spanWindow;
public NearSpansUnordered(int allowedSlop, List<Spans> subSpans)
throws IOException {
super(subSpans);
- this.subSpanCells = new ArrayList<>(subSpans.size());
- for (Spans subSpan : subSpans) { // sub spans in query order
- this.subSpanCells.add(new SpansCell(subSpan));
- }
- spanPositionQueue = new SpanPositionQueue(subSpans.size());
- singleCellToPositionQueue(); // -1 startPosition/endPosition also at doc -1
this.allowedSlop = allowedSlop;
+ this.spanWindow = new SpanTotalLengthEndPositionWindow();
}
- private void singleCellToPositionQueue() {
- maxEndPositionCell = subSpanCells.get(0);
- assert maxEndPositionCell.docID() == -1;
- assert maxEndPositionCell.startPosition() == -1;
- spanPositionQueue.add(maxEndPositionCell);
- }
+ /** Maintain totalSpanLength and maxEndPosition */
+ private class SpanTotalLengthEndPositionWindow extends PriorityQueue<Spans> {
+ int totalSpanLength;
+ int maxEndPosition;
- private void subSpanCellsToPositionQueue() throws IOException { // used when all subSpanCells arrived at the same doc.
- spanPositionQueue.clear();
- for (SpansCell cell : subSpanCells) {
- assert cell.startPosition() == -1;
- cell.nextStartPosition();
- assert cell.startPosition() != NO_MORE_POSITIONS;
- spanPositionQueue.add(cell);
- }
- }
-
- /** SpansCell wraps a sub Spans to maintain totalSpanLength and maxEndPositionCell */
- private int totalSpanLength;
- private SpansCell maxEndPositionCell;
-
- private class SpansCell extends Spans {
- private int spanLength = -1;
- final Spans in;
-
- public SpansCell(Spans spans) {
- this.in = spans;
+ public SpanTotalLengthEndPositionWindow() {
+ super(subSpans.length);
}
@Override
- public int nextStartPosition() throws IOException {
- int res = in.nextStartPosition();
- if (res != NO_MORE_POSITIONS) {
- adjustLength();
- }
- adjustMax(); // also after last end position in current doc.
- return res;
+ protected final boolean lessThan(Spans spans1, Spans spans2) {
+ return positionsOrdered(spans1, spans2);
}
- private void adjustLength() {
- if (spanLength != -1) {
- totalSpanLength -= spanLength; // subtract old, possibly from a previous doc
+ void startDocument() throws IOException {
+ clear();
+ totalSpanLength = 0;
+ maxEndPosition = -1;
+ for (Spans spans : subSpans) {
+ assert spans.startPosition() == -1;
+ spans.nextStartPosition();
+ assert spans.startPosition() != NO_MORE_POSITIONS;
+ add(spans);
+ if (spans.endPosition() > maxEndPosition) {
+ maxEndPosition = spans.endPosition();
+ }
+ int spanLength = spans.endPosition() - spans.startPosition();
+ assert spanLength >= 0;
+ totalSpanLength += spanLength;
}
- assert in.startPosition() != NO_MORE_POSITIONS;
- spanLength = endPosition() - startPosition();
- assert spanLength >= 0;
- totalSpanLength += spanLength; // add new
}
- private void adjustMax() {
- assert docID() == maxEndPositionCell.docID();
- if (endPosition() > maxEndPositionCell.endPosition()) {
- maxEndPositionCell = this;
+ boolean nextPosition() throws IOException {
+ Spans topSpans = top();
+ assert topSpans.startPosition() != NO_MORE_POSITIONS;
+ int spanLength = topSpans.endPosition() - topSpans.startPosition();
+ int nextStartPos = topSpans.nextStartPosition();
+ if (nextStartPos == NO_MORE_POSITIONS) {
+ return false;
}
+ totalSpanLength -= spanLength;
+ spanLength = topSpans.endPosition() - topSpans.startPosition();
+ totalSpanLength += spanLength;
+ if (topSpans.endPosition() > maxEndPosition) {
+ maxEndPosition = topSpans.endPosition();
+ }
+ updateTop();
+ return true;
}
- @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 TwoPhaseIterator asTwoPhaseIterator() {
- return in.asTwoPhaseIterator();
- }
-
- @Override
- public float positionsCost() {
- return in.positionsCost();
- }
-
- @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 String toString() {
- return "NearSpansUnordered.SpansCell(" + in.toString() + ")";
+ boolean atMatch() {
+ boolean res = (maxEndPosition - top().startPosition() - totalSpanLength) <= allowedSlop;
+ return res;
}
}
- private static class SpanPositionQueue extends PriorityQueue<SpansCell> {
- public SpanPositionQueue(int size) {
- super(size);
- }
-
- @Override
- protected final boolean lessThan(SpansCell spans1, SpansCell spans2) {
- return positionsOrdered(spans1, spans2);
- }
- }
-
/** Check whether two Spans in the same document are ordered with possible overlap.
* @return true iff spans1 starts before spans2
* or the spans start at the same position,
@@ -186,30 +109,17 @@ public class NearSpansUnordered extends ConjunctionSpans {
return (start1 == start2) ? (spans1.endPosition() < spans2.endPosition()) : (start1 < start2);
}
- private SpansCell minPositionCell() {
- return spanPositionQueue.top();
- }
-
- private boolean atMatch() {
- assert minPositionCell().docID() == maxEndPositionCell.docID();
- return (maxEndPositionCell.endPosition() - minPositionCell().startPosition() - totalSpanLength) <= allowedSlop;
- }
-
@Override
boolean twoPhaseCurrentDocMatches() throws IOException {
// at doc with all subSpans
- subSpanCellsToPositionQueue();
+ spanWindow.startDocument();
while (true) {
- if (atMatch()) {
+ if (spanWindow.atMatch()) {
atFirstInCurrentDoc = true;
oneExhaustedInCurrentDoc = false;
return true;
}
- assert minPositionCell().startPosition() != NO_MORE_POSITIONS;
- if (minPositionCell().nextStartPosition() != NO_MORE_POSITIONS) {
- spanPositionQueue.updateTop();
- }
- else { // exhausted a subSpan in current doc
+ if (! spanWindow.nextPosition()) {
return false;
}
}
@@ -219,49 +129,46 @@ public class NearSpansUnordered extends ConjunctionSpans {
public int nextStartPosition() throws IOException {
if (atFirstInCurrentDoc) {
atFirstInCurrentDoc = false;
- return minPositionCell().startPosition();
- }
- while (minPositionCell().startPosition() == -1) { // initially at current doc
- minPositionCell().nextStartPosition();
- spanPositionQueue.updateTop();
+ return spanWindow.top().startPosition();
}
- assert minPositionCell().startPosition() != NO_MORE_POSITIONS;
+ assert spanWindow.top().startPosition() != -1;
+ assert spanWindow.top().startPosition() != NO_MORE_POSITIONS;
while (true) {
- if (minPositionCell().nextStartPosition() == NO_MORE_POSITIONS) {
+ if (! spanWindow.nextPosition()) {
oneExhaustedInCurrentDoc = true;
return NO_MORE_POSITIONS;
}
- spanPositionQueue.updateTop();
- if (atMatch()) {
- return minPositionCell().startPosition();
+ if (spanWindow.atMatch()) {
+ return spanWindow.top().startPosition();
}
}
}
@Override
public int startPosition() {
- assert minPositionCell() != null;
+ assert spanWindow.top() != null;
return atFirstInCurrentDoc ? -1
: oneExhaustedInCurrentDoc ? NO_MORE_POSITIONS
- : minPositionCell().startPosition();
+ : spanWindow.top().startPosition();
}
@Override
public int endPosition() {
return atFirstInCurrentDoc ? -1
: oneExhaustedInCurrentDoc ? NO_MORE_POSITIONS
- : maxEndPositionCell.endPosition();
+ : spanWindow.maxEndPosition;
}
@Override
public int width() {
- return maxEndPositionCell.startPosition() - minPositionCell().startPosition();
+ return spanWindow.maxEndPosition
+ - spanWindow.top().startPosition();
}
@Override
public void collect(SpanCollector collector) throws IOException {
- for (SpansCell cell : subSpanCells) {
- cell.collect(collector);
+ for (Spans spans : subSpans) {
+ spans.collect(collector);
}
}
[2/2] lucene-solr:branch_6x: LUCENE-7715: NearSpansUnordered
simplifications.
Posted by jp...@apache.org.
LUCENE-7715: NearSpansUnordered simplifications.
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/780690b1
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/780690b1
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/780690b1
Branch: refs/heads/branch_6x
Commit: 780690b1e9fe9b029ee15cdf81d1f697e2fe4cc7
Parents: dea29d1
Author: Adrien Grand <jp...@gmail.com>
Authored: Thu Mar 2 14:29:43 2017 +0100
Committer: Adrien Grand <jp...@gmail.com>
Committed: Thu Mar 2 14:31:01 2017 +0100
----------------------------------------------------------------------
lucene/CHANGES.txt | 3 +
.../lucene/search/spans/NearSpansUnordered.java | 211 ++++++-------------
2 files changed, 62 insertions(+), 152 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/780690b1/lucene/CHANGES.txt
----------------------------------------------------------------------
diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txt
index 4f42692..e017690 100644
--- a/lucene/CHANGES.txt
+++ b/lucene/CHANGES.txt
@@ -187,6 +187,9 @@ Other
of LatLonPoint, which offers faster indexing and searching
performance, smaller index, and less search-time heap usage. (Mike McCandless)
+* LUCENE-7715: NearSpansUnordered simplifications.
+ (Paul Elschot via Adrien Grand)
+
======================= Lucene 6.4.2 =======================
Bug Fixes
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/780690b1/lucene/core/src/java/org/apache/lucene/search/spans/NearSpansUnordered.java
----------------------------------------------------------------------
diff --git a/lucene/core/src/java/org/apache/lucene/search/spans/NearSpansUnordered.java b/lucene/core/src/java/org/apache/lucene/search/spans/NearSpansUnordered.java
index c3402bc..2a69395 100644
--- a/lucene/core/src/java/org/apache/lucene/search/spans/NearSpansUnordered.java
+++ b/lucene/core/src/java/org/apache/lucene/search/spans/NearSpansUnordered.java
@@ -16,12 +16,9 @@
*/
package org.apache.lucene.search.spans;
-
import java.io.IOException;
-import java.util.ArrayList;
import java.util.List;
-import org.apache.lucene.search.TwoPhaseIterator;
import org.apache.lucene.util.PriorityQueue;
/**
@@ -32,148 +29,74 @@ import org.apache.lucene.util.PriorityQueue;
*/
public class NearSpansUnordered extends ConjunctionSpans {
- private List<SpansCell> subSpanCells; // in query order
private final int allowedSlop;
-
- private SpanPositionQueue spanPositionQueue;
+ private SpanTotalLengthEndPositionWindow spanWindow;
public NearSpansUnordered(int allowedSlop, List<Spans> subSpans)
throws IOException {
super(subSpans);
- this.subSpanCells = new ArrayList<>(subSpans.size());
- for (Spans subSpan : subSpans) { // sub spans in query order
- this.subSpanCells.add(new SpansCell(subSpan));
- }
- spanPositionQueue = new SpanPositionQueue(subSpans.size());
- singleCellToPositionQueue(); // -1 startPosition/endPosition also at doc -1
this.allowedSlop = allowedSlop;
+ this.spanWindow = new SpanTotalLengthEndPositionWindow();
}
- private void singleCellToPositionQueue() {
- maxEndPositionCell = subSpanCells.get(0);
- assert maxEndPositionCell.docID() == -1;
- assert maxEndPositionCell.startPosition() == -1;
- spanPositionQueue.add(maxEndPositionCell);
- }
+ /** Maintain totalSpanLength and maxEndPosition */
+ private class SpanTotalLengthEndPositionWindow extends PriorityQueue<Spans> {
+ int totalSpanLength;
+ int maxEndPosition;
- private void subSpanCellsToPositionQueue() throws IOException { // used when all subSpanCells arrived at the same doc.
- spanPositionQueue.clear();
- for (SpansCell cell : subSpanCells) {
- assert cell.startPosition() == -1;
- cell.nextStartPosition();
- assert cell.startPosition() != NO_MORE_POSITIONS;
- spanPositionQueue.add(cell);
- }
- }
-
- /** SpansCell wraps a sub Spans to maintain totalSpanLength and maxEndPositionCell */
- private int totalSpanLength;
- private SpansCell maxEndPositionCell;
-
- private class SpansCell extends Spans {
- private int spanLength = -1;
- final Spans in;
-
- public SpansCell(Spans spans) {
- this.in = spans;
+ public SpanTotalLengthEndPositionWindow() {
+ super(subSpans.length);
}
@Override
- public int nextStartPosition() throws IOException {
- int res = in.nextStartPosition();
- if (res != NO_MORE_POSITIONS) {
- adjustLength();
- }
- adjustMax(); // also after last end position in current doc.
- return res;
+ protected final boolean lessThan(Spans spans1, Spans spans2) {
+ return positionsOrdered(spans1, spans2);
}
- private void adjustLength() {
- if (spanLength != -1) {
- totalSpanLength -= spanLength; // subtract old, possibly from a previous doc
+ void startDocument() throws IOException {
+ clear();
+ totalSpanLength = 0;
+ maxEndPosition = -1;
+ for (Spans spans : subSpans) {
+ assert spans.startPosition() == -1;
+ spans.nextStartPosition();
+ assert spans.startPosition() != NO_MORE_POSITIONS;
+ add(spans);
+ if (spans.endPosition() > maxEndPosition) {
+ maxEndPosition = spans.endPosition();
+ }
+ int spanLength = spans.endPosition() - spans.startPosition();
+ assert spanLength >= 0;
+ totalSpanLength += spanLength;
}
- assert in.startPosition() != NO_MORE_POSITIONS;
- spanLength = endPosition() - startPosition();
- assert spanLength >= 0;
- totalSpanLength += spanLength; // add new
}
- private void adjustMax() {
- assert docID() == maxEndPositionCell.docID();
- if (endPosition() > maxEndPositionCell.endPosition()) {
- maxEndPositionCell = this;
+ boolean nextPosition() throws IOException {
+ Spans topSpans = top();
+ assert topSpans.startPosition() != NO_MORE_POSITIONS;
+ int spanLength = topSpans.endPosition() - topSpans.startPosition();
+ int nextStartPos = topSpans.nextStartPosition();
+ if (nextStartPos == NO_MORE_POSITIONS) {
+ return false;
}
+ totalSpanLength -= spanLength;
+ spanLength = topSpans.endPosition() - topSpans.startPosition();
+ totalSpanLength += spanLength;
+ if (topSpans.endPosition() > maxEndPosition) {
+ maxEndPosition = topSpans.endPosition();
+ }
+ updateTop();
+ return true;
}
- @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 TwoPhaseIterator asTwoPhaseIterator() {
- return in.asTwoPhaseIterator();
- }
-
- @Override
- public float positionsCost() {
- return in.positionsCost();
- }
-
- @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 String toString() {
- return "NearSpansUnordered.SpansCell(" + in.toString() + ")";
+ boolean atMatch() {
+ boolean res = (maxEndPosition - top().startPosition() - totalSpanLength) <= allowedSlop;
+ return res;
}
}
- private static class SpanPositionQueue extends PriorityQueue<SpansCell> {
- public SpanPositionQueue(int size) {
- super(size);
- }
-
- @Override
- protected final boolean lessThan(SpansCell spans1, SpansCell spans2) {
- return positionsOrdered(spans1, spans2);
- }
- }
-
/** Check whether two Spans in the same document are ordered with possible overlap.
* @return true iff spans1 starts before spans2
* or the spans start at the same position,
@@ -186,30 +109,17 @@ public class NearSpansUnordered extends ConjunctionSpans {
return (start1 == start2) ? (spans1.endPosition() < spans2.endPosition()) : (start1 < start2);
}
- private SpansCell minPositionCell() {
- return spanPositionQueue.top();
- }
-
- private boolean atMatch() {
- assert minPositionCell().docID() == maxEndPositionCell.docID();
- return (maxEndPositionCell.endPosition() - minPositionCell().startPosition() - totalSpanLength) <= allowedSlop;
- }
-
@Override
boolean twoPhaseCurrentDocMatches() throws IOException {
// at doc with all subSpans
- subSpanCellsToPositionQueue();
+ spanWindow.startDocument();
while (true) {
- if (atMatch()) {
+ if (spanWindow.atMatch()) {
atFirstInCurrentDoc = true;
oneExhaustedInCurrentDoc = false;
return true;
}
- assert minPositionCell().startPosition() != NO_MORE_POSITIONS;
- if (minPositionCell().nextStartPosition() != NO_MORE_POSITIONS) {
- spanPositionQueue.updateTop();
- }
- else { // exhausted a subSpan in current doc
+ if (! spanWindow.nextPosition()) {
return false;
}
}
@@ -219,49 +129,46 @@ public class NearSpansUnordered extends ConjunctionSpans {
public int nextStartPosition() throws IOException {
if (atFirstInCurrentDoc) {
atFirstInCurrentDoc = false;
- return minPositionCell().startPosition();
- }
- while (minPositionCell().startPosition() == -1) { // initially at current doc
- minPositionCell().nextStartPosition();
- spanPositionQueue.updateTop();
+ return spanWindow.top().startPosition();
}
- assert minPositionCell().startPosition() != NO_MORE_POSITIONS;
+ assert spanWindow.top().startPosition() != -1;
+ assert spanWindow.top().startPosition() != NO_MORE_POSITIONS;
while (true) {
- if (minPositionCell().nextStartPosition() == NO_MORE_POSITIONS) {
+ if (! spanWindow.nextPosition()) {
oneExhaustedInCurrentDoc = true;
return NO_MORE_POSITIONS;
}
- spanPositionQueue.updateTop();
- if (atMatch()) {
- return minPositionCell().startPosition();
+ if (spanWindow.atMatch()) {
+ return spanWindow.top().startPosition();
}
}
}
@Override
public int startPosition() {
- assert minPositionCell() != null;
+ assert spanWindow.top() != null;
return atFirstInCurrentDoc ? -1
: oneExhaustedInCurrentDoc ? NO_MORE_POSITIONS
- : minPositionCell().startPosition();
+ : spanWindow.top().startPosition();
}
@Override
public int endPosition() {
return atFirstInCurrentDoc ? -1
: oneExhaustedInCurrentDoc ? NO_MORE_POSITIONS
- : maxEndPositionCell.endPosition();
+ : spanWindow.maxEndPosition;
}
@Override
public int width() {
- return maxEndPositionCell.startPosition() - minPositionCell().startPosition();
+ return spanWindow.maxEndPosition
+ - spanWindow.top().startPosition();
}
@Override
public void collect(SpanCollector collector) throws IOException {
- for (SpansCell cell : subSpanCells) {
- cell.collect(collector);
+ for (Spans spans : subSpans) {
+ spans.collect(collector);
}
}