You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by mi...@apache.org on 2014/11/27 12:34:48 UTC
svn commit: r1642110 [8/12] - in /lucene/dev/branches/lucene6005/lucene:
analysis/uima/src/test/org/apache/lucene/analysis/uima/
backward-codecs/src/test/org/apache/lucene/index/
benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/ benchmark/sr...
Modified: lucene/dev/branches/lucene6005/lucene/queries/src/test/org/apache/lucene/queries/TermsFilterTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/queries/src/test/org/apache/lucene/queries/TermsFilterTest.java?rev=1642110&r1=1642109&r2=1642110&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/queries/src/test/org/apache/lucene/queries/TermsFilterTest.java (original)
+++ lucene/dev/branches/lucene6005/lucene/queries/src/test/org/apache/lucene/queries/TermsFilterTest.java Thu Nov 27 11:34:43 2014
@@ -26,6 +26,7 @@ import java.util.HashSet;
import java.util.List;
import java.util.Set;
+import org.apache.lucene.document.Document2;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
import org.apache.lucene.index.IndexReader;
@@ -34,8 +35,8 @@ import org.apache.lucene.index.MultiRead
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.index.SlowCompositeReaderWrapper;
import org.apache.lucene.index.Term;
-import org.apache.lucene.search.BooleanClause;
import org.apache.lucene.search.BooleanClause.Occur;
+import org.apache.lucene.search.BooleanClause;
import org.apache.lucene.search.BooleanQuery;
import org.apache.lucene.search.ConstantScoreQuery;
import org.apache.lucene.search.DocIdSet;
@@ -46,8 +47,8 @@ import org.apache.lucene.search.ScoreDoc
import org.apache.lucene.search.TermQuery;
import org.apache.lucene.search.TopDocs;
import org.apache.lucene.store.Directory;
-import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.BitDocIdSet;
+import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.FixedBitSet;
import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.util.TestUtil;
@@ -70,9 +71,9 @@ public class TermsFilterTest extends Luc
Directory rd = newDirectory();
RandomIndexWriter w = new RandomIndexWriter(random(), rd);
for (int i = 0; i < 100; i++) {
- Document doc = new Document();
+ Document2 doc = w.newDocument();
int term = i * 10; //terms are units of 10;
- doc.add(newStringField(fieldName, "" + term, Field.Store.YES));
+ doc.addAtom(fieldName, "" + term);
w.addDocument(doc);
}
IndexReader reader = SlowCompositeReaderWrapper.wrap(w.getReader());
@@ -105,8 +106,8 @@ public class TermsFilterTest extends Luc
String fieldName = "field1";
Directory rd1 = newDirectory();
RandomIndexWriter w1 = new RandomIndexWriter(random(), rd1);
- Document doc = new Document();
- doc.add(newStringField(fieldName, "content1", Field.Store.YES));
+ Document2 doc = w1.newDocument();
+ doc.addAtom(fieldName, "content1");
w1.addDocument(doc);
IndexReader reader1 = w1.getReader();
w1.close();
@@ -114,8 +115,8 @@ public class TermsFilterTest extends Luc
fieldName = "field2";
Directory rd2 = newDirectory();
RandomIndexWriter w2 = new RandomIndexWriter(random(), rd2);
- doc = new Document();
- doc.add(newStringField(fieldName, "content2", Field.Store.YES));
+ doc = w2.newDocument();
+ doc.addAtom(fieldName, "content2");
w2.addDocument(doc);
IndexReader reader2 = w2.getReader();
w2.close();
@@ -146,11 +147,11 @@ public class TermsFilterTest extends Luc
List<Term> terms = new ArrayList<>();
for (int i = 0; i < num; i++) {
terms.add(new Term("field" + i, "content1"));
- Document doc = new Document();
+ Document2 doc = w.newDocument();
if (skip == i) {
continue;
}
- doc.add(newStringField("field" + i, "content1", Field.Store.YES));
+ doc.addAtom("field" + i, "content1");
w.addDocument(doc);
}
@@ -178,8 +179,8 @@ public class TermsFilterTest extends Luc
for (int i = 0; i < num; i++) {
String field = "field" + random().nextInt(100);
terms.add(new Term(field, "content1"));
- Document doc = new Document();
- doc.add(newStringField(field, "content1", Field.Store.YES));
+ Document2 doc = w.newDocument();
+ doc.addAtom(field, "content1");
w.addDocument(doc);
}
int randomFields = random().nextInt(10);
@@ -216,8 +217,8 @@ public class TermsFilterTest extends Luc
String field = "field" + (singleField ? "1" : random().nextInt(100));
String string = TestUtil.randomRealisticUnicodeString(random());
terms.add(new Term(field, string));
- Document doc = new Document();
- doc.add(newStringField(field, string, Field.Store.YES));
+ Document2 doc = w.newDocument();
+ doc.addAtom(field, string);
w.addDocument(doc);
}
IndexReader reader = w.getReader();
Modified: lucene/dev/branches/lucene6005/lucene/queries/src/test/org/apache/lucene/queries/function/FunctionTestSetup.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/queries/src/test/org/apache/lucene/queries/function/FunctionTestSetup.java?rev=1642110&r1=1642109&r2=1642110&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/queries/src/test/org/apache/lucene/queries/function/FunctionTestSetup.java (original)
+++ lucene/dev/branches/lucene6005/lucene/queries/src/test/org/apache/lucene/queries/function/FunctionTestSetup.java Thu Nov 27 11:34:43 2014
@@ -2,15 +2,14 @@ package org.apache.lucene.queries.functi
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.MockAnalyzer;
+import org.apache.lucene.document.Document2;
import org.apache.lucene.document.Document;
+import org.apache.lucene.document.Field.Store;
import org.apache.lucene.document.Field;
import org.apache.lucene.document.FieldType;
-import org.apache.lucene.document.FloatField;
-import org.apache.lucene.document.IntField;
import org.apache.lucene.document.NumericDocValuesField;
import org.apache.lucene.document.SortedDocValuesField;
import org.apache.lucene.document.TextField;
-import org.apache.lucene.document.Field.Store;
import org.apache.lucene.index.IndexWriterConfig;
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.queries.function.valuesource.FloatFieldSource;
@@ -125,31 +124,14 @@ public abstract class FunctionTestSetup
}
private static void addDoc(RandomIndexWriter iw, int i) throws Exception {
- Document d = new Document();
+ Document2 d = iw.newDocument();
Field f;
int scoreAndID = i + 1;
- FieldType customType = new FieldType(TextField.TYPE_STORED);
- customType.setTokenized(false);
- customType.setOmitNorms(true);
-
- f = newField(ID_FIELD, id2String(scoreAndID), customType); // for debug purposes
- d.add(f);
- d.add(new SortedDocValuesField(ID_FIELD, new BytesRef(id2String(scoreAndID))));
-
- FieldType customType2 = new FieldType(TextField.TYPE_NOT_STORED);
- customType2.setOmitNorms(true);
- f = newField(TEXT_FIELD, "text of doc" + scoreAndID + textLine(i), customType2); // for regular search
- d.add(f);
-
- f = new IntField(INT_FIELD, scoreAndID, Store.YES); // for function scoring
- d.add(f);
- d.add(new NumericDocValuesField(INT_FIELD, scoreAndID));
-
- f = new FloatField(FLOAT_FIELD, scoreAndID, Store.YES); // for function scoring
- d.add(f);
- d.add(new NumericDocValuesField(FLOAT_FIELD, Float.floatToRawIntBits(scoreAndID)));
-
+ d.addAtom(ID_FIELD, id2String(scoreAndID)); // for debug purposes
+ d.addLargeText(TEXT_FIELD, "text of doc" + scoreAndID + textLine(i));
+ d.addInt(INT_FIELD, scoreAndID); // for function scoring
+ d.addFloat(FLOAT_FIELD, scoreAndID); // for function scoring
iw.addDocument(d);
log("added: " + d);
}
Modified: lucene/dev/branches/lucene6005/lucene/queries/src/test/org/apache/lucene/queries/function/TestFunctionQuerySort.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/queries/src/test/org/apache/lucene/queries/function/TestFunctionQuerySort.java?rev=1642110&r1=1642109&r2=1642110&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/queries/src/test/org/apache/lucene/queries/function/TestFunctionQuerySort.java (original)
+++ lucene/dev/branches/lucene6005/lucene/queries/src/test/org/apache/lucene/queries/function/TestFunctionQuerySort.java Thu Nov 27 11:34:43 2014
@@ -19,9 +19,9 @@ package org.apache.lucene.queries.functi
import java.io.IOException;
+import org.apache.lucene.document.Document2;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
-import org.apache.lucene.document.IntField;
import org.apache.lucene.document.NumericDocValuesField;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexWriterConfig;
@@ -47,17 +47,11 @@ public class TestFunctionQuerySort exten
iwc.setMergePolicy(newLogMergePolicy()); // depends on docid order
RandomIndexWriter writer = new RandomIndexWriter(random(), dir, iwc);
- Document doc = new Document();
- Field field = new IntField("value", 0, Field.Store.YES);
- Field dvField = new NumericDocValuesField("value", 0);
- doc.add(field);
- doc.add(dvField);
-
// Save docs unsorted (decreasing value n, n-1, ...)
final int NUM_VALS = 5;
for (int val = NUM_VALS; val > 0; val--) {
- field.setIntValue(val);
- dvField.setLongValue(val);
+ Document2 doc = writer.newDocument();
+ doc.addInt("value", val);
writer.addDocument(doc);
}
@@ -79,7 +73,7 @@ public class TestFunctionQuerySort exten
// Verify that sorting works in general
int i = 0;
for (ScoreDoc hit : hits.scoreDocs) {
- int valueFromDoc = Integer.parseInt(reader.document(hit.doc).getString("value"));
+ int valueFromDoc = reader.document(hit.doc).getInt("value");
assertEquals(++i, valueFromDoc);
}
@@ -94,7 +88,7 @@ public class TestFunctionQuerySort exten
// Verify that hits are actually "after"
int afterValue = ((Double) afterHit.fields[0]).intValue();
for (ScoreDoc hit : hits.scoreDocs) {
- int val = Integer.parseInt(reader.document(hit.doc).getString("value"));
+ int val = reader.document(hit.doc).getInt("value");
assertTrue(afterValue <= val);
assertFalse(hit.doc == afterHit.doc);
}
Modified: lucene/dev/branches/lucene6005/lucene/queries/src/test/org/apache/lucene/queries/function/TestSortedSetFieldSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/queries/src/test/org/apache/lucene/queries/function/TestSortedSetFieldSource.java?rev=1642110&r1=1642109&r2=1642110&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/queries/src/test/org/apache/lucene/queries/function/TestSortedSetFieldSource.java (original)
+++ lucene/dev/branches/lucene6005/lucene/queries/src/test/org/apache/lucene/queries/function/TestSortedSetFieldSource.java Thu Nov 27 11:34:43 2014
@@ -19,12 +19,14 @@ package org.apache.lucene.queries.functi
import java.util.Collections;
+import org.apache.lucene.document.Document2;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
+import org.apache.lucene.document.FieldTypes;
import org.apache.lucene.document.SortedSetDocValuesField;
-import org.apache.lucene.index.LeafReader;
import org.apache.lucene.index.DirectoryReader;
import org.apache.lucene.index.IndexWriter;
+import org.apache.lucene.index.LeafReader;
import org.apache.lucene.queries.function.valuesource.SortedSetFieldSource;
import org.apache.lucene.store.Directory;
import org.apache.lucene.util.BytesRef;
@@ -34,14 +36,16 @@ public class TestSortedSetFieldSource ex
public void testSimple() throws Exception {
Directory dir = newDirectory();
IndexWriter writer = new IndexWriter(dir, newIndexWriterConfig(null));
- Document doc = new Document();
- doc.add(new SortedSetDocValuesField("value", new BytesRef("baz")));
- doc.add(newStringField("id", "2", Field.Store.YES));
+ FieldTypes fieldTypes = writer.getFieldTypes();
+ fieldTypes.setMultiValued("value");
+ Document2 doc = writer.newDocument();
+ doc.addBinary("value", new BytesRef("baz"));
+ doc.addAtom("id", "2");
writer.addDocument(doc);
- doc = new Document();
- doc.add(new SortedSetDocValuesField("value", new BytesRef("foo")));
- doc.add(new SortedSetDocValuesField("value", new BytesRef("bar")));
- doc.add(newStringField("id", "1", Field.Store.YES));
+ doc = writer.newDocument();
+ doc.addBinary("value", new BytesRef("foo"));
+ doc.addBinary("value", new BytesRef("bar"));
+ doc.addAtom("id", "1");
writer.addDocument(doc);
writer.forceMerge(1);
writer.close();
Modified: lucene/dev/branches/lucene6005/lucene/queries/src/test/org/apache/lucene/queries/function/TestValueSources.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/queries/src/test/org/apache/lucene/queries/function/TestValueSources.java?rev=1642110&r1=1642109&r2=1642110&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/queries/src/test/org/apache/lucene/queries/function/TestValueSources.java (original)
+++ lucene/dev/branches/lucene6005/lucene/queries/src/test/org/apache/lucene/queries/function/TestValueSources.java Thu Nov 27 11:34:43 2014
@@ -17,27 +17,24 @@ package org.apache.lucene.queries.functi
* limitations under the License.
*/
+import java.io.IOException;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
-import java.io.IOException;
import org.apache.lucene.analysis.MockAnalyzer;
+import org.apache.lucene.document.Document2;
import org.apache.lucene.document.Document;
-import org.apache.lucene.document.DoubleField;
import org.apache.lucene.document.Field;
-import org.apache.lucene.document.FloatField;
-import org.apache.lucene.document.IntField;
-import org.apache.lucene.document.LongField;
import org.apache.lucene.document.NumericDocValuesField;
import org.apache.lucene.document.SortedDocValuesField;
import org.apache.lucene.document.StringField;
import org.apache.lucene.document.TextField;
-import org.apache.lucene.index.Term;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexWriterConfig;
-import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.index.LeafReaderContext;
+import org.apache.lucene.index.RandomIndexWriter;
+import org.apache.lucene.index.Term;
import org.apache.lucene.queries.function.docvalues.FloatDocValues;
import org.apache.lucene.queries.function.valuesource.BytesRefFieldSource;
import org.apache.lucene.queries.function.valuesource.ConstValueSource;
@@ -76,8 +73,8 @@ import org.apache.lucene.search.Query;
import org.apache.lucene.search.ScoreDoc;
import org.apache.lucene.search.Sort;
import org.apache.lucene.search.SortField;
-import org.apache.lucene.search.TopDocs;
import org.apache.lucene.search.TermQuery;
+import org.apache.lucene.search.TopDocs;
import org.apache.lucene.search.similarities.DefaultSimilarity;
import org.apache.lucene.search.similarities.Similarity;
import org.apache.lucene.store.Directory;
@@ -112,49 +109,16 @@ public class TestValueSources extends Lu
IndexWriterConfig iwConfig = newIndexWriterConfig(new MockAnalyzer(random()));
iwConfig.setMergePolicy(newLogMergePolicy());
RandomIndexWriter iw = new RandomIndexWriter(random(), dir, iwConfig);
- Document document = new Document();
- Field idField = new StringField("id", "", Field.Store.NO);
- document.add(idField);
- Field idDVField = new SortedDocValuesField("id", new BytesRef());
- document.add(idDVField);
- Field doubleField = new DoubleField("double", 0d, Field.Store.NO);
- document.add(doubleField);
- Field doubleDVField = new NumericDocValuesField("double", 0);
- document.add(doubleDVField);
- Field floatField = new FloatField("float", 0f, Field.Store.NO);
- document.add(floatField);
- Field floatDVField = new NumericDocValuesField("float", 0);
- document.add(floatDVField);
- Field intField = new IntField("int", 0, Field.Store.NO);
- document.add(intField);
- Field intDVField = new NumericDocValuesField("int", 0);
- document.add(intDVField);
- Field longField = new LongField("long", 0L, Field.Store.NO);
- document.add(longField);
- Field longDVField = new NumericDocValuesField("long", 0);
- document.add(longDVField);
- Field stringField = new StringField("string", "", Field.Store.NO);
- document.add(stringField);
- Field stringDVField = new SortedDocValuesField("string", new BytesRef());
- document.add(stringDVField);
- Field textField = new TextField("text", "", Field.Store.NO);
- document.add(textField);
-
- for (String [] doc : documents) {
- idField.setStringValue(doc[0]);
- idDVField.setBytesValue(new BytesRef(doc[0]));
- doubleField.setDoubleValue(Double.valueOf(doc[1]));
- doubleDVField.setLongValue(Double.doubleToRawLongBits(Double.valueOf(doc[1])));
- floatField.setFloatValue(Float.valueOf(doc[2]));
- floatDVField.setLongValue(Float.floatToRawIntBits(Float.valueOf(doc[2])));
- intField.setIntValue(Integer.valueOf(doc[3]));
- intDVField.setLongValue(Integer.valueOf(doc[3]));
- longField.setLongValue(Long.valueOf(doc[4]));
- longDVField.setLongValue(Long.valueOf(doc[4]));
- stringField.setStringValue(doc[5]);
- stringDVField.setBytesValue(new BytesRef(doc[5]));
- textField.setStringValue(doc[6]);
- iw.addDocument(document);
+ for (String [] data : documents) {
+ Document2 doc = iw.newDocument();
+ doc.addAtom("id", data[0]);
+ doc.addDouble("double", Double.valueOf(data[1]));
+ doc.addFloat("float", Float.valueOf(data[2]));
+ doc.addInt("int", Integer.valueOf(data[3]));
+ doc.addLong("long", Long.valueOf(data[4]));
+ doc.addAtom("string", data[5]);
+ doc.addLargeText("text", data[6]);
+ iw.addDocument(doc);
}
reader = iw.getReader();
Modified: lucene/dev/branches/lucene6005/lucene/queries/src/test/org/apache/lucene/queries/mlt/TestMoreLikeThis.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/queries/src/test/org/apache/lucene/queries/mlt/TestMoreLikeThis.java?rev=1642110&r1=1642109&r2=1642110&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/queries/src/test/org/apache/lucene/queries/mlt/TestMoreLikeThis.java (original)
+++ lucene/dev/branches/lucene6005/lucene/queries/src/test/org/apache/lucene/queries/mlt/TestMoreLikeThis.java Thu Nov 27 11:34:43 2014
@@ -26,8 +26,10 @@ import java.util.Map;
import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.analysis.MockTokenizer;
+import org.apache.lucene.document.Document2;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
+import org.apache.lucene.document.FieldTypes;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.index.Term;
@@ -70,15 +72,17 @@ public class TestMoreLikeThis extends Lu
}
private void addDoc(RandomIndexWriter writer, String text) throws IOException {
- Document doc = new Document();
- doc.add(newTextField("text", text, Field.Store.YES));
+ Document2 doc = writer.newDocument();
+ doc.addLargeText("text", text);
writer.addDocument(doc);
}
private void addDoc(RandomIndexWriter writer, String[] texts) throws IOException {
- Document doc = new Document();
+ FieldTypes fieldTypes = writer.getFieldTypes();
+ fieldTypes.setMultiValued("text");
+ Document2 doc = writer.newDocument();
for (String text : texts) {
- doc.add(newTextField("text", text, Field.Store.YES));
+ doc.addLargeText("text", text);
}
writer.addDocument(doc);
}
Modified: lucene/dev/branches/lucene6005/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestNumericQueryParser.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestNumericQueryParser.java?rev=1642110&r1=1642109&r2=1642110&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestNumericQueryParser.java (original)
+++ lucene/dev/branches/lucene6005/lucene/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestNumericQueryParser.java Thu Nov 27 11:34:43 2014
@@ -33,13 +33,9 @@ import java.util.TimeZone;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.document.Document;
-import org.apache.lucene.document.DoubleField;
import org.apache.lucene.document.Field;
import org.apache.lucene.document.FieldType.NumericType;
import org.apache.lucene.document.FieldType;
-import org.apache.lucene.document.FloatField;
-import org.apache.lucene.document.IntField;
-import org.apache.lucene.document.LongField;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.queryparser.flexible.core.QueryNodeException;
@@ -55,8 +51,11 @@ import org.apache.lucene.util.LuceneTest
import org.apache.lucene.util.TestUtil;
import org.junit.AfterClass;
import org.junit.BeforeClass;
+import org.junit.Ignore;
import org.junit.Test;
+// nocommit cutover to FieldTypes
+@Ignore
public class TestNumericQueryParser extends LuceneTestCase {
private static enum NumberType {
@@ -202,25 +201,37 @@ public class TestNumericQueryParser exte
numericConfigMap.put(type.name(), new NumericConfig(PRECISION_STEP,
NUMBER_FORMAT, type));
+ /*
FieldType ft = new FieldType(IntField.TYPE_NOT_STORED);
ft.setNumericType(type);
ft.setStored(true);
ft.setNumericPrecisionStep(PRECISION_STEP);
ft.freeze();
+ */
+ // nocommit fixme
+ FieldType ft = null;
final Field field;
switch(type) {
case INT:
- field = new IntField(type.name(), 0, ft);
+ // nocommit fixme
+ //field = new IntField(type.name(), 0, ft);
+ field = null;
break;
case FLOAT:
- field = new FloatField(type.name(), 0.0f, ft);
+ // nocommit fixme
+ //field = new FloatField(type.name(), 0.0f, ft);
+ field = null;
break;
case LONG:
- field = new LongField(type.name(), 0l, ft);
+ // nocommit fixme
+ //field = new LongField(type.name(), 0l, ft);
+ field = null;
break;
case DOUBLE:
- field = new DoubleField(type.name(), 0.0, ft);
+ // nocommit fixme
+ //field = new DoubleField(type.name(), 0.0, ft);
+ field = null;
break;
default:
fail();
@@ -232,12 +243,14 @@ public class TestNumericQueryParser exte
numericConfigMap.put(DATE_FIELD_NAME, new NumericConfig(PRECISION_STEP,
DATE_FORMAT, NumericType.LONG));
- FieldType ft = new FieldType(LongField.TYPE_NOT_STORED);
- ft.setStored(true);
- ft.setNumericPrecisionStep(PRECISION_STEP);
- LongField dateField = new LongField(DATE_FIELD_NAME, 0l, ft);
- numericFieldMap.put(DATE_FIELD_NAME, dateField);
- doc.add(dateField);
+ // nocommit fixme
+ //FieldType ft = new FieldType(LongField.TYPE_NOT_STORED);
+ //ft.setStored(true);
+ //ft.setNumericPrecisionStep(PRECISION_STEP);
+ // nocommit fixme
+ // LongField dateField = new LongField(DATE_FIELD_NAME, 0l, ft);
+ //numericFieldMap.put(DATE_FIELD_NAME, dateField);
+ // doc.add(dateField);
for (NumberType numberType : NumberType.values()) {
setFieldValues(numberType, numericFieldMap);
Modified: lucene/dev/branches/lucene6005/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/TestParser.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/TestParser.java?rev=1642110&r1=1642109&r2=1642110&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/TestParser.java (original)
+++ lucene/dev/branches/lucene6005/lucene/queryparser/src/test/org/apache/lucene/queryparser/xml/TestParser.java Thu Nov 27 11:34:43 2014
@@ -31,7 +31,6 @@ import org.apache.lucene.analysis.MockTo
import org.apache.lucene.document.Document2;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
-import org.apache.lucene.document.IntField;
import org.apache.lucene.index.DirectoryReader;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexWriter;
@@ -46,6 +45,7 @@ import org.apache.lucene.util.LuceneTest
import org.junit.AfterClass;
import org.junit.Assume;
import org.junit.BeforeClass;
+import org.junit.Ignore;
public class TestParser extends LuceneTestCase {
@@ -71,10 +71,10 @@ public class TestParser extends LuceneTe
int endOfDate = line.indexOf('\t');
String date = line.substring(0, endOfDate).trim();
String content = line.substring(endOfDate).trim();
- Document doc = new Document();
- doc.add(newTextField("date", date, Field.Store.YES));
- doc.add(newTextField("contents", content, Field.Store.YES));
- doc.add(new IntField("date2", Integer.valueOf(date), Field.Store.NO));
+ Document2 doc = writer.newDocument();
+ doc.addLargeText("date", date);
+ doc.addLargeText("contents", content);
+ doc.addInt("date2", Integer.valueOf(date));
writer.addDocument(doc);
line = d.readLine();
}
@@ -204,11 +204,15 @@ public class TestParser extends LuceneTe
assertEquals("DuplicateFilterQuery should produce 1 result ", 1, h);
}
+ @Ignore
+ // nocommit
public void testNumericRangeFilterQueryXML() throws ParserException, IOException {
Query q = parse("NumericRangeFilterQuery.xml");
dumpResults("NumericRangeFilter", q, 5);
}
+ @Ignore
+ // nocommit
public void testNumericRangeQueryQueryXML() throws ParserException, IOException {
Query q = parse("NumericRangeQueryQuery.xml");
dumpResults("NumericRangeQuery", q, 5);
Modified: lucene/dev/branches/lucene6005/lucene/replicator/src/test/org/apache/lucene/replicator/IndexAndTaxonomyReplicationClientTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/replicator/src/test/org/apache/lucene/replicator/IndexAndTaxonomyReplicationClientTest.java?rev=1642110&r1=1642109&r2=1642110&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/replicator/src/test/org/apache/lucene/replicator/IndexAndTaxonomyReplicationClientTest.java (original)
+++ lucene/dev/branches/lucene6005/lucene/replicator/src/test/org/apache/lucene/replicator/IndexAndTaxonomyReplicationClientTest.java Thu Nov 27 11:34:43 2014
@@ -27,6 +27,7 @@ import java.util.concurrent.Callable;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;
+import org.apache.lucene.document.Document2;
import org.apache.lucene.document.Document;
import org.apache.lucene.facet.DrillDownQuery;
import org.apache.lucene.facet.FacetField;
@@ -182,8 +183,8 @@ public class IndexAndTaxonomyReplication
return new IndexAndTaxonomyRevision(publishIndexWriter, publishTaxoWriter);
}
- private Document newDocument(TaxonomyWriter taxoWriter, int id) throws IOException {
- Document doc = new Document();
+ private Document2 newDocument(TaxonomyWriter taxoWriter, int id) throws IOException {
+ Document2 doc = publishIndexWriter.newDocument();
doc.add(new FacetField("A", Integer.toString(id, 16)));
return config.build(taxoWriter, doc);
}
Modified: lucene/dev/branches/lucene6005/lucene/sandbox/src/java/org/apache/lucene/codecs/idversion/IDVersionPostingsWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/sandbox/src/java/org/apache/lucene/codecs/idversion/IDVersionPostingsWriter.java?rev=1642110&r1=1642109&r2=1642110&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/sandbox/src/java/org/apache/lucene/codecs/idversion/IDVersionPostingsWriter.java (original)
+++ lucene/dev/branches/lucene6005/lucene/sandbox/src/java/org/apache/lucene/codecs/idversion/IDVersionPostingsWriter.java Thu Nov 27 11:34:43 2014
@@ -65,7 +65,7 @@ final class IDVersionPostingsWriter exte
public int setField(FieldInfo fieldInfo) {
super.setField(fieldInfo);
if (fieldInfo.getIndexOptions() != IndexOptions.DOCS_AND_FREQS_AND_POSITIONS) {
- throw new IllegalArgumentException("field must be index using IndexOptions.DOCS_AND_FREQS_AND_POSITIONS");
+ throw new IllegalArgumentException("field \"" + fieldInfo.name + "\" must be indexed using IndexOptions.DOCS_AND_FREQS_AND_POSITIONS (got: " + fieldInfo.getIndexOptions() + ")");
}
// LUCENE-5693: because CheckIndex cross-checks term vectors with postings even for deleted docs, and because our PF only indexes the
// non-deleted documents on flush, CheckIndex will see this as corruption:
Added: lucene/dev/branches/lucene6005/lucene/sandbox/src/test/org/apache/lucene/codecs/idversion/SingleTokenWithPayloadTokenStream.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/sandbox/src/test/org/apache/lucene/codecs/idversion/SingleTokenWithPayloadTokenStream.java?rev=1642110&view=auto
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/sandbox/src/test/org/apache/lucene/codecs/idversion/SingleTokenWithPayloadTokenStream.java (added)
+++ lucene/dev/branches/lucene6005/lucene/sandbox/src/test/org/apache/lucene/codecs/idversion/SingleTokenWithPayloadTokenStream.java Thu Nov 27 11:34:43 2014
@@ -0,0 +1,63 @@
+package org.apache.lucene.codecs.idversion;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * 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 obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import java.io.IOException;
+
+import org.apache.lucene.analysis.TokenStream;
+import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;
+import org.apache.lucene.analysis.tokenattributes.PayloadAttribute;
+import org.apache.lucene.util.BytesRef;
+
+final class SingleTokenWithPayloadTokenStream extends TokenStream {
+
+ private final CharTermAttribute termAttribute = addAttribute(CharTermAttribute.class);
+ private final PayloadAttribute payloadAttribute = addAttribute(PayloadAttribute.class);
+ private boolean used = false;
+ private String value = null;
+ private BytesRef payload;
+
+ /** Sets the string value. */
+ void setValue(String value, BytesRef payload) {
+ this.value = value;
+ this.payload = payload;
+ }
+
+ @Override
+ public boolean incrementToken() {
+ if (used) {
+ return false;
+ }
+ clearAttributes();
+ termAttribute.append(value);
+ payloadAttribute.setPayload(payload);
+ used = true;
+ return true;
+ }
+
+ @Override
+ public void reset() {
+ used = false;
+ }
+
+ @Override
+ public void close() {
+ value = null;
+ payload = null;
+ }
+}
Modified: lucene/dev/branches/lucene6005/lucene/sandbox/src/test/org/apache/lucene/codecs/idversion/TestIDVersionPostingsFormat.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/sandbox/src/test/org/apache/lucene/codecs/idversion/TestIDVersionPostingsFormat.java?rev=1642110&r1=1642109&r2=1642110&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/sandbox/src/test/org/apache/lucene/codecs/idversion/TestIDVersionPostingsFormat.java (original)
+++ lucene/dev/branches/lucene6005/lucene/sandbox/src/test/org/apache/lucene/codecs/idversion/TestIDVersionPostingsFormat.java Thu Nov 27 11:34:43 2014
@@ -34,10 +34,13 @@ import org.apache.lucene.analysis.Analyz
import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.analysis.MockTokenFilter;
import org.apache.lucene.analysis.MockTokenizer;
+import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.codecs.idversion.StringAndPayloadField.SingleTokenWithPayloadTokenStream;
+import org.apache.lucene.document.Document2;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
import org.apache.lucene.document.FieldType;
+import org.apache.lucene.document.FieldTypes;
import org.apache.lucene.index.ConcurrentMergeScheduler;
import org.apache.lucene.index.DocsEnum;
import org.apache.lucene.index.IndexReader;
@@ -69,11 +72,14 @@ public class TestIDVersionPostingsFormat
IndexWriterConfig iwc = newIndexWriterConfig(new MockAnalyzer(random()));
iwc.setCodec(TestUtil.alwaysPostingsFormat(new IDVersionPostingsFormat()));
RandomIndexWriter w = new RandomIndexWriter(random(), dir, iwc);
- Document doc = new Document();
- doc.add(makeIDField("id0", 100));
+ FieldTypes fieldTypes = w.getFieldTypes();
+ fieldTypes.disableHighlighting("id");
+ fieldTypes.disableExistsFilters();
+ Document2 doc = w.newDocument();
+ doc.addLargeText("id", makeIDTokenStream("id0", 100));
w.addDocument(doc);
- doc = new Document();
- doc.add(makeIDField("id1", 110));
+ doc = w.newDocument();
+ doc.addLargeText("id", makeIDTokenStream("id1", 110));
w.addDocument(doc);
IndexReader r = w.getReader();
IDVersionSegmentTermsEnum termsEnum = (IDVersionSegmentTermsEnum) r.leaves().get(0).reader().fields().terms("id").iterator(null);
@@ -194,6 +200,9 @@ public class TestIDVersionPostingsFormat
int maxItemsInBlock = 2*(minItemsInBlock-1) + random().nextInt(50);
iwc.setCodec(TestUtil.alwaysPostingsFormat(new IDVersionPostingsFormat(minItemsInBlock, maxItemsInBlock)));
RandomIndexWriter w = new RandomIndexWriter(random(), dir, iwc);
+ FieldTypes fieldTypes = w.getFieldTypes();
+ fieldTypes.disableHighlighting("id");
+ fieldTypes.disableExistsFilters();
//IndexWriter w = new IndexWriter(dir, iwc);
int numDocs = atLeast(1000);
Map<String,Long> idValues = new HashMap<String,Long>();
@@ -235,8 +244,8 @@ public class TestIDVersionPostingsFormat
if (VERBOSE) {
System.out.println(" " + idValue + " -> " + version);
}
- Document doc = new Document();
- doc.add(makeIDField(idValue, version));
+ Document2 doc = w.newDocument();
+ doc.addLargeText("id", makeIDTokenStream(idValue, version));
w.addDocument(doc);
idsList.add(idValue);
@@ -249,8 +258,8 @@ public class TestIDVersionPostingsFormat
} else {
version = random().nextLong() & 0x3fffffffffffffffL;
}
- doc = new Document();
- doc.add(makeIDField(idValue, version));
+ doc = w.newDocument();
+ doc.addLargeText("id", makeIDTokenStream(idValue, version));
if (VERBOSE) {
System.out.println(" update " + idValue + " -> " + version);
}
@@ -349,11 +358,13 @@ public class TestIDVersionPostingsFormat
}
}
- private static Field makeIDField(String id, long version) {
+ private static TokenStream makeIDTokenStream(String idValue, long version) {
BytesRef payload = new BytesRef(8);
payload.length = 8;
IDVersionPostingsFormat.longToBytes(version, payload);
- return new StringAndPayloadField("id", id, payload);
+ SingleTokenWithPayloadTokenStream ts = new SingleTokenWithPayloadTokenStream();
+ ts.setValue(idValue, payload);
+ return ts;
}
public void testMoreThanOneDocPerIDOneSegment() throws Exception {
@@ -361,11 +372,14 @@ public class TestIDVersionPostingsFormat
IndexWriterConfig iwc = newIndexWriterConfig(new MockAnalyzer(random()));
iwc.setCodec(TestUtil.alwaysPostingsFormat(new IDVersionPostingsFormat()));
RandomIndexWriter w = new RandomIndexWriter(random(), dir, iwc);
- Document doc = new Document();
- doc.add(makeIDField("id", 17));
+ FieldTypes fieldTypes = w.getFieldTypes();
+ fieldTypes.disableHighlighting("id");
+ fieldTypes.disableExistsFilters();
+ Document2 doc = w.newDocument();
+ doc.addLargeText("id", makeIDTokenStream("id", 17));
w.addDocument(doc);
- doc = new Document();
- doc.add(makeIDField("id", 17));
+ doc = w.newDocument();
+ doc.addLargeText("id", makeIDTokenStream("id", 17));
try {
w.addDocument(doc);
w.commit();
@@ -392,12 +406,15 @@ public class TestIDVersionPostingsFormat
});
}
IndexWriter w = new IndexWriter(dir, iwc);
- Document doc = new Document();
- doc.add(makeIDField("id", 17));
+ FieldTypes fieldTypes = w.getFieldTypes();
+ fieldTypes.disableHighlighting("id");
+ fieldTypes.disableExistsFilters();
+ Document2 doc = w.newDocument();
+ doc.addLargeText("id", makeIDTokenStream("id", 17));
w.addDocument(doc);
w.commit();
- doc = new Document();
- doc.add(makeIDField("id", 17));
+ doc = w.newDocument();
+ doc.addLargeText("id", makeIDTokenStream("id", 17));
try {
w.addDocument(doc);
w.commit();
@@ -418,11 +435,14 @@ public class TestIDVersionPostingsFormat
IndexWriterConfig iwc = newIndexWriterConfig(new MockAnalyzer(random()));
iwc.setCodec(TestUtil.alwaysPostingsFormat(new IDVersionPostingsFormat()));
RandomIndexWriter w = new RandomIndexWriter(random(), dir, iwc);
- Document doc = new Document();
- doc.add(makeIDField("id", 17));
+ FieldTypes fieldTypes = w.getFieldTypes();
+ fieldTypes.disableHighlighting("id");
+ fieldTypes.disableExistsFilters();
+ Document2 doc = w.newDocument();
+ doc.addLargeText("id", makeIDTokenStream("id", 17));
w.addDocument(doc);
- doc = new Document();
- doc.add(makeIDField("id", 17));
+ doc = w.newDocument();
+ doc.addLargeText("id", makeIDTokenStream("id", 17));
// Replaces the doc we just indexed:
w.updateDocument(new Term("id", "id"), doc);
w.commit();
@@ -435,12 +455,15 @@ public class TestIDVersionPostingsFormat
IndexWriterConfig iwc = newIndexWriterConfig(new MockAnalyzer(random()));
iwc.setCodec(TestUtil.alwaysPostingsFormat(new IDVersionPostingsFormat()));
RandomIndexWriter w = new RandomIndexWriter(random(), dir, iwc);
- Document doc = new Document();
- doc.add(makeIDField("id", 17));
+ FieldTypes fieldTypes = w.getFieldTypes();
+ fieldTypes.disableHighlighting("id");
+ fieldTypes.disableExistsFilters();
+ Document2 doc = w.newDocument();
+ doc.addLargeText("id", makeIDTokenStream("id", 17));
w.addDocument(doc);
w.deleteDocuments(new Term("id", "id"));
- doc = new Document();
- doc.add(makeIDField("id", 17));
+ doc = w.newDocument();
+ doc.addLargeText("id", makeIDTokenStream("id", 17));
w.addDocument(doc);
w.commit();
w.close();
@@ -463,7 +486,10 @@ public class TestIDVersionPostingsFormat
IndexWriterConfig iwc = newIndexWriterConfig(a);
iwc.setCodec(TestUtil.alwaysPostingsFormat(new IDVersionPostingsFormat()));
RandomIndexWriter w = new RandomIndexWriter(random(), dir, iwc);
- Document doc = new Document();
+ FieldTypes fieldTypes = w.getFieldTypes();
+ fieldTypes.disableHighlighting("id");
+ fieldTypes.disableExistsFilters();
+ Document2 doc = w.newDocument();
doc.add(newTextField("id", "id", Field.Store.NO));
try {
w.addDocument(doc);
@@ -482,7 +508,10 @@ public class TestIDVersionPostingsFormat
IndexWriterConfig iwc = newIndexWriterConfig(new MockAnalyzer(random()));
iwc.setCodec(TestUtil.alwaysPostingsFormat(new IDVersionPostingsFormat()));
RandomIndexWriter w = new RandomIndexWriter(random(), dir, iwc);
- Document doc = new Document();
+ FieldTypes fieldTypes = w.getFieldTypes();
+ fieldTypes.disableHighlighting("id");
+ fieldTypes.disableExistsFilters();
+ Document2 doc = w.newDocument();
doc.add(newStringField("id", "id", Field.Store.NO));
try {
w.addDocument(doc);
@@ -501,7 +530,10 @@ public class TestIDVersionPostingsFormat
IndexWriterConfig iwc = newIndexWriterConfig(new MockAnalyzer(random()));
iwc.setCodec(TestUtil.alwaysPostingsFormat(new IDVersionPostingsFormat()));
RandomIndexWriter w = new RandomIndexWriter(random(), dir, iwc);
- Document doc = new Document();
+ FieldTypes fieldTypes = w.getFieldTypes();
+ fieldTypes.disableHighlighting("id");
+ fieldTypes.disableExistsFilters();
+ Document2 doc = w.newDocument();
doc.add(new StringAndPayloadField("id", "id", new BytesRef("foo")));
try {
w.addDocument(doc);
@@ -520,12 +552,15 @@ public class TestIDVersionPostingsFormat
IndexWriterConfig iwc = newIndexWriterConfig(new MockAnalyzer(random()));
iwc.setCodec(TestUtil.alwaysPostingsFormat(new IDVersionPostingsFormat()));
RandomIndexWriter w = new RandomIndexWriter(random(), dir, iwc);
- Document doc = new Document();
- doc.add(makeIDField("id", 17));
+ FieldTypes fieldTypes = w.getFieldTypes();
+ fieldTypes.disableHighlighting("id");
+ fieldTypes.disableExistsFilters();
+ Document2 doc = w.newDocument();
+ doc.addLargeText("id", makeIDTokenStream("id", 17));
w.addDocument(doc);
w.commit();
- doc = new Document();
- doc.add(makeIDField("id", 17));
+ doc = w.newDocument();
+ doc.addLargeText("id", makeIDTokenStream("id", 17));
// Replaces the doc we just indexed:
w.updateDocument(new Term("id", "id"), doc);
w.forceMerge(1);
@@ -540,17 +575,12 @@ public class TestIDVersionPostingsFormat
IndexWriterConfig iwc = newIndexWriterConfig(new MockAnalyzer(random()));
iwc.setCodec(TestUtil.alwaysPostingsFormat(new IDVersionPostingsFormat()));
RandomIndexWriter w = new RandomIndexWriter(random(), dir, iwc);
- Document doc = new Document();
-
- FieldType ft = new FieldType(StringAndPayloadField.TYPE);
- ft.setStoreTermVectors(true);
- SingleTokenWithPayloadTokenStream ts = new SingleTokenWithPayloadTokenStream();
- BytesRef payload = new BytesRef(8);
- payload.length = 8;
- IDVersionPostingsFormat.longToBytes(17, payload);
- ts.setValue("foo", payload);
- Field field = new Field("id", ts, ft);
- doc.add(new Field("id", ts, ft));
+ FieldTypes fieldTypes = w.getFieldTypes();
+ fieldTypes.disableHighlighting("id");
+ fieldTypes.disableExistsFilters();
+ fieldTypes.enableTermVectors("id");
+ Document2 doc = w.newDocument();
+ doc.addLargeText("id", makeIDTokenStream("foo", 17));
try {
w.addDocument(doc);
w.commit();
@@ -568,9 +598,13 @@ public class TestIDVersionPostingsFormat
IndexWriterConfig iwc = newIndexWriterConfig(new MockAnalyzer(random()));
iwc.setCodec(TestUtil.alwaysPostingsFormat(new IDVersionPostingsFormat()));
RandomIndexWriter w = new RandomIndexWriter(random(), dir, iwc);
- Document doc = new Document();
- doc.add(makeIDField("id", 17));
- doc.add(makeIDField("id", 17));
+ FieldTypes fieldTypes = w.getFieldTypes();
+ fieldTypes.disableHighlighting("id");
+ fieldTypes.disableExistsFilters();
+ fieldTypes.setMultiValued("id");
+ Document2 doc = w.newDocument();
+ doc.addLargeText("id", makeIDTokenStream("id", 17));
+ doc.addLargeText("id", makeIDTokenStream("id", 17));
try {
w.addDocument(doc);
w.commit();
@@ -587,7 +621,10 @@ public class TestIDVersionPostingsFormat
IndexWriterConfig iwc = newIndexWriterConfig(new MockAnalyzer(random()));
iwc.setCodec(TestUtil.alwaysPostingsFormat(new IDVersionPostingsFormat()));
RandomIndexWriter w = new RandomIndexWriter(random(), dir, iwc);
- Document doc = new Document();
+ FieldTypes fieldTypes = w.getFieldTypes();
+ fieldTypes.disableHighlighting("id");
+ fieldTypes.disableExistsFilters();
+ Document2 doc = w.newDocument();
// -1
doc.add(new StringAndPayloadField("id", "id", new BytesRef(new byte[] {(byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff})));
try {
@@ -598,7 +635,7 @@ public class TestIDVersionPostingsFormat
// expected
}
- doc = new Document();
+ doc = w.newDocument();
// Long.MAX_VALUE:
doc.add(new StringAndPayloadField("id", "id", new BytesRef(new byte[] {(byte)0x7f, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff})));
try {
@@ -618,6 +655,9 @@ public class TestIDVersionPostingsFormat
IndexWriterConfig iwc = newIndexWriterConfig(new MockAnalyzer(random()));
iwc.setCodec(TestUtil.alwaysPostingsFormat(new IDVersionPostingsFormat()));
final RandomIndexWriter w = new RandomIndexWriter(random(), dir, iwc);
+ FieldTypes fieldTypes = w.getFieldTypes();
+ fieldTypes.disableHighlighting("id");
+ fieldTypes.disableExistsFilters();
IDSource idsSource = getRandomIDs();
int numIDs = atLeast(100);
@@ -767,8 +807,8 @@ public class TestIDVersionPostingsFormat
System.out.println(Thread.currentThread() + ": now fail!");
}
assertTrue(passes);
- Document doc = new Document();
- doc.add(makeIDField(id, newVersion));
+ Document2 doc = w.newDocument();
+ doc.addLargeText("id", makeIDTokenStream(id, newVersion));
w.updateDocument(new Term("id", id), doc);
truth.put(id, newVersion);
versionValues.add(id, newVersion);
Modified: lucene/dev/branches/lucene6005/lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/DuplicateFilterTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/DuplicateFilterTest.java?rev=1642110&r1=1642109&r2=1642110&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/DuplicateFilterTest.java (original)
+++ lucene/dev/branches/lucene6005/lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/DuplicateFilterTest.java Thu Nov 27 11:34:43 2014
@@ -75,10 +75,10 @@ public class DuplicateFilterTest extends
}
private void addDoc(RandomIndexWriter writer, String url, String text, String date) throws IOException {
- Document doc = new Document();
- doc.add(newStringField(KEY_FIELD, url, Field.Store.YES));
- doc.add(newTextField("text", text, Field.Store.YES));
- doc.add(newTextField("date", date, Field.Store.YES));
+ Document2 doc = writer.newDocument();
+ doc.addAtom(KEY_FIELD, url);
+ doc.addLargeText("text", text);
+ doc.addLargeText("date", date);
writer.addDocument(doc);
}
Modified: lucene/dev/branches/lucene6005/lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/FuzzyLikeThisQueryTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/FuzzyLikeThisQueryTest.java?rev=1642110&r1=1642109&r2=1642110&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/FuzzyLikeThisQueryTest.java (original)
+++ lucene/dev/branches/lucene6005/lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/FuzzyLikeThisQueryTest.java Thu Nov 27 11:34:43 2014
@@ -69,9 +69,9 @@ public class FuzzyLikeThisQueryTest exte
}
private void addDoc(RandomIndexWriter writer, String name, String id) throws IOException {
- Document doc = new Document();
- doc.add(newTextField("name", name, Field.Store.YES));
- doc.add(newTextField("id", id, Field.Store.YES));
+ Document2 doc = writer.newDocument();
+ doc.addLargeText("name", name);
+ doc.addLargeText("id", id);
writer.addDocument(doc);
}
Modified: lucene/dev/branches/lucene6005/lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/TestSlowCollationMethods.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/TestSlowCollationMethods.java?rev=1642110&r1=1642109&r2=1642110&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/TestSlowCollationMethods.java (original)
+++ lucene/dev/branches/lucene6005/lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/TestSlowCollationMethods.java Thu Nov 27 11:34:43 2014
@@ -3,6 +3,7 @@ package org.apache.lucene.sandbox.querie
import java.text.Collator;
import java.util.Locale;
+import org.apache.lucene.document.Document2;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
import org.apache.lucene.document.SortedDocValuesField;
@@ -56,12 +57,9 @@ public class TestSlowCollationMethods ex
dir = newDirectory();
RandomIndexWriter iw = new RandomIndexWriter(random(), dir);
for (int i = 0; i < numDocs; i++) {
- Document doc = new Document();
+ Document2 doc = iw.newDocument();
String value = TestUtil.randomUnicodeString(random());
- Field field = newStringField("field", value, Field.Store.YES);
- doc.add(field);
- Field dvField = new SortedDocValuesField("field", new BytesRef(value));
- doc.add(dvField);
+ doc.addAtom("field", value);
iw.addDocument(doc);
}
splitDoc = TestUtil.randomUnicodeString(random());
@@ -165,10 +163,9 @@ public class TestSlowCollationMethods ex
Directory dir = newDirectory();
RandomIndexWriter iw = new RandomIndexWriter(random(), dir);
for (int i = 0; i < numDocs; i++) {
- Document doc = new Document();
+ Document2 doc = iw.newDocument();
String value = TestUtil.randomUnicodeString(random());
- Field field = newStringField("field", value, Field.Store.YES);
- doc.add(field);
+ doc.addAtom("field", value);
iw.addDocument(doc);
}
IndexReader reader = iw.getReader();
Modified: lucene/dev/branches/lucene6005/lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/TestSlowFuzzyQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/TestSlowFuzzyQuery.java?rev=1642110&r1=1642109&r2=1642110&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/TestSlowFuzzyQuery.java (original)
+++ lucene/dev/branches/lucene6005/lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/TestSlowFuzzyQuery.java Thu Nov 27 11:34:43 2014
@@ -17,10 +17,11 @@ package org.apache.lucene.sandbox.querie
* limitations under the License.
*/
-import java.util.List;
-import java.util.Arrays;
import java.io.IOException;
+import java.util.Arrays;
+import java.util.List;
+import org.apache.lucene.document.Document2;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
import org.apache.lucene.index.IndexReader;
@@ -486,8 +487,8 @@ public class TestSlowFuzzyQuery extends
}
private void addDoc(String text, RandomIndexWriter writer) throws IOException {
- Document doc = new Document();
- doc.add(newTextField("field", text, Field.Store.YES));
+ Document2 doc = writer.newDocument();
+ doc.addLargeText("field", text);
writer.addDocument(doc);
}
}
Modified: lucene/dev/branches/lucene6005/lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/TestSlowFuzzyQuery2.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/TestSlowFuzzyQuery2.java?rev=1642110&r1=1642109&r2=1642110&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/TestSlowFuzzyQuery2.java (original)
+++ lucene/dev/branches/lucene6005/lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/TestSlowFuzzyQuery2.java Thu Nov 27 11:34:43 2014
@@ -24,6 +24,7 @@ import java.nio.charset.StandardCharsets
import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.analysis.MockTokenizer;
+import org.apache.lucene.document.Document2;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
import org.apache.lucene.index.IndexReader;
@@ -92,12 +93,9 @@ public class TestSlowFuzzyQuery2 extends
Directory dir = newDirectory();
RandomIndexWriter writer = new RandomIndexWriter(random(), dir, newIndexWriterConfig(new MockAnalyzer(random(), MockTokenizer.KEYWORD, false)).setMergePolicy(newLogMergePolicy()));
- Document doc = new Document();
- Field field = newTextField("field", "", Field.Store.NO);
- doc.add(field);
-
for (int i = 0; i < terms; i++) {
- field.setStringValue(mapInt(codePointTable, i));
+ Document2 doc = writer.newDocument();
+ doc.addLargeText("field", mapInt(codePointTable, i));
writer.addDocument(doc);
}
@@ -152,12 +150,9 @@ public class TestSlowFuzzyQuery2 extends
IndexWriter writer = new IndexWriter(dir, new KeywordAnalyzer(),
IndexWriter.MaxFieldLength.UNLIMITED);
- Document doc = new Document();
- Field field = newField("field", "", Field.Store.NO, Field.Index.ANALYZED);
- doc.add(field);
-
for (int i = 0; i < terms; i++) {
- field.setValue(Integer.toBinaryString(i));
+ Document2 doc = writer.newDocument();
+ doc.addLargeText("field", Integer.toBinaryString(i));
writer.addDocument(doc);
}
Modified: lucene/dev/branches/lucene6005/lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/regex/TestRegexQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/regex/TestRegexQuery.java?rev=1642110&r1=1642109&r2=1642110&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/regex/TestRegexQuery.java (original)
+++ lucene/dev/branches/lucene6005/lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/regex/TestRegexQuery.java Thu Nov 27 11:34:43 2014
@@ -17,20 +17,20 @@ package org.apache.lucene.sandbox.querie
* limitations under the License.
*/
+import org.apache.lucene.document.Document2;
+import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
-import org.apache.lucene.search.spans.SpanMultiTermQueryWrapper;
-import org.apache.lucene.store.Directory;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.MultiFields;
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.index.Term;
import org.apache.lucene.index.Terms;
-import org.apache.lucene.document.Document;
-import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.index.TermsEnum;
-
+import org.apache.lucene.search.IndexSearcher;
+import org.apache.lucene.search.spans.SpanMultiTermQueryWrapper;
import org.apache.lucene.search.spans.SpanNearQuery;
import org.apache.lucene.search.spans.SpanQuery;
+import org.apache.lucene.store.Directory;
import org.apache.lucene.util.AttributeSource;
import org.apache.lucene.util.LuceneTestCase;
@@ -46,8 +46,8 @@ public class TestRegexQuery extends Luce
super.setUp();
directory = newDirectory();
RandomIndexWriter writer = new RandomIndexWriter(random(), directory);
- Document doc = new Document();
- doc.add(newTextField(FN, "the quick brown fox jumps over the lazy dog", Field.Store.NO));
+ Document2 doc = writer.newDocument();
+ doc.addLargeText(FN, "the quick brown fox jumps over the lazy dog");
writer.addDocument(doc);
reader = writer.getReader();
writer.close();
Modified: lucene/dev/branches/lucene6005/lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/regex/TestSpanRegexQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/regex/TestSpanRegexQuery.java?rev=1642110&r1=1642109&r2=1642110&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/regex/TestSpanRegexQuery.java (original)
+++ lucene/dev/branches/lucene6005/lucene/sandbox/src/test/org/apache/lucene/sandbox/queries/regex/TestSpanRegexQuery.java Thu Nov 27 11:34:43 2014
@@ -19,6 +19,7 @@ package org.apache.lucene.sandbox.querie
import org.apache.lucene.analysis.MockAnalyzer;
+import org.apache.lucene.document.Document2;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
import org.apache.lucene.index.DirectoryReader;
@@ -54,15 +55,11 @@ public class TestSpanRegexQuery extends
public void testSpanRegex() throws Exception {
Directory directory = newDirectory();
IndexWriter writer = new IndexWriter(directory, newIndexWriterConfig(new MockAnalyzer(random())));
- Document doc = new Document();
- // doc.add(newField("field", "the quick brown fox jumps over the lazy dog",
- // Field.Store.NO, Field.Index.ANALYZED));
- // writer.addDocument(doc);
- // doc = new Document();
- doc.add(newTextField("field", "auto update", Field.Store.NO));
+ Document2 doc = writer.newDocument();
+ doc.addLargeText("field", "auto update");
writer.addDocument(doc);
- doc = new Document();
- doc.add(newTextField("field", "first auto update", Field.Store.NO));
+ doc = writer.newDocument();
+ doc.addLargeText("field", "first auto update");
writer.addDocument(doc);
writer.forceMerge(1);
writer.close();
Modified: lucene/dev/branches/lucene6005/lucene/sandbox/src/test/org/apache/lucene/search/TestTermAutomatonQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/sandbox/src/test/org/apache/lucene/search/TestTermAutomatonQuery.java?rev=1642110&r1=1642109&r2=1642110&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/sandbox/src/test/org/apache/lucene/search/TestTermAutomatonQuery.java (original)
+++ lucene/dev/branches/lucene6005/lucene/sandbox/src/test/org/apache/lucene/search/TestTermAutomatonQuery.java Thu Nov 27 11:34:43 2014
@@ -35,18 +35,20 @@ import org.apache.lucene.analysis.TokenF
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;
import org.apache.lucene.analysis.tokenattributes.PositionIncrementAttribute;
+import org.apache.lucene.document.Document2;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
+import org.apache.lucene.document.FieldTypes;
import org.apache.lucene.document.StoredField;
-import org.apache.lucene.index.LeafReaderContext;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexWriterConfig;
+import org.apache.lucene.index.LeafReaderContext;
import org.apache.lucene.index.RandomIndexWriter;
import org.apache.lucene.index.Term;
import org.apache.lucene.store.Directory;
+import org.apache.lucene.util.BitDocIdSet;
import org.apache.lucene.util.Bits;
import org.apache.lucene.util.BytesRef;
-import org.apache.lucene.util.BitDocIdSet;
import org.apache.lucene.util.FixedBitSet;
import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.util.TestUtil;
@@ -59,14 +61,14 @@ public class TestTermAutomatonQuery exte
public void testBasic1() throws Exception {
Directory dir = newDirectory();
RandomIndexWriter w = new RandomIndexWriter(random(), dir);
- Document doc = new Document();
+ Document2 doc = w.newDocument();
// matches
- doc.add(newTextField("field", "here comes the sun", Field.Store.NO));
+ doc.addLargeText("field", "here comes the sun");
w.addDocument(doc);
- doc = new Document();
+ doc = w.newDocument();
// doesn't match
- doc.add(newTextField("field", "here comes the other sun", Field.Store.NO));
+ doc.addLargeText("field", "here comes the other sun");
w.addDocument(doc);
IndexReader r = w.getReader();
IndexSearcher s = newSearcher(r);
@@ -93,12 +95,12 @@ public class TestTermAutomatonQuery exte
public void testBasicSynonym() throws Exception {
Directory dir = newDirectory();
RandomIndexWriter w = new RandomIndexWriter(random(), dir);
- Document doc = new Document();
- doc.add(newTextField("field", "here comes the sun", Field.Store.NO));
+ Document2 doc = w.newDocument();
+ doc.addLargeText("field", "here comes the sun");
w.addDocument(doc);
- doc = new Document();
- doc.add(newTextField("field", "here comes the moon", Field.Store.NO));
+ doc = w.newDocument();
+ doc.addLargeText("field", "here comes the moon");
w.addDocument(doc);
IndexReader r = w.getReader();
IndexSearcher s = newSearcher(r);
@@ -126,16 +128,16 @@ public class TestTermAutomatonQuery exte
public void testBasicSlop() throws Exception {
Directory dir = newDirectory();
RandomIndexWriter w = new RandomIndexWriter(random(), dir);
- Document doc = new Document();
- doc.add(newTextField("field", "here comes the sun", Field.Store.NO));
+ Document2 doc = w.newDocument();
+ doc.addLargeText("field", "here comes the sun");
w.addDocument(doc);
- doc = new Document();
- doc.add(newTextField("field", "here comes sun", Field.Store.NO));
+ doc = w.newDocument();
+ doc.addLargeText("field", "here comes sun");
w.addDocument(doc);
- doc = new Document();
- doc.add(newTextField("field", "here comes the other sun", Field.Store.NO));
+ doc = w.newDocument();
+ doc.addLargeText("field", "here comes the other sun");
w.addDocument(doc);
IndexReader r = w.getReader();
IndexSearcher s = newSearcher(r);
@@ -167,25 +169,25 @@ public class TestTermAutomatonQuery exte
public void testPosLengthAtQueryTimeMock() throws Exception {
Directory dir = newDirectory();
RandomIndexWriter w = new RandomIndexWriter(random(), dir);
- Document doc = new Document();
- doc.add(newTextField("field", "speedy wifi network", Field.Store.NO));
+ Document2 doc = w.newDocument();
+ doc.addLargeText("field", "speedy wifi network");
w.addDocument(doc);
- doc = new Document();
- doc.add(newTextField("field", "speedy wi fi network", Field.Store.NO));
+ doc = w.newDocument();
+ doc.addLargeText("field", "speedy wi fi network");
w.addDocument(doc);
- doc = new Document();
- doc.add(newTextField("field", "fast wifi network", Field.Store.NO));
+ doc = w.newDocument();
+ doc.addLargeText("field", "fast wifi network");
w.addDocument(doc);
- doc = new Document();
- doc.add(newTextField("field", "fast wi fi network", Field.Store.NO));
+ doc = w.newDocument();
+ doc.addLargeText("field", "fast wi fi network");
w.addDocument(doc);
// doesn't match:
- doc = new Document();
- doc.add(newTextField("field", "slow wi fi network", Field.Store.NO));
+ doc = w.newDocument();
+ doc.addLargeText("field", "slow wi fi network");
w.addDocument(doc);
IndexReader r = w.getReader();
@@ -218,25 +220,25 @@ public class TestTermAutomatonQuery exte
public void testPosLengthAtQueryTimeTrueish() throws Exception {
Directory dir = newDirectory();
RandomIndexWriter w = new RandomIndexWriter(random(), dir);
- Document doc = new Document();
- doc.add(newTextField("field", "speedy wifi network", Field.Store.NO));
+ Document2 doc = w.newDocument();
+ doc.addLargeText("field", "speedy wifi network");
w.addDocument(doc);
- doc = new Document();
- doc.add(newTextField("field", "speedy wi fi network", Field.Store.NO));
+ doc = w.newDocument();
+ doc.addLargeText("field", "speedy wi fi network");
w.addDocument(doc);
- doc = new Document();
- doc.add(newTextField("field", "fast wifi network", Field.Store.NO));
+ doc = w.newDocument();
+ doc.addLargeText("field", "fast wifi network");
w.addDocument(doc);
- doc = new Document();
- doc.add(newTextField("field", "fast wi fi network", Field.Store.NO));
+ doc = w.newDocument();
+ doc.addLargeText("field", "fast wi fi network");
w.addDocument(doc);
// doesn't match:
- doc = new Document();
- doc.add(newTextField("field", "slow wi fi network", Field.Store.NO));
+ doc = w.newDocument();
+ doc.addLargeText("field", "slow wi fi network");
w.addDocument(doc);
IndexReader r = w.getReader();
@@ -263,14 +265,14 @@ public class TestTermAutomatonQuery exte
public void testFreq() throws Exception {
Directory dir = newDirectory();
RandomIndexWriter w = new RandomIndexWriter(random(), dir);
- Document doc = new Document();
+ Document2 doc = w.newDocument();
// matches freq == 3
- doc.add(newTextField("field", "here comes the sun foo bar here comes another sun here comes shiny sun", Field.Store.NO));
+ doc.addLargeText("field", "here comes the sun foo bar here comes another sun here comes shiny sun");
w.addDocument(doc);
- doc = new Document();
+ doc = w.newDocument();
// doesn't match
- doc.add(newTextField("field", "here comes the other sun", Field.Store.NO));
+ doc.addLargeText("field", "here comes the other sun");
w.addDocument(doc);
IndexReader r = w.getReader();
IndexSearcher s = newSearcher(r);
@@ -314,13 +316,13 @@ public class TestTermAutomatonQuery exte
public void testSegsMissingTerms() throws Exception {
Directory dir = newDirectory();
RandomIndexWriter w = new RandomIndexWriter(random(), dir);
- Document doc = new Document();
- doc.add(newTextField("field", "here comes the sun", Field.Store.NO));
+ Document2 doc = w.newDocument();
+ doc.addLargeText("field", "here comes the sun");
w.addDocument(doc);
w.commit();
- doc = new Document();
- doc.add(newTextField("field", "here comes the moon", Field.Store.NO));
+ doc = w.newDocument();
+ doc.addLargeText("field", "here comes the moon");
w.addDocument(doc);
IndexReader r = w.getReader();
IndexSearcher s = newSearcher(r);
@@ -378,21 +380,21 @@ public class TestTermAutomatonQuery exte
public void testAnyFromTokenStream() throws Exception {
Directory dir = newDirectory();
RandomIndexWriter w = new RandomIndexWriter(random(), dir);
- Document doc = new Document();
- doc.add(newTextField("field", "here comes the sun", Field.Store.NO));
+ Document2 doc = w.newDocument();
+ doc.addLargeText("field", "here comes the sun");
w.addDocument(doc);
- doc = new Document();
- doc.add(newTextField("field", "here comes the moon", Field.Store.NO));
+ doc = w.newDocument();
+ doc.addLargeText("field", "here comes the moon");
w.addDocument(doc);
- doc = new Document();
- doc.add(newTextField("field", "here comes sun", Field.Store.NO));
+ doc = w.newDocument();
+ doc.addLargeText("field", "here comes sun");
w.addDocument(doc);
// Should not match:
- doc = new Document();
- doc.add(newTextField("field", "here comes the other sun", Field.Store.NO));
+ doc = w.newDocument();
+ doc.addLargeText("field", "here comes the other sun");
w.addDocument(doc);
IndexReader r = w.getReader();
@@ -476,9 +478,10 @@ public class TestTermAutomatonQuery exte
IndexWriterConfig iwc = newIndexWriterConfig(analyzer);
RandomIndexWriter w = new RandomIndexWriter(random(), dir, iwc);
-
+ FieldTypes fieldTypes = w.getFieldTypes();
+ fieldTypes.disableHighlighting("field");
for(int i=0;i<numDocs;i++) {
- Document doc = new Document();
+ Document2 doc = w.newDocument();
int numTokens = atLeast(10);
StringBuilder sb = new StringBuilder();
@@ -487,8 +490,8 @@ public class TestTermAutomatonQuery exte
sb.append((char) (97 + random().nextInt(3)));
}
String contents = sb.toString();
- doc.add(newTextField("field", contents, Field.Store.NO));
- doc.add(new StoredField("id", ""+i));
+ doc.addLargeText("field", contents);
+ doc.addStored("id", ""+i);
if (VERBOSE) {
System.out.println(" doc " + i + " -> " + contents);
}
Modified: lucene/dev/branches/lucene6005/lucene/spatial/src/java/org/apache/lucene/spatial/NumberRangePrefixTreeStrategy.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/spatial/src/java/org/apache/lucene/spatial/NumberRangePrefixTreeStrategy.java?rev=1642110&r1=1642109&r2=1642110&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/spatial/src/java/org/apache/lucene/spatial/NumberRangePrefixTreeStrategy.java (original)
+++ lucene/dev/branches/lucene6005/lucene/spatial/src/java/org/apache/lucene/spatial/NumberRangePrefixTreeStrategy.java Thu Nov 27 11:34:43 2014
@@ -17,15 +17,16 @@ package org.apache.lucene.spatial;
* limitations under the License.
*/
-import com.spatial4j.core.shape.Point;
-import com.spatial4j.core.shape.Shape;
+import java.text.ParseException;
+
import org.apache.lucene.analysis.TokenStream;
+import org.apache.lucene.document.Document2;
import org.apache.lucene.document.Field;
import org.apache.lucene.queries.function.ValueSource;
import org.apache.lucene.spatial.prefix.RecursivePrefixTreeStrategy;
import org.apache.lucene.spatial.prefix.tree.NumberRangePrefixTree;
-
-import java.text.ParseException;
+import com.spatial4j.core.shape.Point;
+import com.spatial4j.core.shape.Shape;
/** A PrefixTree based on Number/Date ranges. This isn't very "spatial" on the surface (to the user) but
* it's implemented using spatial so that's why it's here extending a SpatialStrategy.
@@ -48,11 +49,9 @@ public class NumberRangePrefixTreeStrate
}
@Override
- public Field[] createIndexableFields(Shape shape) {
+ public void addFields(Document2 doc, Shape shape) {
//levels doesn't actually matter; NumberRange based Shapes have their own "level".
- TokenStream tokenStream = createTokenStream(shape, grid.getMaxLevels());
- Field field = new Field(getFieldName(), tokenStream, FIELD_TYPE);
- return new Field[]{field};
+ doc.addLargeText(getFieldName(), createTokenStream(shape, grid.getMaxLevels()));
}
/** For a Date based tree, pass in a Calendar, with unspecified fields marked as cleared.
Modified: lucene/dev/branches/lucene6005/lucene/spatial/src/java/org/apache/lucene/spatial/SpatialStrategy.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/spatial/src/java/org/apache/lucene/spatial/SpatialStrategy.java?rev=1642110&r1=1642109&r2=1642110&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/spatial/src/java/org/apache/lucene/spatial/SpatialStrategy.java (original)
+++ lucene/dev/branches/lucene6005/lucene/spatial/src/java/org/apache/lucene/spatial/SpatialStrategy.java Thu Nov 27 11:34:43 2014
@@ -17,17 +17,18 @@ package org.apache.lucene.spatial;
* limitations under the License.
*/
-import com.spatial4j.core.context.SpatialContext;
-import com.spatial4j.core.shape.Point;
-import com.spatial4j.core.shape.Rectangle;
-import com.spatial4j.core.shape.Shape;
-import org.apache.lucene.document.Field;
+import org.apache.lucene.document.Document2;
+import org.apache.lucene.document.FieldTypes;
import org.apache.lucene.queries.function.ValueSource;
import org.apache.lucene.queries.function.valuesource.ReciprocalFloatFunction;
import org.apache.lucene.search.ConstantScoreQuery;
import org.apache.lucene.search.Filter;
import org.apache.lucene.search.Query;
import org.apache.lucene.spatial.query.SpatialArgs;
+import com.spatial4j.core.context.SpatialContext;
+import com.spatial4j.core.shape.Point;
+import com.spatial4j.core.shape.Rectangle;
+import com.spatial4j.core.shape.Shape;
/**
* The SpatialStrategy encapsulates an approach to indexing and searching based
@@ -98,7 +99,7 @@ public abstract class SpatialStrategy {
* @return Not null nor will it have null elements.
* @throws UnsupportedOperationException if given a shape incompatible with the strategy
*/
- public abstract Field[] createIndexableFields(Shape shape);
+ public abstract void addFields(Document2 doc, Shape shape);
/**
* See {@link #makeDistanceValueSource(com.spatial4j.core.shape.Point, double)} called with
@@ -126,8 +127,8 @@ public abstract class SpatialStrategy {
* @throws org.apache.lucene.spatial.query.UnsupportedSpatialOperation If the strategy does not support the {@link
* org.apache.lucene.spatial.query.SpatialOperation} in {@code args}.
*/
- public Query makeQuery(SpatialArgs args) {
- return new ConstantScoreQuery(makeFilter(args));
+ public Query makeQuery(FieldTypes fieldTypes, SpatialArgs args) {
+ return new ConstantScoreQuery(makeFilter(fieldTypes, args));
}
/**
@@ -143,7 +144,7 @@ public abstract class SpatialStrategy {
* @throws org.apache.lucene.spatial.query.UnsupportedSpatialOperation If the strategy does not support the {@link
* org.apache.lucene.spatial.query.SpatialOperation} in {@code args}.
*/
- public abstract Filter makeFilter(SpatialArgs args);
+ public abstract Filter makeFilter(FieldTypes fieldTypes, SpatialArgs args);
/**
* Returns a ValueSource with values ranging from 1 to 0, depending inversely