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/30 12:07:19 UTC
svn commit: r1642535 [4/19] - in /lucene/dev/branches/lucene6005/lucene:
analysis/common/src/java/org/apache/lucene/collation/
analysis/common/src/test/org/apache/lucene/analysis/core/
analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/ ...
Modified: lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/search/IndexSearcher.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/search/IndexSearcher.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/search/IndexSearcher.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/search/IndexSearcher.java Sun Nov 30 11:07:09 2014
@@ -32,7 +32,7 @@ import java.util.concurrent.ExecutorServ
import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReentrantLock;
-import org.apache.lucene.document.Document2;
+import org.apache.lucene.document.Document;
import org.apache.lucene.document.FieldTypes;
import org.apache.lucene.index.DirectoryReader; // javadocs
import org.apache.lucene.index.IndexReader;
@@ -189,7 +189,7 @@ public class IndexSearcher {
* Sugar for <code>.getIndexReader().document2(docID)</code>
* @see IndexReader#document2(int)
*/
- public Document2 doc(int docID) throws IOException {
+ public Document doc(int docID) throws IOException {
return reader.document(docID);
}
@@ -205,7 +205,7 @@ public class IndexSearcher {
* Sugar for <code>.getIndexReader().document(docID, fieldsToLoad)</code>
* @see IndexReader#document(int, Set)
*/
- public Document2 doc(int docID, Set<String> fieldsToLoad) throws IOException {
+ public Document doc(int docID, Set<String> fieldsToLoad) throws IOException {
return reader.document(docID, fieldsToLoad);
}
Modified: lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/search/NumericRangeQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/search/NumericRangeQuery.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/search/NumericRangeQuery.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/search/NumericRangeQuery.java Sun Nov 30 11:07:09 2014
@@ -21,7 +21,7 @@ import java.io.IOException;
import java.util.LinkedList;
import org.apache.lucene.analysis.NumericTokenStream; // for javadocs
-import org.apache.lucene.document.FieldType.NumericType;
+import org.apache.lucene.document.NumericType;
import org.apache.lucene.index.FilteredTermsEnum;
import org.apache.lucene.index.Terms;
import org.apache.lucene.index.TermsEnum;
Modified: lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/search/SortField.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/search/SortField.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/search/SortField.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/search/SortField.java Sun Nov 30 11:07:09 2014
@@ -146,8 +146,8 @@ public class SortField {
if (missingValue != STRING_FIRST && missingValue != STRING_LAST) {
throw new IllegalArgumentException("For STRING type, missing value must be either STRING_FIRST or STRING_LAST");
}
- } else if (type != Type.INT && type != Type.FLOAT && type != Type.LONG && type != Type.DOUBLE) {
- throw new IllegalArgumentException("Missing value only works for numeric or STRING types");
+ } else if (type != Type.INT && type != Type.FLOAT && type != Type.LONG && type != Type.DOUBLE && type != Type.CUSTOM) {
+ throw new IllegalArgumentException("Missing value only works for numeric or STRING or CUSTOM types");
}
this.missingValue = missingValue;
}
Modified: lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/search/SortedNumericSelector.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/search/SortedNumericSelector.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/search/SortedNumericSelector.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/search/SortedNumericSelector.java Sun Nov 30 11:07:09 2014
@@ -17,10 +17,10 @@ package org.apache.lucene.search;
* limitations under the License.
*/
+import org.apache.lucene.document.Document;
import org.apache.lucene.index.DocValues;
import org.apache.lucene.index.NumericDocValues;
import org.apache.lucene.index.SortedNumericDocValues;
-import org.apache.lucene.util.NumericUtils;
/**
* Selects a value from the document's list to use as the representative value
@@ -81,14 +81,14 @@ public class SortedNumericSelector {
return new NumericDocValues() {
@Override
public long get(int docID) {
- return NumericUtils.sortableFloatBits((int) view.get(docID));
+ return Document.sortableFloatBits((int) view.get(docID));
}
};
case DOUBLE:
return new NumericDocValues() {
@Override
public long get(int docID) {
- return NumericUtils.sortableDoubleBits(view.get(docID));
+ return Document.sortableDoubleBits(view.get(docID));
}
};
default:
Modified: lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/search/TermRangeFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/search/TermRangeFilter.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/search/TermRangeFilter.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/search/TermRangeFilter.java Sun Nov 30 11:07:09 2014
@@ -25,8 +25,7 @@ import org.apache.lucene.util.BytesRef;
*
* <p>This filter matches the documents looking for terms that fall into the
* supplied range according to {@link
- * Byte#compareTo(Byte)}, It is not intended
- * for numerical ranges; use {@link NumericRangeFilter} instead.
+ * Byte#compareTo(Byte)}.
*
* <p>If you construct a large number of range filters with different ranges but on the
* same field, {@link DocValuesRangeFilter} may have significantly better performance.
@@ -71,7 +70,7 @@ public class TermRangeFilter extends Mul
* less than or equal to <code>upperTerm</code>.
*/
public static TermRangeFilter Less(String fieldName, BytesRef upperTerm) {
- return new TermRangeFilter(fieldName, null, upperTerm, false, true);
+ return new TermRangeFilter(fieldName, null, upperTerm, false, true);
}
/**
@@ -79,7 +78,7 @@ public class TermRangeFilter extends Mul
* greater than or equal to <code>lowerTerm</code>.
*/
public static TermRangeFilter More(String fieldName, BytesRef lowerTerm) {
- return new TermRangeFilter(fieldName, lowerTerm, null, true, false);
+ return new TermRangeFilter(fieldName, lowerTerm, null, true, false);
}
/** Returns the lower value of this range filter */
Modified: lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/search/TermRangeQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/search/TermRangeQuery.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/search/TermRangeQuery.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/search/TermRangeQuery.java Sun Nov 30 11:07:09 2014
@@ -101,7 +101,6 @@ public class TermRangeQuery extends Mult
@Override
protected TermsEnum getTermsEnum(Terms terms, AttributeSource atts) throws IOException {
-
if (lowerTerm != null && upperTerm != null && lowerTerm.compareTo(upperTerm) > 0) {
// Matches no terms:
return TermsEnum.EMPTY;
Modified: lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/TestDemo.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/TestDemo.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/TestDemo.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/TestDemo.java Sun Nov 30 11:07:09 2014
@@ -21,9 +21,7 @@ import java.io.IOException;
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;
import org.apache.lucene.index.DirectoryReader;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.RandomIndexWriter;
@@ -48,7 +46,7 @@ public class TestDemo extends LuceneTest
// To store an index on disk, use this instead:
// Directory directory = FSDirectory.open(new File("/tmp/testindex"));
RandomIndexWriter iwriter = new RandomIndexWriter(random(), directory, analyzer);
- Document2 doc = iwriter.newDocument();
+ Document doc = iwriter.newDocument();
String longTerm = "longtermlongtermlongtermlongtermlongtermlongtermlongtermlongtermlongtermlongtermlongtermlongtermlongtermlongtermlongtermlongtermlongtermlongterm";
String text = "This is the text to be indexed. " + longTerm;
doc.addLargeText("fieldname", text);
@@ -65,7 +63,7 @@ public class TestDemo extends LuceneTest
assertEquals(1, hits.totalHits);
// Iterate through the results:
for (int i = 0; i < hits.scoreDocs.length; i++) {
- Document2 hitDoc = isearcher.doc(hits.scoreDocs[i].doc);
+ Document hitDoc = isearcher.doc(hits.scoreDocs[i].doc);
assertEquals(text, hitDoc.getString("fieldname"));
}
Modified: lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/TestExternalCodecs.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/TestExternalCodecs.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/TestExternalCodecs.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/TestExternalCodecs.java Sun Nov 30 11:07:09 2014
@@ -18,11 +18,7 @@ package org.apache.lucene;
*/
import org.apache.lucene.analysis.MockAnalyzer;
-import org.apache.lucene.codecs.PostingsFormat;
-import org.apache.lucene.codecs.asserting.AssertingCodec;
-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.DirectoryReader;
import org.apache.lucene.index.IndexReader;
@@ -64,7 +60,7 @@ public class TestExternalCodecs extends
fieldTypes.setPostingsFormat("field2", "Memory");
for(int i=0;i<NUM_DOCS;i++) {
- Document2 doc = w.newDocument();
+ Document doc = w.newDocument();
// uses default codec:
doc.addLargeText("field1", "this field uses the standard codec as the test");
// uses memory codec:
Modified: lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/TestMergeSchedulerExternal.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/TestMergeSchedulerExternal.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/TestMergeSchedulerExternal.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/TestMergeSchedulerExternal.java Sun Nov 30 11:07:09 2014
@@ -19,9 +19,7 @@ package org.apache.lucene;
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.Field;
import org.apache.lucene.index.ConcurrentMergeScheduler;
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.index.IndexWriterConfig;
@@ -95,7 +93,7 @@ public class TestMergeSchedulerExternal
.setMaxBufferedDocs(2).setRAMBufferSizeMB(IndexWriterConfig.DISABLE_AUTO_FLUSH)
.setMergePolicy(newLogMergePolicy()));
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
doc.addAtom("id", "");
LogMergePolicy logMP = (LogMergePolicy) writer.getConfig().getMergePolicy();
Modified: lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/TestSearch.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/TestSearch.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/TestSearch.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/TestSearch.java Sun Nov 30 11:07:09 2014
@@ -46,7 +46,7 @@ public class TestSearch extends LuceneTe
IndexWriter writer = new IndexWriter(directory, conf);
try {
- Document2 d = writer.newDocument();
+ Document d = writer.newDocument();
d.addLargeText("foo", "bar");
writer.addDocument(d);
} finally {
@@ -125,7 +125,7 @@ public class TestSearch extends LuceneTe
"a c e a b c"
};
for (int j = 0; j < docs.length; j++) {
- Document2 d = writer.newDocument();
+ Document d = writer.newDocument();
d.addLargeText("contents", docs[j]);
d.addInt("id", j);
writer.addDocument(d);
@@ -150,7 +150,7 @@ public class TestSearch extends LuceneTe
out.println(hits.length + " total results");
for (int i = 0 ; i < hits.length && i < 10; i++) {
- Document2 d = searcher.doc(hits[i].doc);
+ Document d = searcher.doc(hits[i].doc);
out.println(i + " " + hits[i].score + " " + d.getString("contents"));
}
}
Modified: lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/TestSearchForDuplicates.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/TestSearchForDuplicates.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/TestSearchForDuplicates.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/TestSearchForDuplicates.java Sun Nov 30 11:07:09 2014
@@ -79,7 +79,7 @@ public class TestSearchForDuplicates ext
}
for (int j = 0; j < MAX_DOCS; j++) {
- Document2 d = writer.newDocument();
+ Document d = writer.newDocument();
d.addLargeText(PRIORITY_FIELD, HIGH_PRIORITY);
d.addInt(ID_FIELD, j);
writer.addDocument(d);
@@ -125,7 +125,7 @@ public class TestSearchForDuplicates ext
out.println(hits.length + " total results\n");
for (int i = 0 ; i < hits.length; i++) {
if ( i < 10 || (i > 94 && i < 105) ) {
- Document2 d = searcher.doc(hits[i].doc);
+ Document d = searcher.doc(hits[i].doc);
out.println(i + " " + d.getInt(ID_FIELD));
}
}
@@ -135,7 +135,7 @@ public class TestSearchForDuplicates ext
assertEquals("total results", expectedCount, hits.length);
for (int i = 0 ; i < hits.length; i++) {
if (i < 10 || (i > 94 && i < 105) ) {
- Document2 d = searcher.doc(hits[i].doc);
+ Document d = searcher.doc(hits[i].doc);
assertEquals("check " + i, i, d.getInt(ID_FIELD).intValue());
}
}
Modified: lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/analysis/TestCachingTokenFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/analysis/TestCachingTokenFilter.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/analysis/TestCachingTokenFilter.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/analysis/TestCachingTokenFilter.java Sun Nov 30 11:07:09 2014
@@ -22,9 +22,7 @@ import java.io.IOException;
import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;
import org.apache.lucene.analysis.tokenattributes.OffsetAttribute;
-import org.apache.lucene.document.Document2;
import org.apache.lucene.document.Document;
-import org.apache.lucene.document.TextField;
import org.apache.lucene.index.DocsAndPositionsEnum;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.MultiFields;
@@ -39,7 +37,7 @@ public class TestCachingTokenFilter exte
public void testCaching() throws IOException {
Directory dir = newDirectory();
RandomIndexWriter writer = new RandomIndexWriter(random(), dir);
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
TokenStream stream = new TokenStream() {
private int index = 0;
private CharTermAttribute termAtt = addAttribute(CharTermAttribute.class);
Modified: lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/analysis/TestMockAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/analysis/TestMockAnalyzer.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/analysis/TestMockAnalyzer.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/analysis/TestMockAnalyzer.java Sun Nov 30 11:07:09 2014
@@ -22,10 +22,7 @@ import java.io.StringReader;
import java.util.Arrays;
import java.util.Random;
-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.DocsAndPositionsEnum;
import org.apache.lucene.index.Fields;
@@ -310,7 +307,7 @@ public class TestMockAnalyzer extends Ba
final RandomIndexWriter writer = new RandomIndexWriter(random(), newDirectory(), a);
FieldTypes fieldTypes = writer.getFieldTypes();
- final Document2 doc = writer.newDocument();
+ final Document doc = writer.newDocument();
fieldTypes.enableTermVectors("f");
fieldTypes.enableTermVectorPositions("f");
Modified: lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/codecs/compressing/TestCompressingStoredFieldsFormat.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/codecs/compressing/TestCompressingStoredFieldsFormat.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/codecs/compressing/TestCompressingStoredFieldsFormat.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/codecs/compressing/TestCompressingStoredFieldsFormat.java Sun Nov 30 11:07:09 2014
@@ -21,11 +21,7 @@ import java.io.IOException;
import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.codecs.Codec;
-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.index.BaseStoredFieldsFormatTestCase;
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.index.IndexWriterConfig;
@@ -58,13 +54,13 @@ public class TestCompressingStoredFields
// Cannot use RIW because this test wants CFS to stay off:
IndexWriter iw = new IndexWriter(dir, iwConf);
- Document2 validDoc = iw.newDocument();
+ Document validDoc = iw.newDocument();
validDoc.addInt("id", 0);
iw.addDocument(validDoc);
iw.commit();
// make sure that #writeField will fail to trigger an abort
- Document2 invalidDoc = iw.newDocument();
+ Document invalidDoc = iw.newDocument();
try {
invalidDoc.addStored("invalid", (String) null);
Modified: lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/codecs/compressing/TestCompressingTermVectorsFormat.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/codecs/compressing/TestCompressingTermVectorsFormat.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/codecs/compressing/TestCompressingTermVectorsFormat.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/codecs/compressing/TestCompressingTermVectorsFormat.java Sun Nov 30 11:07:09 2014
@@ -1,7 +1,7 @@
package org.apache.lucene.codecs.compressing;
import org.apache.lucene.codecs.Codec;
-import org.apache.lucene.document.Document2;
+import org.apache.lucene.document.Document;
import org.apache.lucene.index.BaseTermVectorsFormatTestCase;
import org.apache.lucene.index.LeafReader;
import org.apache.lucene.index.RandomIndexWriter;
@@ -39,7 +39,7 @@ public class TestCompressingTermVectorsF
public void testNoOrds() throws Exception {
Directory dir = newDirectory();
RandomIndexWriter iw = new RandomIndexWriter(random(), dir);
- Document2 doc = iw.newDocument();
+ Document doc = iw.newDocument();
iw.getFieldTypes().enableTermVectors("foo");
doc.addLargeText("foo", "this is a test");
iw.addDocument(doc);
Modified: lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/codecs/lucene50/TestAutoPrefixTerms.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/codecs/lucene50/TestAutoPrefixTerms.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/codecs/lucene50/TestAutoPrefixTerms.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/codecs/lucene50/TestAutoPrefixTerms.java Sun Nov 30 11:07:09 2014
@@ -30,10 +30,7 @@ import org.apache.lucene.analysis.MockAn
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.tokenattributes.TermToBytesRefAttribute;
import org.apache.lucene.codecs.Codec;
-import org.apache.lucene.document.Document2;
-import org.apache.lucene.document.Field;
-import org.apache.lucene.document.FieldType;
-import org.apache.lucene.document.StringField;
+import org.apache.lucene.document.Document;
import org.apache.lucene.index.BinaryDocValues;
import org.apache.lucene.index.DirectoryReader;
import org.apache.lucene.index.DocValuesType;
@@ -88,7 +85,7 @@ public class TestAutoPrefixTerms extends
}
for(String term : terms) {
- Document2 doc = w.newDocument();
+ Document doc = w.newDocument();
doc.addAtom("field", term);
doc.addLong("long", Long.parseLong(term));
w.addDocument(doc);
@@ -220,7 +217,7 @@ public class TestAutoPrefixTerms extends
}
for(Integer term : terms) {
- Document2 doc = w.newDocument();
+ Document doc = w.newDocument();
doc.addAtom("field", intToBytes(term));
doc.addInt("int", term.intValue());
w.addDocument(doc);
@@ -342,7 +339,7 @@ public class TestAutoPrefixTerms extends
w.getFieldTypes().setDocValuesType("binary", DocValuesType.BINARY);
for(String term : terms) {
- Document2 doc = w.newDocument();
+ Document doc = w.newDocument();
doc.addAtom("field", term);
doc.addBinary("binary", new BytesRef(term));
w.addDocument(doc);
@@ -446,7 +443,7 @@ public class TestAutoPrefixTerms extends
int numDocs = 30;
for(int i=0;i<numDocs;i++) {
- Document2 doc = w.newDocument();
+ Document doc = w.newDocument();
doc.addAtom("field", "" + (char) (97+i));
w.addDocument(doc);
doc = w.newDocument();
@@ -544,22 +541,6 @@ public class TestAutoPrefixTerms extends
}
}
- /** Basically a StringField that accepts binary term. */
- private static class BinaryField extends Field {
-
- final static FieldType TYPE;
- static {
- TYPE = new FieldType(StringField.TYPE_NOT_STORED);
- // Necessary so our custom tokenStream is used by Field.tokenStream:
- TYPE.setTokenized(true);
- TYPE.freeze();
- }
-
- public BinaryField(String name, BytesRef value) {
- super(name, new BinaryTokenStream(value), TYPE);
- }
- }
-
/** Helper class to ensure auto-prefix terms 1) never overlap one another, and 2) are used when they should be. */
private static class VerifyAutoPrefixTerms {
final FixedBitSet allHits;
Modified: lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/codecs/lucene50/TestBlockPostingsFormat.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/codecs/lucene50/TestBlockPostingsFormat.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/codecs/lucene50/TestBlockPostingsFormat.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/codecs/lucene50/TestBlockPostingsFormat.java Sun Nov 30 11:07:09 2014
@@ -21,7 +21,7 @@ import org.apache.lucene.analysis.MockAn
import org.apache.lucene.codecs.Codec;
import org.apache.lucene.codecs.blocktree.FieldReader;
import org.apache.lucene.codecs.blocktree.Stats;
-import org.apache.lucene.document.Document2;
+import org.apache.lucene.document.Document;
import org.apache.lucene.document.FieldTypes;
import org.apache.lucene.index.BasePostingsFormatTestCase;
import org.apache.lucene.index.DirectoryReader;
@@ -49,7 +49,7 @@ public class TestBlockPostingsFormat ext
fieldTypes.disableSorting("field");
fieldTypes.setMultiValued("field");
for(int i=0;i<25;i++) {
- Document2 doc = w.newDocument();
+ Document doc = w.newDocument();
doc.addAtom("field", Character.toString((char) (97+i)));
doc.addAtom("field", "z" + Character.toString((char) (97+i)));
w.addDocument(doc);
Modified: lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/codecs/lucene50/TestBlockPostingsFormat2.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/codecs/lucene50/TestBlockPostingsFormat2.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/codecs/lucene50/TestBlockPostingsFormat2.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/codecs/lucene50/TestBlockPostingsFormat2.java Sun Nov 30 11:07:09 2014
@@ -18,7 +18,7 @@ package org.apache.lucene.codecs.lucene5
*/
import org.apache.lucene.analysis.MockAnalyzer;
-import org.apache.lucene.document.Document2;
+import org.apache.lucene.document.Document;
import org.apache.lucene.document.FieldTypes;
import org.apache.lucene.index.IndexOptions;
import org.apache.lucene.index.IndexWriter;
@@ -61,8 +61,8 @@ public class TestBlockPostingsFormat2 ex
super.tearDown();
}
- private Document2 newDocument(String contents) {
- Document2 doc = iw.newDocument();
+ private Document newDocument(String contents) {
+ Document doc = iw.newDocument();
FieldTypes fieldTypes = iw.getFieldTypes();
for (IndexOptions option : IndexOptions.values()) {
if (option == IndexOptions.NONE) {
Modified: lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/codecs/lucene50/TestBlockPostingsFormat3.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/codecs/lucene50/TestBlockPostingsFormat3.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/codecs/lucene50/TestBlockPostingsFormat3.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/codecs/lucene50/TestBlockPostingsFormat3.java Sun Nov 30 11:07:09 2014
@@ -28,12 +28,8 @@ import org.apache.lucene.analysis.MockTo
import org.apache.lucene.analysis.MockVariableLengthPayloadFilter;
import org.apache.lucene.analysis.TokenFilter;
import org.apache.lucene.analysis.Tokenizer;
-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.document.TextField;
import org.apache.lucene.index.DirectoryReader;
import org.apache.lucene.index.DocsAndPositionsEnum;
import org.apache.lucene.index.DocsEnum;
@@ -121,7 +117,7 @@ public class TestBlockPostingsFormat3 ex
for (int i = 0; i < MAXDOC; i++) {
String stringValue = Integer.toString(i) + " verycommon " + English.intToEnglish(i).replace('-', ' ') + " " + TestUtil.randomSimpleString(random());
- Document2 doc = iw.newDocument();
+ Document doc = iw.newDocument();
for(String fieldName : new String[] {
"field1docs",
"field2freqs",
Modified: lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/codecs/lucene50/TestLucene50DocValuesFormat.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/codecs/lucene50/TestLucene50DocValuesFormat.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/codecs/lucene50/TestLucene50DocValuesFormat.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/codecs/lucene50/TestLucene50DocValuesFormat.java Sun Nov 30 11:07:09 2014
@@ -26,7 +26,7 @@ import org.apache.lucene.codecs.Codec;
import org.apache.lucene.codecs.DocValuesFormat;
import org.apache.lucene.codecs.PostingsFormat;
import org.apache.lucene.codecs.asserting.AssertingCodec;
-import org.apache.lucene.document.Document2;
+import org.apache.lucene.document.Document;
import org.apache.lucene.document.FieldTypes;
import org.apache.lucene.index.BaseCompressingDocValuesFormatTestCase;
import org.apache.lucene.index.DirectoryReader;
@@ -140,7 +140,7 @@ public class TestLucene50DocValuesFormat
// index some docs
for (int i = 0; i < numDocs; i++) {
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
doc.addUniqueAtom("id", Integer.toString(i));
final int length = TestUtil.nextInt(random(), minLength, maxLength);
int numValues = random().nextInt(17);
Modified: lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/codecs/perfield/TestPerFieldDocValuesFormat.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/codecs/perfield/TestPerFieldDocValuesFormat.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/codecs/perfield/TestPerFieldDocValuesFormat.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/codecs/perfield/TestPerFieldDocValuesFormat.java Sun Nov 30 11:07:09 2014
@@ -26,7 +26,7 @@ import org.apache.lucene.analysis.MockAn
import org.apache.lucene.codecs.Codec;
import org.apache.lucene.codecs.DocValuesFormat;
import org.apache.lucene.codecs.asserting.AssertingCodec;
-import org.apache.lucene.document.Document2;
+import org.apache.lucene.document.Document;
import org.apache.lucene.document.FieldTypes;
import org.apache.lucene.index.BaseDocValuesFormatTestCase;
import org.apache.lucene.index.BinaryDocValues;
@@ -90,7 +90,7 @@ public class TestPerFieldDocValuesFormat
}
});
IndexWriter iwriter = new IndexWriter(directory, iwc);
- Document2 doc = iwriter.newDocument();
+ Document doc = iwriter.newDocument();
FieldTypes fieldTypes = iwriter.getFieldTypes();
fieldTypes.setDocValuesType("dv2", DocValuesType.BINARY);
String longTerm = "longtermlongtermlongtermlongtermlongtermlongtermlongtermlongtermlongtermlongtermlongtermlongtermlongtermlongtermlongtermlongtermlongtermlongterm";
@@ -111,7 +111,7 @@ public class TestPerFieldDocValuesFormat
assertEquals(1, hits.totalHits);
// Iterate through the results:
for (int i = 0; i < hits.scoreDocs.length; i++) {
- Document2 hitDoc = isearcher.doc(hits.scoreDocs[i].doc);
+ Document hitDoc = isearcher.doc(hits.scoreDocs[i].doc);
assertEquals(text, hitDoc.getString("fieldname"));
assert ireader.leaves().size() == 1;
NumericDocValues dv = ireader.leaves().get(0).reader().getNumericDocValues("dv1");
Modified: lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/codecs/perfield/TestPerFieldPostingsFormat2.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/codecs/perfield/TestPerFieldPostingsFormat2.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/codecs/perfield/TestPerFieldPostingsFormat2.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/codecs/perfield/TestPerFieldPostingsFormat2.java Sun Nov 30 11:07:09 2014
@@ -26,7 +26,7 @@ import org.apache.lucene.codecs.assertin
import org.apache.lucene.codecs.blockterms.LuceneVarGapFixedInterval;
import org.apache.lucene.codecs.memory.MemoryPostingsFormat;
import org.apache.lucene.codecs.simpletext.SimpleTextPostingsFormat;
-import org.apache.lucene.document.Document2;
+import org.apache.lucene.document.Document;
import org.apache.lucene.document.FieldTypes;
import org.apache.lucene.index.DirectoryReader;
import org.apache.lucene.index.IndexReader;
@@ -66,7 +66,7 @@ public class TestPerFieldPostingsFormat2
private void addDocs(IndexWriter writer, int numDocs) throws IOException {
for (int i = 0; i < numDocs; i++) {
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
doc.addLargeText("content", "aaa");
writer.addDocument(doc);
}
@@ -74,7 +74,7 @@ public class TestPerFieldPostingsFormat2
private void addDocs2(IndexWriter writer, int numDocs) throws IOException {
for (int i = 0; i < numDocs; i++) {
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
doc.addLargeText("content", "bbb");
writer.addDocument(doc);
}
@@ -82,7 +82,7 @@ public class TestPerFieldPostingsFormat2
private void addDocs3(IndexWriter writer, int numDocs) throws IOException {
for (int i = 0; i < numDocs; i++) {
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
doc.addLargeText("content", "ccc");
doc.addUniqueInt("id", i);
writer.addDocument(doc);
@@ -245,7 +245,7 @@ public class TestPerFieldPostingsFormat2
IndexWriter writer = newWriter(dir, config);
FieldTypes fieldTypes = writer.getFieldTypes();
for (int j = 0; j < docsPerRound; j++) {
- final Document2 doc = writer.newDocument();
+ final Document doc = writer.newDocument();
for (int k = 0; k < num; k++) {
if (random().nextBoolean()) {
fieldTypes.disableNorms("" + k);
@@ -310,7 +310,7 @@ public class TestPerFieldPostingsFormat2
fieldTypes.enableTermVectorOffsets("date");
fieldTypes.enableTermVectorPositions("date");
for (int i = 0; i < 100; i++) {
- Document2 doc = iw.newDocument();
+ Document doc = iw.newDocument();
doc.addLargeText("id", Integer.toString(random().nextInt(50)));
doc.addLargeText("date", Integer.toString(random().nextInt(100)));
iw.addDocument(doc);
Modified: lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/document/TestBinaryDocument.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/document/TestBinaryDocument.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/document/TestBinaryDocument.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/document/TestBinaryDocument.java Sun Nov 30 11:07:09 2014
@@ -39,7 +39,7 @@ public class TestBinaryDocument extends
Directory dir = newDirectory();
RandomIndexWriter writer = new RandomIndexWriter(random(), dir);
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
doc.addStored("binaryStored", binaryValStored.getBytes(StandardCharsets.UTF_8));
doc.addStored("stringStored", binaryValStored);
@@ -52,7 +52,7 @@ public class TestBinaryDocument extends
/** open a reader and fetch the document */
IndexReader reader = writer.getReader();
- Document2 docFromReader = reader.document(0);
+ Document docFromReader = reader.document(0);
assertTrue(docFromReader != null);
/** fetch the binary stored field and compare it's content with the original one */
@@ -74,7 +74,7 @@ public class TestBinaryDocument extends
Directory dir = newDirectory();
RandomIndexWriter writer = new RandomIndexWriter(random(), dir);
- Document2 doc = writer.newDocument();
+ Document doc = writer.newDocument();
doc.addStored("binaryCompressed", CompressionTools.compress(binaryValCompressed.getBytes(StandardCharsets.UTF_8)));
doc.addStored("stringCompressed", CompressionTools.compressString(binaryValCompressed));
@@ -84,7 +84,7 @@ public class TestBinaryDocument extends
/** open a reader and fetch the document */
IndexReader reader = writer.getReader();
- Document2 docFromReader = reader.document(0);
+ Document docFromReader = reader.document(0);
assertTrue(docFromReader != null);
/** fetch the binary compressed field and compare it's content with the original one */
Modified: lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/document/TestDocument2.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/document/TestDocument2.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/document/TestDocument2.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/document/TestDocument2.java Sun Nov 30 11:07:09 2014
@@ -19,6 +19,7 @@ package org.apache.lucene.document;
import java.io.IOException;
import java.io.StringReader;
+import java.math.BigInteger;
import java.net.InetAddress;
import java.text.SimpleDateFormat;
import java.util.Date;
@@ -43,7 +44,6 @@ import org.apache.lucene.index.IndexWrit
import org.apache.lucene.index.IndexWriterConfig;
import org.apache.lucene.index.MultiDocValues;
import org.apache.lucene.index.MultiFields;
-import org.apache.lucene.index.NotUniqueException;
import org.apache.lucene.index.NumericDocValues;
import org.apache.lucene.index.SortedNumericDocValues;
import org.apache.lucene.index.SortedSetDocValues;
@@ -54,7 +54,6 @@ import org.apache.lucene.search.IndexSea
import org.apache.lucene.search.MatchAllDocsQuery;
import org.apache.lucene.search.PhraseQuery;
import org.apache.lucene.search.Query;
-import org.apache.lucene.search.ReferenceManager;
import org.apache.lucene.search.ScoreDoc;
import org.apache.lucene.search.TermQuery;
import org.apache.lucene.search.TopDocs;
@@ -63,6 +62,7 @@ import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.util.TestUtil;
import org.apache.lucene.util.Version;
+import org.junit.Ignore;
public class TestDocument2 extends LuceneTestCase {
@@ -76,7 +76,7 @@ public class TestDocument2 extends Lucen
IndexWriter w = new IndexWriter(dir, newIndexWriterConfig());
- Document2 doc = w.newDocument();
+ Document doc = w.newDocument();
doc.addLargeText("body", "some text");
doc.addShortText("title", "a title");
doc.addAtom("id", "29jafnn");
@@ -93,7 +93,7 @@ public class TestDocument2 extends Lucen
IndexWriter w = new IndexWriter(dir, newIndexWriterConfig());
FieldTypes fieldTypes = w.getFieldTypes();
- Document2 doc = w.newDocument();
+ Document doc = w.newDocument();
doc.addAtom("binary", new BytesRef(new byte[5]));
w.addDocument(doc);
IndexReader r = DirectoryReader.open(w, true);
@@ -113,7 +113,7 @@ public class TestDocument2 extends Lucen
// Sort reverse by default:
fieldTypes.enableSorting("binary", true);
- Document2 doc = w.newDocument();
+ Document doc = w.newDocument();
byte[] value = new byte[5];
value[0] = 1;
doc.addAtom("id", "0");
@@ -141,7 +141,7 @@ public class TestDocument2 extends Lucen
IndexWriter w = new IndexWriter(dir, newIndexWriterConfig());
- Document2 doc = w.newDocument();
+ Document doc = w.newDocument();
doc.addStored("binary", new BytesRef(new byte[5]));
w.addDocument(doc);
IndexReader r = DirectoryReader.open(w, true);
@@ -159,7 +159,7 @@ public class TestDocument2 extends Lucen
fieldTypes.setMultiValued("sortedset");
fieldTypes.setDocValuesType("sortedset", DocValuesType.SORTED_SET);
- Document2 doc = w.newDocument();
+ Document doc = w.newDocument();
doc.addAtom("sortedset", "one");
doc.addAtom("sortedset", "two");
doc.addAtom("sortedset", "three");
@@ -194,7 +194,7 @@ public class TestDocument2 extends Lucen
fieldTypes.setDocValuesType("sortednumeric", DocValuesType.SORTED_NUMERIC);
fieldTypes.setMultiValued("sortednumeric");
- Document2 doc = w.newDocument();
+ Document doc = w.newDocument();
doc.addInt("sortednumeric", 3);
doc.addInt("sortednumeric", 1);
doc.addInt("sortednumeric", 2);
@@ -212,16 +212,134 @@ public class TestDocument2 extends Lucen
dir.close();
}
+ // nocommit test multi-valued too
+ // nocommit does not work ... how to fix? bring getComparator back to life!?
+ @Ignore
+ public void testBigIntRange() throws Exception {
+ Directory dir = newDirectory();
+
+ IndexWriter w = new IndexWriter(dir, newIndexWriterConfig());
+ FieldTypes fieldTypes = w.getFieldTypes();
+ //System.out.println("id type: " + fieldTypes.getFieldType("id"));
+
+ Document doc = w.newDocument();
+ doc.addBigInteger("big", new BigInteger("3000000000000000000"));
+ doc.addAtom("id", "one");
+ w.addDocument(doc);
+
+ doc = w.newDocument();
+ doc.addBigInteger("big", new BigInteger("2000000000000000000"));
+ doc.addAtom("id", "two");
+ w.addDocument(doc);
+
+ doc = w.newDocument();
+ doc.addBigInteger("big", new BigInteger("7000000000000000000"));
+ doc.addAtom("id", "three");
+ w.addDocument(doc);
+
+ IndexReader r = DirectoryReader.open(w, true);
+ IndexSearcher s = newSearcher(r);
+
+ System.out.println("FILTER: " + fieldTypes.newRangeFilter("big",
+ new BigInteger("0"), true,
+ new BigInteger("3000000000000000000"), true));
+
+ // Make sure range query hits the right number of hits
+ assertEquals(2, search(s, fieldTypes.newRangeFilter("big",
+ new BigInteger("0"), true,
+ new BigInteger("3000000000000000000"), true), 1).totalHits);
+ System.out.println("test query 2");
+ assertEquals(3, search(s, fieldTypes.newRangeFilter("big",
+ new BigInteger("0"), true,
+ new BigInteger("10000000000000000000"), true), 1).totalHits);
+ assertEquals(1, search(s, fieldTypes.newRangeFilter("big",
+ new BigInteger("10000000000000000000"), true,
+ new BigInteger("25000000000000000000"), true), 1).totalHits);
+ r.close();
+ w.close();
+ dir.close();
+ }
+
+ public void testHalfFloatRange() throws Exception {
+ Directory dir = newDirectory();
+
+ IndexWriter w = new IndexWriter(dir, newIndexWriterConfig());
+ FieldTypes fieldTypes = w.getFieldTypes();
+ //System.out.println("id type: " + fieldTypes.getFieldType("id"));
+
+ Document doc = w.newDocument();
+ doc.addHalfFloat("halffloat", 3f);
+ doc.addAtom("id", "one");
+ w.addDocument(doc);
+
+ doc = w.newDocument();
+ doc.addHalfFloat("halffloat", 2f);
+ doc.addAtom("id", "two");
+ w.addDocument(doc);
+
+ doc = w.newDocument();
+ doc.addHalfFloat("halffloat", 7f);
+ doc.addAtom("id", "three");
+ w.addDocument(doc);
+
+ IndexReader r = DirectoryReader.open(w, true);
+ IndexSearcher s = newSearcher(r);
+
+ // Make sure range query hits the right number of hits
+ assertEquals(2, search(s, fieldTypes.newRangeFilter("halffloat", 0f, true, 3f, true), 1).totalHits);
+ assertEquals(3, search(s, fieldTypes.newRangeFilter("halffloat", 0f, true, 10f, true), 1).totalHits);
+ assertEquals(1, search(s, fieldTypes.newRangeFilter("halffloat", 1f, true,2.5f, true), 1).totalHits);
+ r.close();
+ w.close();
+ dir.close();
+ }
+
+ // nocommit test multi-valued too
+ // nocommit this passed too easily:
+ public void testHalfFloatSort() throws Exception {
+ Directory dir = newDirectory();
+
+ IndexWriter w = new IndexWriter(dir, newIndexWriterConfig());
+ FieldTypes fieldTypes = w.getFieldTypes();
+ //System.out.println("id type: " + fieldTypes.getFieldType("id"));
+
+ Document doc = w.newDocument();
+ doc.addHalfFloat("halffloat", 3f);
+ doc.addAtom("id", "one");
+ w.addDocument(doc);
+
+ doc = w.newDocument();
+ doc.addHalfFloat("halffloat", 2f);
+ doc.addAtom("id", "two");
+ w.addDocument(doc);
+
+ doc = w.newDocument();
+ doc.addHalfFloat("halffloat", 7f);
+ doc.addAtom("id", "three");
+ w.addDocument(doc);
+
+ IndexReader r = DirectoryReader.open(w, true);
+ IndexSearcher s = newSearcher(r);
+
+ // Make sure range query hits the right number of hits
+ TopDocs hits = s.search(new MatchAllDocsQuery(), 3, fieldTypes.newSort("halffloat"));
+ assertEquals(3, hits.totalHits);
+ assertEquals("two", r.document(hits.scoreDocs[0].doc).getString("id"));
+ assertEquals("one", r.document(hits.scoreDocs[1].doc).getString("id"));
+ assertEquals("three", r.document(hits.scoreDocs[2].doc).getString("id"));
+ r.close();
+ w.close();
+ dir.close();
+ }
+
public void testFloatRangeQuery() throws Exception {
Directory dir = newDirectory();
IndexWriter w = new IndexWriter(dir, newIndexWriterConfig());
FieldTypes fieldTypes = w.getFieldTypes();
- fieldTypes.enableStored("id");
- fieldTypes.enableSorting("id");
//System.out.println("id type: " + fieldTypes.getFieldType("id"));
- Document2 doc = w.newDocument();
+ Document doc = w.newDocument();
doc.addFloat("float", 3f);
doc.addAtom("id", "one");
w.addDocument(doc);
@@ -250,7 +368,7 @@ public class TestDocument2 extends Lucen
NumericDocValues ndv = MultiDocValues.getNumericValues(r, "float");
assertNotNull(ndv);
ScoreDoc hit = hits.scoreDocs[0];
- Document2 storedDoc = r.document(hit.doc);
+ Document storedDoc = r.document(hit.doc);
assertEquals("one", storedDoc.getString("id"));
assertEquals(3f, Float.intBitsToFloat((int) ndv.get(hit.doc)), .001f);
@@ -286,7 +404,7 @@ public class TestDocument2 extends Lucen
IndexWriter w = new IndexWriter(dir, newIndexWriterConfig());
- Document2 doc = w.newDocument();
+ Document doc = w.newDocument();
doc.addInt("int", 3);
w.addDocument(doc);
w.close();
@@ -303,7 +421,7 @@ public class TestDocument2 extends Lucen
IndexWriter w = new IndexWriter(dir, newIndexWriterConfig());
FieldTypes fieldTypes = w.getFieldTypes();
- Document2 doc = w.newDocument();
+ Document doc = w.newDocument();
doc.addInt("int", 3);
w.addDocument(doc);
@@ -347,13 +465,13 @@ public class TestDocument2 extends Lucen
IndexWriter w = new IndexWriter(dir, newIndexWriterConfig());
FieldTypes fieldTypes = w.getFieldTypes();
fieldTypes.setDocValuesType("string", DocValuesType.SORTED);
- Document2 doc = w.newDocument();
+ Document doc = w.newDocument();
try {
doc.addInt("string", 17);
fail("did not hit expected exception");
} catch (IllegalStateException ise) {
// Expected
- assertEquals("wrong exception message: " + ise.getMessage(), "field \"string\": type INT must use NUMERIC docValuesType (got: SORTED)", ise.getMessage());
+ assertEquals("wrong exception message: " + ise.getMessage(), "field \"string\": type INT must use NUMERIC or SORTED_NUMERIC docValuesType (got: SORTED)", ise.getMessage());
}
doc.addAtom("string", "a string");
w.addDocument(doc);
@@ -367,13 +485,13 @@ public class TestDocument2 extends Lucen
IndexWriter w = new IndexWriter(dir, newIndexWriterConfig());
FieldTypes fieldTypes = w.getFieldTypes();
fieldTypes.setDocValuesType("binary", DocValuesType.BINARY);
- Document2 doc = w.newDocument();
+ Document doc = w.newDocument();
try {
doc.addInt("binary", 17);
fail("did not hit expected exception");
} catch (IllegalStateException ise) {
// Expected
- assertEquals("wrong exception message: " + ise.getMessage(), "field \"binary\": type INT must use NUMERIC docValuesType (got: BINARY)", ise.getMessage());
+ assertEquals("wrong exception message: " + ise.getMessage(), "field \"binary\": type INT must use NUMERIC or SORTED_NUMERIC docValuesType (got: BINARY)", ise.getMessage());
}
doc.addAtom("binary", new BytesRef(new byte[7]));
w.addDocument(doc);
@@ -387,7 +505,7 @@ public class TestDocument2 extends Lucen
IndexWriter w = new IndexWriter(dir, newIndexWriterConfig());
FieldTypes fieldTypes = w.getFieldTypes();
fieldTypes.enableStored("body");
- Document2 doc = w.newDocument();
+ Document doc = w.newDocument();
try {
doc.addLargeText("body", new StringReader("a small string"));
fail("did not hit expected exception");
@@ -407,7 +525,7 @@ public class TestDocument2 extends Lucen
IndexWriter w = new IndexWriter(dir, newIndexWriterConfig());
FieldTypes fieldTypes = w.getFieldTypes();
fieldTypes.enableStored("body");
- Document2 doc = w.newDocument();
+ Document doc = w.newDocument();
try {
doc.addLargeText("body", new CannedTokenStream());
fail("did not hit expected exception");
@@ -430,7 +548,7 @@ public class TestDocument2 extends Lucen
fieldTypes.enableSorting("id", true);
fieldTypes.enableStored("id");
- Document2 doc = w.newDocument();
+ Document doc = w.newDocument();
doc.addAtom("id", "two");
w.addDocument(doc);
@@ -457,7 +575,7 @@ public class TestDocument2 extends Lucen
fieldTypes.enableSorting("numbers");
fieldTypes.enableStored("id");
- Document2 doc = w.newDocument();
+ Document doc = w.newDocument();
doc.addInt("numbers", 1);
doc.addInt("numbers", 2);
doc.addAtom("id", "one");
@@ -489,7 +607,7 @@ public class TestDocument2 extends Lucen
fieldTypes.enableSorting("strings");
fieldTypes.enableStored("id");
- Document2 doc = w.newDocument();
+ Document doc = w.newDocument();
doc.addAtom("strings", "abc");
doc.addAtom("strings", "baz");
doc.addAtom("id", "one");
@@ -526,7 +644,7 @@ public class TestDocument2 extends Lucen
assertEquals("wrong exception message: " + ise.getMessage(), "field \"binary\": DocValuesType=BINARY cannot be multi-valued", ise.getMessage());
}
assertFalse(fieldTypes.getMultiValued("binary"));
- Document2 doc = w.newDocument();
+ Document doc = w.newDocument();
doc.addStored("binary", new BytesRef(new byte[7]));
w.addDocument(doc);
w.close();
@@ -547,7 +665,7 @@ public class TestDocument2 extends Lucen
assertEquals("wrong exception message: " + ise.getMessage(), "field \"sorted\": DocValuesType=SORTED cannot be multi-valued", ise.getMessage());
}
assertFalse(fieldTypes.getMultiValued("sorted"));
- Document2 doc = w.newDocument();
+ Document doc = w.newDocument();
doc.addStored("binary", new BytesRef(new byte[7]));
w.addDocument(doc);
w.close();
@@ -568,7 +686,7 @@ public class TestDocument2 extends Lucen
assertEquals("wrong exception message: " + ise.getMessage(), "field \"numeric\": DocValuesType=NUMERIC cannot be multi-valued", ise.getMessage());
}
assertFalse(fieldTypes.getMultiValued("numeric"));
- Document2 doc = w.newDocument();
+ Document doc = w.newDocument();
doc.addInt("numeric", 17);
w.addDocument(doc);
w.close();
@@ -585,7 +703,7 @@ public class TestDocument2 extends Lucen
fieldTypes.enableStored("id");
fieldTypes.disableFastRanges("id");
- Document2 doc = w.newDocument();
+ Document doc = w.newDocument();
doc.addAtom("id", "0");
w.addDocument(doc);
@@ -612,7 +730,7 @@ public class TestDocument2 extends Lucen
IndexWriter w = new IndexWriter(dir, iwc);
FieldTypes fieldTypes = w.getFieldTypes();
- Document2 doc = w.newDocument();
+ Document doc = w.newDocument();
doc.addLong("id", 1L);
w.addDocument(doc);
@@ -631,7 +749,7 @@ public class TestDocument2 extends Lucen
IndexWriter w = new IndexWriter(dir, iwc);
FieldTypes fieldTypes = w.getFieldTypes();
- Document2 doc = w.newDocument();
+ Document doc = w.newDocument();
doc.addInt("id", 1);
w.addDocument(doc);
@@ -651,7 +769,7 @@ public class TestDocument2 extends Lucen
FieldTypes fieldTypes = w.getFieldTypes();
fieldTypes.setIndexOptions("id", IndexOptions.DOCS);
- Document2 doc = w.newDocument();
+ Document doc = w.newDocument();
doc.addStored("id", new BytesRef(new byte[1]));
w.addDocument(doc);
@@ -674,7 +792,7 @@ public class TestDocument2 extends Lucen
fieldTypes.enableStored("id");
fieldTypes.enableSorting("id");
- Document2 doc = w.newDocument();
+ Document doc = w.newDocument();
doc.addAtom("id", "1");
w.addDocument(doc);
@@ -704,12 +822,12 @@ public class TestDocument2 extends Lucen
fieldTypes.setTermsDictBlockSize("id", 10);
for(int i=0;i<10;i++) {
- Document2 doc = w.newDocument();
+ Document doc = w.newDocument();
doc.addAtom("id", "0" + i);
w.addDocument(doc);
}
for(int i=0;i<10;i++) {
- Document2 doc = w.newDocument();
+ Document doc = w.newDocument();
doc.addAtom("id", "1" + i);
w.addDocument(doc);
}
@@ -753,13 +871,13 @@ public class TestDocument2 extends Lucen
IndexWriter w = new IndexWriter(dir, iwc);
FieldTypes fieldTypes = w.getFieldTypes();
fieldTypes.setDocValuesType("id", DocValuesType.BINARY);
- Document2 doc = w.newDocument();
+ Document doc = w.newDocument();
try {
doc.addInt("id", 17);
fail("did not hit exception");
} catch (IllegalStateException ise) {
// Expected
- assertEquals("wrong exception message: " + ise.getMessage(), "field \"id\": type INT must use NUMERIC docValuesType (got: BINARY)", ise.getMessage());
+ assertEquals("wrong exception message: " + ise.getMessage(), "field \"id\": type INT must use NUMERIC or SORTED_NUMERIC docValuesType (got: BINARY)", ise.getMessage());
}
fieldTypes.setPostingsFormat("id", "Memory");
w.close();
@@ -789,7 +907,7 @@ public class TestDocument2 extends Lucen
IndexWriterConfig iwc = newIndexWriterConfig();
IndexWriter w = new IndexWriter(dir, iwc);
FieldTypes fieldTypes = w.getFieldTypes();
- Document2 doc = w.newDocument();
+ Document doc = w.newDocument();
doc.addAtom("id", "foo bar");
w.addDocument(doc);
BaseTokenStreamTestCase.assertTokenStreamContents(fieldTypes.getQueryAnalyzer().tokenStream("id", "foo bar"), new String[] {"foo bar"}, new int[1], new int[] {7});
@@ -804,7 +922,7 @@ public class TestDocument2 extends Lucen
FieldTypes fieldTypes = w.getFieldTypes();
fieldTypes.disableHighlighting("no_highlight");
- Document2 doc = w.newDocument();
+ Document doc = w.newDocument();
doc.addLargeText("highlight", "here is some content");
doc.addLargeText("no_highlight", "here is some content");
w.addDocument(doc);
@@ -833,7 +951,7 @@ public class TestDocument2 extends Lucen
fieldTypes.disableHighlighting("onegap");
fieldTypes.setAnalyzerPositionGap("onegap", 1);
- Document2 doc = w.newDocument();
+ Document doc = w.newDocument();
doc.addLargeText("nogap", "word1");
doc.addLargeText("nogap", "word2");
doc.addLargeText("onegap", "word1");
@@ -860,7 +978,7 @@ public class TestDocument2 extends Lucen
public void testExcFieldTypesAreSaved() throws Exception {
Directory dir = newDirectory();
IndexWriter w = new IndexWriter(dir, newIndexWriterConfig());
- Document2 doc = w.newDocument();
+ Document doc = w.newDocument();
doc.addAtom("id", new BytesRef(new byte[5]));
w.addDocument(doc);
w.close();
@@ -887,7 +1005,7 @@ public class TestDocument2 extends Lucen
FieldTypes fieldTypes = w.getFieldTypes();
fieldTypes.setIndexOptions("foo", IndexOptions.NONE);
- Document2 doc = w.newDocument();
+ Document doc = w.newDocument();
doc.addAtom("foo", "bar");
w.addDocument(doc);
@@ -912,7 +1030,7 @@ public class TestDocument2 extends Lucen
FieldTypes fieldTypes = w.getFieldTypes();
fieldTypes.setDocValuesType("foo", DocValuesType.NONE);
- Document2 doc = w.newDocument();
+ Document doc = w.newDocument();
doc.addInt("foo", 17);
w.addDocument(doc);
@@ -934,7 +1052,7 @@ public class TestDocument2 extends Lucen
IndexWriter w = new IndexWriter(dir, newIndexWriterConfig());
FieldTypes fieldTypes = w.getFieldTypes();
fieldTypes.disableFastRanges("int");
- Document2 doc = w.newDocument();
+ Document doc = w.newDocument();
doc.addInt("int", 17);
w.addDocument(doc);
try {
@@ -962,7 +1080,7 @@ public class TestDocument2 extends Lucen
FieldTypes fieldTypes = w.getFieldTypes();
- Document2 doc = w.newDocument();
+ Document doc = w.newDocument();
doc.addBoolean("onsale", true);
w.addDocument(doc);
@@ -1004,7 +1122,7 @@ public class TestDocument2 extends Lucen
fieldTypes.enableSorting("int");
fieldTypes.setSortMissingFirst("int");
- Document2 doc = w.newDocument();
+ Document doc = w.newDocument();
doc.addInt("int", 7);
doc.addAtom("id", "0");
w.addDocument(doc);
@@ -1040,7 +1158,7 @@ public class TestDocument2 extends Lucen
fieldTypes.enableSorting("int", true);
fieldTypes.setSortMissingFirst("int");
- Document2 doc = w.newDocument();
+ Document doc = w.newDocument();
doc.addInt("int", 7);
doc.addAtom("id", "0");
w.addDocument(doc);
@@ -1076,7 +1194,7 @@ public class TestDocument2 extends Lucen
fieldTypes.enableSorting("int");
fieldTypes.setSortMissingLast("int");
- Document2 doc = w.newDocument();
+ Document doc = w.newDocument();
doc.addInt("int", 7);
doc.addAtom("id", "0");
w.addDocument(doc);
@@ -1112,7 +1230,7 @@ public class TestDocument2 extends Lucen
fieldTypes.enableSorting("int", true);
fieldTypes.setSortMissingLast("int");
- Document2 doc = w.newDocument();
+ Document doc = w.newDocument();
doc.addInt("int", 7);
doc.addAtom("id", "0");
w.addDocument(doc);
@@ -1145,7 +1263,7 @@ public class TestDocument2 extends Lucen
IndexWriter w = new IndexWriter(dir, newIndexWriterConfig());
w.commit();
- Document2 doc = w.newDocument();
+ Document doc = w.newDocument();
doc.addInt("int", 7);
doc.addAtom("id", "0");
w.addDocument(doc);
@@ -1178,7 +1296,7 @@ public class TestDocument2 extends Lucen
IndexWriter w = new IndexWriter(dir, newIndexWriterConfig());
w.commit();
- Document2 doc = w.newDocument();
+ Document doc = w.newDocument();
doc.addInt("int", 7);
doc.addAtom("id", "0");
w.addDocument(doc);
@@ -1216,7 +1334,7 @@ public class TestDocument2 extends Lucen
fieldTypes.enableSorting("atom");
fieldTypes.setSortMissingFirst("atom");
- Document2 doc = w.newDocument();
+ Document doc = w.newDocument();
doc.addAtom("atom", "z");
doc.addAtom("id", "0");
w.addDocument(doc);
@@ -1252,7 +1370,7 @@ public class TestDocument2 extends Lucen
fieldTypes.enableSorting("atom", true);
fieldTypes.setSortMissingFirst("atom");
- Document2 doc = w.newDocument();
+ Document doc = w.newDocument();
doc.addAtom("atom", "z");
doc.addAtom("id", "0");
w.addDocument(doc);
@@ -1288,7 +1406,7 @@ public class TestDocument2 extends Lucen
fieldTypes.enableSorting("atom");
fieldTypes.setSortMissingLast("atom");
- Document2 doc = w.newDocument();
+ Document doc = w.newDocument();
doc.addAtom("atom", "z");
doc.addAtom("id", "0");
w.addDocument(doc);
@@ -1324,7 +1442,7 @@ public class TestDocument2 extends Lucen
fieldTypes.enableSorting("atom", true);
fieldTypes.setSortMissingLast("atom");
- Document2 doc = w.newDocument();
+ Document doc = w.newDocument();
doc.addAtom("atom", "z");
doc.addAtom("id", "0");
w.addDocument(doc);
@@ -1357,7 +1475,7 @@ public class TestDocument2 extends Lucen
IndexWriter w = new IndexWriter(dir, newIndexWriterConfig());
w.commit();
- Document2 doc = w.newDocument();
+ Document doc = w.newDocument();
doc.addAtom("atom", "z");
doc.addAtom("id", "0");
w.addDocument(doc);
@@ -1390,7 +1508,7 @@ public class TestDocument2 extends Lucen
IndexWriter w = new IndexWriter(dir, newIndexWriterConfig());
w.commit();
- Document2 doc = w.newDocument();
+ Document doc = w.newDocument();
doc.addAtom("atom", "z");
doc.addAtom("id", "0");
w.addDocument(doc);
@@ -1423,7 +1541,7 @@ public class TestDocument2 extends Lucen
w.getFieldTypes().setMinMaxTokenLength("field", 2, 7);
w.commit();
- Document2 doc = w.newDocument();
+ Document doc = w.newDocument();
doc.addLargeText("field", "hello a toobigterm");
w.addDocument(doc);
@@ -1451,7 +1569,7 @@ public class TestDocument2 extends Lucen
fieldTypes.setMaxTokenCount("field", 3);
w.commit();
- Document2 doc = w.newDocument();
+ Document doc = w.newDocument();
doc.addLargeText("field", "hello a toobigterm goodbye");
w.addDocument(doc);
@@ -1475,7 +1593,7 @@ public class TestDocument2 extends Lucen
FieldTypes fieldTypes = w.getFieldTypes();
fieldTypes.setMaxTokenCount("field", 3, true);
- Document2 doc = w.newDocument();
+ Document doc = w.newDocument();
doc.addLargeText("field", "hello a toobigterm goodbye");
w.addDocument(doc);
@@ -1499,7 +1617,7 @@ public class TestDocument2 extends Lucen
FieldTypes fieldTypes = w.getFieldTypes();
fieldTypes.setDocValuesType("field", DocValuesType.NONE);
- Document2 doc = w.newDocument();
+ Document doc = w.newDocument();
doc.addInt("field", 17);
w.addDocument(doc);
@@ -1520,7 +1638,7 @@ public class TestDocument2 extends Lucen
SimpleDateFormat parser = new SimpleDateFormat("MM/dd/yyyy", Locale.ROOT);
parser.setTimeZone(TimeZone.getTimeZone("GMT"));
- Document2 doc = w.newDocument();
+ Document doc = w.newDocument();
Date date0 = parser.parse("10/22/2014");
doc.addDate("date", date0);
doc.addAtom("id", "0");
@@ -1540,7 +1658,7 @@ public class TestDocument2 extends Lucen
IndexSearcher s = newSearcher(r);
TopDocs hits = s.search(new MatchAllDocsQuery(), 10, fieldTypes.newSort("date"));
assertEquals(2, hits.totalHits);
- Document2 hit = s.doc(hits.scoreDocs[0].doc);
+ Document hit = s.doc(hits.scoreDocs[0].doc);
assertEquals("1", hit.getString("id"));
assertEquals(date1, hit.getDate("date"));
hit = s.doc(hits.scoreDocs[1].doc);
@@ -1558,7 +1676,7 @@ public class TestDocument2 extends Lucen
SimpleDateFormat parser = new SimpleDateFormat("MM/dd/yyyy", Locale.ROOT);
parser.setTimeZone(TimeZone.getTimeZone("GMT"));
- Document2 doc = w.newDocument();
+ Document doc = w.newDocument();
Date date0 = parser.parse("10/22/2014");
doc.addDate("date", date0);
doc.addAtom("id", "0");
@@ -1587,7 +1705,7 @@ public class TestDocument2 extends Lucen
Directory dir = newDirectory();
IndexWriter w = new IndexWriter(dir, newIndexWriterConfig());
- Document2 doc = w.newDocument();
+ Document doc = w.newDocument();
InetAddress inet0 = InetAddress.getByName("10.17.4.10");
doc.addInetAddress("inet", inet0);
doc.addAtom("id", "0");
@@ -1605,7 +1723,7 @@ public class TestDocument2 extends Lucen
IndexSearcher s = newSearcher(r);
TopDocs hits = s.search(new MatchAllDocsQuery(), 10, fieldTypes.newSort("inet"));
assertEquals(2, hits.totalHits);
- Document2 hit = s.doc(hits.scoreDocs[0].doc);
+ Document hit = s.doc(hits.scoreDocs[0].doc);
assertEquals("0", hit.getString("id"));
assertEquals(inet0, hit.getInetAddress("inet"));
hit = s.doc(hits.scoreDocs[1].doc);
@@ -1620,7 +1738,7 @@ public class TestDocument2 extends Lucen
Directory dir = newDirectory();
IndexWriter w = new IndexWriter(dir, newIndexWriterConfig());
- Document2 doc = w.newDocument();
+ Document doc = w.newDocument();
InetAddress inet0 = InetAddress.getByName("10.17.4.10");
doc.addInetAddress("inet", inet0);
doc.addAtom("id", "0");
@@ -1651,7 +1769,7 @@ public class TestDocument2 extends Lucen
FieldTypes fieldTypes = w.getFieldTypes();
fieldTypes.setMinMaxTokenLength("field", 2, 7);
fieldTypes.setMultiValued("field");
- Document2 doc = w.newDocument();
+ Document doc = w.newDocument();
doc.addAtom("field", "a");
doc.addAtom("field", "ab");
doc.addAtom("field", "goodbyeyou");
@@ -1675,7 +1793,7 @@ public class TestDocument2 extends Lucen
FieldTypes fieldTypes = w.getFieldTypes();
fieldTypes.setMinMaxTokenLength("field", 2, 7);
fieldTypes.setMultiValued("field");
- Document2 doc = w.newDocument();
+ Document doc = w.newDocument();
doc.addAtom("field", new BytesRef(new byte[1]));
doc.addAtom("field", new BytesRef(new byte[2]));
doc.addAtom("field", new BytesRef(new byte[10]));
@@ -1700,7 +1818,7 @@ public class TestDocument2 extends Lucen
fieldTypes.disableNorms("field");
fieldTypes.enableStored("field");
- Document2 doc = w.newDocument();
+ Document doc = w.newDocument();
try {
doc.addLargeText("field", new TokenStream() {
@Override
@@ -1719,7 +1837,7 @@ public class TestDocument2 extends Lucen
public void testFieldExistsFilter() throws Exception {
Directory dir = newDirectory();
IndexWriter w = new IndexWriter(dir, newIndexWriterConfig());
- Document2 doc = w.newDocument();
+ Document doc = w.newDocument();
doc.addAtom("field1", "field");
doc.addAtom("field2", "field");
doc.addAtom("id", "0");
@@ -1777,7 +1895,7 @@ public class TestDocument2 extends Lucen
IndexWriter w = new IndexWriter(dir, newIndexWriterConfig());
FieldTypes fieldTypes = w.getFieldTypes();
fieldTypes.setMultiValued("field");
- Document2 doc = w.newDocument();
+ Document doc = w.newDocument();
doc.addUniqueAtom("field", "foo");
doc.addUniqueAtom("field", "bar");
w.addDocument(doc);
@@ -1797,7 +1915,7 @@ public class TestDocument2 extends Lucen
IndexWriter w = newIndexWriter(dir);
FieldTypes fieldTypes = w.getFieldTypes();
fieldTypes.setMultiValued("field");
- Document2 doc = w.newDocument();
+ Document doc = w.newDocument();
doc.addStored("field", "bar");
// nocommit why no exc here?
doc.addLargeText("field", "bar");
@@ -1809,19 +1927,45 @@ public class TestDocument2 extends Lucen
public void testDoubleTermQuery() throws Exception {
Directory dir = newDirectory();
IndexWriter w = newIndexWriter(dir);
- Document2 doc = w.newDocument();
+ Document doc = w.newDocument();
doc.addDouble("double", 180.0);
w.addDocument(doc);
DirectoryReader r = DirectoryReader.open(w, true);
IndexSearcher s = newSearcher(r);
assertEquals(1, s.search(new TermQuery(new Term("double",
- Document2.longToBytes(Document2.sortableDoubleBits(Double.doubleToLongBits(180.0))))),
+ Document.longToBytes(Document.sortableDoubleBits(Double.doubleToLongBits(180.0))))),
1).totalHits);
r.close();
w.close();
dir.close();
}
+ public void testSortLocale() throws Exception {
+ Directory dir = newDirectory();
+ IndexWriter w = newIndexWriter(dir);
+ FieldTypes fieldTypes = w.getFieldTypes();
+ fieldTypes.setSortLocale("collated", Locale.ENGLISH);
+
+ Document doc = w.newDocument();
+ doc.addAtom("field", "ABC");
+ doc.addAtom("collated", "ABC");
+ w.addDocument(doc);
+
+ doc = w.newDocument();
+ doc.addAtom("field", "abc");
+ doc.addAtom("collated", "abc");
+ w.addDocument(doc);
+
+ DirectoryReader r = DirectoryReader.open(w, true);
+ IndexSearcher s = newSearcher(r);
+ TopDocs td = s.search(new MatchAllDocsQuery(), 5, fieldTypes.newSort("collated"));
+ assertEquals("abc", r.document(td.scoreDocs[0].doc).get("field"));
+ assertEquals("ABC", r.document(td.scoreDocs[1].doc).get("field"));
+ r.close();
+ w.close();
+ dir.close();
+ }
+
// nocommit test per-field analyzers
// nocommit test per-field sims
Modified: lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/Test2BBinaryDocValues.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/Test2BBinaryDocValues.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/Test2BBinaryDocValues.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/Test2BBinaryDocValues.java Sun Nov 30 11:07:09 2014
@@ -18,8 +18,6 @@ package org.apache.lucene.index;
*/
import org.apache.lucene.analysis.MockAnalyzer;
-import org.apache.lucene.document.BinaryDocValuesField;
-import org.apache.lucene.document.Document2;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.FieldTypes;
import org.apache.lucene.store.BaseDirectoryWrapper;
@@ -62,7 +60,7 @@ public class Test2BBinaryDocValues exten
BytesRef data = new BytesRef(bytes);
for (int i = 0; i < IndexWriter.MAX_DOCS; i++) {
- Document2 doc = w.newDocument();
+ Document doc = w.newDocument();
bytes[0] = (byte)(i >> 24);
bytes[1] = (byte)(i >> 16);
bytes[2] = (byte)(i >> 8);
@@ -128,7 +126,7 @@ public class Test2BBinaryDocValues exten
encoder.reset(bytes);
encoder.writeVInt(i % 65535); // 1, 2, or 3 bytes
data.length = encoder.getPosition();
- Document2 doc = w.newDocument();
+ Document doc = w.newDocument();
doc.addBinary("dv", data);
w.addDocument(doc);
if (i % 100000 == 0) {
Modified: lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/Test2BNumericDocValues.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/Test2BNumericDocValues.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/Test2BNumericDocValues.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/Test2BNumericDocValues.java Sun Nov 30 11:07:09 2014
@@ -18,9 +18,7 @@ package org.apache.lucene.index;
*/
import org.apache.lucene.analysis.MockAnalyzer;
-import org.apache.lucene.document.Document2;
import org.apache.lucene.document.Document;
-import org.apache.lucene.document.NumericDocValuesField;
import org.apache.lucene.store.BaseDirectoryWrapper;
import org.apache.lucene.store.MockDirectoryWrapper;
import org.apache.lucene.util.LuceneTestCase.Monster;
@@ -54,7 +52,7 @@ public class Test2BNumericDocValues exte
.setCodec(TestUtil.getDefaultCodec()));
for (int i = 0; i < IndexWriter.MAX_DOCS; i++) {
- Document2 doc = w.newDocument();
+ Document doc = w.newDocument();
doc.addLong("dv", i);
w.addDocument(doc);
if (i % 100000 == 0) {
Modified: lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/Test2BPositions.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/Test2BPositions.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/Test2BPositions.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/Test2BPositions.java Sun Nov 30 11:07:09 2014
@@ -21,20 +21,14 @@ import org.apache.lucene.analysis.MockAn
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.FieldType;
import org.apache.lucene.document.FieldTypes;
-import org.apache.lucene.document.TextField;
import org.apache.lucene.store.BaseDirectoryWrapper;
import org.apache.lucene.store.MockDirectoryWrapper;
import org.apache.lucene.util.LuceneTestCase.Monster;
import org.apache.lucene.util.LuceneTestCase.SuppressCodecs;
import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.util.TestUtil;
-import org.apache.lucene.util.TimeUnits;
-import com.carrotsearch.randomizedtesting.annotations.TimeoutSuite;
/**
* Test indexes ~82M docs with 52 positions each, so you get > Integer.MAX_VALUE positions
@@ -69,7 +63,7 @@ public class Test2BPositions extends Luc
fieldTypes.disableNorms("field");
final int numDocs = (Integer.MAX_VALUE / 26) + 1;
- Document2 doc = w.newDocument();
+ Document doc = w.newDocument();
doc.addLargeText("field", new MyTokenStream());
w.addDocument(doc);
for (int i = 0; i < numDocs; i++) {
Modified: lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/Test2BPostings.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/Test2BPostings.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/Test2BPostings.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/Test2BPostings.java Sun Nov 30 11:07:09 2014
@@ -20,12 +20,8 @@ package org.apache.lucene.index;
import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;
-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.document.TextField;
import org.apache.lucene.store.BaseDirectoryWrapper;
import org.apache.lucene.store.MockDirectoryWrapper;
import org.apache.lucene.util.LuceneTestCase.SuppressCodecs;
@@ -66,7 +62,7 @@ public class Test2BPostings extends Luce
fieldTypes.setIndexOptions("field", IndexOptions.DOCS);
fieldTypes.disableStored("field");
fieldTypes.disableNorms("field");
- Document2 doc = w.newDocument();
+ Document doc = w.newDocument();
doc.addLargeText("field", new MyTokenStream());
final int numDocs = (Integer.MAX_VALUE / 26) + 1;
Modified: lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/Test2BPostingsBytes.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/Test2BPostingsBytes.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/Test2BPostingsBytes.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/Test2BPostingsBytes.java Sun Nov 30 11:07:09 2014
@@ -22,12 +22,8 @@ import java.util.Arrays;
import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;
-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.document.TextField;
import org.apache.lucene.store.BaseDirectoryWrapper;
import org.apache.lucene.store.MockDirectoryWrapper;
import org.apache.lucene.util.LuceneTestCase.Monster;
@@ -65,7 +61,7 @@ public class Test2BPostingsBytes extends
((LogByteSizeMergePolicy) mp).setMaxMergeMB(1024*1024*1024);
}
- Document2 doc = w.newDocument();
+ Document doc = w.newDocument();
FieldTypes fieldTypes = w.getFieldTypes();
fieldTypes.disableNorms("field");
fieldTypes.disableHighlighting("field");
Modified: lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/Test2BSortedDocValues.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/Test2BSortedDocValues.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/Test2BSortedDocValues.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/Test2BSortedDocValues.java Sun Nov 30 11:07:09 2014
@@ -18,9 +18,7 @@ package org.apache.lucene.index;
*/
import org.apache.lucene.analysis.MockAnalyzer;
-import org.apache.lucene.document.Document2;
import org.apache.lucene.document.Document;
-import org.apache.lucene.document.SortedDocValuesField;
import org.apache.lucene.store.BaseDirectoryWrapper;
import org.apache.lucene.store.MockDirectoryWrapper;
import org.apache.lucene.util.BytesRef;
@@ -54,7 +52,7 @@ public class Test2BSortedDocValues exten
.setOpenMode(IndexWriterConfig.OpenMode.CREATE)
.setCodec(TestUtil.getDefaultCodec()));
- Document2 doc = w.newDocument();
+ Document doc = w.newDocument();
byte bytes[] = new byte[2];
BytesRef data = new BytesRef(bytes);
doc.addBinary("dv", data);
@@ -109,7 +107,7 @@ public class Test2BSortedDocValues exten
.setOpenMode(IndexWriterConfig.OpenMode.CREATE)
.setCodec(TestUtil.getDefaultCodec()));
- Document2 doc = w.newDocument();
+ Document doc = w.newDocument();
byte bytes[] = new byte[4];
BytesRef data = new BytesRef(bytes);
doc.addBinary("dv", data);
Modified: lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/Test2BTerms.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/Test2BTerms.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/Test2BTerms.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/Test2BTerms.java Sun Nov 30 11:07:09 2014
@@ -27,12 +27,8 @@ import org.apache.lucene.analysis.MockAn
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;
import org.apache.lucene.analysis.tokenattributes.TermToBytesRefAttribute;
-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.document.TextField;
import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.search.TermQuery;
import org.apache.lucene.store.BaseDirectoryWrapper;
@@ -195,7 +191,7 @@ public class Test2BTerms extends LuceneT
FieldTypes fieldTypes = w.getFieldTypes();
- Document2 doc = w.newDocument();
+ Document doc = w.newDocument();
List<Long> savedTokens = new ArrayList<>();
Modified: lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/Test4GBStoredFields.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/Test4GBStoredFields.java?rev=1642535&r1=1642534&r2=1642535&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/Test4GBStoredFields.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/Test4GBStoredFields.java Sun Nov 30 11:07:09 2014
@@ -18,10 +18,7 @@ package org.apache.lucene.index;
*/
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.document.FieldType;
import org.apache.lucene.store.MMapDirectory;
import org.apache.lucene.store.MockDirectoryWrapper;
import org.apache.lucene.util.BytesRef;
@@ -57,7 +54,7 @@ public class Test4GBStoredFields extends
((LogByteSizeMergePolicy) mp).setMaxMergeMB(1024*1024*1024);
}
- final Document2 doc = w.newDocument();
+ final Document doc = w.newDocument();
final int valueLength = RandomInts.randomIntBetween(random(), 1 << 13, 1 << 20);
final byte[] value = new byte[valueLength];
for (int i = 0; i < valueLength; ++i) {
@@ -92,7 +89,7 @@ public class Test4GBStoredFields extends
}
DirectoryReader rd = DirectoryReader.open(dir);
- Document2 sd = rd.document(numDocs - 1);
+ Document sd = rd.document(numDocs - 1);
assertNotNull(sd);
assertEquals(1, sd.getFields().size());
BytesRef valueRef = sd.getBinary("fld");