You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by mi...@apache.org on 2012/10/28 23:17:52 UTC
svn commit: r1403111 - in
/lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search:
TermQuery.java Weight.java
Author: mikemccand
Date: Sun Oct 28 22:17:52 2012
New Revision: 1403111
URL: http://svn.apache.org/viewvc?rev=1403111&view=rev
Log:
LUCENE-2878: use PostingsFeatures.compareTo instead of isProximityFeature
Modified:
lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/TermQuery.java
lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/Weight.java
Modified: lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/TermQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/TermQuery.java?rev=1403111&r1=1403110&r2=1403111&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/TermQuery.java (original)
+++ lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/TermQuery.java Sun Oct 28 22:17:52 2012
@@ -93,7 +93,7 @@ public class TermQuery extends Query {
return null;
}
DocsEnum docs;
- if (!flags.isProximityFeature()) {
+ if (flags.compareTo(PostingFeatures.POSITIONS) < 0) {
docs = termsEnum.docs(acceptDocs, null, flags.docFlags());
} else {
docs = termsEnum.docsAndPositions(acceptDocs, null, flags.docsAndPositionsFlags());
Modified: lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/Weight.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/Weight.java?rev=1403111&r1=1403110&r2=1403111&view=diff
==============================================================================
--- lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/Weight.java (original)
+++ lucene/dev/branches/LUCENE-2878/lucene/core/src/java/org/apache/lucene/search/Weight.java Sun Oct 28 22:17:52 2012
@@ -136,27 +136,25 @@ public abstract class Weight {
*/
public static enum PostingFeatures {
/**Only document IDs are required for document collection and scoring*/
- DOCS_ONLY(0, 0, false),
+ DOCS_ONLY(0, 0),
/**Document IDs and Term Frequencies are required for document collection and scoring*/
- DOCS_AND_FREQS(DocsEnum.FLAG_FREQS, 0, false),
+ DOCS_AND_FREQS(DocsEnum.FLAG_FREQS, 0),
/**Document IDs, Term Frequencies and Positions are required for document collection and scoring*/
- POSITIONS(DocsEnum.FLAG_FREQS, 0, true),
+ POSITIONS(DocsEnum.FLAG_FREQS, 0),
/**Document IDs, Term Frequencies, Positions and Payloads are required for document collection and scoring*/
- POSITIONS_AND_PAYLOADS(DocsEnum.FLAG_FREQS, DocsAndPositionsEnum.FLAG_PAYLOADS, true),
+ POSITIONS_AND_PAYLOADS(DocsEnum.FLAG_FREQS, DocsAndPositionsEnum.FLAG_PAYLOADS),
/**Document IDs, Term Frequencies, Positions and Offsets are required for document collection and scoring*/
- OFFSETS(DocsEnum.FLAG_FREQS, DocsAndPositionsEnum.FLAG_OFFSETS, true),
+ OFFSETS(DocsEnum.FLAG_FREQS, DocsAndPositionsEnum.FLAG_OFFSETS),
/**Document IDs, Term Frequencies, Positions, Offsets and Payloads are required for document collection and scoring*/
OFFSETS_AND_PAYLOADS(DocsEnum.FLAG_FREQS, DocsAndPositionsEnum.FLAG_OFFSETS
- | DocsAndPositionsEnum.FLAG_PAYLOADS, true);
+ | DocsAndPositionsEnum.FLAG_PAYLOADS);
private final int docsAndPositionsFlags;
private final int docFlags;
- private final boolean isProximityFeature;
- private PostingFeatures(int docFlags, int docsAndPositionsFlags, boolean isProximityFeature) {
+ private PostingFeatures(int docFlags, int docsAndPositionsFlags) {
this.docsAndPositionsFlags = docsAndPositionsFlags;
this.docFlags = docFlags;
- this.isProximityFeature = isProximityFeature;
}
/**
@@ -180,14 +178,5 @@ public abstract class Weight {
public int docFlags() {
return docFlags;
}
-
- /**
- * Returns <code>true</code> iff the current flags set requires positions
- * ie. a {@link DocsAndPositionsEnum}.
- */
- public boolean isProximityFeature() {
- return isProximityFeature;
- }
-
}
}