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/08/30 01:13:23 UTC
svn commit: r1163047 [13/15] - in /lucene/dev/branches/flexscoring: ./
dev-tools/idea/lucene/contrib/ lucene/ lucene/contrib/
lucene/contrib/demo/src/java/org/apache/lucene/demo/
lucene/contrib/demo/src/java/org/apache/lucene/demo/xmlparser/ lucene/con...
Modified: lucene/dev/branches/flexscoring/modules/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/LimitTokenCountAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/flexscoring/modules/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/LimitTokenCountAnalyzer.java?rev=1163047&r1=1163046&r2=1163047&view=diff
==============================================================================
--- lucene/dev/branches/flexscoring/modules/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/LimitTokenCountAnalyzer.java (original)
+++ lucene/dev/branches/flexscoring/modules/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/LimitTokenCountAnalyzer.java Mon Aug 29 23:13:10 2011
@@ -17,9 +17,9 @@ package org.apache.lucene.analysis.misce
* limitations under the License.
*/
-import org.apache.lucene.document.Fieldable;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.TokenStream;
+import org.apache.lucene.index.IndexableField;
import java.io.Reader;
import java.io.IOException;
@@ -60,7 +60,7 @@ public final class LimitTokenCountAnalyz
}
@Override
- public int getOffsetGap(Fieldable field) {
+ public int getOffsetGap(IndexableField field) {
return delegate.getOffsetGap(field);
}
Modified: lucene/dev/branches/flexscoring/modules/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/PerFieldAnalyzerWrapper.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/flexscoring/modules/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/PerFieldAnalyzerWrapper.java?rev=1163047&r1=1163046&r2=1163047&view=diff
==============================================================================
--- lucene/dev/branches/flexscoring/modules/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/PerFieldAnalyzerWrapper.java (original)
+++ lucene/dev/branches/flexscoring/modules/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/PerFieldAnalyzerWrapper.java Mon Aug 29 23:13:10 2011
@@ -19,7 +19,7 @@ package org.apache.lucene.analysis.misce
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.TokenStream;
-import org.apache.lucene.document.Fieldable;
+import org.apache.lucene.index.IndexableField;
import java.io.Reader;
import java.io.IOException;
@@ -119,10 +119,11 @@ public final class PerFieldAnalyzerWrapp
/** Return the offsetGap from the analyzer assigned to field */
@Override
- public int getOffsetGap(Fieldable field) {
+ public int getOffsetGap(IndexableField field) {
Analyzer analyzer = analyzerMap.get(field.name());
- if (analyzer == null)
+ if (analyzer == null) {
analyzer = defaultAnalyzer;
+ }
return analyzer.getOffsetGap(field);
}
Modified: lucene/dev/branches/flexscoring/modules/analysis/common/src/test/org/apache/lucene/analysis/core/TestClassicAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/flexscoring/modules/analysis/common/src/test/org/apache/lucene/analysis/core/TestClassicAnalyzer.java?rev=1163047&r1=1163046&r2=1163047&view=diff
==============================================================================
--- lucene/dev/branches/flexscoring/modules/analysis/common/src/test/org/apache/lucene/analysis/core/TestClassicAnalyzer.java (original)
+++ lucene/dev/branches/flexscoring/modules/analysis/common/src/test/org/apache/lucene/analysis/core/TestClassicAnalyzer.java Mon Aug 29 23:13:10 2011
@@ -4,7 +4,7 @@ import org.apache.lucene.analysis.Analyz
import org.apache.lucene.analysis.BaseTokenStreamTestCase;
import org.apache.lucene.analysis.standard.ClassicAnalyzer;
import org.apache.lucene.document.Document;
-import org.apache.lucene.document.Field;
+import org.apache.lucene.document.TextField;
import org.apache.lucene.index.DocsAndPositionsEnum;
import org.apache.lucene.index.DocsEnum;
import org.apache.lucene.index.IndexReader;
@@ -261,12 +261,12 @@ public class TestClassicAnalyzer extends
// This produces a too-long term:
String contents = "abc xyz x" + bigTerm + " another term";
- doc.add(new Field("content", contents, Field.Store.NO, Field.Index.ANALYZED));
+ doc.add(new TextField("content", contents));
writer.addDocument(doc);
// Make sure we can add another normal document
doc = new Document();
- doc.add(new Field("content", "abc bbb ccc", Field.Store.NO, Field.Index.ANALYZED));
+ doc.add(new TextField("content", "abc bbb ccc"));
writer.addDocument(doc);
writer.close();
@@ -297,7 +297,7 @@ public class TestClassicAnalyzer extends
// Make sure we can add a document with exactly the
// maximum length term, and search on that term:
doc = new Document();
- doc.add(new Field("content", bigTerm, Field.Store.NO, Field.Index.ANALYZED));
+ doc.add(new TextField("content", bigTerm));
ClassicAnalyzer sa = new ClassicAnalyzer(TEST_VERSION_CURRENT);
sa.setMaxTokenLength(100000);
writer = new IndexWriter(dir, new IndexWriterConfig(TEST_VERSION_CURRENT, sa));
Modified: lucene/dev/branches/flexscoring/modules/analysis/common/src/test/org/apache/lucene/analysis/core/TestKeywordAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/flexscoring/modules/analysis/common/src/test/org/apache/lucene/analysis/core/TestKeywordAnalyzer.java?rev=1163047&r1=1163046&r2=1163047&view=diff
==============================================================================
--- lucene/dev/branches/flexscoring/modules/analysis/common/src/test/org/apache/lucene/analysis/core/TestKeywordAnalyzer.java (original)
+++ lucene/dev/branches/flexscoring/modules/analysis/common/src/test/org/apache/lucene/analysis/core/TestKeywordAnalyzer.java Mon Aug 29 23:13:10 2011
@@ -24,6 +24,8 @@ import org.apache.lucene.analysis.TokenS
import org.apache.lucene.analysis.tokenattributes.OffsetAttribute;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
+import org.apache.lucene.document.StringField;
+import org.apache.lucene.document.TextField;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.index.IndexWriterConfig;
@@ -46,8 +48,8 @@ public class TestKeywordAnalyzer extends
TEST_VERSION_CURRENT, new SimpleAnalyzer(TEST_VERSION_CURRENT)));
Document doc = new Document();
- doc.add(new Field("partnum", "Q36", Field.Store.YES, Field.Index.NOT_ANALYZED));
- doc.add(new Field("description", "Illidium Space Modulator", Field.Store.YES, Field.Index.ANALYZED));
+ doc.add(new Field("partnum", StringField.TYPE_STORED, "Q36"));
+ doc.add(new Field("description", TextField.TYPE_STORED, "Illidium Space Modulator"));
writer.addDocument(doc);
writer.close();
@@ -74,10 +76,10 @@ public class TestKeywordAnalyzer extends
RAMDirectory dir = new RAMDirectory();
IndexWriter writer = new IndexWriter(dir, new IndexWriterConfig(TEST_VERSION_CURRENT, new KeywordAnalyzer()));
Document doc = new Document();
- doc.add(new Field("partnum", "Q36", Field.Store.YES, Field.Index.ANALYZED));
+ doc.add(new Field("partnum", TextField.TYPE_STORED, "Q36"));
writer.addDocument(doc);
doc = new Document();
- doc.add(new Field("partnum", "Q37", Field.Store.YES, Field.Index.ANALYZED));
+ doc.add(new Field("partnum", TextField.TYPE_STORED, "Q37"));
writer.addDocument(doc);
writer.close();
Modified: lucene/dev/branches/flexscoring/modules/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestLimitTokenCountAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/flexscoring/modules/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestLimitTokenCountAnalyzer.java?rev=1163047&r1=1163046&r2=1163047&view=diff
==============================================================================
--- lucene/dev/branches/flexscoring/modules/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestLimitTokenCountAnalyzer.java (original)
+++ lucene/dev/branches/flexscoring/modules/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestLimitTokenCountAnalyzer.java Mon Aug 29 23:13:10 2011
@@ -26,7 +26,7 @@ import org.apache.lucene.analysis.MockAn
import org.apache.lucene.analysis.core.WhitespaceAnalyzer;
import org.apache.lucene.analysis.standard.StandardAnalyzer;
import org.apache.lucene.document.Document;
-import org.apache.lucene.document.Field;
+import org.apache.lucene.document.TextField;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.index.IndexWriterConfig;
@@ -58,7 +58,7 @@ public class TestLimitTokenCountAnalyzer
for(int i=0;i<10000;i++)
b.append(" a");
b.append(" x");
- doc.add(newField("field", b.toString(), Field.Store.NO, Field.Index.ANALYZED));
+ doc.add(newField("field", b.toString(), TextField.TYPE_UNSTORED));
writer.addDocument(doc);
writer.close();
Modified: lucene/dev/branches/flexscoring/modules/analysis/common/src/test/org/apache/lucene/analysis/query/QueryAutoStopWordAnalyzerTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/flexscoring/modules/analysis/common/src/test/org/apache/lucene/analysis/query/QueryAutoStopWordAnalyzerTest.java?rev=1163047&r1=1163046&r2=1163047&view=diff
==============================================================================
--- lucene/dev/branches/flexscoring/modules/analysis/common/src/test/org/apache/lucene/analysis/query/QueryAutoStopWordAnalyzerTest.java (original)
+++ lucene/dev/branches/flexscoring/modules/analysis/common/src/test/org/apache/lucene/analysis/query/QueryAutoStopWordAnalyzerTest.java Mon Aug 29 23:13:10 2011
@@ -26,6 +26,7 @@ import org.apache.lucene.analysis.MockTo
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
+import org.apache.lucene.document.TextField;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.index.IndexWriterConfig;
@@ -51,8 +52,8 @@ public class QueryAutoStopWordAnalyzerTe
Document doc = new Document();
String variedFieldValue = variedFieldValues[i % variedFieldValues.length];
String repetitiveFieldValue = repetitiveFieldValues[i % repetitiveFieldValues.length];
- doc.add(new Field("variedField", variedFieldValue, Field.Store.YES, Field.Index.ANALYZED));
- doc.add(new Field("repetitiveField", repetitiveFieldValue, Field.Store.YES, Field.Index.ANALYZED));
+ doc.add(new Field("variedField", TextField.TYPE_STORED, variedFieldValue));
+ doc.add(new Field("repetitiveField", TextField.TYPE_STORED, repetitiveFieldValue));
writer.addDocument(doc);
}
writer.close();
Modified: lucene/dev/branches/flexscoring/modules/analysis/common/src/test/org/apache/lucene/analysis/shingle/ShingleAnalyzerWrapperTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/flexscoring/modules/analysis/common/src/test/org/apache/lucene/analysis/shingle/ShingleAnalyzerWrapperTest.java?rev=1163047&r1=1163046&r2=1163047&view=diff
==============================================================================
--- lucene/dev/branches/flexscoring/modules/analysis/common/src/test/org/apache/lucene/analysis/shingle/ShingleAnalyzerWrapperTest.java (original)
+++ lucene/dev/branches/flexscoring/modules/analysis/common/src/test/org/apache/lucene/analysis/shingle/ShingleAnalyzerWrapperTest.java Mon Aug 29 23:13:10 2011
@@ -29,6 +29,7 @@ import org.apache.lucene.analysis.tokena
import org.apache.lucene.analysis.tokenattributes.PositionIncrementAttribute;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
+import org.apache.lucene.document.TextField;
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.index.IndexWriterConfig;
import org.apache.lucene.index.Term;
@@ -56,18 +57,15 @@ public class ShingleAnalyzerWrapperTest
Document doc;
doc = new Document();
- doc.add(new Field("content", "please divide this sentence into shingles",
- Field.Store.YES,Field.Index.ANALYZED));
+ doc.add(new Field("content", TextField.TYPE_STORED, "please divide this sentence into shingles"));
writer.addDocument(doc);
doc = new Document();
- doc.add(new Field("content", "just another test sentence",
- Field.Store.YES,Field.Index.ANALYZED));
+ doc.add(new Field("content", TextField.TYPE_STORED, "just another test sentence"));
writer.addDocument(doc);
doc = new Document();
- doc.add(new Field("content", "a sentence which contains no test",
- Field.Store.YES,Field.Index.ANALYZED));
+ doc.add(new Field("content", TextField.TYPE_STORED, "a sentence which contains no test"));
writer.addDocument(doc);
writer.close();
Modified: lucene/dev/branches/flexscoring/modules/analysis/common/src/test/org/apache/lucene/analysis/sinks/TestTeeSinkTokenFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/flexscoring/modules/analysis/common/src/test/org/apache/lucene/analysis/sinks/TestTeeSinkTokenFilter.java?rev=1163047&r1=1163046&r2=1163047&view=diff
==============================================================================
--- lucene/dev/branches/flexscoring/modules/analysis/common/src/test/org/apache/lucene/analysis/sinks/TestTeeSinkTokenFilter.java (original)
+++ lucene/dev/branches/flexscoring/modules/analysis/common/src/test/org/apache/lucene/analysis/sinks/TestTeeSinkTokenFilter.java Mon Aug 29 23:13:10 2011
@@ -21,14 +21,14 @@ import java.io.StringReader;
import org.apache.lucene.analysis.*;
import org.apache.lucene.analysis.core.LowerCaseFilter;
-import org.apache.lucene.analysis.core.WhitespaceAnalyzer;
-import org.apache.lucene.analysis.core.WhitespaceTokenizer;
import org.apache.lucene.analysis.standard.StandardFilter;
import org.apache.lucene.analysis.standard.StandardTokenizer;
import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;
import org.apache.lucene.analysis.tokenattributes.PositionIncrementAttribute;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
+import org.apache.lucene.document.FieldType;
+import org.apache.lucene.document.TextField;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.index.TermPositionVector;
@@ -89,8 +89,12 @@ public class TestTeeSinkTokenFilter exte
Document doc = new Document();
TeeSinkTokenFilter tee = new TeeSinkTokenFilter(analyzer.tokenStream("field", new StringReader("abcd ")));
TokenStream sink = tee.newSinkTokenStream();
- Field f1 = new Field("field", tee, Field.TermVector.WITH_POSITIONS_OFFSETS);
- Field f2 = new Field("field", sink, Field.TermVector.WITH_POSITIONS_OFFSETS);
+ FieldType ft = new FieldType(TextField.TYPE_UNSTORED);
+ ft.setStoreTermVectors(true);
+ ft.setStoreTermVectorOffsets(true);
+ ft.setStoreTermVectorPositions(true);
+ Field f1 = new Field("field", ft, tee);
+ Field f2 = new Field("field", ft, sink);
doc.add(f1);
doc.add(f2);
w.addDocument(doc);
Modified: lucene/dev/branches/flexscoring/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/DocMaker.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/flexscoring/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/DocMaker.java?rev=1163047&r1=1163046&r2=1163047&view=diff
==============================================================================
--- lucene/dev/branches/flexscoring/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/DocMaker.java (original)
+++ lucene/dev/branches/flexscoring/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/DocMaker.java Mon Aug 29 23:13:10 2011
@@ -34,10 +34,10 @@ import org.apache.lucene.benchmark.byTas
import org.apache.lucene.benchmark.byTask.utils.Format;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
+import org.apache.lucene.document.FieldType;
import org.apache.lucene.document.NumericField;
-import org.apache.lucene.document.Field.Index;
-import org.apache.lucene.document.Field.Store;
-import org.apache.lucene.document.Field.TermVector;
+import org.apache.lucene.document.StringField;
+import org.apache.lucene.document.TextField;
/**
* Creates {@link Document} objects. Uses a {@link ContentSource} to generate
@@ -94,7 +94,7 @@ public class DocMaker {
final Document doc;
DocData docData = new DocData();
- public DocState(boolean reuseFields, Store store, Store bodyStore, Index index, Index bodyIndex, TermVector termVector) {
+ public DocState(boolean reuseFields, FieldType ft, FieldType bodyFt) {
this.reuseFields = reuseFields;
@@ -103,11 +103,11 @@ public class DocMaker {
numericFields = new HashMap<String,NumericField>();
// Initialize the map with the default fields.
- fields.put(BODY_FIELD, new Field(BODY_FIELD, "", bodyStore, bodyIndex, termVector));
- fields.put(TITLE_FIELD, new Field(TITLE_FIELD, "", store, index, termVector));
- fields.put(DATE_FIELD, new Field(DATE_FIELD, "", store, index, termVector));
- fields.put(ID_FIELD, new Field(ID_FIELD, "", Field.Store.YES, Field.Index.NOT_ANALYZED_NO_NORMS));
- fields.put(NAME_FIELD, new Field(NAME_FIELD, "", store, index, termVector));
+ fields.put(BODY_FIELD, new Field(BODY_FIELD, bodyFt, ""));
+ fields.put(TITLE_FIELD, new Field(TITLE_FIELD, ft, ""));
+ fields.put(DATE_FIELD, new Field(DATE_FIELD, ft, ""));
+ fields.put(ID_FIELD, new Field(ID_FIELD, StringField.TYPE_STORED, ""));
+ fields.put(NAME_FIELD, new Field(NAME_FIELD, ft, ""));
numericFields.put(DATE_MSEC_FIELD, new NumericField(DATE_MSEC_FIELD));
numericFields.put(TIME_SEC_FIELD, new NumericField(TIME_SEC_FIELD));
@@ -125,14 +125,14 @@ public class DocMaker {
* <code>reuseFields</code> was set to true, then it attempts to reuse a
* Field instance. If such a field does not exist, it creates a new one.
*/
- Field getField(String name, Store store, Index index, TermVector termVector) {
+ Field getField(String name, FieldType ft) {
if (!reuseFields) {
- return new Field(name, "", store, index, termVector);
+ return new Field(name, ft, "");
}
Field f = fields.get(name);
if (f == null) {
- f = new Field(name, "", store, index, termVector);
+ f = new Field(name, ft, "");
fields.put(name, f);
}
return f;
@@ -179,12 +179,9 @@ public class DocMaker {
protected Config config;
- protected Store storeVal = Store.NO;
- protected Store bodyStoreVal = Store.NO;
- protected Index indexVal = Index.ANALYZED_NO_NORMS;
- protected Index bodyIndexVal = Index.ANALYZED;
- protected TermVector termVecVal = TermVector.NO;
-
+ protected final FieldType valType;
+ protected final FieldType bodyValType;
+
protected ContentSource source;
protected boolean reuseFields;
protected boolean indexProperties;
@@ -196,6 +193,13 @@ public class DocMaker {
private int printNum = 0;
+ public DocMaker() {
+ valType = new FieldType(TextField.TYPE_UNSTORED);
+ valType.setOmitNorms(true);
+
+ bodyValType = new FieldType(TextField.TYPE_UNSTORED);
+ }
+
// create a doc
// use only part of the body, modify it to keep the rest (or use all if size==0).
// reset the docdata properties so they are not added more than once.
@@ -206,7 +210,10 @@ public class DocMaker {
doc.getFields().clear();
// Set ID_FIELD
- Field idField = ds.getField(ID_FIELD, storeVal, Index.NOT_ANALYZED_NO_NORMS, termVecVal);
+ FieldType ft = new FieldType(valType);
+ ft.setIndexed(true);
+
+ Field idField = ds.getField(ID_FIELD, ft);
int id;
if (r != null) {
id = r.nextInt(updateDocIDLimit);
@@ -223,7 +230,7 @@ public class DocMaker {
String name = docData.getName();
if (name == null) name = "";
name = cnt < 0 ? name : name + "_" + cnt;
- Field nameField = ds.getField(NAME_FIELD, storeVal, indexVal, termVecVal);
+ Field nameField = ds.getField(NAME_FIELD, valType);
nameField.setValue(name);
doc.add(nameField);
@@ -242,7 +249,7 @@ public class DocMaker {
} else {
dateString = "";
}
- Field dateStringField = ds.getField(DATE_FIELD, storeVal, indexVal, termVecVal);
+ Field dateStringField = ds.getField(DATE_FIELD, valType);
dateStringField.setValue(dateString);
doc.add(dateStringField);
@@ -264,7 +271,7 @@ public class DocMaker {
// Set TITLE_FIELD
String title = docData.getTitle();
- Field titleField = ds.getField(TITLE_FIELD, storeVal, indexVal, termVecVal);
+ Field titleField = ds.getField(TITLE_FIELD, valType);
titleField.setValue(title == null ? "" : title);
doc.add(titleField);
@@ -285,12 +292,12 @@ public class DocMaker {
bdy = body.substring(0, size); // use part
docData.setBody(body.substring(size)); // some left
}
- Field bodyField = ds.getField(BODY_FIELD, bodyStoreVal, bodyIndexVal, termVecVal);
+ Field bodyField = ds.getField(BODY_FIELD, bodyValType);
bodyField.setValue(bdy);
doc.add(bodyField);
if (storeBytes) {
- Field bytesField = ds.getField(BYTES_FIELD, Store.YES, Index.NOT_ANALYZED_NO_NORMS, TermVector.NO);
+ Field bytesField = ds.getField(BYTES_FIELD, StringField.TYPE_STORED);
bytesField.setValue(bdy.getBytes("UTF-8"));
doc.add(bytesField);
}
@@ -300,7 +307,7 @@ public class DocMaker {
Properties props = docData.getProps();
if (props != null) {
for (final Map.Entry<Object,Object> entry : props.entrySet()) {
- Field f = ds.getField((String) entry.getKey(), storeVal, indexVal, termVecVal);
+ Field f = ds.getField((String) entry.getKey(), valType);
f.setValue((String) entry.getValue());
doc.add(f);
}
@@ -319,7 +326,7 @@ public class DocMaker {
protected DocState getDocState() {
DocState ds = docState.get();
if (ds == null) {
- ds = new DocState(reuseFields, storeVal, bodyStoreVal, indexVal, bodyIndexVal, termVecVal);
+ ds = new DocState(reuseFields, valType, bodyValType);
docState.set(ds);
}
return ds;
@@ -455,33 +462,23 @@ public class DocMaker {
boolean norms = config.get("doc.tokenized.norms", false);
boolean bodyNorms = config.get("doc.body.tokenized.norms", true);
boolean termVec = config.get("doc.term.vector", false);
- storeVal = (stored ? Field.Store.YES : Field.Store.NO);
- bodyStoreVal = (bodyStored ? Field.Store.YES : Field.Store.NO);
- if (tokenized) {
- indexVal = norms ? Index.ANALYZED : Index.ANALYZED_NO_NORMS;
- } else {
- indexVal = norms ? Index.NOT_ANALYZED : Index.NOT_ANALYZED_NO_NORMS;
- }
-
- if (bodyTokenized) {
- bodyIndexVal = bodyNorms ? Index.ANALYZED : Index.ANALYZED_NO_NORMS;
- } else {
- bodyIndexVal = bodyNorms ? Index.NOT_ANALYZED : Index.NOT_ANALYZED_NO_NORMS;
- }
-
boolean termVecPositions = config.get("doc.term.vector.positions", false);
boolean termVecOffsets = config.get("doc.term.vector.offsets", false);
- if (termVecPositions && termVecOffsets) {
- termVecVal = TermVector.WITH_POSITIONS_OFFSETS;
- } else if (termVecPositions) {
- termVecVal = TermVector.WITH_POSITIONS;
- } else if (termVecOffsets) {
- termVecVal = TermVector.WITH_OFFSETS;
- } else if (termVec) {
- termVecVal = TermVector.YES;
- } else {
- termVecVal = TermVector.NO;
- }
+
+ valType.setStored(stored);
+ bodyValType.setStored(bodyStored);
+ valType.setTokenized(tokenized);
+ valType.setOmitNorms(!norms);
+ bodyValType.setTokenized(bodyTokenized);
+ bodyValType.setOmitNorms(!bodyNorms);
+
+ valType.setStoreTermVectors(termVec);
+ valType.setStoreTermVectorPositions(termVecPositions);
+ valType.setStoreTermVectorOffsets(termVecOffsets);
+ bodyValType.setStoreTermVectors(termVec);
+ bodyValType.setStoreTermVectorPositions(termVecPositions);
+ bodyValType.setStoreTermVectorOffsets(termVecOffsets);
+
storeBytes = config.get("doc.store.body.bytes", false);
reuseFields = config.get("doc.reuse.fields", true);
Modified: lucene/dev/branches/flexscoring/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ReadTask.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/flexscoring/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ReadTask.java?rev=1163047&r1=1163046&r2=1163047&view=diff
==============================================================================
--- lucene/dev/branches/flexscoring/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ReadTask.java (original)
+++ lucene/dev/branches/flexscoring/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ReadTask.java Mon Aug 29 23:13:10 2011
@@ -28,8 +28,8 @@ import org.apache.lucene.analysis.Analyz
import org.apache.lucene.benchmark.byTask.PerfRunData;
import org.apache.lucene.benchmark.byTask.feeds.QueryMaker;
import org.apache.lucene.document.Document;
-import org.apache.lucene.document.Fieldable;
import org.apache.lucene.index.IndexReader;
+import org.apache.lucene.index.IndexableField;
import org.apache.lucene.index.MultiFields;
import org.apache.lucene.search.Collector;
import org.apache.lucene.search.TopDocs;
@@ -300,10 +300,10 @@ public abstract class ReadTask extends P
* @return A Collection of Field names (Strings)
*/
protected Collection<String> getFieldsToHighlight(Document document) {
- List<Fieldable> fieldables = document.getFields();
- Set<String> result = new HashSet<String>(fieldables.size());
- for (final Fieldable fieldable : fieldables) {
- result.add(fieldable.name());
+ List<IndexableField> fields = document.getFields();
+ Set<String> result = new HashSet<String>(fields.size());
+ for (final IndexableField f : fields) {
+ result.add(f.name());
}
return result;
}
Modified: lucene/dev/branches/flexscoring/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ReadTokensTask.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/flexscoring/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ReadTokensTask.java?rev=1163047&r1=1163046&r2=1163047&view=diff
==============================================================================
--- lucene/dev/branches/flexscoring/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ReadTokensTask.java (original)
+++ lucene/dev/branches/flexscoring/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ReadTokensTask.java Mon Aug 29 23:13:10 2011
@@ -26,8 +26,8 @@ import org.apache.lucene.analysis.tokena
import org.apache.lucene.benchmark.byTask.PerfRunData;
import org.apache.lucene.benchmark.byTask.feeds.DocMaker;
import org.apache.lucene.document.Document;
-import org.apache.lucene.document.Fieldable;
import org.apache.lucene.document.NumericField;
+import org.apache.lucene.index.IndexableField;
/**
* Simple task to test performance of tokenizers. It just
@@ -65,11 +65,11 @@ public class ReadTokensTask extends Perf
@Override
public int doLogic() throws Exception {
- List<Fieldable> fields = doc.getFields();
+ List<IndexableField> fields = doc.getFields();
Analyzer analyzer = getRunData().getAnalyzer();
int tokenCount = 0;
- for(final Fieldable field : fields) {
- if (!field.isTokenized() || field instanceof NumericField) continue;
+ for(final IndexableField field : fields) {
+ if (!field.tokenized() || field instanceof NumericField) continue;
final TokenStream stream;
final TokenStream streamValue = field.tokenStreamValue();
Modified: lucene/dev/branches/flexscoring/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/SearchTravRetLoadFieldSelectorTask.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/flexscoring/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/SearchTravRetLoadFieldSelectorTask.java?rev=1163047&r1=1163046&r2=1163047&view=diff
==============================================================================
--- lucene/dev/branches/flexscoring/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/SearchTravRetLoadFieldSelectorTask.java (original)
+++ lucene/dev/branches/flexscoring/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/SearchTravRetLoadFieldSelectorTask.java Mon Aug 29 23:13:10 2011
@@ -16,20 +16,19 @@ package org.apache.lucene.benchmark.byTa
*/
+import java.io.IOException;
+import java.util.HashSet;
+import java.util.Set;
+import java.util.StringTokenizer;
+
import org.apache.lucene.benchmark.byTask.PerfRunData;
-import org.apache.lucene.document.FieldSelector;
-import org.apache.lucene.document.SetBasedFieldSelector;
import org.apache.lucene.document.Document;
+import org.apache.lucene.index.DocumentStoredFieldVisitor;
import org.apache.lucene.index.IndexReader;
-import java.util.StringTokenizer;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.Collections;
-import java.io.IOException;
-
/**
- * Search and Traverse and Retrieve docs task using a SetBasedFieldSelector.
+ * Search and Traverse and Retrieve docs task using a
+ * FieldVisitor loading only the requested fields.
*
* <p>Note: This task reuses the reader if it is already open.
* Otherwise a reader is opened at start and closed at the end.
@@ -41,7 +40,8 @@ import java.io.IOException;
*/
public class SearchTravRetLoadFieldSelectorTask extends SearchTravTask {
- protected FieldSelector fieldSelector;
+ protected Set<String> fieldsToLoad;
+
public SearchTravRetLoadFieldSelectorTask(PerfRunData runData) {
super(runData);
@@ -55,18 +55,23 @@ public class SearchTravRetLoadFieldSelec
@Override
protected Document retrieveDoc(IndexReader ir, int id) throws IOException {
- return ir.document(id, fieldSelector);
+ if (fieldsToLoad == null) {
+ return ir.document(id);
+ } else {
+ DocumentStoredFieldVisitor visitor = new DocumentStoredFieldVisitor(fieldsToLoad);
+ ir.document(id, visitor);
+ return visitor.getDocument();
+ }
}
@Override
public void setParams(String params) {
this.params = params; // cannot just call super.setParams(), b/c it's params differ.
- Set<String> fieldsToLoad = new HashSet<String>();
+ fieldsToLoad = new HashSet<String>();
for (StringTokenizer tokenizer = new StringTokenizer(params, ","); tokenizer.hasMoreTokens();) {
String s = tokenizer.nextToken();
fieldsToLoad.add(s);
}
- fieldSelector = new SetBasedFieldSelector(fieldsToLoad, Collections.<String> emptySet());
}
Modified: lucene/dev/branches/flexscoring/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/WriteLineDocTask.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/flexscoring/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/WriteLineDocTask.java?rev=1163047&r1=1163046&r2=1163047&view=diff
==============================================================================
--- lucene/dev/branches/flexscoring/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/WriteLineDocTask.java (original)
+++ lucene/dev/branches/flexscoring/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/WriteLineDocTask.java Mon Aug 29 23:13:10 2011
@@ -32,7 +32,7 @@ import org.apache.lucene.benchmark.byTas
import org.apache.lucene.benchmark.byTask.utils.Config;
import org.apache.lucene.benchmark.byTask.utils.StreamUtils;
import org.apache.lucene.document.Document;
-import org.apache.lucene.document.Field;
+import org.apache.lucene.index.IndexableField;
/**
* A task which writes documents, one line per document. Each line is in the
@@ -172,7 +172,7 @@ public class WriteLineDocTask extends Pe
boolean sufficient = !checkSufficientFields;
for (int i=0; i<fieldsToWrite.length; i++) {
- Field f = doc.getField(fieldsToWrite[i]);
+ IndexableField f = doc.getField(fieldsToWrite[i]);
String text = f == null ? "" : matcher.reset(f.stringValue()).replaceAll(" ").trim();
sb.append(text).append(SEP);
sufficient |= text.length()>0 && sufficientFields[i];
Modified: lucene/dev/branches/flexscoring/modules/benchmark/src/java/org/apache/lucene/benchmark/quality/utils/DocNameExtractor.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/flexscoring/modules/benchmark/src/java/org/apache/lucene/benchmark/quality/utils/DocNameExtractor.java?rev=1163047&r1=1163046&r2=1163047&view=diff
==============================================================================
--- lucene/dev/branches/flexscoring/modules/benchmark/src/java/org/apache/lucene/benchmark/quality/utils/DocNameExtractor.java (original)
+++ lucene/dev/branches/flexscoring/modules/benchmark/src/java/org/apache/lucene/benchmark/quality/utils/DocNameExtractor.java Mon Aug 29 23:13:10 2011
@@ -17,18 +17,20 @@
package org.apache.lucene.benchmark.quality.utils;
import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
-import org.apache.lucene.document.FieldSelector;
-import org.apache.lucene.document.FieldSelectorResult;
+import org.apache.lucene.index.FieldInfo;
+import org.apache.lucene.index.StoredFieldVisitor;
import org.apache.lucene.search.IndexSearcher;
+import org.apache.lucene.store.IndexInput;
/**
* Utility: extract doc names from an index
*/
public class DocNameExtractor {
- private FieldSelector fldSel;
- private String docNameField;
+ private final String docNameField;
/**
* Constructor for DocNameExtractor.
@@ -36,13 +38,6 @@ public class DocNameExtractor {
*/
public DocNameExtractor (final String docNameField) {
this.docNameField = docNameField;
- fldSel = new FieldSelector() {
- public FieldSelectorResult accept(String fieldName) {
- return fieldName.equals(docNameField) ?
- FieldSelectorResult.LOAD_AND_BREAK :
- FieldSelectorResult.NO_LOAD;
- }
- };
}
/**
@@ -53,7 +48,25 @@ public class DocNameExtractor {
* @throws IOException if cannot extract the doc name from the index.
*/
public String docName(IndexSearcher searcher, int docid) throws IOException {
- return searcher.doc(docid,fldSel).get(docNameField);
+ final List<String> name = new ArrayList<String>();
+ searcher.getIndexReader().document(docid, new StoredFieldVisitor() {
+ @Override
+ public boolean stringField(FieldInfo fieldInfo, IndexInput in, int numUTF8Bytes) throws IOException {
+ if (fieldInfo.name.equals(docNameField) && name.size() == 0) {
+ final byte[] b = new byte[numUTF8Bytes];
+ in.readBytes(b, 0, b.length);
+ name.add(new String(b, "UTF-8"));
+ } else {
+ in.seek(in.getFilePointer() + numUTF8Bytes);
+ }
+ return false;
+ }
+ });
+ if (name.size() != 0) {
+ return name.get(0);
+ } else {
+ return null;
+ }
}
}
Modified: lucene/dev/branches/flexscoring/modules/benchmark/src/test/org/apache/lucene/benchmark/byTask/feeds/DocMakerTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/flexscoring/modules/benchmark/src/test/org/apache/lucene/benchmark/byTask/feeds/DocMakerTest.java?rev=1163047&r1=1163046&r2=1163047&view=diff
==============================================================================
--- lucene/dev/branches/flexscoring/modules/benchmark/src/test/org/apache/lucene/benchmark/byTask/feeds/DocMakerTest.java (original)
+++ lucene/dev/branches/flexscoring/modules/benchmark/src/test/org/apache/lucene/benchmark/byTask/feeds/DocMakerTest.java Mon Aug 29 23:13:10 2011
@@ -20,7 +20,6 @@ package org.apache.lucene.benchmark.byTa
import java.io.IOException;
import java.util.Properties;
-import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.analysis.core.WhitespaceAnalyzer;
import org.apache.lucene.benchmark.BenchmarkTestCase;
import org.apache.lucene.benchmark.byTask.PerfRunData;
@@ -137,28 +136,28 @@ public class DocMakerTest extends Benchm
// Don't set anything, use the defaults
doc = createTestNormsDocument(false, false, false, false);
- assertTrue(doc.getField(DocMaker.TITLE_FIELD).getOmitNorms());
- assertFalse(doc.getField(DocMaker.BODY_FIELD).getOmitNorms());
+ assertTrue(doc.getField(DocMaker.TITLE_FIELD).omitNorms());
+ assertFalse(doc.getField(DocMaker.BODY_FIELD).omitNorms());
// Set norms to false
doc = createTestNormsDocument(true, false, false, false);
- assertTrue(doc.getField(DocMaker.TITLE_FIELD).getOmitNorms());
- assertFalse(doc.getField(DocMaker.BODY_FIELD).getOmitNorms());
+ assertTrue(doc.getField(DocMaker.TITLE_FIELD).omitNorms());
+ assertFalse(doc.getField(DocMaker.BODY_FIELD).omitNorms());
// Set norms to true
doc = createTestNormsDocument(true, true, false, false);
- assertFalse(doc.getField(DocMaker.TITLE_FIELD).getOmitNorms());
- assertFalse(doc.getField(DocMaker.BODY_FIELD).getOmitNorms());
+ assertFalse(doc.getField(DocMaker.TITLE_FIELD).omitNorms());
+ assertFalse(doc.getField(DocMaker.BODY_FIELD).omitNorms());
// Set body norms to false
doc = createTestNormsDocument(false, false, true, false);
- assertTrue(doc.getField(DocMaker.TITLE_FIELD).getOmitNorms());
- assertTrue(doc.getField(DocMaker.BODY_FIELD).getOmitNorms());
+ assertTrue(doc.getField(DocMaker.TITLE_FIELD).omitNorms());
+ assertTrue(doc.getField(DocMaker.BODY_FIELD).omitNorms());
// Set body norms to true
doc = createTestNormsDocument(false, false, true, true);
- assertTrue(doc.getField(DocMaker.TITLE_FIELD).getOmitNorms());
- assertFalse(doc.getField(DocMaker.BODY_FIELD).getOmitNorms());
+ assertTrue(doc.getField(DocMaker.TITLE_FIELD).omitNorms());
+ assertFalse(doc.getField(DocMaker.BODY_FIELD).omitNorms());
}
}
Modified: lucene/dev/branches/flexscoring/modules/benchmark/src/test/org/apache/lucene/benchmark/byTask/tasks/WriteLineDocTaskTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/flexscoring/modules/benchmark/src/test/org/apache/lucene/benchmark/byTask/tasks/WriteLineDocTaskTest.java?rev=1163047&r1=1163046&r2=1163047&view=diff
==============================================================================
--- lucene/dev/branches/flexscoring/modules/benchmark/src/test/org/apache/lucene/benchmark/byTask/tasks/WriteLineDocTaskTest.java (original)
+++ lucene/dev/branches/flexscoring/modules/benchmark/src/test/org/apache/lucene/benchmark/byTask/tasks/WriteLineDocTaskTest.java Mon Aug 29 23:13:10 2011
@@ -33,9 +33,7 @@ import org.apache.lucene.benchmark.byTas
import org.apache.lucene.benchmark.byTask.utils.Config;
import org.apache.lucene.benchmark.byTask.utils.StreamUtils.Type;
import org.apache.lucene.document.Document;
-import org.apache.lucene.document.Field;
-import org.apache.lucene.document.Field.Index;
-import org.apache.lucene.document.Field.Store;
+import org.apache.lucene.document.StringField;
/** Tests the functionality of {@link WriteLineDocTask}. */
public class WriteLineDocTaskTest extends BenchmarkTestCase {
@@ -46,9 +44,9 @@ public class WriteLineDocTaskTest extend
@Override
public Document makeDocument() throws Exception {
Document doc = new Document();
- doc.add(new Field(BODY_FIELD, "body", Store.NO, Index.NOT_ANALYZED_NO_NORMS));
- doc.add(new Field(TITLE_FIELD, "title", Store.NO, Index.NOT_ANALYZED_NO_NORMS));
- doc.add(new Field(DATE_FIELD, "date", Store.NO, Index.NOT_ANALYZED_NO_NORMS));
+ doc.add(new StringField(BODY_FIELD, "body"));
+ doc.add(new StringField(TITLE_FIELD, "title"));
+ doc.add(new StringField(DATE_FIELD, "date"));
return doc;
}
@@ -60,9 +58,9 @@ public class WriteLineDocTaskTest extend
@Override
public Document makeDocument() throws Exception {
Document doc = new Document();
- doc.add(new Field(BODY_FIELD, "body\r\ntext\ttwo", Store.NO, Index.NOT_ANALYZED_NO_NORMS));
- doc.add(new Field(TITLE_FIELD, "title\r\ntext", Store.NO, Index.NOT_ANALYZED_NO_NORMS));
- doc.add(new Field(DATE_FIELD, "date\r\ntext", Store.NO, Index.NOT_ANALYZED_NO_NORMS));
+ doc.add(new StringField(BODY_FIELD, "body\r\ntext\ttwo"));
+ doc.add(new StringField(TITLE_FIELD, "title\r\ntext"));
+ doc.add(new StringField(DATE_FIELD, "date\r\ntext"));
return doc;
}
@@ -73,8 +71,8 @@ public class WriteLineDocTaskTest extend
@Override
public Document makeDocument() throws Exception {
Document doc = new Document();
- doc.add(new Field(TITLE_FIELD, "title", Store.NO, Index.NOT_ANALYZED_NO_NORMS));
- doc.add(new Field(DATE_FIELD, "date", Store.NO, Index.NOT_ANALYZED_NO_NORMS));
+ doc.add(new StringField(TITLE_FIELD, "title"));
+ doc.add(new StringField(DATE_FIELD, "date"));
return doc;
}
}
@@ -84,8 +82,8 @@ public class WriteLineDocTaskTest extend
@Override
public Document makeDocument() throws Exception {
Document doc = new Document();
- doc.add(new Field(BODY_FIELD, "body", Store.NO, Index.NOT_ANALYZED_NO_NORMS));
- doc.add(new Field(DATE_FIELD, "date", Store.NO, Index.NOT_ANALYZED_NO_NORMS));
+ doc.add(new StringField(BODY_FIELD, "body"));
+ doc.add(new StringField(DATE_FIELD, "date"));
return doc;
}
}
@@ -95,7 +93,7 @@ public class WriteLineDocTaskTest extend
@Override
public Document makeDocument() throws Exception {
Document doc = new Document();
- doc.add(new Field(DATE_FIELD, "date", Store.NO, Index.NOT_ANALYZED_NO_NORMS));
+ doc.add(new StringField(DATE_FIELD, "date"));
return doc;
}
}
@@ -106,7 +104,7 @@ public class WriteLineDocTaskTest extend
@Override
public Document makeDocument() throws Exception {
Document doc = new Document();
- doc.add(new Field(DATE_FIELD, "date", Store.NO, Index.NOT_ANALYZED_NO_NORMS));
+ doc.add(new StringField(DATE_FIELD, "date"));
return doc;
}
}
@@ -126,9 +124,9 @@ public class WriteLineDocTaskTest extend
public Document makeDocument() throws Exception {
Document doc = new Document();
String name = Thread.currentThread().getName();
- doc.add(new Field(BODY_FIELD, "body_" + name, Store.NO, Index.NOT_ANALYZED_NO_NORMS));
- doc.add(new Field(TITLE_FIELD, "title_" + name, Store.NO, Index.NOT_ANALYZED_NO_NORMS));
- doc.add(new Field(DATE_FIELD, "date_" + name, Store.NO, Index.NOT_ANALYZED_NO_NORMS));
+ doc.add(new StringField(BODY_FIELD, "body_" + name));
+ doc.add(new StringField(TITLE_FIELD, "title_" + name));
+ doc.add(new StringField(DATE_FIELD, "date_" + name));
return doc;
}
Modified: lucene/dev/branches/flexscoring/modules/facet/src/examples/org/apache/lucene/facet/example/association/AssociationIndexer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/flexscoring/modules/facet/src/examples/org/apache/lucene/facet/example/association/AssociationIndexer.java?rev=1163047&r1=1163046&r2=1163047&view=diff
==============================================================================
--- lucene/dev/branches/flexscoring/modules/facet/src/examples/org/apache/lucene/facet/example/association/AssociationIndexer.java (original)
+++ lucene/dev/branches/flexscoring/modules/facet/src/examples/org/apache/lucene/facet/example/association/AssociationIndexer.java Mon Aug 29 23:13:10 2011
@@ -2,8 +2,7 @@ package org.apache.lucene.facet.example.
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
-import org.apache.lucene.document.Field.Index;
-import org.apache.lucene.document.Field.Store;
+import org.apache.lucene.document.TextField;
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.index.IndexWriterConfig;
import org.apache.lucene.index.IndexWriterConfig.OpenMode;
@@ -94,10 +93,8 @@ public class AssociationIndexer {
// create a plain Lucene document and add some regular Lucene fields
// to it
Document doc = new Document();
- doc.add(new Field(SimpleUtils.TITLE, SimpleUtils.docTitles[docNum],
- Store.YES, Index.ANALYZED));
- doc.add(new Field(SimpleUtils.TEXT, SimpleUtils.docTexts[docNum],
- Store.NO, Index.ANALYZED));
+ doc.add(new Field(SimpleUtils.TITLE, TextField.TYPE_STORED, SimpleUtils.docTitles[docNum]));
+ doc.add(new TextField(SimpleUtils.TEXT, SimpleUtils.docTexts[docNum]));
// invoke the category document builder for adding categories to the
// document and,
Modified: lucene/dev/branches/flexscoring/modules/facet/src/examples/org/apache/lucene/facet/example/multiCL/MultiCLIndexer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/flexscoring/modules/facet/src/examples/org/apache/lucene/facet/example/multiCL/MultiCLIndexer.java?rev=1163047&r1=1163046&r2=1163047&view=diff
==============================================================================
--- lucene/dev/branches/flexscoring/modules/facet/src/examples/org/apache/lucene/facet/example/multiCL/MultiCLIndexer.java (original)
+++ lucene/dev/branches/flexscoring/modules/facet/src/examples/org/apache/lucene/facet/example/multiCL/MultiCLIndexer.java Mon Aug 29 23:13:10 2011
@@ -6,8 +6,7 @@ import java.util.Random;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
-import org.apache.lucene.document.Field.Index;
-import org.apache.lucene.document.Field.Store;
+import org.apache.lucene.document.TextField;
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.index.IndexWriterConfig;
import org.apache.lucene.index.Term;
@@ -174,8 +173,8 @@ public class MultiCLIndexer {
// create a plain Lucene document and add some regular Lucene fields
// to it
Document doc = new Document();
- doc.add(new Field(SimpleUtils.TITLE, docTitles[docNum], Store.YES, Index.ANALYZED));
- doc.add(new Field(SimpleUtils.TEXT, docTexts[docNum], Store.NO, Index.ANALYZED));
+ doc.add(new Field(SimpleUtils.TITLE, TextField.TYPE_STORED, docTitles[docNum]));
+ doc.add(new TextField(SimpleUtils.TEXT, docTexts[docNum]));
// finally add the document to the index
categoryDocBuilder.build(doc);
Modified: lucene/dev/branches/flexscoring/modules/facet/src/examples/org/apache/lucene/facet/example/simple/SimpleIndexer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/flexscoring/modules/facet/src/examples/org/apache/lucene/facet/example/simple/SimpleIndexer.java?rev=1163047&r1=1163046&r2=1163047&view=diff
==============================================================================
--- lucene/dev/branches/flexscoring/modules/facet/src/examples/org/apache/lucene/facet/example/simple/SimpleIndexer.java (original)
+++ lucene/dev/branches/flexscoring/modules/facet/src/examples/org/apache/lucene/facet/example/simple/SimpleIndexer.java Mon Aug 29 23:13:10 2011
@@ -5,8 +5,7 @@ import java.util.List;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
-import org.apache.lucene.document.Field.Index;
-import org.apache.lucene.document.Field.Store;
+import org.apache.lucene.document.TextField;
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.index.IndexWriterConfig;
import org.apache.lucene.index.IndexWriterConfig.OpenMode;
@@ -71,8 +70,8 @@ public class SimpleIndexer {
// create a plain Lucene document and add some regular Lucene fields to it
Document doc = new Document();
- doc.add(new Field(SimpleUtils.TITLE, SimpleUtils.docTitles[docNum], Store.YES, Index.ANALYZED));
- doc.add(new Field(SimpleUtils.TEXT, SimpleUtils.docTexts[docNum], Store.NO, Index.ANALYZED));
+ doc.add(new Field(SimpleUtils.TITLE, TextField.TYPE_STORED, SimpleUtils.docTitles[docNum]));
+ doc.add(new TextField(SimpleUtils.TEXT, SimpleUtils.docTexts[docNum]));
// invoke the category document builder for adding categories to the document and,
// as required, to the taxonomy index
Modified: lucene/dev/branches/flexscoring/modules/facet/src/java/org/apache/lucene/facet/index/CategoryDocumentBuilder.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/flexscoring/modules/facet/src/java/org/apache/lucene/facet/index/CategoryDocumentBuilder.java?rev=1163047&r1=1163046&r2=1163047&view=diff
==============================================================================
--- lucene/dev/branches/flexscoring/modules/facet/src/java/org/apache/lucene/facet/index/CategoryDocumentBuilder.java (original)
+++ lucene/dev/branches/flexscoring/modules/facet/src/java/org/apache/lucene/facet/index/CategoryDocumentBuilder.java Mon Aug 29 23:13:10 2011
@@ -10,6 +10,8 @@ import java.util.Map.Entry;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
+import org.apache.lucene.document.FieldType;
+import org.apache.lucene.document.TextField;
import org.apache.lucene.DocumentBuilder;
import org.apache.lucene.facet.index.attributes.CategoryAttribute;
@@ -183,7 +185,9 @@ public class CategoryDocumentBuilder imp
// Finally creating a suitable field with stream and adding it to a
// master field-list, used during the build process (see
// super.build())
- fieldList.add(new Field(e.getKey(), stream));
+ FieldType ft = new FieldType(TextField.TYPE_UNSTORED);
+ ft.setOmitNorms(true);
+ fieldList.add(new Field(e.getKey(), ft, stream));
}
return this;
@@ -289,7 +293,6 @@ public class CategoryDocumentBuilder imp
*/
public Document build(Document doc) {
for (Field f : fieldList) {
- f.setOmitNorms(true);
doc.add(f);
}
return doc;
Modified: lucene/dev/branches/flexscoring/modules/facet/src/java/org/apache/lucene/facet/taxonomy/lucene/Consts.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/flexscoring/modules/facet/src/java/org/apache/lucene/facet/taxonomy/lucene/Consts.java?rev=1163047&r1=1163046&r2=1163047&view=diff
==============================================================================
--- lucene/dev/branches/flexscoring/modules/facet/src/java/org/apache/lucene/facet/taxonomy/lucene/Consts.java (original)
+++ lucene/dev/branches/flexscoring/modules/facet/src/java/org/apache/lucene/facet/taxonomy/lucene/Consts.java Mon Aug 29 23:13:10 2011
@@ -1,7 +1,10 @@
package org.apache.lucene.facet.taxonomy.lucene;
-import org.apache.lucene.document.FieldSelector;
-import org.apache.lucene.document.FieldSelectorResult;
+import java.io.IOException;
+
+import org.apache.lucene.index.FieldInfo;
+import org.apache.lucene.index.StoredFieldVisitor;
+import org.apache.lucene.store.IndexInput;
/**
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -31,17 +34,26 @@ abstract class Consts {
static final char[] PAYLOAD_PARENT_CHARS = PAYLOAD_PARENT.toCharArray();
/**
- * The following is a "field selector", an object which tells Lucene to
- * extract only a single field rather than a whole document.
+ * The following is a "stored field visitor", an object
+ * which tells Lucene to extract only a single field
+ * rather than a whole document.
*/
- public static final FieldSelector fullPathSelector = new FieldSelector() {
- public FieldSelectorResult accept(String fieldName) {
- if (fieldName.equals(FULL)) {
- return FieldSelectorResult.LOAD_AND_BREAK;
- }
- return FieldSelectorResult.NO_LOAD;
- }
- };
+ public static final class LoadFullPathOnly extends StoredFieldVisitor {
+ private String fullPath;
+
+ public boolean stringField(FieldInfo fieldInfo, IndexInput in, int numUTF8Bytes) throws IOException {
+ final byte[] bytes = new byte[numUTF8Bytes];
+ in.readBytes(bytes, 0, bytes.length);
+ fullPath = new String(bytes, "UTF-8");
+
+ // Stop loading:
+ return true;
+ }
+
+ public String getFullPath() {
+ return fullPath;
+ }
+ }
/**
* Delimiter used for creating the full path of a category from the list of
Modified: lucene/dev/branches/flexscoring/modules/facet/src/java/org/apache/lucene/facet/taxonomy/lucene/LuceneTaxonomyReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/flexscoring/modules/facet/src/java/org/apache/lucene/facet/taxonomy/lucene/LuceneTaxonomyReader.java?rev=1163047&r1=1163046&r2=1163047&view=diff
==============================================================================
--- lucene/dev/branches/flexscoring/modules/facet/src/java/org/apache/lucene/facet/taxonomy/lucene/LuceneTaxonomyReader.java (original)
+++ lucene/dev/branches/flexscoring/modules/facet/src/java/org/apache/lucene/facet/taxonomy/lucene/LuceneTaxonomyReader.java Mon Aug 29 23:13:10 2011
@@ -13,7 +13,6 @@ import java.util.logging.Logger;
import org.apache.lucene.index.CorruptIndexException;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.MultiFields;
-import org.apache.lucene.index.Term;
import org.apache.lucene.index.DocsEnum;
import org.apache.lucene.search.DocIdSetIterator;
import org.apache.lucene.store.Directory;
@@ -21,6 +20,7 @@ import org.apache.lucene.store.FSDirecto
import org.apache.lucene.facet.taxonomy.CategoryPath;
import org.apache.lucene.facet.taxonomy.TaxonomyReader;
+import org.apache.lucene.facet.taxonomy.lucene.Consts.LoadFullPathOnly;
import org.apache.lucene.util.Bits;
import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.collections.LRUHashMap;
@@ -295,8 +295,9 @@ public class LuceneTaxonomyReader implem
if (catID<0 || catID>=indexReader.maxDoc()) {
return null;
}
- ret = indexReader.document(catID, Consts.fullPathSelector)
- .get(Consts.FULL);
+ final LoadFullPathOnly loader = new LoadFullPathOnly();
+ indexReader.document(catID, loader);
+ ret = loader.getFullPath();
} finally {
indexReaderLock.readLock().unlock();
}
Modified: lucene/dev/branches/flexscoring/modules/facet/src/java/org/apache/lucene/facet/taxonomy/lucene/LuceneTaxonomyWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/flexscoring/modules/facet/src/java/org/apache/lucene/facet/taxonomy/lucene/LuceneTaxonomyWriter.java?rev=1163047&r1=1163046&r2=1163047&view=diff
==============================================================================
--- lucene/dev/branches/flexscoring/modules/facet/src/java/org/apache/lucene/facet/taxonomy/lucene/LuceneTaxonomyWriter.java (original)
+++ lucene/dev/branches/flexscoring/modules/facet/src/java/org/apache/lucene/facet/taxonomy/lucene/LuceneTaxonomyWriter.java Mon Aug 29 23:13:10 2011
@@ -17,11 +17,11 @@ import org.apache.lucene.analysis.tokena
import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
-import org.apache.lucene.document.Field.Index;
-import org.apache.lucene.document.Field.Store;
+import org.apache.lucene.document.FieldType;
+import org.apache.lucene.document.StringField;
+import org.apache.lucene.document.TextField;
import org.apache.lucene.index.CorruptIndexException;
import org.apache.lucene.index.DocsEnum;
-import org.apache.lucene.index.FieldInfo.IndexOptions;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.index.IndexWriterConfig;
@@ -179,10 +179,10 @@ public class LuceneTaxonomyWriter implem
openLuceneIndex(directory, openMode);
reader = null;
- parentStreamField = new Field(Consts.FIELD_PAYLOADS, parentStream);
- parentStreamField.setOmitNorms(true);
- fullPathField = new Field(Consts.FULL, "", Store.YES, Index.NOT_ANALYZED_NO_NORMS);
- fullPathField.setIndexOptions(IndexOptions.DOCS_ONLY);
+ FieldType ft = new FieldType(TextField.TYPE_UNSTORED);
+ ft.setOmitNorms(true);
+ parentStreamField = new Field(Consts.FIELD_PAYLOADS, ft, parentStream);
+ fullPathField = new Field(Consts.FULL, StringField.TYPE_STORED, "");
this.nextID = indexWriter.maxDoc();
Modified: lucene/dev/branches/flexscoring/modules/facet/src/test/org/apache/lucene/facet/FacetTestBase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/flexscoring/modules/facet/src/test/org/apache/lucene/facet/FacetTestBase.java?rev=1163047&r1=1163046&r2=1163047&view=diff
==============================================================================
--- lucene/dev/branches/flexscoring/modules/facet/src/test/org/apache/lucene/facet/FacetTestBase.java (original)
+++ lucene/dev/branches/flexscoring/modules/facet/src/test/org/apache/lucene/facet/FacetTestBase.java Mon Aug 29 23:13:10 2011
@@ -15,9 +15,7 @@ import org.apache.lucene.analysis.MockAn
import org.apache.lucene.analysis.MockTokenizer;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
-import org.apache.lucene.document.Field.Index;
-import org.apache.lucene.document.Field.Store;
-import org.apache.lucene.document.Field.TermVector;
+import org.apache.lucene.document.TextField;
import org.apache.lucene.index.CorruptIndexException;
import org.apache.lucene.index.DocsEnum;
import org.apache.lucene.index.IndexReader;
@@ -247,7 +245,7 @@ public abstract class FacetTestBase exte
CategoryDocumentBuilder builder = new CategoryDocumentBuilder(tw, iParams);
builder.setCategoryPaths(categories);
builder.build(d);
- d.add(new Field("content", content, Store.YES, Index.ANALYZED, TermVector.NO));
+ d.add(new Field("content", TextField.TYPE_STORED, content));
iw.addDocument(d);
}
Modified: lucene/dev/branches/flexscoring/modules/facet/src/test/org/apache/lucene/facet/FacetTestUtils.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/flexscoring/modules/facet/src/test/org/apache/lucene/facet/FacetTestUtils.java?rev=1163047&r1=1163046&r2=1163047&view=diff
==============================================================================
--- lucene/dev/branches/flexscoring/modules/facet/src/test/org/apache/lucene/facet/FacetTestUtils.java (original)
+++ lucene/dev/branches/flexscoring/modules/facet/src/test/org/apache/lucene/facet/FacetTestUtils.java Mon Aug 29 23:13:10 2011
@@ -7,9 +7,7 @@ import java.util.Collection;
import org.apache.lucene.analysis.standard.StandardAnalyzer;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
-import org.apache.lucene.document.Field.Index;
-import org.apache.lucene.document.Field.Store;
-import org.apache.lucene.document.Field.TermVector;
+import org.apache.lucene.document.TextField;
import org.apache.lucene.index.CorruptIndexException;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexWriter;
@@ -130,8 +128,7 @@ public class FacetTestUtils {
cps.add(cp);
Document d = new Document();
new CategoryDocumentBuilder(tw, iParams).setCategoryPaths(cps).build(d);
- d.add(new Field("content", "alpha", Store.YES, Index.ANALYZED,
- TermVector.NO));
+ d.add(new Field("content", TextField.TYPE_STORED, "alpha"));
iw.addDocument(d);
}
Modified: lucene/dev/branches/flexscoring/modules/facet/src/test/org/apache/lucene/facet/search/CategoryListIteratorTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/flexscoring/modules/facet/src/test/org/apache/lucene/facet/search/CategoryListIteratorTest.java?rev=1163047&r1=1163046&r2=1163047&view=diff
==============================================================================
--- lucene/dev/branches/flexscoring/modules/facet/src/test/org/apache/lucene/facet/search/CategoryListIteratorTest.java (original)
+++ lucene/dev/branches/flexscoring/modules/facet/src/test/org/apache/lucene/facet/search/CategoryListIteratorTest.java Mon Aug 29 23:13:10 2011
@@ -12,7 +12,7 @@ import org.apache.lucene.analysis.TokenS
import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;
import org.apache.lucene.analysis.tokenattributes.PayloadAttribute;
import org.apache.lucene.document.Document;
-import org.apache.lucene.document.Field;
+import org.apache.lucene.document.TextField;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.Payload;
import org.apache.lucene.index.RandomIndexWriter;
@@ -21,8 +21,6 @@ import org.apache.lucene.store.Directory
import org.junit.Test;
import org.apache.lucene.util.LuceneTestCase;
-import org.apache.lucene.facet.search.CategoryListIterator;
-import org.apache.lucene.facet.search.PayloadIntDecodingIterator;
import org.apache.lucene.util.UnsafeByteArrayOutputStream;
import org.apache.lucene.util.encoding.DGapIntEncoder;
import org.apache.lucene.util.encoding.IntEncoder;
@@ -104,7 +102,7 @@ public class CategoryListIteratorTest ex
for (int i = 0; i < data.length; i++) {
dts.setIdx(i);
Document doc = new Document();
- doc.add(new Field("f", dts));
+ doc.add(new TextField("f", dts));
writer.addDocument(doc);
}
IndexReader reader = writer.getReader();
@@ -155,10 +153,10 @@ public class CategoryListIteratorTest ex
dts.setIdx(i);
Document doc = new Document();
if (i==0 || i == 2) {
- doc.add(new Field("f", dts)); // only docs 0 & 2 have payloads!
+ doc.add(new TextField("f", dts)); // only docs 0 & 2 have payloads!
}
dts2.setIdx(i);
- doc.add(new Field("f", dts2));
+ doc.add(new TextField("f", dts2));
writer.addDocument(doc);
writer.commit();
}
@@ -168,7 +166,7 @@ public class CategoryListIteratorTest ex
for (int i = 0; i < 10; ++i) {
Document d = new Document();
dts.setIdx(2);
- d.add(new Field("f", dts2));
+ d.add(new TextField("f", dts2));
writer.addDocument(d);
if (i %10 == 0) {
writer.commit();
Modified: lucene/dev/branches/flexscoring/modules/facet/src/test/org/apache/lucene/facet/search/DrillDownTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/flexscoring/modules/facet/src/test/org/apache/lucene/facet/search/DrillDownTest.java?rev=1163047&r1=1163046&r2=1163047&view=diff
==============================================================================
--- lucene/dev/branches/flexscoring/modules/facet/src/test/org/apache/lucene/facet/search/DrillDownTest.java (original)
+++ lucene/dev/branches/flexscoring/modules/facet/src/test/org/apache/lucene/facet/search/DrillDownTest.java Mon Aug 29 23:13:10 2011
@@ -6,12 +6,9 @@ import java.util.ArrayList;
import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.analysis.MockTokenizer;
import org.apache.lucene.document.Document;
-import org.apache.lucene.document.Field;
-import org.apache.lucene.document.Field.Index;
-import org.apache.lucene.document.Field.Store;
+import org.apache.lucene.document.TextField;
import org.apache.lucene.index.CorruptIndexException;
import org.apache.lucene.index.IndexReader;
-import org.apache.lucene.index.IndexWriterConfig;
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.index.Term;
import org.apache.lucene.search.IndexSearcher;
@@ -28,7 +25,6 @@ import org.apache.lucene.util.LuceneTest
import org.apache.lucene.facet.index.CategoryDocumentBuilder;
import org.apache.lucene.facet.index.params.CategoryListParams;
import org.apache.lucene.facet.index.params.PerDimensionIndexingParams;
-import org.apache.lucene.facet.search.DrillDown;
import org.apache.lucene.facet.search.params.FacetSearchParams;
import org.apache.lucene.facet.taxonomy.CategoryPath;
import org.apache.lucene.facet.taxonomy.TaxonomyWriter;
@@ -84,10 +80,10 @@ public class DrillDownTest extends Lucen
ArrayList<CategoryPath> paths = new ArrayList<CategoryPath>();
Document doc = new Document();
if (i % 2 == 0) { // 50
- doc.add(new Field("content", "foo", Store.NO, Index.ANALYZED));
+ doc.add(new TextField("content", "foo"));
}
if (i % 3 == 0) { // 33
- doc.add(new Field("content", "bar", Store.NO, Index.ANALYZED));
+ doc.add(new TextField("content", "bar"));
}
if (i % 4 == 0) { // 25
paths.add(new CategoryPath("a"));
Modified: lucene/dev/branches/flexscoring/modules/facet/src/test/org/apache/lucene/facet/search/TestMultipleCategoryLists.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/flexscoring/modules/facet/src/test/org/apache/lucene/facet/search/TestMultipleCategoryLists.java?rev=1163047&r1=1163046&r2=1163047&view=diff
==============================================================================
--- lucene/dev/branches/flexscoring/modules/facet/src/test/org/apache/lucene/facet/search/TestMultipleCategoryLists.java (original)
+++ lucene/dev/branches/flexscoring/modules/facet/src/test/org/apache/lucene/facet/search/TestMultipleCategoryLists.java Mon Aug 29 23:13:10 2011
@@ -99,7 +99,7 @@ public class TestMultipleCategoryLists e
searcher.close();
iw.close();
tw.close();
- IOUtils.closeSafely(false, dirs[0]);
+ IOUtils.close(dirs[0]);
}
@Test
@@ -140,7 +140,7 @@ public class TestMultipleCategoryLists e
searcher.close();
iw.close();
tw.close();
- IOUtils.closeSafely(false, dirs[0]);
+ IOUtils.close(dirs[0]);
}
@Test
@@ -184,7 +184,7 @@ public class TestMultipleCategoryLists e
searcher.close();
iw.close();
tw.close();
- IOUtils.closeSafely(false, dirs[0]);
+ IOUtils.close(dirs[0]);
}
private void assertPostingListExists(String field, String text, IndexReader ir) throws IOException {
@@ -230,7 +230,7 @@ public class TestMultipleCategoryLists e
searcher.close();
iw.close();
tw.close();
- IOUtils.closeSafely(false, dirs[0]);
+ IOUtils.close(dirs[0]);
}
@Test
@@ -275,7 +275,7 @@ public class TestMultipleCategoryLists e
searcher.close();
iw.close();
tw.close();
- IOUtils.closeSafely(false, dirs[0]);
+ IOUtils.close(dirs[0]);
}
private Directory[][] getDirs() throws IOException {
Modified: lucene/dev/branches/flexscoring/modules/facet/src/test/org/apache/lucene/facet/search/TestTopKInEachNodeResultHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/flexscoring/modules/facet/src/test/org/apache/lucene/facet/search/TestTopKInEachNodeResultHandler.java?rev=1163047&r1=1163046&r2=1163047&view=diff
==============================================================================
--- lucene/dev/branches/flexscoring/modules/facet/src/test/org/apache/lucene/facet/search/TestTopKInEachNodeResultHandler.java (original)
+++ lucene/dev/branches/flexscoring/modules/facet/src/test/org/apache/lucene/facet/search/TestTopKInEachNodeResultHandler.java Mon Aug 29 23:13:10 2011
@@ -7,9 +7,7 @@ import java.util.List;
import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
-import org.apache.lucene.document.Field.Index;
-import org.apache.lucene.document.Field.Store;
-import org.apache.lucene.document.Field.TermVector;
+import org.apache.lucene.document.TextField;
import org.apache.lucene.index.CorruptIndexException;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexWriterConfig.OpenMode;
@@ -24,11 +22,6 @@ import org.junit.Test;
import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.facet.index.CategoryDocumentBuilder;
import org.apache.lucene.facet.index.params.DefaultFacetIndexingParams;
-import org.apache.lucene.facet.search.FacetsAccumulator;
-import org.apache.lucene.facet.search.FloatArrayAllocator;
-import org.apache.lucene.facet.search.IntArrayAllocator;
-import org.apache.lucene.facet.search.ScoredDocIdCollector;
-import org.apache.lucene.facet.search.StandardFacetsAccumulator;
import org.apache.lucene.facet.search.params.CountFacetRequest;
import org.apache.lucene.facet.search.params.FacetSearchParams;
import org.apache.lucene.facet.search.params.FacetRequest.ResultMode;
@@ -335,7 +328,7 @@ public class TestTopKInEachNodeResultHan
cps.add(cp);
Document d = new Document();
new CategoryDocumentBuilder(tw, iParams).setCategoryPaths(cps).build(d);
- d.add(new Field("content", "alpha", Store.YES, Index.ANALYZED, TermVector.NO));
+ d.add(new Field("content", TextField.TYPE_STORED, "alpha"));
iw.addDocument(d);
}
Modified: lucene/dev/branches/flexscoring/modules/facet/src/test/org/apache/lucene/facet/search/TestTotalFacetCounts.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/flexscoring/modules/facet/src/test/org/apache/lucene/facet/search/TestTotalFacetCounts.java?rev=1163047&r1=1163046&r2=1163047&view=diff
==============================================================================
--- lucene/dev/branches/flexscoring/modules/facet/src/test/org/apache/lucene/facet/search/TestTotalFacetCounts.java (original)
+++ lucene/dev/branches/flexscoring/modules/facet/src/test/org/apache/lucene/facet/search/TestTotalFacetCounts.java Mon Aug 29 23:13:10 2011
@@ -109,7 +109,7 @@ public class TestTotalFacetCounts extend
++partition;
}
readers[0].close();
- IOUtils.closeSafely(false, dirs[0]);
+ IOUtils.close(dirs[0]);
tmpFile.delete();
}
Modified: lucene/dev/branches/flexscoring/modules/facet/src/test/org/apache/lucene/facet/search/TestTotalFacetCountsCache.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/flexscoring/modules/facet/src/test/org/apache/lucene/facet/search/TestTotalFacetCountsCache.java?rev=1163047&r1=1163046&r2=1163047&view=diff
==============================================================================
--- lucene/dev/branches/flexscoring/modules/facet/src/test/org/apache/lucene/facet/search/TestTotalFacetCountsCache.java (original)
+++ lucene/dev/branches/flexscoring/modules/facet/src/test/org/apache/lucene/facet/search/TestTotalFacetCountsCache.java Mon Aug 29 23:13:10 2011
@@ -339,7 +339,7 @@ public class TestTotalFacetCountsCache e
readers[0].close();
r2.close();
outputFile.delete();
- IOUtils.closeSafely(false, dirs[0]);
+ IOUtils.close(dirs[0]);
}
private int assertReadFromDisc(TotalFacetCounts totalCounts, int prevGen, String errMsg) {
@@ -405,7 +405,7 @@ public class TestTotalFacetCountsCache e
outputFile.delete();
writers[0].close();
readers[0].close();
- IOUtils.closeSafely(false, dirs[0]);
+ IOUtils.close(dirs[0]);
}
/**
@@ -535,7 +535,7 @@ public class TestTotalFacetCountsCache e
readers[0].close();
readers[1].close();
for (Directory[] dirset : dirs) {
- IOUtils.closeSafely(false, dirset);
+ IOUtils.close(dirset);
}
}
Modified: lucene/dev/branches/flexscoring/modules/facet/src/test/org/apache/lucene/facet/taxonomy/lucene/TestAddTaxonomies.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/flexscoring/modules/facet/src/test/org/apache/lucene/facet/taxonomy/lucene/TestAddTaxonomies.java?rev=1163047&r1=1163046&r2=1163047&view=diff
==============================================================================
--- lucene/dev/branches/flexscoring/modules/facet/src/test/org/apache/lucene/facet/taxonomy/lucene/TestAddTaxonomies.java (original)
+++ lucene/dev/branches/flexscoring/modules/facet/src/test/org/apache/lucene/facet/taxonomy/lucene/TestAddTaxonomies.java Mon Aug 29 23:13:10 2011
@@ -247,8 +247,8 @@ public class TestAddTaxonomies extends L
}
main.close();
- IOUtils.closeSafely(false, dirs);
- IOUtils.closeSafely(false, copydirs);
+ IOUtils.close(dirs);
+ IOUtils.close(copydirs);
}
}
Modified: lucene/dev/branches/flexscoring/modules/facet/src/test/org/apache/lucene/facet/util/TestScoredDocIDsUtils.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/flexscoring/modules/facet/src/test/org/apache/lucene/facet/util/TestScoredDocIDsUtils.java?rev=1163047&r1=1163046&r2=1163047&view=diff
==============================================================================
--- lucene/dev/branches/flexscoring/modules/facet/src/test/org/apache/lucene/facet/util/TestScoredDocIDsUtils.java (original)
+++ lucene/dev/branches/flexscoring/modules/facet/src/test/org/apache/lucene/facet/util/TestScoredDocIDsUtils.java Mon Aug 29 23:13:10 2011
@@ -7,8 +7,8 @@ import org.apache.lucene.analysis.MockAn
import org.apache.lucene.analysis.MockTokenizer;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
-import org.apache.lucene.document.Field.Index;
-import org.apache.lucene.document.Field.Store;
+import org.apache.lucene.document.FieldType;
+import org.apache.lucene.document.StringField;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.MultiFields;
import org.apache.lucene.index.RandomIndexWriter;
@@ -134,7 +134,7 @@ public class TestScoredDocIDsUtils exten
int docNum = it.getDocID();
assertNull(
"Deleted docs must not appear in the allDocsScoredDocIds set: " + docNum,
- reader.document(docNum).getFieldable("del"));
+ reader.document(docNum).getField("del"));
}
assertEquals("Wrong number of (live) documents", allDocs.size(), numIteratedDocs);
@@ -166,7 +166,7 @@ public class TestScoredDocIDsUtils exten
live != null && !live.get(docNum));
assertNull(
"Complement-Set must not contain docs from the original set (doc="+ docNum+")",
- reader.document(docNum).getFieldable("del"));
+ reader.document(docNum).getField("del"));
assertFalse(
"Complement-Set must not contain docs from the original set (doc="+docNum+")",
resultSet.fastGet(docNum));
@@ -189,8 +189,8 @@ public class TestScoredDocIDsUtils exten
protected final static String delTxt = "delete";
protected final static String alphaTxt = "alpha";
- private final static Field deletionMark = new Field(field, delTxt, Store.NO, Index.NOT_ANALYZED_NO_NORMS);
- private final static Field alphaContent = new Field(field, alphaTxt, Store.NO, Index.NOT_ANALYZED_NO_NORMS);
+ private final static Field deletionMark = new StringField(field, delTxt);
+ private final static Field alphaContent = new StringField(field, alphaTxt);
protected final int numDocs;
@@ -208,7 +208,9 @@ public class TestScoredDocIDsUtils exten
doc.add(deletionMark);
// Add a special field for docs that are marked for deletion. Later we
// assert that those docs are not returned by all-scored-doc-IDs.
- doc.add(new Field("del", Integer.toString(docNum), Store.YES, Index.NO));
+ FieldType ft = new FieldType();
+ ft.setStored(true);
+ doc.add(new Field("del", ft, Integer.toString(docNum)));
}
if (haveAlpha(docNum)) {
Modified: lucene/dev/branches/flexscoring/modules/grouping/src/java/org/apache/lucene/search/grouping/package.html
URL: http://svn.apache.org/viewvc/lucene/dev/branches/flexscoring/modules/grouping/src/java/org/apache/lucene/search/grouping/package.html?rev=1163047&r1=1163046&r2=1163047&view=diff
==============================================================================
--- lucene/dev/branches/flexscoring/modules/grouping/src/java/org/apache/lucene/search/grouping/package.html (original)
+++ lucene/dev/branches/flexscoring/modules/grouping/src/java/org/apache/lucene/search/grouping/package.html Mon Aug 29 23:13:10 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);
Modified: lucene/dev/branches/flexscoring/modules/grouping/src/test/org/apache/lucene/search/grouping/TermAllGroupHeadsCollectorTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/flexscoring/modules/grouping/src/test/org/apache/lucene/search/grouping/TermAllGroupHeadsCollectorTest.java?rev=1163047&r1=1163046&r2=1163047&view=diff
==============================================================================
--- lucene/dev/branches/flexscoring/modules/grouping/src/test/org/apache/lucene/search/grouping/TermAllGroupHeadsCollectorTest.java (original)
+++ lucene/dev/branches/flexscoring/modules/grouping/src/test/org/apache/lucene/search/grouping/TermAllGroupHeadsCollectorTest.java Mon Aug 29 23:13:10 2011
@@ -21,6 +21,8 @@ import org.apache.lucene.analysis.MockAn
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
import org.apache.lucene.document.NumericField;
+import org.apache.lucene.document.StringField;
+import org.apache.lucene.document.TextField;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.index.Term;
@@ -47,57 +49,57 @@ public class TermAllGroupHeadsCollectorT
// 0
Document doc = new Document();
- doc.add(new Field(groupField, "author1", Field.Store.YES, Field.Index.ANALYZED));
- doc.add(new Field("content", "random text", Field.Store.YES, Field.Index.ANALYZED));
- doc.add(new Field("id", "1", Field.Store.YES, Field.Index.NOT_ANALYZED_NO_NORMS));
+ doc.add(newField(groupField, "author1", TextField.TYPE_STORED));
+ doc.add(newField("content", "random text", TextField.TYPE_STORED));
+ doc.add(newField("id", "1", StringField.TYPE_STORED));
w.addDocument(doc);
// 1
doc = new Document();
- doc.add(new Field(groupField, "author1", Field.Store.YES, Field.Index.ANALYZED));
- doc.add(new Field("content", "some more random text blob", Field.Store.YES, Field.Index.ANALYZED));
- doc.add(new Field("id", "2", Field.Store.YES, Field.Index.NOT_ANALYZED_NO_NORMS));
+ doc.add(newField(groupField, "author1", TextField.TYPE_STORED));
+ doc.add(newField("content", "some more random text blob", TextField.TYPE_STORED));
+ doc.add(newField("id", "2", StringField.TYPE_STORED));
w.addDocument(doc);
// 2
doc = new Document();
- doc.add(new Field(groupField, "author1", Field.Store.YES, Field.Index.ANALYZED));
- doc.add(new Field("content", "some more random textual data", Field.Store.YES, Field.Index.ANALYZED));
- doc.add(new Field("id", "3", Field.Store.YES, Field.Index.NOT_ANALYZED_NO_NORMS));
+ doc.add(newField(groupField, "author1", TextField.TYPE_STORED));
+ doc.add(newField("content", "some more random textual data", TextField.TYPE_STORED));
+ doc.add(newField("id", "3", StringField.TYPE_STORED));
w.addDocument(doc);
w.commit(); // To ensure a second segment
// 3
doc = new Document();
- doc.add(new Field(groupField, "author2", Field.Store.YES, Field.Index.ANALYZED));
- doc.add(new Field("content", "some random text", Field.Store.YES, Field.Index.ANALYZED));
- doc.add(new Field("id", "4", Field.Store.YES, Field.Index.NOT_ANALYZED_NO_NORMS));
+ doc.add(newField(groupField, "author2", TextField.TYPE_STORED));
+ doc.add(newField("content", "some random text", TextField.TYPE_STORED));
+ doc.add(newField("id", "4", StringField.TYPE_STORED));
w.addDocument(doc);
// 4
doc = new Document();
- doc.add(new Field(groupField, "author3", Field.Store.YES, Field.Index.ANALYZED));
- doc.add(new Field("content", "some more random text", Field.Store.YES, Field.Index.ANALYZED));
- doc.add(new Field("id", "5", Field.Store.YES, Field.Index.NOT_ANALYZED_NO_NORMS));
+ doc.add(newField(groupField, "author3", TextField.TYPE_STORED));
+ doc.add(newField("content", "some more random text", TextField.TYPE_STORED));
+ doc.add(newField("id", "5", StringField.TYPE_STORED));
w.addDocument(doc);
// 5
doc = new Document();
- doc.add(new Field(groupField, "author3", Field.Store.YES, Field.Index.ANALYZED));
- doc.add(new Field("content", "random blob", Field.Store.YES, Field.Index.ANALYZED));
- doc.add(new Field("id", "6", Field.Store.YES, Field.Index.NOT_ANALYZED_NO_NORMS));
+ doc.add(newField(groupField, "author3", TextField.TYPE_STORED));
+ doc.add(newField("content", "random blob", TextField.TYPE_STORED));
+ doc.add(newField("id", "6", StringField.TYPE_STORED));
w.addDocument(doc);
// 6 -- no author field
doc = new Document();
- doc.add(new Field("content", "random word stuck in alot of other text", Field.Store.YES, Field.Index.ANALYZED));
- doc.add(new Field("id", "6", Field.Store.YES, Field.Index.NOT_ANALYZED_NO_NORMS));
+ doc.add(newField("content", "random word stuck in alot of other text", TextField.TYPE_STORED));
+ doc.add(newField("id", "6", StringField.TYPE_STORED));
w.addDocument(doc);
// 7 -- no author field
doc = new Document();
- doc.add(new Field("content", "random word stuck in alot of other text", Field.Store.YES, Field.Index.ANALYZED));
- doc.add(new Field("id", "7", Field.Store.YES, Field.Index.NOT_ANALYZED_NO_NORMS));
+ doc.add(newField("content", "random word stuck in alot of other text", TextField.TYPE_STORED));
+ doc.add(newField("id", "7", StringField.TYPE_STORED));
w.addDocument(doc);
IndexSearcher indexSearcher = new IndexSearcher(w.getReader());
@@ -182,18 +184,18 @@ public class TermAllGroupHeadsCollectorT
Document doc = new Document();
Document docNoGroup = new Document();
- Field group = newField("group", "", Field.Index.NOT_ANALYZED);
+ Field group = newField("group", "", StringField.TYPE_UNSTORED);
doc.add(group);
- Field sort1 = newField("sort1", "", Field.Index.NOT_ANALYZED);
+ Field sort1 = newField("sort1", "", StringField.TYPE_UNSTORED);
doc.add(sort1);
docNoGroup.add(sort1);
- Field sort2 = newField("sort2", "", Field.Index.NOT_ANALYZED);
+ Field sort2 = newField("sort2", "", StringField.TYPE_UNSTORED);
doc.add(sort2);
docNoGroup.add(sort2);
- Field sort3 = newField("sort3", "", Field.Index.NOT_ANALYZED);
+ Field sort3 = newField("sort3", "", StringField.TYPE_UNSTORED);
doc.add(sort3);
docNoGroup.add(sort3);
- Field content = newField("content", "", Field.Index.ANALYZED);
+ Field content = newField("content", "", TextField.TYPE_UNSTORED);
doc.add(content);
docNoGroup.add(content);
NumericField id = new NumericField("id");
Modified: lucene/dev/branches/flexscoring/modules/grouping/src/test/org/apache/lucene/search/grouping/TermAllGroupsCollectorTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/flexscoring/modules/grouping/src/test/org/apache/lucene/search/grouping/TermAllGroupsCollectorTest.java?rev=1163047&r1=1163046&r2=1163047&view=diff
==============================================================================
--- lucene/dev/branches/flexscoring/modules/grouping/src/test/org/apache/lucene/search/grouping/TermAllGroupsCollectorTest.java (original)
+++ lucene/dev/branches/flexscoring/modules/grouping/src/test/org/apache/lucene/search/grouping/TermAllGroupsCollectorTest.java Mon Aug 29 23:13:10 2011
@@ -5,7 +5,7 @@ package org.apache.lucene.search.groupin
* 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 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
@@ -20,6 +20,8 @@ package org.apache.lucene.search.groupin
import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
+import org.apache.lucene.document.FieldType;
+import org.apache.lucene.document.TextField;
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.index.Term;
import org.apache.lucene.search.IndexSearcher;
@@ -32,6 +34,8 @@ public class TermAllGroupsCollectorTest
public void testTotalGroupCount() throws Exception {
final String groupField = "author";
+ FieldType customType = new FieldType();
+ customType.setStored(true);
Directory dir = newDirectory();
RandomIndexWriter w = new RandomIndexWriter(
@@ -41,51 +45,51 @@ public class TermAllGroupsCollectorTest
new MockAnalyzer(random)).setMergePolicy(newLogMergePolicy()));
// 0
Document doc = new Document();
- doc.add(new Field(groupField, "author1", Field.Store.YES, Field.Index.ANALYZED));
- doc.add(new Field("content", "random text", Field.Store.YES, Field.Index.ANALYZED));
- doc.add(new Field("id", "1", Field.Store.YES, Field.Index.NO));
+ doc.add(new Field(groupField, TextField.TYPE_STORED, "author1"));
+ doc.add(new Field("content", TextField.TYPE_STORED, "random text"));
+ doc.add(new Field("id", customType, "1"));
w.addDocument(doc);
// 1
doc = new Document();
- doc.add(new Field(groupField, "author1", Field.Store.YES, Field.Index.ANALYZED));
- doc.add(new Field("content", "some more random text blob", Field.Store.YES, Field.Index.ANALYZED));
- doc.add(new Field("id", "2", Field.Store.YES, Field.Index.NO));
+ doc.add(new Field(groupField, TextField.TYPE_STORED, "author1"));
+ doc.add(new Field("content", TextField.TYPE_STORED, "some more random text blob"));
+ doc.add(new Field("id", customType, "2"));
w.addDocument(doc);
// 2
doc = new Document();
- doc.add(new Field(groupField, "author1", Field.Store.YES, Field.Index.ANALYZED));
- doc.add(new Field("content", "some more random textual data", Field.Store.YES, Field.Index.ANALYZED));
- doc.add(new Field("id", "3", Field.Store.YES, Field.Index.NO));
+ doc.add(new Field(groupField, TextField.TYPE_STORED, "author1"));
+ doc.add(new Field("content", TextField.TYPE_STORED, "some more random textual data"));
+ doc.add(new Field("id", customType, "3"));
w.addDocument(doc);
w.commit(); // To ensure a second segment
// 3
doc = new Document();
- doc.add(new Field(groupField, "author2", Field.Store.YES, Field.Index.ANALYZED));
- doc.add(new Field("content", "some random text", Field.Store.YES, Field.Index.ANALYZED));
- doc.add(new Field("id", "4", Field.Store.YES, Field.Index.NO));
+ doc.add(new Field(groupField, TextField.TYPE_STORED, "author2"));
+ doc.add(new Field("content", TextField.TYPE_STORED, "some random text"));
+ doc.add(new Field("id", customType, "4"));
w.addDocument(doc);
// 4
doc = new Document();
- doc.add(new Field(groupField, "author3", Field.Store.YES, Field.Index.ANALYZED));
- doc.add(new Field("content", "some more random text", Field.Store.YES, Field.Index.ANALYZED));
- doc.add(new Field("id", "5", Field.Store.YES, Field.Index.NO));
+ doc.add(new Field(groupField, TextField.TYPE_STORED, "author3"));
+ doc.add(new Field("content", TextField.TYPE_STORED, "some more random text"));
+ doc.add(new Field("id", customType, "5"));
w.addDocument(doc);
// 5
doc = new Document();
- doc.add(new Field(groupField, "author3", Field.Store.YES, Field.Index.ANALYZED));
- doc.add(new Field("content", "random blob", Field.Store.YES, Field.Index.ANALYZED));
- doc.add(new Field("id", "6", Field.Store.YES, Field.Index.NO));
+ doc.add(new Field(groupField, TextField.TYPE_STORED, "author3"));
+ doc.add(new Field("content", TextField.TYPE_STORED, "random blob"));
+ doc.add(new Field("id", customType, "6"));
w.addDocument(doc);
// 6 -- no author field
doc = new Document();
- doc.add(new Field("content", "random word stuck in alot of other text", Field.Store.YES, Field.Index.ANALYZED));
- doc.add(new Field("id", "6", Field.Store.YES, Field.Index.NO));
+ doc.add(new Field("content", TextField.TYPE_STORED, "random word stuck in alot of other text"));
+ doc.add(new Field("id", customType, "6"));
w.addDocument(doc);
IndexSearcher indexSearcher = new IndexSearcher(w.getReader());