You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rm...@apache.org on 2011/07/11 21:29:16 UTC
svn commit: r1145300 - in /lucene/dev/branches/omitp:
lucene/src/java/org/apache/lucene/analysis/
lucene/src/java/org/apache/lucene/index/
lucene/src/java/org/apache/lucene/search/
lucene/src/java/org/apache/lucene/search/spans/ modules/grouping/src/ja...
Author: rmuir
Date: Mon Jul 11 19:29:16 2011
New Revision: 1145300
URL: http://svn.apache.org/viewvc?rev=1145300&view=rev
Log:
fix strings
Modified:
lucene/dev/branches/omitp/lucene/src/java/org/apache/lucene/analysis/NumericTokenStream.java
lucene/dev/branches/omitp/lucene/src/java/org/apache/lucene/index/CheckIndex.java
lucene/dev/branches/omitp/lucene/src/java/org/apache/lucene/index/FreqProxTermsWriterPerField.java
lucene/dev/branches/omitp/lucene/src/java/org/apache/lucene/index/SegmentInfo.java
lucene/dev/branches/omitp/lucene/src/java/org/apache/lucene/search/MultiPhraseQuery.java
lucene/dev/branches/omitp/lucene/src/java/org/apache/lucene/search/PhraseQuery.java
lucene/dev/branches/omitp/lucene/src/java/org/apache/lucene/search/spans/SpanTermQuery.java
lucene/dev/branches/omitp/modules/grouping/src/java/org/apache/lucene/search/grouping/package.html
Modified: lucene/dev/branches/omitp/lucene/src/java/org/apache/lucene/analysis/NumericTokenStream.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/omitp/lucene/src/java/org/apache/lucene/analysis/NumericTokenStream.java?rev=1145300&r1=1145299&r2=1145300&view=diff
==============================================================================
--- lucene/dev/branches/omitp/lucene/src/java/org/apache/lucene/analysis/NumericTokenStream.java (original)
+++ lucene/dev/branches/omitp/lucene/src/java/org/apache/lucene/analysis/NumericTokenStream.java Mon Jul 11 19:29:16 2011
@@ -49,7 +49,7 @@ import org.apache.lucene.analysis.tokena
* <pre>
* Field field = new Field(name, new NumericTokenStream(precisionStep).setIntValue(value));
* field.setOmitNorms(true);
- * field.setOmitTermFreqAndPositions(true);
+ * field.setIndexOptions(IndexOptions.DOCS_ONLY);
* document.add(field);
* </pre>
*
@@ -60,7 +60,7 @@ import org.apache.lucene.analysis.tokena
* NumericTokenStream stream = new NumericTokenStream(precisionStep);
* Field field = new Field(name, stream);
* field.setOmitNorms(true);
- * field.setOmitTermFreqAndPositions(true);
+ * field.setIndexOptions(IndexOptions.DOCS_ONLY);
* Document document = new Document();
* document.add(field);
*
Modified: lucene/dev/branches/omitp/lucene/src/java/org/apache/lucene/index/CheckIndex.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/omitp/lucene/src/java/org/apache/lucene/index/CheckIndex.java?rev=1145300&r1=1145299&r2=1145300&view=diff
==============================================================================
--- lucene/dev/branches/omitp/lucene/src/java/org/apache/lucene/index/CheckIndex.java (original)
+++ lucene/dev/branches/omitp/lucene/src/java/org/apache/lucene/index/CheckIndex.java Mon Jul 11 19:29:16 2011
@@ -186,8 +186,8 @@ public class CheckIndex {
int numFields;
/** True if at least one of the fields in this segment
- * does not omitTermFreqAndPositions.
- * @see AbstractField#setOmitTermFreqAndPositions */
+ * has position data
+ * @see AbstractField#setIndexOptions(org.apache.lucene.index.FieldInfo.IndexOptions) */
public boolean hasProx;
/** Map that includes certain
Modified: lucene/dev/branches/omitp/lucene/src/java/org/apache/lucene/index/FreqProxTermsWriterPerField.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/omitp/lucene/src/java/org/apache/lucene/index/FreqProxTermsWriterPerField.java?rev=1145300&r1=1145299&r2=1145300&view=diff
==============================================================================
--- lucene/dev/branches/omitp/lucene/src/java/org/apache/lucene/index/FreqProxTermsWriterPerField.java (original)
+++ lucene/dev/branches/omitp/lucene/src/java/org/apache/lucene/index/FreqProxTermsWriterPerField.java Mon Jul 11 19:29:16 2011
@@ -367,8 +367,7 @@ final class FreqProxTermsWriterPerField
// format.
if (currentFieldIndexOptions == IndexOptions.DOCS_AND_FREQS_AND_POSITIONS) {
- // omitTermFreqAndPositions == false so we do write positions &
- // payload
+ // we do write positions & payload
int position = 0;
for(int j=0;j<termDocFreq;j++) {
final int code = prox.readVInt();
Modified: lucene/dev/branches/omitp/lucene/src/java/org/apache/lucene/index/SegmentInfo.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/omitp/lucene/src/java/org/apache/lucene/index/SegmentInfo.java?rev=1145300&r1=1145299&r2=1145300&view=diff
==============================================================================
--- lucene/dev/branches/omitp/lucene/src/java/org/apache/lucene/index/SegmentInfo.java (original)
+++ lucene/dev/branches/omitp/lucene/src/java/org/apache/lucene/index/SegmentInfo.java Mon Jul 11 19:29:16 2011
@@ -91,7 +91,7 @@ public final class SegmentInfo implement
//TODO: remove when we don't have to support old indexes anymore that had this field
private int hasVectors = CHECK_FIELDINFO;
//TODO: remove when we don't have to support old indexes anymore that had this field
- private int hasProx = CHECK_FIELDINFO; // True if this segment has any fields with omitTermFreqAndPositions==false
+ private int hasProx = CHECK_FIELDINFO; // True if this segment has any fields with positional information
private FieldInfos fieldInfos;
Modified: lucene/dev/branches/omitp/lucene/src/java/org/apache/lucene/search/MultiPhraseQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/omitp/lucene/src/java/org/apache/lucene/search/MultiPhraseQuery.java?rev=1145300&r1=1145299&r2=1145300&view=diff
==============================================================================
--- lucene/dev/branches/omitp/lucene/src/java/org/apache/lucene/search/MultiPhraseQuery.java (original)
+++ lucene/dev/branches/omitp/lucene/src/java/org/apache/lucene/search/MultiPhraseQuery.java Mon Jul 11 19:29:16 2011
@@ -195,7 +195,7 @@ public class MultiPhraseQuery extends Qu
if (postingsEnum == null) {
if (reader.termDocsEnum(liveDocs, term.field(), term.bytes()) != null) {
// term does exist, but has no positions
- throw new IllegalStateException("field \"" + term.field() + "\" was indexed with Field.omitTermFreqAndPositions=true; cannot run PhraseQuery (term=" + term.text() + ")");
+ throw new IllegalStateException("field \"" + term.field() + "\" was indexed without position data; cannot run PhraseQuery (term=" + term.text() + ")");
} else {
// term does not exist
return null;
@@ -443,7 +443,7 @@ class UnionDocsAndPositionsEnum extends
} else {
if (indexReader.termDocsEnum(liveDocs, terms[i].field(), terms[i].bytes()) != null) {
// term does exist, but has no positions
- throw new IllegalStateException("field \"" + terms[i].field() + "\" was indexed with Field.omitTermFreqAndPositions=true; cannot run PhraseQuery (term=" + terms[i].text() + ")");
+ throw new IllegalStateException("field \"" + terms[i].field() + "\" was indexed without position data; cannot run PhraseQuery (term=" + terms[i].text() + ")");
}
}
}
Modified: lucene/dev/branches/omitp/lucene/src/java/org/apache/lucene/search/PhraseQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/omitp/lucene/src/java/org/apache/lucene/search/PhraseQuery.java?rev=1145300&r1=1145299&r2=1145300&view=diff
==============================================================================
--- lucene/dev/branches/omitp/lucene/src/java/org/apache/lucene/search/PhraseQuery.java (original)
+++ lucene/dev/branches/omitp/lucene/src/java/org/apache/lucene/search/PhraseQuery.java Mon Jul 11 19:29:16 2011
@@ -229,7 +229,7 @@ public class PhraseQuery extends Query {
if (postingsEnum == null) {
assert (reader.termDocsEnum(liveDocs, t.field(), t.bytes(), state) != null) : "termstate found but no term exists in reader";
// term does exist, but has no positions
- throw new IllegalStateException("field \"" + t.field() + "\" was indexed with Field.omitTermFreqAndPositions=true; cannot run PhraseQuery (term=" + t.text() + ")");
+ throw new IllegalStateException("field \"" + t.field() + "\" was indexed without position data; cannot run PhraseQuery (term=" + t.text() + ")");
}
// get the docFreq without seeking
TermsEnum te = reader.fields().terms(field).getThreadTermsEnum();
Modified: lucene/dev/branches/omitp/lucene/src/java/org/apache/lucene/search/spans/SpanTermQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/omitp/lucene/src/java/org/apache/lucene/search/spans/SpanTermQuery.java?rev=1145300&r1=1145299&r2=1145300&view=diff
==============================================================================
--- lucene/dev/branches/omitp/lucene/src/java/org/apache/lucene/search/spans/SpanTermQuery.java (original)
+++ lucene/dev/branches/omitp/lucene/src/java/org/apache/lucene/search/spans/SpanTermQuery.java Mon Jul 11 19:29:16 2011
@@ -92,7 +92,7 @@ public class SpanTermQuery extends SpanQ
} else {
if (reader.termDocsEnum(reader.getLiveDocs(), term.field(), term.bytes()) != null) {
// term does exist, but has no positions
- throw new IllegalStateException("field \"" + term.field() + "\" was indexed with Field.omitTermFreqAndPositions=true; cannot run SpanTermQuery (term=" + term.text() + ")");
+ throw new IllegalStateException("field \"" + term.field() + "\" was indexed without position data; cannot run SpanTermQuery (term=" + term.text() + ")");
} else {
// term does not exist
return TermSpans.EMPTY_TERM_SPANS;
Modified: lucene/dev/branches/omitp/modules/grouping/src/java/org/apache/lucene/search/grouping/package.html
URL: http://svn.apache.org/viewvc/lucene/dev/branches/omitp/modules/grouping/src/java/org/apache/lucene/search/grouping/package.html?rev=1145300&r1=1145299&r2=1145300&view=diff
==============================================================================
--- lucene/dev/branches/omitp/modules/grouping/src/java/org/apache/lucene/search/grouping/package.html (original)
+++ lucene/dev/branches/omitp/modules/grouping/src/java/org/apache/lucene/search/grouping/package.html Mon Jul 11 19:29:16 2011
@@ -130,7 +130,7 @@ field fall into a single group.</p>
List<Document> oneGroup = ...;
Field groupEndField = new Field("groupEnd", "x", Field.Store.NO, Field.Index.NOT_ANALYZED);
- groupEndField.setOmitTermFreqAndPositions(true);
+ groupEndField.setIndexOptions(IndexOptions.DOCS_ONLY);
groupEndField.setOmitNorms(true);
oneGroup.get(oneGroup.size()-1).add(groupEndField);