You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ry...@apache.org on 2012/03/06 19:13:50 UTC
svn commit: r1297628 [4/13] - in /lucene/dev/branches/solr_3159_jetty8: ./
dev-tools/maven/ dev-tools/maven/lucene/ dev-tools/maven/lucene/contrib/demo/
dev-tools/maven/lucene/contrib/highlighter/
dev-tools/maven/lucene/contrib/memory/ dev-tools/maven/...
Modified: lucene/dev/branches/solr_3159_jetty8/lucene/core/src/java/org/apache/lucene/util/packed/Direct32.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr_3159_jetty8/lucene/core/src/java/org/apache/lucene/util/packed/Direct32.java?rev=1297628&r1=1297627&r2=1297628&view=diff
==============================================================================
--- lucene/dev/branches/solr_3159_jetty8/lucene/core/src/java/org/apache/lucene/util/packed/Direct32.java (original)
+++ lucene/dev/branches/solr_3159_jetty8/lucene/core/src/java/org/apache/lucene/util/packed/Direct32.java Tue Mar 6 18:13:38 2012
@@ -65,6 +65,7 @@ class Direct32 extends PackedInts.Reader
}
public long get(final int index) {
+ assert index >= 0 && index < size();
return 0xFFFFFFFFL & values[index];
}
Modified: lucene/dev/branches/solr_3159_jetty8/lucene/core/src/java/org/apache/lucene/util/packed/Direct64.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr_3159_jetty8/lucene/core/src/java/org/apache/lucene/util/packed/Direct64.java?rev=1297628&r1=1297627&r2=1297628&view=diff
==============================================================================
--- lucene/dev/branches/solr_3159_jetty8/lucene/core/src/java/org/apache/lucene/util/packed/Direct64.java (original)
+++ lucene/dev/branches/solr_3159_jetty8/lucene/core/src/java/org/apache/lucene/util/packed/Direct64.java Tue Mar 6 18:13:38 2012
@@ -61,6 +61,7 @@ class Direct64 extends PackedInts.Reader
}
public long get(final int index) {
+ assert index >= 0 && index < size();
return values[index];
}
Modified: lucene/dev/branches/solr_3159_jetty8/lucene/core/src/java/org/apache/lucene/util/packed/Direct8.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr_3159_jetty8/lucene/core/src/java/org/apache/lucene/util/packed/Direct8.java?rev=1297628&r1=1297627&r2=1297628&view=diff
==============================================================================
--- lucene/dev/branches/solr_3159_jetty8/lucene/core/src/java/org/apache/lucene/util/packed/Direct8.java (original)
+++ lucene/dev/branches/solr_3159_jetty8/lucene/core/src/java/org/apache/lucene/util/packed/Direct8.java Tue Mar 6 18:13:38 2012
@@ -70,6 +70,7 @@ class Direct8 extends PackedInts.ReaderI
}
public long get(final int index) {
+ assert index >= 0 && index < size();
return 0xFFL & values[index];
}
Modified: lucene/dev/branches/solr_3159_jetty8/lucene/core/src/java/org/apache/lucene/util/packed/Packed32.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr_3159_jetty8/lucene/core/src/java/org/apache/lucene/util/packed/Packed32.java?rev=1297628&r1=1297627&r2=1297628&view=diff
==============================================================================
--- lucene/dev/branches/solr_3159_jetty8/lucene/core/src/java/org/apache/lucene/util/packed/Packed32.java (original)
+++ lucene/dev/branches/solr_3159_jetty8/lucene/core/src/java/org/apache/lucene/util/packed/Packed32.java Tue Mar 6 18:13:38 2012
@@ -186,6 +186,7 @@ class Packed32 extends PackedInts.Reader
* @return the value at the given index.
*/
public long get(final int index) {
+ assert index >= 0 && index < size();
final long majorBitPos = (long)index * bitsPerValue;
final int elementPos = (int)(majorBitPos >>> BLOCK_BITS); // / BLOCK_SIZE
final int bitPos = (int)(majorBitPos & MOD_MASK); // % BLOCK_SIZE);
Modified: lucene/dev/branches/solr_3159_jetty8/lucene/core/src/java/org/apache/lucene/util/packed/Packed64.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr_3159_jetty8/lucene/core/src/java/org/apache/lucene/util/packed/Packed64.java?rev=1297628&r1=1297627&r2=1297628&view=diff
==============================================================================
--- lucene/dev/branches/solr_3159_jetty8/lucene/core/src/java/org/apache/lucene/util/packed/Packed64.java (original)
+++ lucene/dev/branches/solr_3159_jetty8/lucene/core/src/java/org/apache/lucene/util/packed/Packed64.java Tue Mar 6 18:13:38 2012
@@ -176,6 +176,7 @@ class Packed64 extends PackedInts.Reader
* @return the value at the given index.
*/
public long get(final int index) {
+ assert index >= 0 && index < size();
final long majorBitPos = (long)index * bitsPerValue;
final int elementPos = (int)(majorBitPos >>> BLOCK_BITS); // / BLOCK_SIZE
final int bitPos = (int)(majorBitPos & MOD_MASK); // % BLOCK_SIZE);
Modified: lucene/dev/branches/solr_3159_jetty8/lucene/core/src/test/org/apache/lucene/TestExternalCodecs.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr_3159_jetty8/lucene/core/src/test/org/apache/lucene/TestExternalCodecs.java?rev=1297628&r1=1297627&r2=1297628&view=diff
==============================================================================
--- lucene/dev/branches/solr_3159_jetty8/lucene/core/src/test/org/apache/lucene/TestExternalCodecs.java (original)
+++ lucene/dev/branches/solr_3159_jetty8/lucene/core/src/test/org/apache/lucene/TestExternalCodecs.java Tue Mar 6 18:13:38 2012
@@ -17,9 +17,6 @@ package org.apache.lucene;
* limitations under the License.
*/
-import java.io.*;
-import java.util.*;
-
import org.apache.lucene.analysis.*;
import org.apache.lucene.codecs.*;
import org.apache.lucene.codecs.lucene40.Lucene40Codec;
Modified: lucene/dev/branches/solr_3159_jetty8/lucene/core/src/test/org/apache/lucene/analysis/TestCachingTokenFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr_3159_jetty8/lucene/core/src/test/org/apache/lucene/analysis/TestCachingTokenFilter.java?rev=1297628&r1=1297627&r2=1297628&view=diff
==============================================================================
--- lucene/dev/branches/solr_3159_jetty8/lucene/core/src/test/org/apache/lucene/analysis/TestCachingTokenFilter.java (original)
+++ lucene/dev/branches/solr_3159_jetty8/lucene/core/src/test/org/apache/lucene/analysis/TestCachingTokenFilter.java Tue Mar 6 18:13:38 2012
@@ -28,6 +28,7 @@ import org.apache.lucene.index.IndexRead
import org.apache.lucene.index.MultiFields;
import org.apache.lucene.index.DocsAndPositionsEnum;
import org.apache.lucene.index.RandomIndexWriter;
+import org.apache.lucene.search.DocIdSetIterator;
import org.apache.lucene.store.Directory;
import org.apache.lucene.util.BytesRef;
@@ -76,7 +77,7 @@ public class TestCachingTokenFilter exte
"preanalyzed",
new BytesRef("term1"),
false);
- assertTrue(termPositions.nextDoc() != termPositions.NO_MORE_DOCS);
+ assertTrue(termPositions.nextDoc() != DocIdSetIterator.NO_MORE_DOCS);
assertEquals(1, termPositions.freq());
assertEquals(0, termPositions.nextPosition());
@@ -85,7 +86,7 @@ public class TestCachingTokenFilter exte
"preanalyzed",
new BytesRef("term2"),
false);
- assertTrue(termPositions.nextDoc() != termPositions.NO_MORE_DOCS);
+ assertTrue(termPositions.nextDoc() != DocIdSetIterator.NO_MORE_DOCS);
assertEquals(2, termPositions.freq());
assertEquals(1, termPositions.nextPosition());
assertEquals(3, termPositions.nextPosition());
@@ -95,7 +96,7 @@ public class TestCachingTokenFilter exte
"preanalyzed",
new BytesRef("term3"),
false);
- assertTrue(termPositions.nextDoc() != termPositions.NO_MORE_DOCS);
+ assertTrue(termPositions.nextDoc() != DocIdSetIterator.NO_MORE_DOCS);
assertEquals(1, termPositions.freq());
assertEquals(2, termPositions.nextPosition());
reader.close();
Modified: lucene/dev/branches/solr_3159_jetty8/lucene/core/src/test/org/apache/lucene/analysis/TestMockAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr_3159_jetty8/lucene/core/src/test/org/apache/lucene/analysis/TestMockAnalyzer.java?rev=1297628&r1=1297627&r2=1297628&view=diff
==============================================================================
--- lucene/dev/branches/solr_3159_jetty8/lucene/core/src/test/org/apache/lucene/analysis/TestMockAnalyzer.java (original)
+++ lucene/dev/branches/solr_3159_jetty8/lucene/core/src/test/org/apache/lucene/analysis/TestMockAnalyzer.java Tue Mar 6 18:13:38 2012
@@ -3,8 +3,6 @@ package org.apache.lucene.analysis;
import java.io.StringReader;
import java.util.Arrays;
-import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;
-import org.apache.lucene.analysis.tokenattributes.OffsetAttribute;
import org.apache.lucene.util._TestUtil;
import org.apache.lucene.util.automaton.Automaton;
import org.apache.lucene.util.automaton.BasicAutomata;
Modified: lucene/dev/branches/solr_3159_jetty8/lucene/core/src/test/org/apache/lucene/analysis/tokenattributes/TestSimpleAttributeImpl.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr_3159_jetty8/lucene/core/src/test/org/apache/lucene/analysis/tokenattributes/TestSimpleAttributeImpl.java?rev=1297628&r1=1297627&r2=1297628&view=diff
==============================================================================
--- lucene/dev/branches/solr_3159_jetty8/lucene/core/src/test/org/apache/lucene/analysis/tokenattributes/TestSimpleAttributeImpl.java (original)
+++ lucene/dev/branches/solr_3159_jetty8/lucene/core/src/test/org/apache/lucene/analysis/tokenattributes/TestSimpleAttributeImpl.java Tue Mar 6 18:13:38 2012
@@ -29,6 +29,8 @@ public class TestSimpleAttributeImpl ext
public void testAttributes() {
_TestUtil.assertAttributeReflection(new PositionIncrementAttributeImpl(),
Collections.singletonMap(PositionIncrementAttribute.class.getName()+"#positionIncrement", 1));
+ _TestUtil.assertAttributeReflection(new PositionLengthAttributeImpl(),
+ Collections.singletonMap(PositionLengthAttribute.class.getName()+"#positionLength", 1));
_TestUtil.assertAttributeReflection(new FlagsAttributeImpl(),
Collections.singletonMap(FlagsAttribute.class.getName()+"#flags", 0));
_TestUtil.assertAttributeReflection(new TypeAttributeImpl(),
Modified: lucene/dev/branches/solr_3159_jetty8/lucene/core/src/test/org/apache/lucene/codecs/appending/TestAppendingCodec.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr_3159_jetty8/lucene/core/src/test/org/apache/lucene/codecs/appending/TestAppendingCodec.java?rev=1297628&r1=1297627&r2=1297628&view=diff
==============================================================================
--- lucene/dev/branches/solr_3159_jetty8/lucene/core/src/test/org/apache/lucene/codecs/appending/TestAppendingCodec.java (original)
+++ lucene/dev/branches/solr_3159_jetty8/lucene/core/src/test/org/apache/lucene/codecs/appending/TestAppendingCodec.java Tue Mar 6 18:13:38 2012
@@ -35,6 +35,7 @@ import org.apache.lucene.index.Terms;
import org.apache.lucene.index.TermsEnum.SeekStatus;
import org.apache.lucene.index.TermsEnum;
import org.apache.lucene.index.TieredMergePolicy;
+import org.apache.lucene.search.DocIdSetIterator;
import org.apache.lucene.store.Directory;
import org.apache.lucene.store.IOContext;
import org.apache.lucene.store.IndexOutput;
@@ -141,10 +142,10 @@ public class TestAppendingCodec extends
assertEquals(SeekStatus.FOUND, te.seekCeil(new BytesRef("dog")));
assertEquals(SeekStatus.FOUND, te.seekCeil(new BytesRef("the")));
DocsEnum de = te.docs(null, null, true);
- assertTrue(de.advance(0) != DocsEnum.NO_MORE_DOCS);
+ assertTrue(de.advance(0) != DocIdSetIterator.NO_MORE_DOCS);
assertEquals(2, de.freq());
- assertTrue(de.advance(1) != DocsEnum.NO_MORE_DOCS);
- assertTrue(de.advance(2) == DocsEnum.NO_MORE_DOCS);
+ assertTrue(de.advance(1) != DocIdSetIterator.NO_MORE_DOCS);
+ assertTrue(de.advance(2) == DocIdSetIterator.NO_MORE_DOCS);
reader.close();
}
Modified: lucene/dev/branches/solr_3159_jetty8/lucene/core/src/test/org/apache/lucene/codecs/lucene3x/TestTermInfosReaderIndex.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr_3159_jetty8/lucene/core/src/test/org/apache/lucene/codecs/lucene3x/TestTermInfosReaderIndex.java?rev=1297628&r1=1297627&r2=1297628&view=diff
==============================================================================
--- lucene/dev/branches/solr_3159_jetty8/lucene/core/src/test/org/apache/lucene/codecs/lucene3x/TestTermInfosReaderIndex.java (original)
+++ lucene/dev/branches/solr_3159_jetty8/lucene/core/src/test/org/apache/lucene/codecs/lucene3x/TestTermInfosReaderIndex.java Tue Mar 6 18:13:38 2012
@@ -25,12 +25,7 @@ import java.util.Random;
import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.analysis.MockTokenizer;
-import org.apache.lucene.codecs.Codec;
import org.apache.lucene.codecs.FieldInfosReader;
-import org.apache.lucene.codecs.lucene3x.Lucene3xPostingsFormat;
-import org.apache.lucene.codecs.lucene3x.PreFlexRWCodec;
-import org.apache.lucene.codecs.lucene3x.SegmentTermEnum;
-import org.apache.lucene.codecs.lucene3x.TermInfosReaderIndex;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.StringField;
import org.apache.lucene.index.CorruptIndexException;
@@ -86,8 +81,8 @@ public class TestTermInfosReaderIndex ex
directory = newDirectory();
config.setCodec(new PreFlexRWCodec());
- // turn off compound file, this test will open some index files directly.
LogMergePolicy mp = newLogMergePolicy();
+ // turn off compound file, this test will open some index files directly.
mp.setUseCompoundFile(false);
config.setMergePolicy(mp);
@@ -182,9 +177,16 @@ public class TestTermInfosReaderIndex ex
int termPosition = index * termIndexInterval * indexDivisor;
for (int i = 0; i < termPosition; i++) {
// TODO: this test just uses random terms, so this is always possible
- assumeTrue("ran out of terms.", termEnum.next());
+ assumeTrue("ran out of terms", termEnum.next());
}
- return termEnum.term();
+ final Term term = termEnum.term();
+ // An indexed term is only written when the term after
+ // it exists, so, if the number of terms is 0 mod
+ // termIndexInterval, the last index term will not be
+ // written; so we require a term after this term
+ // as well:
+ assumeTrue("ran out of terms", termEnum.next());
+ return term;
}
private static void populate(Directory directory, IndexWriterConfig config) throws CorruptIndexException, LockObtainFailedException, IOException {
Modified: lucene/dev/branches/solr_3159_jetty8/lucene/core/src/test/org/apache/lucene/codecs/lucene40/values/TestDocValues.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr_3159_jetty8/lucene/core/src/test/org/apache/lucene/codecs/lucene40/values/TestDocValues.java?rev=1297628&r1=1297627&r2=1297628&view=diff
==============================================================================
--- lucene/dev/branches/solr_3159_jetty8/lucene/core/src/test/org/apache/lucene/codecs/lucene40/values/TestDocValues.java (original)
+++ lucene/dev/branches/solr_3159_jetty8/lucene/core/src/test/org/apache/lucene/codecs/lucene40/values/TestDocValues.java Tue Mar 6 18:13:38 2012
@@ -114,7 +114,7 @@ public class TestDocValues extends Lucen
assertEquals("doc " + idx, values[idx], ss.getByOrd(ss.ord(idx),
bytesRef).utf8ToString());
int ord = ss
- .getByValue(new BytesRef(values[idx]), new BytesRef());
+ .getOrdByValue(new BytesRef(values[idx]), new BytesRef());
assertTrue(ord >= 0);
assertEquals(ss.ord(idx), ord);
}
@@ -125,7 +125,7 @@ public class TestDocValues extends Lucen
final int valueCount = ss.getValueCount();
for (int i = 0; i < 1000; i++) {
BytesRef bytesValue = new BytesRef(_TestUtil.randomFixedByteLengthUnicodeString(random, fixedSize? fixedLength : 1 + random.nextInt(39)));
- int ord = ss.getByValue(bytesValue, new BytesRef());
+ int ord = ss.getOrdByValue(bytesValue, new BytesRef());
if (ord >= 0) {
assertTrue(bytesValue
.bytesEquals(ss.getByOrd(ord, bytesRef)));
Modified: lucene/dev/branches/solr_3159_jetty8/lucene/core/src/test/org/apache/lucene/document/TestDateTools.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr_3159_jetty8/lucene/core/src/test/org/apache/lucene/document/TestDateTools.java?rev=1297628&r1=1297627&r2=1297628&view=diff
==============================================================================
--- lucene/dev/branches/solr_3159_jetty8/lucene/core/src/test/org/apache/lucene/document/TestDateTools.java (original)
+++ lucene/dev/branches/solr_3159_jetty8/lucene/core/src/test/org/apache/lucene/document/TestDateTools.java Tue Mar 6 18:13:38 2012
@@ -9,6 +9,10 @@ import java.util.TimeZone;
import java.util.Locale;
import org.apache.lucene.util.LuceneTestCase;
+import org.apache.lucene.util.SystemPropertiesRestoreRule;
+import org.junit.Rule;
+import org.junit.rules.RuleChain;
+import org.junit.rules.TestRule;
/**
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -27,6 +31,9 @@ import org.apache.lucene.util.LuceneTest
* limitations under the License.
*/
public class TestDateTools extends LuceneTestCase {
+ @Rule
+ public TestRule testRules =
+ RuleChain.outerRule(new SystemPropertiesRestoreRule());
public void testStringToDate() throws ParseException {
Modified: lucene/dev/branches/solr_3159_jetty8/lucene/core/src/test/org/apache/lucene/index/TestCodecs.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr_3159_jetty8/lucene/core/src/test/org/apache/lucene/index/TestCodecs.java?rev=1297628&r1=1297627&r2=1297628&view=diff
==============================================================================
--- lucene/dev/branches/solr_3159_jetty8/lucene/core/src/test/org/apache/lucene/index/TestCodecs.java (original)
+++ lucene/dev/branches/solr_3159_jetty8/lucene/core/src/test/org/apache/lucene/index/TestCodecs.java Tue Mar 6 18:13:38 2012
@@ -81,7 +81,7 @@ public class TestCodecs extends LuceneTe
NUM_TEST_ITER = atLeast(20);
}
- class FieldData implements Comparable {
+ class FieldData implements Comparable<FieldData> {
final FieldInfo fieldInfo;
final TermData[] terms;
final boolean omitTF;
@@ -102,8 +102,8 @@ public class TestCodecs extends LuceneTe
Arrays.sort(terms);
}
- public int compareTo(final Object other) {
- return fieldInfo.name.compareTo(((FieldData) other).fieldInfo.name);
+ public int compareTo(final FieldData other) {
+ return fieldInfo.name.compareTo(other.fieldInfo.name);
}
public void write(final FieldsConsumer consumer) throws Throwable {
@@ -133,7 +133,7 @@ public class TestCodecs extends LuceneTe
}
}
- class TermData implements Comparable {
+ class TermData implements Comparable<TermData> {
String text2;
final BytesRef text;
int[] docs;
@@ -147,8 +147,8 @@ public class TestCodecs extends LuceneTe
this.positions = positions;
}
- public int compareTo(final Object o) {
- return text.compareTo(((TermData) o).text);
+ public int compareTo(final TermData o) {
+ return text.compareTo(o.text);
}
public long write(final TermsConsumer termsConsumer) throws Throwable {
@@ -281,7 +281,7 @@ public class TestCodecs extends LuceneTe
for(int iter=0;iter<2;iter++) {
docsEnum = _TestUtil.docs(random, termsEnum, null, docsEnum, false);
assertEquals(terms[i].docs[0], docsEnum.nextDoc());
- assertEquals(DocsEnum.NO_MORE_DOCS, docsEnum.nextDoc());
+ assertEquals(DocIdSetIterator.NO_MORE_DOCS, docsEnum.nextDoc());
}
}
assertNull(termsEnum.next());
@@ -439,7 +439,7 @@ public class TestCodecs extends LuceneTe
assertEquals(positions[i].pos, pos);
if (positions[i].payload != null) {
assertTrue(posEnum.hasPayload());
- if (TestCodecs.random.nextInt(3) < 2) {
+ if (LuceneTestCase.random.nextInt(3) < 2) {
// Verify the payload bytes
final BytesRef otherPayload = posEnum.getPayload();
assertTrue("expected=" + positions[i].payload.toString() + " got=" + otherPayload.toString(), positions[i].payload.equals(otherPayload));
@@ -453,7 +453,7 @@ public class TestCodecs extends LuceneTe
public void _run() throws Throwable {
for(int iter=0;iter<NUM_TEST_ITER;iter++) {
- final FieldData field = fields[TestCodecs.random.nextInt(fields.length)];
+ final FieldData field = fields[LuceneTestCase.random.nextInt(fields.length)];
final TermsEnum termsEnum = termsDict.terms(field.fieldInfo.name).iterator(null);
if (si.getCodec() instanceof Lucene3xCodec) {
// code below expects unicode sort order
@@ -473,7 +473,7 @@ public class TestCodecs extends LuceneTe
assertEquals(upto, field.terms.length);
// Test random seek:
- TermData term = field.terms[TestCodecs.random.nextInt(field.terms.length)];
+ TermData term = field.terms[LuceneTestCase.random.nextInt(field.terms.length)];
TermsEnum.SeekStatus status = termsEnum.seekCeil(new BytesRef(term.text2));
assertEquals(status, TermsEnum.SeekStatus.FOUND);
assertEquals(term.docs.length, termsEnum.docFreq());
@@ -484,7 +484,7 @@ public class TestCodecs extends LuceneTe
}
// Test random seek by ord:
- final int idx = TestCodecs.random.nextInt(field.terms.length);
+ final int idx = LuceneTestCase.random.nextInt(field.terms.length);
term = field.terms[idx];
boolean success = false;
try {
@@ -547,7 +547,7 @@ public class TestCodecs extends LuceneTe
upto = 0;
do {
term = field.terms[upto];
- if (TestCodecs.random.nextInt(3) == 1) {
+ if (LuceneTestCase.random.nextInt(3) == 1) {
final DocsEnum docs;
final DocsEnum docsAndFreqs;
final DocsAndPositionsEnum postings;
@@ -569,10 +569,10 @@ public class TestCodecs extends LuceneTe
// Maybe skip:
final int left = term.docs.length-upto2;
int doc;
- if (TestCodecs.random.nextInt(3) == 1 && left >= 1) {
- final int inc = 1+TestCodecs.random.nextInt(left-1);
+ if (LuceneTestCase.random.nextInt(3) == 1 && left >= 1) {
+ final int inc = 1+LuceneTestCase.random.nextInt(left-1);
upto2 += inc;
- if (TestCodecs.random.nextInt(2) == 1) {
+ if (LuceneTestCase.random.nextInt(2) == 1) {
doc = docs.advance(term.docs[upto2]);
assertEquals(term.docs[upto2], doc);
} else {
@@ -597,7 +597,7 @@ public class TestCodecs extends LuceneTe
assertEquals(term.docs[upto2], doc);
if (!field.omitTF) {
assertEquals(term.positions[upto2].length, postings.freq());
- if (TestCodecs.random.nextInt(2) == 1) {
+ if (LuceneTestCase.random.nextInt(2) == 1) {
this.verifyPositions(term.positions[upto2], postings);
}
}
Modified: lucene/dev/branches/solr_3159_jetty8/lucene/core/src/test/org/apache/lucene/index/TestDirectoryReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr_3159_jetty8/lucene/core/src/test/org/apache/lucene/index/TestDirectoryReader.java?rev=1297628&r1=1297627&r2=1297628&view=diff
==============================================================================
--- lucene/dev/branches/solr_3159_jetty8/lucene/core/src/test/org/apache/lucene/index/TestDirectoryReader.java (original)
+++ lucene/dev/branches/solr_3159_jetty8/lucene/core/src/test/org/apache/lucene/index/TestDirectoryReader.java Tue Mar 6 18:13:38 2012
@@ -110,7 +110,7 @@ public class TestDirectoryReader extends
// This should blow up if we forget to check that the TermEnum is from the same
// reader as the TermDocs.
- while (td.nextDoc() != td.NO_MORE_DOCS) ret += td.docID();
+ while (td.nextDoc() != DocIdSetIterator.NO_MORE_DOCS) ret += td.docID();
// really a dummy assert to ensure that we got some docs and to ensure that
// nothing is eliminated by hotspot
Modified: lucene/dev/branches/solr_3159_jetty8/lucene/core/src/test/org/apache/lucene/index/TestDocValuesIndexing.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr_3159_jetty8/lucene/core/src/test/org/apache/lucene/index/TestDocValuesIndexing.java?rev=1297628&r1=1297627&r2=1297628&view=diff
==============================================================================
--- lucene/dev/branches/solr_3159_jetty8/lucene/core/src/test/org/apache/lucene/index/TestDocValuesIndexing.java (original)
+++ lucene/dev/branches/solr_3159_jetty8/lucene/core/src/test/org/apache/lucene/index/TestDocValuesIndexing.java Tue Mar 6 18:13:38 2012
@@ -23,16 +23,17 @@ import java.util.Arrays;
import java.util.Collections;
import java.util.EnumSet;
import java.util.HashMap;
+import java.util.HashSet;
import java.util.List;
-import java.util.Map;
import java.util.Map.Entry;
+import java.util.Map;
import java.util.Set;
import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.codecs.Codec;
+import org.apache.lucene.document.DocValuesField;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
-import org.apache.lucene.document.DocValuesField;
import org.apache.lucene.document.StringField;
import org.apache.lucene.document.TextField;
import org.apache.lucene.index.DocValues.SortedSource;
@@ -792,7 +793,7 @@ public class TestDocValuesIndexing exten
hash.get(sort[i], expected);
asSortedSource.getByOrd(i, actual);
assertEquals(expected.utf8ToString(), actual.utf8ToString());
- int ord = asSortedSource.getByValue(expected, actual);
+ int ord = asSortedSource.getOrdByValue(expected, actual);
assertEquals(i, ord);
}
AtomicReader slowR = SlowCompositeReaderWrapper.wrap(reader);
@@ -815,8 +816,113 @@ public class TestDocValuesIndexing exten
assertEquals(1, docFreq);
DocsEnum termDocsEnum = reader.termDocsEnum(null, term.field, term.bytes, false);
int nextDoc = termDocsEnum.nextDoc();
- assertEquals(DocsEnum.NO_MORE_DOCS, termDocsEnum.nextDoc());
+ assertEquals(DocIdSetIterator.NO_MORE_DOCS, termDocsEnum.nextDoc());
return nextDoc;
+ }
+
+ public void testWithThreads() throws Exception {
+ final int NUM_DOCS = atLeast(100);
+ final Directory dir = newDirectory();
+ final RandomIndexWriter writer = new RandomIndexWriter(random, dir);
+ final boolean allowDups = random.nextBoolean();
+ final Set<String> seen = new HashSet<String>();
+ if (VERBOSE) {
+ System.out.println("TEST: NUM_DOCS=" + NUM_DOCS + " allowDups=" + allowDups);
+ }
+ int numDocs = 0;
+ final List<BytesRef> docValues = new ArrayList<BytesRef>();
+
+ // TODO: deletions
+ while (numDocs < NUM_DOCS) {
+ final String s;
+ if (random.nextBoolean()) {
+ s = _TestUtil.randomSimpleString(random);
+ } else {
+ s = _TestUtil.randomUnicodeString(random);
+ }
+ final BytesRef br = new BytesRef(s);
+
+ if (!allowDups) {
+ if (seen.contains(s)) {
+ continue;
+ }
+ seen.add(s);
+ }
+
+ if (VERBOSE) {
+ System.out.println(" " + numDocs + ": s=" + s);
+ }
+
+ final Document doc = new Document();
+ doc.add(new DocValuesField("stringdv", br, DocValues.Type.BYTES_VAR_SORTED));
+ doc.add(new DocValuesField("id", numDocs, DocValues.Type.VAR_INTS));
+ docValues.add(br);
+ writer.addDocument(doc);
+ numDocs++;
+
+ if (random.nextInt(40) == 17) {
+ // force flush
+ writer.getReader().close();
+ }
+ }
+
+ writer.forceMerge(1);
+ final DirectoryReader r = writer.getReader();
+ writer.close();
+ final AtomicReader sr = getOnlySegmentReader(r);
+ final DocValues dv = sr.docValues("stringdv");
+ assertNotNull(dv);
+
+ final long END_TIME = System.currentTimeMillis() + (TEST_NIGHTLY ? 30 : 1);
+
+ final DocValues.Source docIDToID = sr.docValues("id").getSource();
+
+ final int NUM_THREADS = _TestUtil.nextInt(random, 1, 10);
+ Thread[] threads = new Thread[NUM_THREADS];
+ for(int thread=0;thread<NUM_THREADS;thread++) {
+ threads[thread] = new Thread() {
+ @Override
+ public void run() {
+ final DocValues.Source stringDVSource;
+ final DocValues.Source stringDVDirectSource;
+ try {
+ stringDVSource = dv.getSource();
+ assertNotNull(stringDVSource);
+ stringDVDirectSource = dv.getDirectSource();
+ assertNotNull(stringDVDirectSource);
+ } catch (IOException ioe) {
+ throw new RuntimeException(ioe);
+ }
+ while(System.currentTimeMillis() < END_TIME) {
+ final DocValues.Source source;
+ if (random.nextBoolean()) {
+ source = stringDVSource;
+ } else {
+ source = stringDVDirectSource;
+ }
+
+ final DocValues.SortedSource sortedSource = source.asSortedSource();
+ assertNotNull(sortedSource);
+
+ final BytesRef scratch = new BytesRef();
+
+ for(int iter=0;iter<100;iter++) {
+ final int docID = random.nextInt(sr.maxDoc());
+ final BytesRef br = sortedSource.getBytes(docID, scratch);
+ assertEquals(docValues.get((int) docIDToID.getInt(docID)), br);
+ }
+ }
+ }
+ };
+ threads[thread].start();
+ }
+
+ for(Thread thread : threads) {
+ thread.join();
+ }
+
+ r.close();
+ dir.close();
}
}
Modified: lucene/dev/branches/solr_3159_jetty8/lucene/core/src/test/org/apache/lucene/index/TestDocsAndPositions.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr_3159_jetty8/lucene/core/src/test/org/apache/lucene/index/TestDocsAndPositions.java?rev=1297628&r1=1297627&r2=1297628&view=diff
==============================================================================
--- lucene/dev/branches/solr_3159_jetty8/lucene/core/src/test/org/apache/lucene/index/TestDocsAndPositions.java (original)
+++ lucene/dev/branches/solr_3159_jetty8/lucene/core/src/test/org/apache/lucene/index/TestDocsAndPositions.java Tue Mar 6 18:13:38 2012
@@ -84,7 +84,7 @@ public class TestDocsAndPositions extend
assertEquals(msg, 20, docsAndPosEnum.nextPosition());
assertEquals(msg, 4, docsAndPosEnum.freq());
assertEquals(msg, 30, docsAndPosEnum.nextPosition());
- } while (docsAndPosEnum.nextDoc() != DocsAndPositionsEnum.NO_MORE_DOCS);
+ } while (docsAndPosEnum.nextDoc() != DocIdSetIterator.NO_MORE_DOCS);
}
}
reader.close();
@@ -156,7 +156,7 @@ public class TestDocsAndPositions extend
// now run through the scorer and check if all positions are there...
do {
int docID = docsAndPosEnum.docID();
- if (docID == DocsAndPositionsEnum.NO_MORE_DOCS) {
+ if (docID == DocIdSetIterator.NO_MORE_DOCS) {
break;
}
Integer[] pos = positionsInDoc[atomicReaderContext.docBase + docID];
@@ -177,7 +177,7 @@ public class TestDocsAndPositions extend
.advance(docID + 1 + random.nextInt((maxDoc - docID)));
}
- } while (docsAndPosEnum.nextDoc() != DocsAndPositionsEnum.NO_MORE_DOCS);
+ } while (docsAndPosEnum.nextDoc() != DocIdSetIterator.NO_MORE_DOCS);
}
}
@@ -234,7 +234,7 @@ public class TestDocsAndPositions extend
int next = findNext(freqInDoc, context.docBase+j+1, context.docBase + maxDoc) - context.docBase;
int advancedTo = docsEnum.advance(next);
if (next >= maxDoc) {
- assertEquals(DocsEnum.NO_MORE_DOCS, advancedTo);
+ assertEquals(DocIdSetIterator.NO_MORE_DOCS, advancedTo);
} else {
assertTrue("advanced to: " +advancedTo + " but should be <= " + next, next >= advancedTo);
}
@@ -243,7 +243,7 @@ public class TestDocsAndPositions extend
}
}
}
- assertEquals("docBase: " + context.docBase + " maxDoc: " + maxDoc + " " + docsEnum.getClass(), DocsEnum.NO_MORE_DOCS, docsEnum.docID());
+ assertEquals("docBase: " + context.docBase + " maxDoc: " + maxDoc + " " + docsEnum.getClass(), DocIdSetIterator.NO_MORE_DOCS, docsEnum.docID());
}
}
Modified: lucene/dev/branches/solr_3159_jetty8/lucene/core/src/test/org/apache/lucene/index/TestDocumentWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr_3159_jetty8/lucene/core/src/test/org/apache/lucene/index/TestDocumentWriter.java?rev=1297628&r1=1297627&r2=1297628&view=diff
==============================================================================
--- lucene/dev/branches/solr_3159_jetty8/lucene/core/src/test/org/apache/lucene/index/TestDocumentWriter.java (original)
+++ lucene/dev/branches/solr_3159_jetty8/lucene/core/src/test/org/apache/lucene/index/TestDocumentWriter.java Tue Mar 6 18:13:38 2012
@@ -30,6 +30,7 @@ import org.apache.lucene.document.FieldT
import org.apache.lucene.document.StringField;
import org.apache.lucene.document.TextField;
import org.apache.lucene.index.FieldInfo.IndexOptions;
+import org.apache.lucene.search.DocIdSetIterator;
import org.apache.lucene.store.Directory;
import org.apache.lucene.util.AttributeSource;
import org.apache.lucene.util.BytesRef;
@@ -129,7 +130,7 @@ public class TestDocumentWriter extends
DocsAndPositionsEnum termPositions = MultiFields.getTermPositionsEnum(reader, MultiFields.getLiveDocs(reader),
"repeated", new BytesRef("repeated"), false);
- assertTrue(termPositions.nextDoc() != termPositions.NO_MORE_DOCS);
+ assertTrue(termPositions.nextDoc() != DocIdSetIterator.NO_MORE_DOCS);
int freq = termPositions.freq();
assertEquals(2, freq);
assertEquals(0, termPositions.nextPosition());
@@ -200,7 +201,7 @@ public class TestDocumentWriter extends
SegmentReader reader = new SegmentReader(info, DirectoryReader.DEFAULT_TERMS_INDEX_DIVISOR, newIOContext(random));
DocsAndPositionsEnum termPositions = MultiFields.getTermPositionsEnum(reader, reader.getLiveDocs(), "f1", new BytesRef("a"), false);
- assertTrue(termPositions.nextDoc() != termPositions.NO_MORE_DOCS);
+ assertTrue(termPositions.nextDoc() != DocIdSetIterator.NO_MORE_DOCS);
int freq = termPositions.freq();
assertEquals(3, freq);
assertEquals(0, termPositions.nextPosition());
@@ -244,18 +245,18 @@ public class TestDocumentWriter extends
SegmentReader reader = new SegmentReader(info, DirectoryReader.DEFAULT_TERMS_INDEX_DIVISOR, newIOContext(random));
DocsAndPositionsEnum termPositions = reader.termPositionsEnum(reader.getLiveDocs(), "preanalyzed", new BytesRef("term1"), false);
- assertTrue(termPositions.nextDoc() != termPositions.NO_MORE_DOCS);
+ assertTrue(termPositions.nextDoc() != DocIdSetIterator.NO_MORE_DOCS);
assertEquals(1, termPositions.freq());
assertEquals(0, termPositions.nextPosition());
termPositions = reader.termPositionsEnum(reader.getLiveDocs(), "preanalyzed", new BytesRef("term2"), false);
- assertTrue(termPositions.nextDoc() != termPositions.NO_MORE_DOCS);
+ assertTrue(termPositions.nextDoc() != DocIdSetIterator.NO_MORE_DOCS);
assertEquals(2, termPositions.freq());
assertEquals(1, termPositions.nextPosition());
assertEquals(3, termPositions.nextPosition());
termPositions = reader.termPositionsEnum(reader.getLiveDocs(), "preanalyzed", new BytesRef("term3"), false);
- assertTrue(termPositions.nextDoc() != termPositions.NO_MORE_DOCS);
+ assertTrue(termPositions.nextDoc() != DocIdSetIterator.NO_MORE_DOCS);
assertEquals(1, termPositions.freq());
assertEquals(2, termPositions.nextPosition());
reader.close();
Modified: lucene/dev/branches/solr_3159_jetty8/lucene/core/src/test/org/apache/lucene/index/TestDuelingCodecs.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr_3159_jetty8/lucene/core/src/test/org/apache/lucene/index/TestDuelingCodecs.java?rev=1297628&r1=1297627&r2=1297628&view=diff
==============================================================================
--- lucene/dev/branches/solr_3159_jetty8/lucene/core/src/test/org/apache/lucene/index/TestDuelingCodecs.java (original)
+++ lucene/dev/branches/solr_3159_jetty8/lucene/core/src/test/org/apache/lucene/index/TestDuelingCodecs.java Tue Mar 6 18:13:38 2012
@@ -18,6 +18,8 @@ package org.apache.lucene.index;
*/
import java.io.IOException;
+import java.util.Collections;
+import java.util.Comparator;
import java.util.HashSet;
import java.util.Iterator;
import java.util.Random;
@@ -29,7 +31,6 @@ import org.apache.lucene.analysis.MockAn
import org.apache.lucene.codecs.Codec;
import org.apache.lucene.document.Document;
import org.apache.lucene.search.DocIdSetIterator;
-import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.store.Directory;
import org.apache.lucene.util.Bits;
import org.apache.lucene.util.BytesRef;
@@ -97,10 +98,9 @@ public class TestDuelingCodecs extends L
createRandomIndex(numdocs, leftWriter, seed);
createRandomIndex(numdocs, rightWriter, seed);
- // TODO: maybe we should do this wrapping in another test?
- leftReader = maybeWrap(leftWriter.getReader());
+ leftReader = maybeWrapReader(leftWriter.getReader());
leftWriter.close();
- rightReader = maybeWrap(rightWriter.getReader());
+ rightReader = maybeWrapReader(rightWriter.getReader());
rightWriter.close();
info = "left: " + leftCodec.toString() + " / right: " + rightCodec.toString();
@@ -116,12 +116,6 @@ public class TestDuelingCodecs extends L
super.tearDown();
}
- static IndexReader maybeWrap(IndexReader other) throws IOException {
- // TODO: bogus how we do this
- IndexSearcher is = newSearcher(other);
- return is.getIndexReader();
- }
-
/**
* populates a writer with random stuff. this must be fully reproducable with the seed!
*/
@@ -488,8 +482,18 @@ public class TestDuelingCodecs extends L
Document rightDoc = rightReader.document(i);
// TODO: I think this is bogus because we don't document what the order should be
- // from these iterators, etc. I think the codec should be free to order this stuff
+ // from these iterators, etc. I think the codec/IndexReader should be free to order this stuff
// in whatever way it wants (e.g. maybe it packs related fields together or something)
+ // To fix this, we sort the fields in both documents by name, but
+ // we still assume that all instances with same name are in order:
+ Comparator<IndexableField> comp = new Comparator<IndexableField>() {
+ @Override
+ public int compare(IndexableField arg0, IndexableField arg1) {
+ return arg0.name().compareTo(arg1.name());
+ }
+ };
+ Collections.sort(leftDoc.getFields(), comp);
+ Collections.sort(rightDoc.getFields(), comp);
Iterator<IndexableField> leftIterator = leftDoc.iterator();
Iterator<IndexableField> rightIterator = rightDoc.iterator();
Modified: lucene/dev/branches/solr_3159_jetty8/lucene/core/src/test/org/apache/lucene/index/TestFilterAtomicReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr_3159_jetty8/lucene/core/src/test/org/apache/lucene/index/TestFilterAtomicReader.java?rev=1297628&r1=1297627&r2=1297628&view=diff
==============================================================================
--- lucene/dev/branches/solr_3159_jetty8/lucene/core/src/test/org/apache/lucene/index/TestFilterAtomicReader.java (original)
+++ lucene/dev/branches/solr_3159_jetty8/lucene/core/src/test/org/apache/lucene/index/TestFilterAtomicReader.java Tue Mar 6 18:13:38 2012
@@ -21,17 +21,15 @@ package org.apache.lucene.index;
import java.io.IOException;
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
-import java.util.HashSet;
-
import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.TextField;
+import org.apache.lucene.search.DocIdSetIterator;
import org.apache.lucene.store.Directory;
import org.apache.lucene.store.MockDirectoryWrapper;
import org.apache.lucene.util.Bits;
import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.LuceneTestCase;
-import org.apache.lucene.util.ReaderUtil;
public class TestFilterAtomicReader extends LuceneTestCase {
@@ -168,7 +166,7 @@ public class TestFilterAtomicReader exte
DocsAndPositionsEnum positions = terms.docsAndPositions(MultiFields.getLiveDocs(reader),
null, false);
- while (positions.nextDoc() != DocsEnum.NO_MORE_DOCS) {
+ while (positions.nextDoc() != DocIdSetIterator.NO_MORE_DOCS) {
assertTrue((positions.docID() % 2) == 1);
}
@@ -176,22 +174,31 @@ public class TestFilterAtomicReader exte
directory.close();
target.close();
}
-
- public void testOverrideMethods() throws Exception {
+
+ private void checkOverrideMethods(Class<?> clazz) throws Exception {
boolean fail = false;
- for (Method m : FilterAtomicReader.class.getMethods()) {
+ for (Method m : clazz.getMethods()) {
int mods = m.getModifiers();
if (Modifier.isStatic(mods) || Modifier.isFinal(mods) || m.isSynthetic()) {
continue;
}
Class<?> declaringClass = m.getDeclaringClass();
- String name = m.getName();
- if (declaringClass != FilterAtomicReader.class && declaringClass != Object.class) {
- System.err.println("method is not overridden by FilterIndexReader: " + name);
+ if (declaringClass != clazz && declaringClass != Object.class) {
+ System.err.println("method is not overridden by "+clazz.getName()+": " + m.toGenericString());
fail = true;
}
}
- assertFalse("FilterIndexReader overrides (or not) some problematic methods; see log above", fail);
+ assertFalse(clazz.getName()+" does not override some methods; see log above", fail);
+ }
+
+ public void testOverrideMethods() throws Exception {
+ checkOverrideMethods(FilterAtomicReader.class);
+ checkOverrideMethods(FilterAtomicReader.FilterFields.class);
+ checkOverrideMethods(FilterAtomicReader.FilterTerms.class);
+ checkOverrideMethods(FilterAtomicReader.FilterFieldsEnum.class);
+ checkOverrideMethods(FilterAtomicReader.FilterTermsEnum.class);
+ checkOverrideMethods(FilterAtomicReader.FilterDocsEnum.class);
+ checkOverrideMethods(FilterAtomicReader.FilterDocsAndPositionsEnum.class);
}
}
Modified: lucene/dev/branches/solr_3159_jetty8/lucene/core/src/test/org/apache/lucene/index/TestFlushByRamOrCountsPolicy.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr_3159_jetty8/lucene/core/src/test/org/apache/lucene/index/TestFlushByRamOrCountsPolicy.java?rev=1297628&r1=1297627&r2=1297628&view=diff
==============================================================================
--- lucene/dev/branches/solr_3159_jetty8/lucene/core/src/test/org/apache/lucene/index/TestFlushByRamOrCountsPolicy.java (original)
+++ lucene/dev/branches/solr_3159_jetty8/lucene/core/src/test/org/apache/lucene/index/TestFlushByRamOrCountsPolicy.java Tue Mar 6 18:13:38 2012
@@ -39,7 +39,7 @@ public class TestFlushByRamOrCountsPolic
@BeforeClass
public static void beforeClass() throws Exception {
- lineDocFile = new LineFileDocs(random);
+ lineDocFile = new LineFileDocs(random, defaultCodecSupportsDocValues());
}
@AfterClass
@@ -323,6 +323,8 @@ public class TestFlushByRamOrCountsPolic
}
writer.commit();
} catch (Throwable ex) {
+ System.out.println("FAILED exc:");
+ ex.printStackTrace(System.out);
throw new RuntimeException(ex);
}
}
Modified: lucene/dev/branches/solr_3159_jetty8/lucene/core/src/test/org/apache/lucene/index/TestForTooMuchCloning.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr_3159_jetty8/lucene/core/src/test/org/apache/lucene/index/TestForTooMuchCloning.java?rev=1297628&r1=1297627&r2=1297628&view=diff
==============================================================================
--- lucene/dev/branches/solr_3159_jetty8/lucene/core/src/test/org/apache/lucene/index/TestForTooMuchCloning.java (original)
+++ lucene/dev/branches/solr_3159_jetty8/lucene/core/src/test/org/apache/lucene/index/TestForTooMuchCloning.java Tue Mar 6 18:13:38 2012
@@ -17,8 +17,6 @@ package org.apache.lucene.index;
* limitations under the License.
*/
-import java.util.*;
-
import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.TextField;
Modified: lucene/dev/branches/solr_3159_jetty8/lucene/core/src/test/org/apache/lucene/index/TestForceMergeForever.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr_3159_jetty8/lucene/core/src/test/org/apache/lucene/index/TestForceMergeForever.java?rev=1297628&r1=1297627&r2=1297628&view=diff
==============================================================================
--- lucene/dev/branches/solr_3159_jetty8/lucene/core/src/test/org/apache/lucene/index/TestForceMergeForever.java (original)
+++ lucene/dev/branches/solr_3159_jetty8/lucene/core/src/test/org/apache/lucene/index/TestForceMergeForever.java Tue Mar 6 18:13:38 2012
@@ -59,7 +59,7 @@ public class TestForceMergeForever exten
// Try to make an index that requires merging:
w.getConfig().setMaxBufferedDocs(_TestUtil.nextInt(random, 2, 11));
final int numStartDocs = atLeast(20);
- final LineFileDocs docs = new LineFileDocs(random);
+ final LineFileDocs docs = new LineFileDocs(random, defaultCodecSupportsDocValues());
for(int docIDX=0;docIDX<numStartDocs;docIDX++) {
w.addDocument(docs.nextDoc());
}
Modified: lucene/dev/branches/solr_3159_jetty8/lucene/core/src/test/org/apache/lucene/index/TestIndexWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr_3159_jetty8/lucene/core/src/test/org/apache/lucene/index/TestIndexWriter.java?rev=1297628&r1=1297627&r2=1297628&view=diff
==============================================================================
--- lucene/dev/branches/solr_3159_jetty8/lucene/core/src/test/org/apache/lucene/index/TestIndexWriter.java (original)
+++ lucene/dev/branches/solr_3159_jetty8/lucene/core/src/test/org/apache/lucene/index/TestIndexWriter.java Tue Mar 6 18:13:38 2012
@@ -21,6 +21,7 @@ import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.Reader;
import java.io.StringReader;
+import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashSet;
import java.util.Iterator;
@@ -38,8 +39,8 @@ import org.apache.lucene.document.FieldT
import org.apache.lucene.document.StoredField;
import org.apache.lucene.document.StringField;
import org.apache.lucene.document.TextField;
-import org.apache.lucene.index.IndexWriterConfig.OpenMode;
import org.apache.lucene.index.FieldInfo.IndexOptions;
+import org.apache.lucene.index.IndexWriterConfig.OpenMode;
import org.apache.lucene.search.DocIdSetIterator;
import org.apache.lucene.search.FieldCache;
import org.apache.lucene.search.IndexSearcher;
@@ -968,14 +969,14 @@ public class TestIndexWriter extends Luc
assertNotNull(termsEnum.next());
DocsAndPositionsEnum dpEnum = termsEnum.docsAndPositions(null, null, false);
assertNotNull(dpEnum);
- assertTrue(dpEnum.nextDoc() != DocsEnum.NO_MORE_DOCS);
+ assertTrue(dpEnum.nextDoc() != DocIdSetIterator.NO_MORE_DOCS);
assertEquals(1, dpEnum.freq());
assertEquals(100, dpEnum.nextPosition());
assertNotNull(termsEnum.next());
dpEnum = termsEnum.docsAndPositions(null, dpEnum, false);
assertNotNull(dpEnum);
- assertTrue(dpEnum.nextDoc() != DocsEnum.NO_MORE_DOCS);
+ assertTrue(dpEnum.nextDoc() != DocIdSetIterator.NO_MORE_DOCS);
assertEquals(1, dpEnum.freq());
assertEquals(101, dpEnum.nextPosition());
assertNull(termsEnum.next());
@@ -1787,4 +1788,17 @@ public class TestIndexWriter extends Luc
w.close();
dir.close();
}
+
+ public void testOnlyUpdateDocuments() throws Exception {
+ Directory dir = newDirectory();
+ IndexWriter w = new IndexWriter(dir,
+ new IndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random)));
+
+ final List<Document> docs = new ArrayList<Document>();
+ docs.add(new Document());
+ w.updateDocuments(new Term("foo", "bar"),
+ docs);
+ w.close();
+ dir.close();
+ }
}
Modified: lucene/dev/branches/solr_3159_jetty8/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr_3159_jetty8/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterReader.java?rev=1297628&r1=1297627&r2=1297628&view=diff
==============================================================================
--- lucene/dev/branches/solr_3159_jetty8/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterReader.java (original)
+++ lucene/dev/branches/solr_3159_jetty8/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterReader.java Tue Mar 6 18:13:38 2012
@@ -31,6 +31,7 @@ import org.apache.lucene.document.Docume
import org.apache.lucene.document.Field;
import org.apache.lucene.document.StringField;
import org.apache.lucene.document.TextField;
+import org.apache.lucene.search.DocIdSetIterator;
import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.search.Query;
import org.apache.lucene.search.TermQuery;
@@ -57,7 +58,7 @@ public class TestIndexWriterReader exten
false);
if (td != null) {
- while (td.nextDoc() != DocsEnum.NO_MORE_DOCS) {
+ while (td.nextDoc() != DocIdSetIterator.NO_MORE_DOCS) {
td.docID();
count++;
}
Modified: lucene/dev/branches/solr_3159_jetty8/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterWithThreads.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr_3159_jetty8/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterWithThreads.java?rev=1297628&r1=1297627&r2=1297628&view=diff
==============================================================================
--- lucene/dev/branches/solr_3159_jetty8/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterWithThreads.java (original)
+++ lucene/dev/branches/solr_3159_jetty8/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterWithThreads.java Tue Mar 6 18:13:38 2012
@@ -25,6 +25,7 @@ import org.apache.lucene.document.Docume
import org.apache.lucene.document.Field;
import org.apache.lucene.document.FieldType;
import org.apache.lucene.document.TextField;
+import org.apache.lucene.search.DocIdSetIterator;
import org.apache.lucene.store.AlreadyClosedException;
import org.apache.lucene.store.Directory;
import org.apache.lucene.store.MockDirectoryWrapper;
@@ -217,7 +218,7 @@ public class TestIndexWriterWithThreads
null,
false);
int count = 0;
- while(tdocs.nextDoc() != DocsEnum.NO_MORE_DOCS) {
+ while(tdocs.nextDoc() != DocIdSetIterator.NO_MORE_DOCS) {
count++;
}
assertTrue(count > 0);
Modified: lucene/dev/branches/solr_3159_jetty8/lucene/core/src/test/org/apache/lucene/index/TestIndexableField.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr_3159_jetty8/lucene/core/src/test/org/apache/lucene/index/TestIndexableField.java?rev=1297628&r1=1297627&r2=1297628&view=diff
==============================================================================
--- lucene/dev/branches/solr_3159_jetty8/lucene/core/src/test/org/apache/lucene/index/TestIndexableField.java (original)
+++ lucene/dev/branches/solr_3159_jetty8/lucene/core/src/test/org/apache/lucene/index/TestIndexableField.java Tue Mar 6 18:13:38 2012
@@ -28,6 +28,7 @@ import org.apache.lucene.document.Docume
import org.apache.lucene.document.StringField;
import org.apache.lucene.search.BooleanClause;
import org.apache.lucene.search.BooleanQuery;
+import org.apache.lucene.search.DocIdSetIterator;
import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.search.TermQuery;
import org.apache.lucene.search.TopDocs;
@@ -264,14 +265,14 @@ public class TestIndexableField extends
assertEquals(new BytesRef(""+counter), termsEnum.next());
assertEquals(1, termsEnum.totalTermFreq());
DocsAndPositionsEnum dpEnum = termsEnum.docsAndPositions(null, null, false);
- assertTrue(dpEnum.nextDoc() != DocsEnum.NO_MORE_DOCS);
+ assertTrue(dpEnum.nextDoc() != DocIdSetIterator.NO_MORE_DOCS);
assertEquals(1, dpEnum.freq());
assertEquals(1, dpEnum.nextPosition());
assertEquals(new BytesRef("text"), termsEnum.next());
assertEquals(1, termsEnum.totalTermFreq());
dpEnum = termsEnum.docsAndPositions(null, dpEnum, false);
- assertTrue(dpEnum.nextDoc() != DocsEnum.NO_MORE_DOCS);
+ assertTrue(dpEnum.nextDoc() != DocIdSetIterator.NO_MORE_DOCS);
assertEquals(1, dpEnum.freq());
assertEquals(0, dpEnum.nextPosition());
Modified: lucene/dev/branches/solr_3159_jetty8/lucene/core/src/test/org/apache/lucene/index/TestLongPostings.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr_3159_jetty8/lucene/core/src/test/org/apache/lucene/index/TestLongPostings.java?rev=1297628&r1=1297627&r2=1297628&view=diff
==============================================================================
--- lucene/dev/branches/solr_3159_jetty8/lucene/core/src/test/org/apache/lucene/index/TestLongPostings.java (original)
+++ lucene/dev/branches/solr_3159_jetty8/lucene/core/src/test/org/apache/lucene/index/TestLongPostings.java Tue Mar 6 18:13:38 2012
@@ -29,6 +29,7 @@ import org.apache.lucene.document.Field;
import org.apache.lucene.document.FieldType;
import org.apache.lucene.index.FieldInfo.IndexOptions;
import org.apache.lucene.document.TextField;
+import org.apache.lucene.search.DocIdSetIterator;
import org.apache.lucene.store.Directory;
import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.LuceneTestCase;
@@ -110,30 +111,26 @@ public class TestLongPostings extends Lu
}
final IndexReader r;
- if (true) {
- final IndexWriterConfig iwc = newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random))
- .setOpenMode(IndexWriterConfig.OpenMode.CREATE)
- .setMergePolicy(newLogMergePolicy());
- iwc.setRAMBufferSizeMB(16.0 + 16.0 * random.nextDouble());
- iwc.setMaxBufferedDocs(-1);
- final RandomIndexWriter riw = new RandomIndexWriter(random, dir, iwc);
-
- for(int idx=0;idx<NUM_DOCS;idx++) {
- final Document doc = new Document();
- String s = isS1.get(idx) ? s1 : s2;
- final Field f = newField("field", s, TextField.TYPE_UNSTORED);
- final int count = _TestUtil.nextInt(random, 1, 4);
- for(int ct=0;ct<count;ct++) {
- doc.add(f);
- }
- riw.addDocument(doc);
- }
-
- r = riw.getReader();
- riw.close();
- } else {
- r = IndexReader.open(dir);
- }
+ final IndexWriterConfig iwc = newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random))
+ .setOpenMode(IndexWriterConfig.OpenMode.CREATE)
+ .setMergePolicy(newLogMergePolicy());
+ iwc.setRAMBufferSizeMB(16.0 + 16.0 * random.nextDouble());
+ iwc.setMaxBufferedDocs(-1);
+ final RandomIndexWriter riw = new RandomIndexWriter(random, dir, iwc);
+
+ for(int idx=0;idx<NUM_DOCS;idx++) {
+ final Document doc = new Document();
+ String s = isS1.get(idx) ? s1 : s2;
+ final Field f = newField("field", s, TextField.TYPE_UNSTORED);
+ final int count = _TestUtil.nextInt(random, 1, 4);
+ for(int ct=0;ct<count;ct++) {
+ doc.add(f);
+ }
+ riw.addDocument(doc);
+ }
+
+ r = riw.getReader();
+ riw.close();
/*
if (VERBOSE) {
@@ -176,7 +173,7 @@ public class TestLongPostings extends Lu
final DocsAndPositionsEnum postings = MultiFields.getTermPositionsEnum(r, null, "field", new BytesRef(term), false);
int docID = -1;
- while(docID < DocsEnum.NO_MORE_DOCS) {
+ while(docID < DocIdSetIterator.NO_MORE_DOCS) {
final int what = random.nextInt(3);
if (what == 0) {
if (VERBOSE) {
@@ -199,7 +196,7 @@ public class TestLongPostings extends Lu
System.out.println(" got docID=" + docID);
}
assertEquals(expected, docID);
- if (docID == DocsEnum.NO_MORE_DOCS) {
+ if (docID == DocIdSetIterator.NO_MORE_DOCS) {
break;
}
@@ -241,7 +238,7 @@ public class TestLongPostings extends Lu
System.out.println(" got docID=" + docID);
}
assertEquals(expected, docID);
- if (docID == DocsEnum.NO_MORE_DOCS) {
+ if (docID == DocIdSetIterator.NO_MORE_DOCS) {
break;
}
@@ -380,7 +377,7 @@ public class TestLongPostings extends Lu
assert docs != null;
int docID = -1;
- while(docID < DocsEnum.NO_MORE_DOCS) {
+ while(docID < DocIdSetIterator.NO_MORE_DOCS) {
final int what = random.nextInt(3);
if (what == 0) {
if (VERBOSE) {
@@ -403,7 +400,7 @@ public class TestLongPostings extends Lu
System.out.println(" got docID=" + docID);
}
assertEquals(expected, docID);
- if (docID == DocsEnum.NO_MORE_DOCS) {
+ if (docID == DocIdSetIterator.NO_MORE_DOCS) {
break;
}
@@ -439,7 +436,7 @@ public class TestLongPostings extends Lu
System.out.println(" got docID=" + docID);
}
assertEquals(expected, docID);
- if (docID == DocsEnum.NO_MORE_DOCS) {
+ if (docID == DocIdSetIterator.NO_MORE_DOCS) {
break;
}
Modified: lucene/dev/branches/solr_3159_jetty8/lucene/core/src/test/org/apache/lucene/index/TestMultiFields.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr_3159_jetty8/lucene/core/src/test/org/apache/lucene/index/TestMultiFields.java?rev=1297628&r1=1297627&r2=1297628&view=diff
==============================================================================
--- lucene/dev/branches/solr_3159_jetty8/lucene/core/src/test/org/apache/lucene/index/TestMultiFields.java (original)
+++ lucene/dev/branches/solr_3159_jetty8/lucene/core/src/test/org/apache/lucene/index/TestMultiFields.java Tue Mar 6 18:13:38 2012
@@ -17,6 +17,7 @@ package org.apache.lucene.index;
* limitations under the License.
*/
+import org.apache.lucene.search.DocIdSetIterator;
import org.apache.lucene.store.*;
import org.apache.lucene.util.*;
import org.apache.lucene.document.*;
@@ -128,7 +129,7 @@ public class TestMultiFields extends Luc
assertEquals(docID, docsEnum.nextDoc());
}
}
- assertEquals(docsEnum.NO_MORE_DOCS, docsEnum.nextDoc());
+ assertEquals(DocIdSetIterator.NO_MORE_DOCS, docsEnum.nextDoc());
}
reader.close();
Modified: lucene/dev/branches/solr_3159_jetty8/lucene/core/src/test/org/apache/lucene/index/TestNorms.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr_3159_jetty8/lucene/core/src/test/org/apache/lucene/index/TestNorms.java?rev=1297628&r1=1297627&r2=1297628&view=diff
==============================================================================
--- lucene/dev/branches/solr_3159_jetty8/lucene/core/src/test/org/apache/lucene/index/TestNorms.java (original)
+++ lucene/dev/branches/solr_3159_jetty8/lucene/core/src/test/org/apache/lucene/index/TestNorms.java Tue Mar 6 18:13:38 2012
@@ -29,7 +29,6 @@ import org.apache.lucene.search.similari
import org.apache.lucene.search.similarities.PerFieldSimilarityWrapper;
import org.apache.lucene.search.similarities.Similarity;
import org.apache.lucene.store.Directory;
-import org.apache.lucene.store.MockDirectoryWrapper;
import org.apache.lucene.util.LineFileDocs;
import org.apache.lucene.util.LuceneTestCase;
@@ -179,7 +178,7 @@ public class TestNorms extends LuceneTes
Similarity provider = new MySimProvider(writeNorms);
config.setSimilarity(provider);
RandomIndexWriter writer = new RandomIndexWriter(random, dir, config);
- final LineFileDocs docs = new LineFileDocs(random);
+ final LineFileDocs docs = new LineFileDocs(random, defaultCodecSupportsDocValues());
int num = atLeast(100);
for (int i = 0; i < num; i++) {
Document doc = docs.nextDoc();
Modified: lucene/dev/branches/solr_3159_jetty8/lucene/core/src/test/org/apache/lucene/index/TestParallelTermEnum.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr_3159_jetty8/lucene/core/src/test/org/apache/lucene/index/TestParallelTermEnum.java?rev=1297628&r1=1297627&r2=1297628&view=diff
==============================================================================
--- lucene/dev/branches/solr_3159_jetty8/lucene/core/src/test/org/apache/lucene/index/TestParallelTermEnum.java (original)
+++ lucene/dev/branches/solr_3159_jetty8/lucene/core/src/test/org/apache/lucene/index/TestParallelTermEnum.java Tue Mar 6 18:13:38 2012
@@ -22,6 +22,7 @@ import java.io.IOException;
import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.TextField;
+import org.apache.lucene.search.DocIdSetIterator;
import org.apache.lucene.store.Directory;
import org.apache.lucene.util.Bits;
import org.apache.lucene.util.BytesRef;
@@ -79,9 +80,9 @@ public class TestParallelTermEnum extend
assertNotNull(b);
assertEquals(t, b.utf8ToString());
DocsEnum td = _TestUtil.docs(random, te, liveDocs, null, false);
- assertTrue(td.nextDoc() != DocsEnum.NO_MORE_DOCS);
+ assertTrue(td.nextDoc() != DocIdSetIterator.NO_MORE_DOCS);
assertEquals(0, td.docID());
- assertEquals(td.nextDoc(), DocsEnum.NO_MORE_DOCS);
+ assertEquals(td.nextDoc(), DocIdSetIterator.NO_MORE_DOCS);
}
assertNull(te.next());
}
Modified: lucene/dev/branches/solr_3159_jetty8/lucene/core/src/test/org/apache/lucene/index/TestPerSegmentDeletes.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr_3159_jetty8/lucene/core/src/test/org/apache/lucene/index/TestPerSegmentDeletes.java?rev=1297628&r1=1297627&r2=1297628&view=diff
==============================================================================
--- lucene/dev/branches/solr_3159_jetty8/lucene/core/src/test/org/apache/lucene/index/TestPerSegmentDeletes.java (original)
+++ lucene/dev/branches/solr_3159_jetty8/lucene/core/src/test/org/apache/lucene/index/TestPerSegmentDeletes.java Tue Mar 6 18:13:38 2012
@@ -24,6 +24,7 @@ import java.util.Map;
import java.util.Random;
import org.apache.lucene.analysis.MockAnalyzer;
+import org.apache.lucene.search.DocIdSetIterator;
import org.apache.lucene.store.Directory;
import org.apache.lucene.store.MockDirectoryWrapper;
import org.apache.lucene.store.RAMDirectory;
@@ -233,7 +234,7 @@ public class TestPerSegmentDeletes exten
public static int[] toArray(DocsEnum docsEnum) throws IOException {
List<Integer> docs = new ArrayList<Integer>();
- while (docsEnum.nextDoc() != DocsEnum.NO_MORE_DOCS) {
+ while (docsEnum.nextDoc() != DocIdSetIterator.NO_MORE_DOCS) {
int docID = docsEnum.docID();
docs.add(docID);
}
Modified: lucene/dev/branches/solr_3159_jetty8/lucene/core/src/test/org/apache/lucene/index/TestPostingsOffsets.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr_3159_jetty8/lucene/core/src/test/org/apache/lucene/index/TestPostingsOffsets.java?rev=1297628&r1=1297627&r2=1297628&view=diff
==============================================================================
--- lucene/dev/branches/solr_3159_jetty8/lucene/core/src/test/org/apache/lucene/index/TestPostingsOffsets.java (original)
+++ lucene/dev/branches/solr_3159_jetty8/lucene/core/src/test/org/apache/lucene/index/TestPostingsOffsets.java Tue Mar 6 18:13:38 2012
@@ -88,7 +88,7 @@ public class TestPostingsOffsets extends
assertEquals(2, dp.nextPosition());
assertEquals(9, dp.startOffset());
assertEquals(17, dp.endOffset());
- assertEquals(DocsEnum.NO_MORE_DOCS, dp.nextDoc());
+ assertEquals(DocIdSetIterator.NO_MORE_DOCS, dp.nextDoc());
dp = MultiFields.getTermPositionsEnum(r, null, "content", new BytesRef("b"), true);
assertNotNull(dp);
@@ -97,7 +97,7 @@ public class TestPostingsOffsets extends
assertEquals(1, dp.nextPosition());
assertEquals(8, dp.startOffset());
assertEquals(9, dp.endOffset());
- assertEquals(DocsEnum.NO_MORE_DOCS, dp.nextDoc());
+ assertEquals(DocIdSetIterator.NO_MORE_DOCS, dp.nextDoc());
dp = MultiFields.getTermPositionsEnum(r, null, "content", new BytesRef("c"), true);
assertNotNull(dp);
@@ -106,7 +106,7 @@ public class TestPostingsOffsets extends
assertEquals(3, dp.nextPosition());
assertEquals(19, dp.startOffset());
assertEquals(50, dp.endOffset());
- assertEquals(DocsEnum.NO_MORE_DOCS, dp.nextDoc());
+ assertEquals(DocIdSetIterator.NO_MORE_DOCS, dp.nextDoc());
r.close();
dir.close();
@@ -156,7 +156,7 @@ public class TestPostingsOffsets extends
for (String term : terms) {
DocsAndPositionsEnum dp = MultiFields.getTermPositionsEnum(reader, null, "numbers", new BytesRef(term), true);
int doc;
- while((doc = dp.nextDoc()) != DocsEnum.NO_MORE_DOCS) {
+ while((doc = dp.nextDoc()) != DocIdSetIterator.NO_MORE_DOCS) {
String storedNumbers = reader.document(doc).get("numbers");
int freq = dp.freq();
for (int i = 0; i < freq; i++) {
@@ -304,7 +304,7 @@ public class TestPostingsOffsets extends
assertNotNull(docs);
int doc;
//System.out.println(" doc/freq");
- while((doc = docs.nextDoc()) != DocsEnum.NO_MORE_DOCS) {
+ while((doc = docs.nextDoc()) != DocIdSetIterator.NO_MORE_DOCS) {
final List<Token> expected = actualTokens.get(term).get(docIDToID[doc]);
//System.out.println(" doc=" + docIDToID[doc] + " docID=" + doc + " " + expected.size() + " freq");
assertNotNull(expected);
@@ -314,7 +314,7 @@ public class TestPostingsOffsets extends
docsAndPositions = termsEnum.docsAndPositions(null, docsAndPositions, false);
assertNotNull(docsAndPositions);
//System.out.println(" doc/freq/pos");
- while((doc = docsAndPositions.nextDoc()) != DocsEnum.NO_MORE_DOCS) {
+ while((doc = docsAndPositions.nextDoc()) != DocIdSetIterator.NO_MORE_DOCS) {
final List<Token> expected = actualTokens.get(term).get(docIDToID[doc]);
//System.out.println(" doc=" + docIDToID[doc] + " " + expected.size() + " freq");
assertNotNull(expected);
@@ -329,7 +329,7 @@ public class TestPostingsOffsets extends
docsAndPositionsAndOffsets = termsEnum.docsAndPositions(null, docsAndPositions, true);
assertNotNull(docsAndPositionsAndOffsets);
//System.out.println(" doc/freq/pos/offs");
- while((doc = docsAndPositions.nextDoc()) != DocsEnum.NO_MORE_DOCS) {
+ while((doc = docsAndPositions.nextDoc()) != DocIdSetIterator.NO_MORE_DOCS) {
final List<Token> expected = actualTokens.get(term).get(docIDToID[doc]);
//System.out.println(" doc=" + docIDToID[doc] + " " + expected.size() + " freq");
assertNotNull(expected);
Modified: lucene/dev/branches/solr_3159_jetty8/lucene/core/src/test/org/apache/lucene/index/TestRollingUpdates.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr_3159_jetty8/lucene/core/src/test/org/apache/lucene/index/TestRollingUpdates.java?rev=1297628&r1=1297627&r2=1297628&view=diff
==============================================================================
--- lucene/dev/branches/solr_3159_jetty8/lucene/core/src/test/org/apache/lucene/index/TestRollingUpdates.java (original)
+++ lucene/dev/branches/solr_3159_jetty8/lucene/core/src/test/org/apache/lucene/index/TestRollingUpdates.java Tue Mar 6 18:13:38 2012
@@ -34,7 +34,7 @@ public class TestRollingUpdates extends
public void testRollingUpdates() throws Exception {
final MockDirectoryWrapper dir = newDirectory();
dir.setCheckIndexOnClose(false); // we use a custom codec provider
- final LineFileDocs docs = new LineFileDocs(random);
+ final LineFileDocs docs = new LineFileDocs(random, defaultCodecSupportsDocValues());
//provider.register(new MemoryCodec());
if ( (!"Lucene3x".equals(Codec.getDefault().getName())) && random.nextBoolean()) {
Modified: lucene/dev/branches/solr_3159_jetty8/lucene/core/src/test/org/apache/lucene/index/TestSegmentMerger.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr_3159_jetty8/lucene/core/src/test/org/apache/lucene/index/TestSegmentMerger.java?rev=1297628&r1=1297627&r2=1297628&view=diff
==============================================================================
--- lucene/dev/branches/solr_3159_jetty8/lucene/core/src/test/org/apache/lucene/index/TestSegmentMerger.java (original)
+++ lucene/dev/branches/solr_3159_jetty8/lucene/core/src/test/org/apache/lucene/index/TestSegmentMerger.java Tue Mar 6 18:13:38 2012
@@ -23,6 +23,7 @@ import org.apache.lucene.analysis.MockAn
import org.apache.lucene.codecs.Codec;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.TextField;
+import org.apache.lucene.search.DocIdSetIterator;
import org.apache.lucene.store.Directory;
import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.InfoStream;
@@ -105,7 +106,7 @@ public class TestSegmentMerger extends L
null,
false);
assertTrue(termDocs != null);
- assertTrue(termDocs.nextDoc() != DocsEnum.NO_MORE_DOCS);
+ assertTrue(termDocs.nextDoc() != DocIdSetIterator.NO_MORE_DOCS);
int tvCount = 0;
for(FieldInfo fieldInfo : mergedReader.getFieldInfos()) {
Modified: lucene/dev/branches/solr_3159_jetty8/lucene/core/src/test/org/apache/lucene/index/TestSegmentReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr_3159_jetty8/lucene/core/src/test/org/apache/lucene/index/TestSegmentReader.java?rev=1297628&r1=1297627&r2=1297628&view=diff
==============================================================================
--- lucene/dev/branches/solr_3159_jetty8/lucene/core/src/test/org/apache/lucene/index/TestSegmentReader.java (original)
+++ lucene/dev/branches/solr_3159_jetty8/lucene/core/src/test/org/apache/lucene/index/TestSegmentReader.java Tue Mar 6 18:13:38 2012
@@ -23,6 +23,7 @@ import java.util.HashSet;
import java.util.List;
import org.apache.lucene.document.Document;
+import org.apache.lucene.search.DocIdSetIterator;
import org.apache.lucene.store.Directory;
import org.apache.lucene.store.IOContext;
import org.apache.lucene.util.BytesRef;
@@ -133,7 +134,7 @@ public class TestSegmentReader extends L
MultiFields.getLiveDocs(reader),
null,
false);
- assertTrue(termDocs.nextDoc() != DocsEnum.NO_MORE_DOCS);
+ assertTrue(termDocs.nextDoc() != DocIdSetIterator.NO_MORE_DOCS);
termDocs = _TestUtil.docs(random, reader,
DocHelper.NO_NORMS_KEY,
@@ -142,7 +143,7 @@ public class TestSegmentReader extends L
null,
false);
- assertTrue(termDocs.nextDoc() != DocsEnum.NO_MORE_DOCS);
+ assertTrue(termDocs.nextDoc() != DocIdSetIterator.NO_MORE_DOCS);
DocsAndPositionsEnum positions = MultiFields.getTermPositionsEnum(reader,
@@ -152,7 +153,7 @@ public class TestSegmentReader extends L
false);
// NOTE: prior rev of this test was failing to first
// call next here:
- assertTrue(positions.nextDoc() != DocsEnum.NO_MORE_DOCS);
+ assertTrue(positions.nextDoc() != DocIdSetIterator.NO_MORE_DOCS);
assertTrue(positions.docID() == 0);
assertTrue(positions.nextPosition() >= 0);
}
Modified: lucene/dev/branches/solr_3159_jetty8/lucene/core/src/test/org/apache/lucene/index/TestSegmentTermDocs.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr_3159_jetty8/lucene/core/src/test/org/apache/lucene/index/TestSegmentTermDocs.java?rev=1297628&r1=1297627&r2=1297628&view=diff
==============================================================================
--- lucene/dev/branches/solr_3159_jetty8/lucene/core/src/test/org/apache/lucene/index/TestSegmentTermDocs.java (original)
+++ lucene/dev/branches/solr_3159_jetty8/lucene/core/src/test/org/apache/lucene/index/TestSegmentTermDocs.java Tue Mar 6 18:13:38 2012
@@ -22,6 +22,7 @@ import java.io.IOException;
import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.TextField;
+import org.apache.lucene.search.DocIdSetIterator;
import org.apache.lucene.store.Directory;
import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.LuceneTestCase;
@@ -63,7 +64,7 @@ public class TestSegmentTermDocs extends
TermsEnum terms = reader.fields().terms(DocHelper.TEXT_FIELD_2_KEY).iterator(null);
terms.seekCeil(new BytesRef("field"));
DocsEnum termDocs = _TestUtil.docs(random, terms, reader.getLiveDocs(), null, true);
- if (termDocs.nextDoc() != DocsEnum.NO_MORE_DOCS) {
+ if (termDocs.nextDoc() != DocIdSetIterator.NO_MORE_DOCS) {
int docId = termDocs.docID();
assertTrue(docId == 0);
int freq = termDocs.freq();
@@ -142,19 +143,19 @@ public class TestSegmentTermDocs extends
// without optimization (assumption skipInterval == 16)
// with next
- assertTrue(tdocs.nextDoc() != DocsEnum.NO_MORE_DOCS);
+ assertTrue(tdocs.nextDoc() != DocIdSetIterator.NO_MORE_DOCS);
assertEquals(0, tdocs.docID());
assertEquals(4, tdocs.freq());
- assertTrue(tdocs.nextDoc() != DocsEnum.NO_MORE_DOCS);
+ assertTrue(tdocs.nextDoc() != DocIdSetIterator.NO_MORE_DOCS);
assertEquals(1, tdocs.docID());
assertEquals(4, tdocs.freq());
- assertTrue(tdocs.advance(0) != DocsEnum.NO_MORE_DOCS);
+ assertTrue(tdocs.advance(0) != DocIdSetIterator.NO_MORE_DOCS);
assertEquals(2, tdocs.docID());
- assertTrue(tdocs.advance(4) != DocsEnum.NO_MORE_DOCS);
+ assertTrue(tdocs.advance(4) != DocIdSetIterator.NO_MORE_DOCS);
assertEquals(4, tdocs.docID());
- assertTrue(tdocs.advance(9) != DocsEnum.NO_MORE_DOCS);
+ assertTrue(tdocs.advance(9) != DocIdSetIterator.NO_MORE_DOCS);
assertEquals(9, tdocs.docID());
- assertFalse(tdocs.advance(10) != DocsEnum.NO_MORE_DOCS);
+ assertFalse(tdocs.advance(10) != DocIdSetIterator.NO_MORE_DOCS);
// without next
tdocs = _TestUtil.docs(random, reader,
@@ -164,13 +165,13 @@ public class TestSegmentTermDocs extends
null,
false);
- assertTrue(tdocs.advance(0) != DocsEnum.NO_MORE_DOCS);
+ assertTrue(tdocs.advance(0) != DocIdSetIterator.NO_MORE_DOCS);
assertEquals(0, tdocs.docID());
- assertTrue(tdocs.advance(4) != DocsEnum.NO_MORE_DOCS);
+ assertTrue(tdocs.advance(4) != DocIdSetIterator.NO_MORE_DOCS);
assertEquals(4, tdocs.docID());
- assertTrue(tdocs.advance(9) != DocsEnum.NO_MORE_DOCS);
+ assertTrue(tdocs.advance(9) != DocIdSetIterator.NO_MORE_DOCS);
assertEquals(9, tdocs.docID());
- assertFalse(tdocs.advance(10) != DocsEnum.NO_MORE_DOCS);
+ assertFalse(tdocs.advance(10) != DocIdSetIterator.NO_MORE_DOCS);
// exactly skipInterval documents and therefore with optimization
@@ -182,21 +183,21 @@ public class TestSegmentTermDocs extends
null,
true);
- assertTrue(tdocs.nextDoc() != DocsEnum.NO_MORE_DOCS);
+ assertTrue(tdocs.nextDoc() != DocIdSetIterator.NO_MORE_DOCS);
assertEquals(10, tdocs.docID());
assertEquals(4, tdocs.freq());
- assertTrue(tdocs.nextDoc() != DocsEnum.NO_MORE_DOCS);
+ assertTrue(tdocs.nextDoc() != DocIdSetIterator.NO_MORE_DOCS);
assertEquals(11, tdocs.docID());
assertEquals(4, tdocs.freq());
- assertTrue(tdocs.advance(5) != DocsEnum.NO_MORE_DOCS);
+ assertTrue(tdocs.advance(5) != DocIdSetIterator.NO_MORE_DOCS);
assertEquals(12, tdocs.docID());
- assertTrue(tdocs.advance(15) != DocsEnum.NO_MORE_DOCS);
+ assertTrue(tdocs.advance(15) != DocIdSetIterator.NO_MORE_DOCS);
assertEquals(15, tdocs.docID());
- assertTrue(tdocs.advance(24) != DocsEnum.NO_MORE_DOCS);
+ assertTrue(tdocs.advance(24) != DocIdSetIterator.NO_MORE_DOCS);
assertEquals(24, tdocs.docID());
- assertTrue(tdocs.advance(25) != DocsEnum.NO_MORE_DOCS);
+ assertTrue(tdocs.advance(25) != DocIdSetIterator.NO_MORE_DOCS);
assertEquals(25, tdocs.docID());
- assertFalse(tdocs.advance(26) != DocsEnum.NO_MORE_DOCS);
+ assertFalse(tdocs.advance(26) != DocIdSetIterator.NO_MORE_DOCS);
// without next
tdocs = _TestUtil.docs(random, reader,
@@ -206,15 +207,15 @@ public class TestSegmentTermDocs extends
null,
true);
- assertTrue(tdocs.advance(5) != DocsEnum.NO_MORE_DOCS);
+ assertTrue(tdocs.advance(5) != DocIdSetIterator.NO_MORE_DOCS);
assertEquals(10, tdocs.docID());
- assertTrue(tdocs.advance(15) != DocsEnum.NO_MORE_DOCS);
+ assertTrue(tdocs.advance(15) != DocIdSetIterator.NO_MORE_DOCS);
assertEquals(15, tdocs.docID());
- assertTrue(tdocs.advance(24) != DocsEnum.NO_MORE_DOCS);
+ assertTrue(tdocs.advance(24) != DocIdSetIterator.NO_MORE_DOCS);
assertEquals(24, tdocs.docID());
- assertTrue(tdocs.advance(25) != DocsEnum.NO_MORE_DOCS);
+ assertTrue(tdocs.advance(25) != DocIdSetIterator.NO_MORE_DOCS);
assertEquals(25, tdocs.docID());
- assertFalse(tdocs.advance(26) != DocsEnum.NO_MORE_DOCS);
+ assertFalse(tdocs.advance(26) != DocIdSetIterator.NO_MORE_DOCS);
// much more than skipInterval documents and therefore with optimization
@@ -226,23 +227,23 @@ public class TestSegmentTermDocs extends
null,
true);
- assertTrue(tdocs.nextDoc() != DocsEnum.NO_MORE_DOCS);
+ assertTrue(tdocs.nextDoc() != DocIdSetIterator.NO_MORE_DOCS);
assertEquals(26, tdocs.docID());
assertEquals(4, tdocs.freq());
- assertTrue(tdocs.nextDoc() != DocsEnum.NO_MORE_DOCS);
+ assertTrue(tdocs.nextDoc() != DocIdSetIterator.NO_MORE_DOCS);
assertEquals(27, tdocs.docID());
assertEquals(4, tdocs.freq());
- assertTrue(tdocs.advance(5) != DocsEnum.NO_MORE_DOCS);
+ assertTrue(tdocs.advance(5) != DocIdSetIterator.NO_MORE_DOCS);
assertEquals(28, tdocs.docID());
- assertTrue(tdocs.advance(40) != DocsEnum.NO_MORE_DOCS);
+ assertTrue(tdocs.advance(40) != DocIdSetIterator.NO_MORE_DOCS);
assertEquals(40, tdocs.docID());
- assertTrue(tdocs.advance(57) != DocsEnum.NO_MORE_DOCS);
+ assertTrue(tdocs.advance(57) != DocIdSetIterator.NO_MORE_DOCS);
assertEquals(57, tdocs.docID());
- assertTrue(tdocs.advance(74) != DocsEnum.NO_MORE_DOCS);
+ assertTrue(tdocs.advance(74) != DocIdSetIterator.NO_MORE_DOCS);
assertEquals(74, tdocs.docID());
- assertTrue(tdocs.advance(75) != DocsEnum.NO_MORE_DOCS);
+ assertTrue(tdocs.advance(75) != DocIdSetIterator.NO_MORE_DOCS);
assertEquals(75, tdocs.docID());
- assertFalse(tdocs.advance(76) != DocsEnum.NO_MORE_DOCS);
+ assertFalse(tdocs.advance(76) != DocIdSetIterator.NO_MORE_DOCS);
//without next
tdocs = _TestUtil.docs(random, reader,
@@ -251,17 +252,17 @@ public class TestSegmentTermDocs extends
MultiFields.getLiveDocs(reader),
null,
false);
- assertTrue(tdocs.advance(5) != DocsEnum.NO_MORE_DOCS);
+ assertTrue(tdocs.advance(5) != DocIdSetIterator.NO_MORE_DOCS);
assertEquals(26, tdocs.docID());
- assertTrue(tdocs.advance(40) != DocsEnum.NO_MORE_DOCS);
+ assertTrue(tdocs.advance(40) != DocIdSetIterator.NO_MORE_DOCS);
assertEquals(40, tdocs.docID());
- assertTrue(tdocs.advance(57) != DocsEnum.NO_MORE_DOCS);
+ assertTrue(tdocs.advance(57) != DocIdSetIterator.NO_MORE_DOCS);
assertEquals(57, tdocs.docID());
- assertTrue(tdocs.advance(74) != DocsEnum.NO_MORE_DOCS);
+ assertTrue(tdocs.advance(74) != DocIdSetIterator.NO_MORE_DOCS);
assertEquals(74, tdocs.docID());
- assertTrue(tdocs.advance(75) != DocsEnum.NO_MORE_DOCS);
+ assertTrue(tdocs.advance(75) != DocIdSetIterator.NO_MORE_DOCS);
assertEquals(75, tdocs.docID());
- assertFalse(tdocs.advance(76) != DocsEnum.NO_MORE_DOCS);
+ assertFalse(tdocs.advance(76) != DocIdSetIterator.NO_MORE_DOCS);
reader.close();
dir.close();
Modified: lucene/dev/branches/solr_3159_jetty8/lucene/core/src/test/org/apache/lucene/index/TestStressAdvance.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr_3159_jetty8/lucene/core/src/test/org/apache/lucene/index/TestStressAdvance.java?rev=1297628&r1=1297627&r2=1297628&view=diff
==============================================================================
--- lucene/dev/branches/solr_3159_jetty8/lucene/core/src/test/org/apache/lucene/index/TestStressAdvance.java (original)
+++ lucene/dev/branches/solr_3159_jetty8/lucene/core/src/test/org/apache/lucene/index/TestStressAdvance.java Tue Mar 6 18:13:38 2012
@@ -22,6 +22,7 @@ import java.util.List;
import java.util.Set;
import org.apache.lucene.util.*;
+import org.apache.lucene.search.DocIdSetIterator;
import org.apache.lucene.store.*;
import org.apache.lucene.document.*;
@@ -117,14 +118,14 @@ public class TestStressAdvance extends L
}
if (upto == expected.size()) {
if (VERBOSE) {
- System.out.println(" expect docID=" + DocsEnum.NO_MORE_DOCS + " actual=" + docID);
+ System.out.println(" expect docID=" + DocIdSetIterator.NO_MORE_DOCS + " actual=" + docID);
}
- assertEquals(DocsEnum.NO_MORE_DOCS, docID);
+ assertEquals(DocIdSetIterator.NO_MORE_DOCS, docID);
} else {
if (VERBOSE) {
System.out.println(" expect docID=" + expected.get(upto) + " actual=" + docID);
}
- assertTrue(docID != DocsEnum.NO_MORE_DOCS);
+ assertTrue(docID != DocIdSetIterator.NO_MORE_DOCS);
assertEquals(expected.get(upto).intValue(), docID);
}
}