You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ro...@apache.org on 2014/12/14 22:44:59 UTC
svn commit: r1645528 - in /lucene/dev/branches/lucene2878/lucene:
core/src/java/org/apache/lucene/codecs/
core/src/java/org/apache/lucene/search/posfilter/
core/src/java/org/apache/lucene/search/spans/
sandbox/src/java/org/apache/lucene/search/
Author: romseygeek
Date: Sun Dec 14 21:44:58 2014
New Revision: 1645528
URL: http://svn.apache.org/r1645528
Log:
LUCENE-2878: last nocommits
Modified:
lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/codecs/PostingsReaderBase.java
lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/search/posfilter/PositionFilterQuery.java
lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/search/posfilter/PositionFilteredScorer.java
lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/search/spans/SpanScorer.java
lucene/dev/branches/lucene2878/lucene/sandbox/src/java/org/apache/lucene/search/TermAutomatonScorer.java
Modified: lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/codecs/PostingsReaderBase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/codecs/PostingsReaderBase.java?rev=1645528&r1=1645527&r2=1645528&view=diff
==============================================================================
--- lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/codecs/PostingsReaderBase.java (original)
+++ lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/codecs/PostingsReaderBase.java Sun Dec 14 21:44:58 2014
@@ -17,6 +17,9 @@ package org.apache.lucene.codecs;
* limitations under the License.
*/
+import java.io.Closeable;
+import java.io.IOException;
+
import org.apache.lucene.index.DocsEnum;
import org.apache.lucene.index.FieldInfo;
import org.apache.lucene.index.SegmentReadState;
@@ -25,9 +28,6 @@ import org.apache.lucene.store.IndexInpu
import org.apache.lucene.util.Accountable;
import org.apache.lucene.util.Bits;
-import java.io.Closeable;
-import java.io.IOException;
-
/** The core terms dictionaries (BlockTermsReader,
* BlockTreeTermsReader) interact with a single instance
* of this class to manage creation of {@link DocsEnum} and
@@ -71,8 +71,8 @@ public abstract class PostingsReaderBase
* TermState may be reused. */
public abstract DocsEnum docsAndPositions(FieldInfo fieldInfo, BlockTermState state, Bits skipDocs, DocsEnum reuse,
int flags) throws IOException;
- // nocommit this still has the distinction - no need to remove this as long as we get the interface straight?
-
+ // TODO merge this into docs()?
+
/**
* Checks consistency of this reader.
* <p>
Modified: lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/search/posfilter/PositionFilterQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/search/posfilter/PositionFilterQuery.java?rev=1645528&r1=1645527&r2=1645528&view=diff
==============================================================================
--- lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/search/posfilter/PositionFilterQuery.java (original)
+++ lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/search/posfilter/PositionFilterQuery.java Sun Dec 14 21:44:58 2014
@@ -104,8 +104,10 @@ public class PositionFilterQuery extends
termStats[i] = searcher.termStatistics(term, state);
i++;
}
- final String field = terms.first().field(); // nocommit - should we be checking all filtered terms
- // are on the same field?
+ // In most cases subqueries will all be on the same field, so use term statistics from
+ // the first term in the collected set. In the cases where something is funky is happening
+ // with cross-field positional queries, phrase-type scoring isn't going to be useful anyway.
+ final String field = terms.first().field();
return similarity.computeWeight(query.getBoost(), searcher.collectionStatistics(field), termStats);
}
Modified: lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/search/posfilter/PositionFilteredScorer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/search/posfilter/PositionFilteredScorer.java?rev=1645528&r1=1645527&r2=1645528&view=diff
==============================================================================
--- lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/search/posfilter/PositionFilteredScorer.java (original)
+++ lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/search/posfilter/PositionFilteredScorer.java Sun Dec 14 21:44:58 2014
@@ -140,12 +140,12 @@ public abstract class PositionFilteredSc
@Override
public BytesRef getPayload() throws IOException {
- return null; // nocommit
+ return null; // TODO - payloads on intervals
}
@Override
public long cost() {
return child.cost();
}
-// nocommit Payloads - need to add these to Interval?
+
}
Modified: lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/search/spans/SpanScorer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/search/spans/SpanScorer.java?rev=1645528&r1=1645527&r2=1645528&view=diff
==============================================================================
--- lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/search/spans/SpanScorer.java (original)
+++ lucene/dev/branches/lucene2878/lucene/core/src/java/org/apache/lucene/search/spans/SpanScorer.java Sun Dec 14 21:44:58 2014
@@ -98,11 +98,9 @@ public class SpanScorer extends Scorer {
return numMatches;
}
- // nocommit - make SpanScorer work with positions, or just nuke it entirely?
-
@Override
public int nextPosition() throws IOException {
- throw new UnsupportedOperationException();
+ throw new UnsupportedOperationException("SpanQueries do not support nextPosition() iteration");
}
@Override
Modified: lucene/dev/branches/lucene2878/lucene/sandbox/src/java/org/apache/lucene/search/TermAutomatonScorer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2878/lucene/sandbox/src/java/org/apache/lucene/search/TermAutomatonScorer.java?rev=1645528&r1=1645527&r2=1645528&view=diff
==============================================================================
--- lucene/dev/branches/lucene2878/lucene/sandbox/src/java/org/apache/lucene/search/TermAutomatonScorer.java (original)
+++ lucene/dev/branches/lucene2878/lucene/sandbox/src/java/org/apache/lucene/search/TermAutomatonScorer.java Sun Dec 14 21:44:58 2014
@@ -327,32 +327,32 @@ class TermAutomatonScorer extends Scorer
@Override
public int nextPosition() throws IOException {
- return -1; // nocommit we should be able to implement this
+ return -1; // TODO can we get positional information out of this Scorer?
}
@Override
public int startPosition() throws IOException {
- return 0; // nocommit
+ return 0;
}
@Override
public int endPosition() throws IOException {
- return 0; // nocommit
+ return 0;
}
@Override
public int startOffset() throws IOException {
- return 0; // nocommit
+ return 0;
}
@Override
public int endOffset() throws IOException {
- return 0; // nocommit
+ return 0;
}
@Override
public BytesRef getPayload() throws IOException {
- return null; // nocommit
+ return null;
}
@Override