You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rm...@apache.org on 2014/09/02 13:14:41 UTC
svn commit: r1621960 [2/3] - in /lucene/dev/trunk: ./ dev-tools/
dev-tools/maven/lucene/ dev-tools/maven/lucene/backward-codecs/
dev-tools/scripts/ lucene/ lucene/analysis/ lucene/analysis/common/
lucene/analysis/common/src/test/org/apache/lucene/colla...
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestBinaryDocValuesUpdates.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestBinaryDocValuesUpdates.java?rev=1621960&r1=1621959&r2=1621960&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestBinaryDocValuesUpdates.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestBinaryDocValuesUpdates.java Tue Sep 2 11:14:38 2014
@@ -9,13 +9,8 @@ import java.util.concurrent.atomic.Atomi
import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.analysis.MockTokenizer;
-import org.apache.lucene.codecs.Codec;
import org.apache.lucene.codecs.DocValuesFormat;
import org.apache.lucene.codecs.asserting.AssertingDocValuesFormat;
-import org.apache.lucene.codecs.lucene40.Lucene40RWCodec;
-import org.apache.lucene.codecs.lucene41.Lucene41RWCodec;
-import org.apache.lucene.codecs.lucene42.Lucene42RWCodec;
-import org.apache.lucene.codecs.lucene45.Lucene45RWCodec;
import org.apache.lucene.codecs.lucene410.Lucene410Codec;
import org.apache.lucene.codecs.lucene410.Lucene410DocValuesFormat;
import org.apache.lucene.document.BinaryDocValuesField;
@@ -32,7 +27,6 @@ import org.apache.lucene.util.Bits;
import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.IOUtils;
import org.apache.lucene.util.LuceneTestCase;
-import org.apache.lucene.util.LuceneTestCase.SuppressCodecs;
import org.apache.lucene.util.TestUtil;
import org.junit.Test;
@@ -55,8 +49,6 @@ import com.carrotsearch.randomizedtestin
* limitations under the License.
*/
-@SuppressCodecs({"Lucene40","Lucene41","Lucene42","Lucene45"})
-@SuppressWarnings("resource")
public class TestBinaryDocValuesUpdates extends LuceneTestCase {
static long getValue(BinaryDocValues bdv, int idx) {
@@ -861,38 +853,6 @@ public class TestBinaryDocValuesUpdates
dir.close();
}
- public void testUpdateOldSegments() throws Exception {
- Codec[] oldCodecs = new Codec[] { new Lucene40RWCodec(), new Lucene41RWCodec(), new Lucene42RWCodec(), new Lucene45RWCodec() };
- Directory dir = newDirectory();
-
- boolean oldValue = OLD_FORMAT_IMPERSONATION_IS_ACTIVE;
- // create a segment with an old Codec
- IndexWriterConfig conf = newIndexWriterConfig(new MockAnalyzer(random()));
- conf.setCodec(oldCodecs[random().nextInt(oldCodecs.length)]);
- OLD_FORMAT_IMPERSONATION_IS_ACTIVE = true;
- IndexWriter writer = new IndexWriter(dir, conf);
- Document doc = new Document();
- doc.add(new StringField("id", "doc", Store.NO));
- doc.add(new BinaryDocValuesField("f", toBytes(5L)));
- writer.addDocument(doc);
- writer.close();
-
- conf = newIndexWriterConfig(new MockAnalyzer(random()));
- writer = new IndexWriter(dir, conf);
- writer.updateBinaryDocValue(new Term("id", "doc"), "f", toBytes(4L));
- OLD_FORMAT_IMPERSONATION_IS_ACTIVE = false;
- try {
- writer.close();
- fail("should not have succeeded to update a segment written with an old Codec");
- } catch (UnsupportedOperationException e) {
- writer.rollback();
- } finally {
- OLD_FORMAT_IMPERSONATION_IS_ACTIVE = oldValue;
- }
-
- dir.close();
- }
-
public void testStressMultiThreading() throws Exception {
final Directory dir = newDirectory();
IndexWriterConfig conf = newIndexWriterConfig(new MockAnalyzer(random()));
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestCodecs.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestCodecs.java?rev=1621960&r1=1621959&r2=1621960&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestCodecs.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestCodecs.java Tue Sep 2 11:14:38 2014
@@ -27,9 +27,6 @@ import org.apache.lucene.analysis.MockAn
import org.apache.lucene.codecs.Codec;
import org.apache.lucene.codecs.FieldsConsumer;
import org.apache.lucene.codecs.FieldsProducer;
-import org.apache.lucene.codecs.lucene40.Lucene40RWCodec;
-import org.apache.lucene.codecs.lucene41.Lucene41RWCodec;
-import org.apache.lucene.codecs.lucene42.Lucene42RWCodec;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field.Store;
import org.apache.lucene.document.NumericDocValuesField;
@@ -850,29 +847,4 @@ public class TestCodecs extends LuceneTe
dir.close();
}
- public void testDisableImpersonation() throws Exception {
- Codec[] oldCodecs = new Codec[] { new Lucene40RWCodec(), new Lucene41RWCodec(), new Lucene42RWCodec() };
- Directory dir = newDirectory();
- IndexWriterConfig conf = newIndexWriterConfig(new MockAnalyzer(random()));
- conf.setCodec(oldCodecs[random().nextInt(oldCodecs.length)]);
- IndexWriter writer = new IndexWriter(dir, conf);
-
- Document doc = new Document();
- doc.add(new StringField("f", "bar", Store.YES));
- doc.add(new NumericDocValuesField("n", 18L));
-
- OLD_FORMAT_IMPERSONATION_IS_ACTIVE = false;
- try {
- writer.addDocument(doc);
- writer.close();
- fail("should not have succeeded to impersonate an old format!");
- } catch (UnsupportedOperationException e) {
- writer.rollback();
- } finally {
- OLD_FORMAT_IMPERSONATION_IS_ACTIVE = true;
- }
-
- dir.close();
- }
-
}
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestDocValuesIndexing.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestDocValuesIndexing.java?rev=1621960&r1=1621959&r2=1621960&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestDocValuesIndexing.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestDocValuesIndexing.java Tue Sep 2 11:14:38 2014
@@ -378,7 +378,6 @@ public class TestDocValuesIndexing exten
}
public void testTooLargeTermSortedSetBytes() throws IOException {
- assumeTrue("codec does not support SORTED_SET", defaultCodecSupportsSortedSet());
Analyzer analyzer = new MockAnalyzer(random());
Directory directory = newDirectory();
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestIndexWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestIndexWriter.java?rev=1621960&r1=1621959&r2=1621960&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestIndexWriter.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestIndexWriter.java Tue Sep 2 11:14:38 2014
@@ -1037,14 +1037,10 @@ public class TestIndexWriter extends Luc
doc.add(new BinaryDocValuesField("binarydv", new BytesRef("500")));
doc.add(new NumericDocValuesField("numericdv", 500));
doc.add(new SortedDocValuesField("sorteddv", new BytesRef("500")));
- if (defaultCodecSupportsSortedSet()) {
- doc.add(new SortedSetDocValuesField("sortedsetdv", new BytesRef("one")));
- doc.add(new SortedSetDocValuesField("sortedsetdv", new BytesRef("two")));
- }
- if (defaultCodecSupportsSortedNumeric()) {
- doc.add(new SortedNumericDocValuesField("sortednumericdv", 4));
- doc.add(new SortedNumericDocValuesField("sortednumericdv", 3));
- }
+ doc.add(new SortedSetDocValuesField("sortedsetdv", new BytesRef("one")));
+ doc.add(new SortedSetDocValuesField("sortedsetdv", new BytesRef("two")));
+ doc.add(new SortedNumericDocValuesField("sortednumericdv", 4));
+ doc.add(new SortedNumericDocValuesField("sortednumericdv", 3));
w.addDocument(doc);
doc = new Document();
doc.add(newStringField(random, "id", "501", Field.Store.NO));
@@ -1052,14 +1048,10 @@ public class TestIndexWriter extends Luc
doc.add(new BinaryDocValuesField("binarydv", new BytesRef("501")));
doc.add(new NumericDocValuesField("numericdv", 501));
doc.add(new SortedDocValuesField("sorteddv", new BytesRef("501")));
- if (defaultCodecSupportsSortedSet()) {
- doc.add(new SortedSetDocValuesField("sortedsetdv", new BytesRef("two")));
- doc.add(new SortedSetDocValuesField("sortedsetdv", new BytesRef("three")));
- }
- if (defaultCodecSupportsSortedNumeric()) {
- doc.add(new SortedNumericDocValuesField("sortednumericdv", 6));
- doc.add(new SortedNumericDocValuesField("sortednumericdv", 1));
- }
+ doc.add(new SortedSetDocValuesField("sortedsetdv", new BytesRef("two")));
+ doc.add(new SortedSetDocValuesField("sortedsetdv", new BytesRef("three")));
+ doc.add(new SortedNumericDocValuesField("sortednumericdv", 6));
+ doc.add(new SortedNumericDocValuesField("sortednumericdv", 1));
w.addDocument(doc);
w.deleteDocuments(new Term("id", "500"));
w.close();
@@ -1108,9 +1100,7 @@ public class TestIndexWriter extends Luc
doc.add(binaryDVField);
doc.add(numericDVField);
doc.add(sortedDVField);
- if (defaultCodecSupportsSortedSet()) {
- doc.add(sortedSetDVField);
- }
+ doc.add(sortedSetDVField);
for(int i=0;i<100;i++) {
idField.setStringValue(Integer.toString(i));
binaryDVField.setBytesValue(new BytesRef(idField.stringValue()));
@@ -2893,11 +2883,7 @@ public class TestIndexWriter extends Luc
assertNotNull(id1);
String id2 = sis.info(0).info.getId();
- if (defaultCodecSupportsSegmentIds()) {
- assertNotNull(id2);
- } else {
- assertNull(id2);
- }
+ assertNotNull(id2);
// Make sure CheckIndex includes id output:
ByteArrayOutputStream bos = new ByteArrayOutputStream(1024);
@@ -2912,12 +2898,7 @@ public class TestIndexWriter extends Luc
// Commit id is always stored:
assertTrue("missing id=" + id1 + " in:\n" + s, s.contains("id=" + id1));
- // Per-segment id may or may not be stored depending on the codec:
- if (defaultCodecSupportsSegmentIds()) {
- assertTrue("missing id=" + id2 + " in:\n" + s, s.contains("id=" + id2));
- } else {
- assertTrue("missing id=null in:\n" + s, s.contains("id=null"));
- }
+ assertTrue("missing id=" + id2 + " in:\n" + s, s.contains("id=" + id2));
d.close();
Set<String> ids = new HashSet<>();
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterExceptions.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterExceptions.java?rev=1621960&r1=1621959&r2=1621960&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterExceptions.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterExceptions.java Tue Sep 2 11:14:38 2014
@@ -156,14 +156,10 @@ public class TestIndexWriterExceptions e
doc.add(new NumericDocValuesField("numericdv", 5));
doc.add(new BinaryDocValuesField("binarydv", new BytesRef("hello")));
doc.add(new SortedDocValuesField("sorteddv", new BytesRef("world")));
- if (defaultCodecSupportsSortedSet()) {
- doc.add(new SortedSetDocValuesField("sortedsetdv", new BytesRef("hellllo")));
- doc.add(new SortedSetDocValuesField("sortedsetdv", new BytesRef("again")));
- }
- if (defaultCodecSupportsSortedNumeric()) {
- doc.add(new SortedNumericDocValuesField("sortednumericdv", 10));
- doc.add(new SortedNumericDocValuesField("sortednumericdv", 5));
- }
+ doc.add(new SortedSetDocValuesField("sortedsetdv", new BytesRef("hellllo")));
+ doc.add(new SortedSetDocValuesField("sortedsetdv", new BytesRef("again")));
+ doc.add(new SortedNumericDocValuesField("sortednumericdv", 10));
+ doc.add(new SortedNumericDocValuesField("sortednumericdv", 5));
doc.add(newField(r, "content7", "aaa bbb ccc ddd", DocCopyIterator.custom4));
@@ -2054,10 +2050,9 @@ public class TestIndexWriterExceptions e
shouldFail.set(true);
boolean doClose = false;
try {
- boolean defaultCodecSupportsFieldUpdates = defaultCodecSupportsFieldUpdates();
for(int i=0;i<numDocs;i++) {
if (random().nextInt(10) == 7) {
- boolean fieldUpdate = defaultCodecSupportsFieldUpdates && random().nextBoolean();
+ boolean fieldUpdate = random().nextBoolean();
int docid = docBase + i;
if (fieldUpdate) {
long value = iter;
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterExceptions2.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterExceptions2.java?rev=1621960&r1=1621959&r2=1621960&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterExceptions2.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterExceptions2.java Tue Sep 2 11:14:38 2014
@@ -106,14 +106,10 @@ public class TestIndexWriterExceptions2
doc.add(new NumericDocValuesField("dv", i));
doc.add(new BinaryDocValuesField("dv2", new BytesRef(Integer.toString(i))));
doc.add(new SortedDocValuesField("dv3", new BytesRef(Integer.toString(i))));
- if (defaultCodecSupportsSortedSet()) {
- doc.add(new SortedSetDocValuesField("dv4", new BytesRef(Integer.toString(i))));
- doc.add(new SortedSetDocValuesField("dv4", new BytesRef(Integer.toString(i-1))));
- }
- if (defaultCodecSupportsSortedNumeric()) {
- doc.add(new SortedNumericDocValuesField("dv5", i));
- doc.add(new SortedNumericDocValuesField("dv5", i-1));
- }
+ doc.add(new SortedSetDocValuesField("dv4", new BytesRef(Integer.toString(i))));
+ doc.add(new SortedSetDocValuesField("dv4", new BytesRef(Integer.toString(i-1))));
+ doc.add(new SortedNumericDocValuesField("dv5", i));
+ doc.add(new SortedNumericDocValuesField("dv5", i-1));
doc.add(newTextField("text1", TestUtil.randomAnalysisString(random(), 20, true), Field.Store.NO));
// ensure we store something
doc.add(new StoredField("stored1", "foo"));
@@ -133,9 +129,9 @@ public class TestIndexWriterExceptions2
int thingToDo = random().nextInt(4);
if (thingToDo == 0) {
iw.deleteDocuments(new Term("id", Integer.toString(i)));
- } else if (thingToDo == 1 && defaultCodecSupportsFieldUpdates()) {
+ } else if (thingToDo == 1) {
iw.updateNumericDocValue(new Term("id", Integer.toString(i)), "dv", i+1L);
- } else if (thingToDo == 2 && defaultCodecSupportsFieldUpdates()) {
+ } else if (thingToDo == 2) {
iw.updateBinaryDocValue(new Term("id", Integer.toString(i)), "dv2", new BytesRef(Integer.toString(i+1)));
}
} catch (Exception e) {
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterOutOfMemory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterOutOfMemory.java?rev=1621960&r1=1621959&r2=1621960&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterOutOfMemory.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterOutOfMemory.java Tue Sep 2 11:14:38 2014
@@ -127,14 +127,10 @@ public class TestIndexWriterOutOfMemory
doc.add(new NumericDocValuesField("dv", i));
doc.add(new BinaryDocValuesField("dv2", new BytesRef(Integer.toString(i))));
doc.add(new SortedDocValuesField("dv3", new BytesRef(Integer.toString(i))));
- if (defaultCodecSupportsSortedSet()) {
- doc.add(new SortedSetDocValuesField("dv4", new BytesRef(Integer.toString(i))));
- doc.add(new SortedSetDocValuesField("dv4", new BytesRef(Integer.toString(i-1))));
- }
- if (defaultCodecSupportsSortedNumeric()) {
- doc.add(new SortedNumericDocValuesField("dv5", i));
- doc.add(new SortedNumericDocValuesField("dv5", i-1));
- }
+ doc.add(new SortedSetDocValuesField("dv4", new BytesRef(Integer.toString(i))));
+ doc.add(new SortedSetDocValuesField("dv4", new BytesRef(Integer.toString(i-1))));
+ doc.add(new SortedNumericDocValuesField("dv5", i));
+ doc.add(new SortedNumericDocValuesField("dv5", i-1));
doc.add(newTextField("text1", TestUtil.randomAnalysisString(random(), 20, true), Field.Store.NO));
// ensure we store something
doc.add(new StoredField("stored1", "foo"));
@@ -154,9 +150,9 @@ public class TestIndexWriterOutOfMemory
int thingToDo = random().nextInt(4);
if (thingToDo == 0) {
iw.deleteDocuments(new Term("id", Integer.toString(i)));
- } else if (thingToDo == 1 && defaultCodecSupportsFieldUpdates()) {
+ } else if (thingToDo == 1) {
iw.updateNumericDocValue(new Term("id", Integer.toString(i)), "dv", i+1L);
- } else if (thingToDo == 2 && defaultCodecSupportsFieldUpdates()) {
+ } else if (thingToDo == 2) {
iw.updateBinaryDocValue(new Term("id", Integer.toString(i)), "dv2", new BytesRef(Integer.toString(i+1)));
}
} catch (OutOfMemoryError e) {
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestMixedDocValuesUpdates.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestMixedDocValuesUpdates.java?rev=1621960&r1=1621959&r2=1621960&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestMixedDocValuesUpdates.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestMixedDocValuesUpdates.java Tue Sep 2 11:14:38 2014
@@ -18,7 +18,6 @@ import org.apache.lucene.util.Bits;
import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.IOUtils;
import org.apache.lucene.util.LuceneTestCase;
-import org.apache.lucene.util.LuceneTestCase.SuppressCodecs;
import org.apache.lucene.util.TestUtil;
import com.carrotsearch.randomizedtesting.generators.RandomPicks;
@@ -40,7 +39,6 @@ import com.carrotsearch.randomizedtestin
* limitations under the License.
*/
-@SuppressCodecs({"Lucene40","Lucene41","Lucene42","Lucene45"})
public class TestMixedDocValuesUpdates extends LuceneTestCase {
public void testManyReopensAndFields() throws Exception {
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestMultiDocValues.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestMultiDocValues.java?rev=1621960&r1=1621959&r2=1621960&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestMultiDocValues.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestMultiDocValues.java Tue Sep 2 11:14:38 2014
@@ -120,7 +120,7 @@ public class TestMultiDocValues extends
for (int i = 0; i < numDocs; i++) {
BytesRef ref = new BytesRef(TestUtil.randomUnicodeString(random()));
field.setBytesValue(ref);
- if (defaultCodecSupportsDocsWithField() && random().nextInt(7) == 0) {
+ if (random().nextInt(7) == 0) {
iw.addDocument(new Document());
}
iw.addDocument(doc);
@@ -193,7 +193,6 @@ public class TestMultiDocValues extends
}
public void testSortedSet() throws Exception {
- assumeTrue("codec does not support SORTED_SET", defaultCodecSupportsSortedSet());
Directory dir = newDirectory();
IndexWriterConfig iwc = newIndexWriterConfig(random(), null);
@@ -256,7 +255,6 @@ public class TestMultiDocValues extends
// tries to make more dups than testSortedSet
public void testSortedSetWithDups() throws Exception {
- assumeTrue("codec does not support SORTED_SET", defaultCodecSupportsSortedSet());
Directory dir = newDirectory();
IndexWriterConfig iwc = newIndexWriterConfig(random(), null);
@@ -318,7 +316,6 @@ public class TestMultiDocValues extends
}
public void testSortedNumeric() throws Exception {
- assumeTrue("codec does not support SORTED_NUMERIC", defaultCodecSupportsSortedNumeric());
Directory dir = newDirectory();
IndexWriterConfig iwc = newIndexWriterConfig(random(), null);
@@ -370,7 +367,6 @@ public class TestMultiDocValues extends
}
public void testDocsWithField() throws Exception {
- assumeTrue("codec does not support docsWithField", defaultCodecSupportsDocsWithField());
Directory dir = newDirectory();
IndexWriterConfig iwc = newIndexWriterConfig(random(), null);
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestNumericDocValuesUpdates.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestNumericDocValuesUpdates.java?rev=1621960&r1=1621959&r2=1621960&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestNumericDocValuesUpdates.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestNumericDocValuesUpdates.java Tue Sep 2 11:14:38 2014
@@ -12,10 +12,6 @@ import org.apache.lucene.analysis.MockTo
import org.apache.lucene.codecs.Codec;
import org.apache.lucene.codecs.DocValuesFormat;
import org.apache.lucene.codecs.asserting.AssertingDocValuesFormat;
-import org.apache.lucene.codecs.lucene40.Lucene40RWCodec;
-import org.apache.lucene.codecs.lucene41.Lucene41RWCodec;
-import org.apache.lucene.codecs.lucene42.Lucene42RWCodec;
-import org.apache.lucene.codecs.lucene45.Lucene45RWCodec;
import org.apache.lucene.codecs.lucene410.Lucene410DocValuesFormat;
import org.apache.lucene.codecs.lucene410.Lucene410Codec;
import org.apache.lucene.document.BinaryDocValuesField;
@@ -32,7 +28,6 @@ import org.apache.lucene.util.Bits;
import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.IOUtils;
import org.apache.lucene.util.LuceneTestCase;
-import org.apache.lucene.util.LuceneTestCase.SuppressCodecs;
import org.apache.lucene.util.TestUtil;
import org.junit.Test;
@@ -55,7 +50,6 @@ import com.carrotsearch.randomizedtestin
* limitations under the License.
*/
-@SuppressCodecs({"Lucene40","Lucene41","Lucene42","Lucene45"})
@SuppressWarnings("resource")
public class TestNumericDocValuesUpdates extends LuceneTestCase {
@@ -854,39 +848,6 @@ public class TestNumericDocValuesUpdates
}
@Test
- public void testUpdateOldSegments() throws Exception {
- Codec[] oldCodecs = new Codec[] { new Lucene40RWCodec(), new Lucene41RWCodec(), new Lucene42RWCodec(), new Lucene45RWCodec() };
- Directory dir = newDirectory();
-
- boolean oldValue = OLD_FORMAT_IMPERSONATION_IS_ACTIVE;
- // create a segment with an old Codec
- IndexWriterConfig conf = newIndexWriterConfig(new MockAnalyzer(random()));
- conf.setCodec(oldCodecs[random().nextInt(oldCodecs.length)]);
- OLD_FORMAT_IMPERSONATION_IS_ACTIVE = true;
- IndexWriter writer = new IndexWriter(dir, conf);
- Document doc = new Document();
- doc.add(new StringField("id", "doc", Store.NO));
- doc.add(new NumericDocValuesField("f", 5));
- writer.addDocument(doc);
- writer.close();
-
- conf = newIndexWriterConfig(new MockAnalyzer(random()));
- writer = new IndexWriter(dir, conf);
- writer.updateNumericDocValue(new Term("id", "doc"), "f", 4L);
- OLD_FORMAT_IMPERSONATION_IS_ACTIVE = false;
- try {
- writer.close();
- fail("should not have succeeded to update a segment written with an old Codec");
- } catch (UnsupportedOperationException e) {
- writer.rollback();
- } finally {
- OLD_FORMAT_IMPERSONATION_IS_ACTIVE = oldValue;
- }
-
- dir.close();
- }
-
- @Test
public void testStressMultiThreading() throws Exception {
final Directory dir = newDirectory();
IndexWriterConfig conf = newIndexWriterConfig(new MockAnalyzer(random()));
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestDocTermOrdsRangeFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestDocTermOrdsRangeFilter.java?rev=1621960&r1=1621959&r2=1621960&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestDocTermOrdsRangeFilter.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestDocTermOrdsRangeFilter.java Tue Sep 2 11:14:38 2014
@@ -33,14 +33,12 @@ import org.apache.lucene.index.Term;
import org.apache.lucene.store.Directory;
import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.LuceneTestCase;
-import org.apache.lucene.util.LuceneTestCase.SuppressCodecs;
import org.apache.lucene.util.TestUtil;
import org.apache.lucene.util.UnicodeUtil;
/**
* Tests the DocTermOrdsRangeFilter
*/
-@SuppressCodecs({"Lucene40", "Lucene41", "Lucene42"}) // needs SORTED_SET
public class TestDocTermOrdsRangeFilter extends LuceneTestCase {
protected IndexSearcher searcher1;
protected IndexSearcher searcher2;
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestDocTermOrdsRewriteMethod.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestDocTermOrdsRewriteMethod.java?rev=1621960&r1=1621959&r2=1621960&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestDocTermOrdsRewriteMethod.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestDocTermOrdsRewriteMethod.java Tue Sep 2 11:14:38 2014
@@ -34,7 +34,6 @@ import org.apache.lucene.store.Directory
import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.util.TestUtil;
-import org.apache.lucene.util.LuceneTestCase.SuppressCodecs;
import org.apache.lucene.util.automaton.AutomatonTestUtil;
import org.apache.lucene.util.automaton.RegExp;
import org.apache.lucene.util.UnicodeUtil;
@@ -42,7 +41,6 @@ import org.apache.lucene.util.UnicodeUti
/**
* Tests the DocTermOrdsRewriteMethod
*/
-@SuppressCodecs({"Lucene40", "Lucene41", "Lucene42"}) // needs SORTED_SET
public class TestDocTermOrdsRewriteMethod extends LuceneTestCase {
protected IndexSearcher searcher1;
protected IndexSearcher searcher2;
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestFieldCacheTermsFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestFieldCacheTermsFilter.java?rev=1621960&r1=1621959&r2=1621960&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestFieldCacheTermsFilter.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestFieldCacheTermsFilter.java Tue Sep 2 11:14:38 2014
@@ -37,7 +37,6 @@ import java.util.List;
*/
public class TestFieldCacheTermsFilter extends LuceneTestCase {
public void testMissingTerms() throws Exception {
- assumeTrue("requires support for missing values", defaultCodecSupportsMissingDocValues());
String fieldName = "field1";
Directory rd = newDirectory();
RandomIndexWriter w = new RandomIndexWriter(random(), rd);
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestFieldValueFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestFieldValueFilter.java?rev=1621960&r1=1621959&r2=1621960&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestFieldValueFilter.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestFieldValueFilter.java Tue Sep 2 11:14:38 2014
@@ -29,12 +29,10 @@ import org.apache.lucene.index.Term;
import org.apache.lucene.store.Directory;
import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.LuceneTestCase;
-import org.apache.lucene.util.LuceneTestCase.SuppressCodecs;
/**
*
*/
-@SuppressCodecs({"Lucene40", "Lucene41", "Lucene42"}) // suppress codecs without missing
public class TestFieldValueFilter extends LuceneTestCase {
public void testFieldValueFilterNoValue() throws IOException {
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestMinShouldMatch2.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestMinShouldMatch2.java?rev=1621960&r1=1621959&r2=1621960&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestMinShouldMatch2.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestMinShouldMatch2.java Tue Sep 2 11:14:38 2014
@@ -43,12 +43,10 @@ import org.apache.lucene.store.Directory
import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.util.TestUtil;
-import org.apache.lucene.util.LuceneTestCase.SuppressCodecs;
import org.junit.AfterClass;
import org.junit.BeforeClass;
/** tests BooleanScorer2's minShouldMatch */
-@SuppressCodecs({"Lucene40", "Lucene41"})
public class TestMinShouldMatch2 extends LuceneTestCase {
static Directory dir;
static DirectoryReader r;
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestSort.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestSort.java?rev=1621960&r1=1621959&r2=1621960&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestSort.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestSort.java Tue Sep 2 11:14:38 2014
@@ -31,7 +31,6 @@ import org.apache.lucene.index.RandomInd
import org.apache.lucene.store.Directory;
import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.LuceneTestCase;
-import org.apache.lucene.util.LuceneTestCase.SuppressCodecs;
/*
* Very simple tests of sorting.
@@ -48,7 +47,6 @@ import org.apache.lucene.util.LuceneTest
* |
* \./
*/
-@SuppressCodecs({"Lucene40", "Lucene41", "Lucene42"}) // avoid codecs that don't support "missing"
public class TestSort extends LuceneTestCase {
/** Tests sorting on type string */
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestSortRandom.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestSortRandom.java?rev=1621960&r1=1621959&r2=1621960&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestSortRandom.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestSortRandom.java Tue Sep 2 11:14:38 2014
@@ -133,10 +133,7 @@ public class TestSortRandom extends Luce
final boolean sortMissingLast;
final boolean missingIsNull;
sf = new SortField("stringdv", type, reverse);
- // Can only use sort missing if the DVFormat
- // supports docsWithField:
- sortMissingLast = defaultCodecSupportsDocsWithField() && random().nextBoolean();
- missingIsNull = defaultCodecSupportsDocsWithField();
+ sortMissingLast = random().nextBoolean();
if (sortMissingLast) {
sf.setMissingValue(SortField.STRING_LAST);
@@ -206,9 +203,6 @@ public class TestSortRandom extends Luce
System.out.println(" expected:");
for(int idx=0;idx<expected.size();idx++) {
BytesRef br = expected.get(idx);
- if (br == null && missingIsNull == false) {
- br = new BytesRef();
- }
System.out.println(" " + idx + ": " + (br == null ? "<missing>" : br.utf8ToString()));
if (idx == hitCount-1) {
break;
@@ -228,20 +222,8 @@ public class TestSortRandom extends Luce
for(int hitIDX=0;hitIDX<hits.scoreDocs.length;hitIDX++) {
final FieldDoc fd = (FieldDoc) hits.scoreDocs[hitIDX];
BytesRef br = expected.get(hitIDX);
- if (br == null && missingIsNull == false) {
- br = new BytesRef();
- }
- // Normally, the old codecs (that don't support
- // docsWithField via doc values) will always return
- // an empty BytesRef for the missing case; however,
- // if all docs in a given segment were missing, in
- // that case it will return null! So we must map
- // null here, too:
BytesRef br2 = (BytesRef) fd.fields[0];
- if (br2 == null && missingIsNull == false) {
- br2 = new BytesRef();
- }
assertEquals(br, br2);
}
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestSortedNumericSortField.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestSortedNumericSortField.java?rev=1621960&r1=1621959&r2=1621960&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestSortedNumericSortField.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestSortedNumericSortField.java Tue Sep 2 11:14:38 2014
@@ -26,12 +26,9 @@ import org.apache.lucene.index.RandomInd
import org.apache.lucene.index.Term;
import org.apache.lucene.store.Directory;
import org.apache.lucene.util.LuceneTestCase;
-import org.apache.lucene.util.LuceneTestCase.SuppressCodecs;
import org.apache.lucene.util.NumericUtils;
/** Simple tests for SortedNumericSortField */
-@SuppressCodecs({"Lucene40", "Lucene41", "Lucene42", "Lucene45", "Lucene46"})
-// avoid codecs that don't support sortednumeric
public class TestSortedNumericSortField extends LuceneTestCase {
public void testEmptyIndex() throws Exception {
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestSortedSetSortField.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestSortedSetSortField.java?rev=1621960&r1=1621959&r2=1621960&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestSortedSetSortField.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestSortedSetSortField.java Tue Sep 2 11:14:38 2014
@@ -27,10 +27,8 @@ import org.apache.lucene.index.Term;
import org.apache.lucene.store.Directory;
import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.LuceneTestCase;
-import org.apache.lucene.util.LuceneTestCase.SuppressCodecs;
/** Simple tests for SortedSetSortField, indexing the sortedset up front */
-@SuppressCodecs({"Lucene40", "Lucene41"}) // avoid codecs that don't support sortedset
public class TestSortedSetSortField extends LuceneTestCase {
public void testEmptyIndex() throws Exception {
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/store/TestFileSwitchDirectory.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/store/TestFileSwitchDirectory.java?rev=1621960&r1=1621959&r2=1621960&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/store/TestFileSwitchDirectory.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/store/TestFileSwitchDirectory.java Tue Sep 2 11:14:38 2014
@@ -49,13 +49,11 @@ public class TestFileSwitchDirectory ext
secondaryDir.setCheckIndexOnClose(false); // only part of an index
FileSwitchDirectory fsd = new FileSwitchDirectory(fileExtensions, primaryDir, secondaryDir, true);
- // for now we wire Lucene40Codec because we rely upon its specific impl
- boolean oldValue = OLD_FORMAT_IMPERSONATION_IS_ACTIVE;
- OLD_FORMAT_IMPERSONATION_IS_ACTIVE = true;
+ // for now we wire Lucene410Codec because we rely upon its specific impl
IndexWriter writer = new IndexWriter(
fsd,
new IndexWriterConfig(new MockAnalyzer(random())).
- setMergePolicy(newLogMergePolicy(false)).setCodec(Codec.forName("Lucene40")).setUseCompoundFile(false)
+ setMergePolicy(newLogMergePolicy(false)).setCodec(Codec.forName("Lucene410")).setUseCompoundFile(false)
);
TestIndexWriterReader.createIndexNoClose(true, "ram", writer);
IndexReader reader = DirectoryReader.open(writer, true);
@@ -83,7 +81,6 @@ public class TestFileSwitchDirectory ext
assertNotNull(files[i]);
}
fsd.close();
- OLD_FORMAT_IMPERSONATION_IS_ACTIVE = oldValue;
}
private Directory newFSSwitchDirectory(Set<String> primaryExtensions) throws IOException {
Modified: lucene/dev/trunk/lucene/demo/src/test/org/apache/lucene/demo/facet/TestDistanceFacetsExample.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/demo/src/test/org/apache/lucene/demo/facet/TestDistanceFacetsExample.java?rev=1621960&r1=1621959&r2=1621960&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/demo/src/test/org/apache/lucene/demo/facet/TestDistanceFacetsExample.java (original)
+++ lucene/dev/trunk/lucene/demo/src/test/org/apache/lucene/demo/facet/TestDistanceFacetsExample.java Tue Sep 2 11:14:38 2014
@@ -20,10 +20,8 @@ package org.apache.lucene.demo.facet;
import org.apache.lucene.facet.FacetResult;
import org.apache.lucene.search.TopDocs;
-import org.apache.lucene.util.LuceneTestCase.SuppressCodecs;
import org.apache.lucene.util.LuceneTestCase;
-@SuppressCodecs("Lucene3x")
public class TestDistanceFacetsExample extends LuceneTestCase {
public void testSimple() throws Exception {
Modified: lucene/dev/trunk/lucene/demo/src/test/org/apache/lucene/demo/facet/TestRangeFacetsExample.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/demo/src/test/org/apache/lucene/demo/facet/TestRangeFacetsExample.java?rev=1621960&r1=1621959&r2=1621960&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/demo/src/test/org/apache/lucene/demo/facet/TestRangeFacetsExample.java (original)
+++ lucene/dev/trunk/lucene/demo/src/test/org/apache/lucene/demo/facet/TestRangeFacetsExample.java Tue Sep 2 11:14:38 2014
@@ -21,11 +21,9 @@ import java.util.List;
import org.apache.lucene.facet.FacetResult;
import org.apache.lucene.search.TopDocs;
-import org.apache.lucene.util.LuceneTestCase.SuppressCodecs;
import org.apache.lucene.util.LuceneTestCase;
import org.junit.Test;
-@SuppressCodecs("Lucene3x")
public class TestRangeFacetsExample extends LuceneTestCase {
@Test
Modified: lucene/dev/trunk/lucene/demo/src/test/org/apache/lucene/demo/facet/TestSimpleSortedSetFacetsExample.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/demo/src/test/org/apache/lucene/demo/facet/TestSimpleSortedSetFacetsExample.java?rev=1621960&r1=1621959&r2=1621960&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/demo/src/test/org/apache/lucene/demo/facet/TestSimpleSortedSetFacetsExample.java (original)
+++ lucene/dev/trunk/lucene/demo/src/test/org/apache/lucene/demo/facet/TestSimpleSortedSetFacetsExample.java Tue Sep 2 11:14:38 2014
@@ -21,13 +21,11 @@ import java.util.List;
import org.apache.lucene.facet.FacetResult;
import org.apache.lucene.facet.taxonomy.FacetLabel;
-import org.apache.lucene.util.LuceneTestCase.SuppressCodecs;
import org.apache.lucene.util.LuceneTestCase;
import org.junit.Test;
// We require sorted set DVs:
-@SuppressCodecs({"Lucene40", "Lucene41"})
public class TestSimpleSortedSetFacetsExample extends LuceneTestCase {
@Test
Modified: lucene/dev/trunk/lucene/expressions/src/test/org/apache/lucene/expressions/TestExpressionValueSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/expressions/src/test/org/apache/lucene/expressions/TestExpressionValueSource.java?rev=1621960&r1=1621959&r2=1621960&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/expressions/src/test/org/apache/lucene/expressions/TestExpressionValueSource.java (original)
+++ lucene/dev/trunk/lucene/expressions/src/test/org/apache/lucene/expressions/TestExpressionValueSource.java Tue Sep 2 11:14:38 2014
@@ -35,9 +35,7 @@ import org.apache.lucene.search.DocIdSet
import org.apache.lucene.search.SortField;
import org.apache.lucene.store.Directory;
import org.apache.lucene.util.LuceneTestCase;
-import org.apache.lucene.util.LuceneTestCase.SuppressCodecs;
-@SuppressCodecs("Lucene3x")
public class TestExpressionValueSource extends LuceneTestCase {
DirectoryReader reader;
Directory dir;
Modified: lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/TestDrillSideways.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/TestDrillSideways.java?rev=1621960&r1=1621959&r2=1621960&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/TestDrillSideways.java (original)
+++ lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/TestDrillSideways.java Tue Sep 2 11:14:38 2014
@@ -401,8 +401,6 @@ public class TestDrillSideways extends F
public void testRandom() throws Exception {
- boolean canUseDV = defaultCodecSupportsSortedSet();
-
while (aChance == 0.0) {
aChance = random().nextDouble();
}
@@ -490,7 +488,7 @@ public class TestDrillSideways extends F
config.setMultiValued("dim"+i, true);
}
- boolean doUseDV = canUseDV && random().nextBoolean();
+ boolean doUseDV = random().nextBoolean();
for(Doc rawDoc : docs) {
Document doc = new Document();
Modified: lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/range/TestRangeFacetCounts.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/range/TestRangeFacetCounts.java?rev=1621960&r1=1621959&r2=1621960&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/range/TestRangeFacetCounts.java (original)
+++ lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/range/TestRangeFacetCounts.java Tue Sep 2 11:14:38 2014
@@ -824,7 +824,6 @@ public class TestRangeFacetCounts extend
// LUCENE-5178
public void testMissingValues() throws Exception {
- assumeTrue("codec does not support docsWithField", defaultCodecSupportsDocsWithField());
Directory d = newDirectory();
RandomIndexWriter w = new RandomIndexWriter(random(), d);
Document doc = new Document();
Modified: lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/sortedset/TestSortedSetDocValuesFacets.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/sortedset/TestSortedSetDocValuesFacets.java?rev=1621960&r1=1621959&r2=1621960&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/sortedset/TestSortedSetDocValuesFacets.java (original)
+++ lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/sortedset/TestSortedSetDocValuesFacets.java Tue Sep 2 11:14:38 2014
@@ -49,7 +49,6 @@ public class TestSortedSetDocValuesFacet
// randomly uses SortedSetDV
public void testBasic() throws Exception {
- assumeTrue("Test requires SortedSetDV support", defaultCodecSupportsSortedSet());
Directory dir = newDirectory();
FacetsConfig config = new FacetsConfig();
@@ -99,7 +98,6 @@ public class TestSortedSetDocValuesFacet
// LUCENE-5090
@SuppressWarnings("unused")
public void testStaleState() throws Exception {
- assumeTrue("Test requires SortedSetDV support", defaultCodecSupportsSortedSet());
Directory dir = newDirectory();
RandomIndexWriter writer = new RandomIndexWriter(random(), dir);
@@ -142,7 +140,6 @@ public class TestSortedSetDocValuesFacet
// LUCENE-5333
public void testSparseFacets() throws Exception {
- assumeTrue("Test requires SortedSetDV support", defaultCodecSupportsSortedSet());
Directory dir = newDirectory();
RandomIndexWriter writer = new RandomIndexWriter(random(), dir);
@@ -196,7 +193,6 @@ public class TestSortedSetDocValuesFacet
}
public void testSomeSegmentsMissing() throws Exception {
- assumeTrue("Test requires SortedSetDV support", defaultCodecSupportsSortedSet());
Directory dir = newDirectory();
RandomIndexWriter writer = new RandomIndexWriter(random(), dir);
@@ -236,7 +232,6 @@ public class TestSortedSetDocValuesFacet
}
public void testSlowCompositeReaderWrapper() throws Exception {
- assumeTrue("Test requires SortedSetDV support", defaultCodecSupportsSortedSet());
Directory dir = newDirectory();
RandomIndexWriter writer = new RandomIndexWriter(random(), dir);
@@ -272,7 +267,6 @@ public class TestSortedSetDocValuesFacet
public void testRandom() throws Exception {
- assumeTrue("Test requires SortedSetDV support", defaultCodecSupportsSortedSet());
String[] tokens = getRandomTokens(10);
Directory indexDir = newDirectory();
Directory taxoDir = newDirectory();
Modified: lucene/dev/trunk/lucene/grouping/src/test/org/apache/lucene/search/grouping/DistinctValuesCollectorTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/grouping/src/test/org/apache/lucene/search/grouping/DistinctValuesCollectorTest.java?rev=1621960&r1=1621959&r2=1621960&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/grouping/src/test/org/apache/lucene/search/grouping/DistinctValuesCollectorTest.java (original)
+++ lucene/dev/trunk/lucene/grouping/src/test/org/apache/lucene/search/grouping/DistinctValuesCollectorTest.java Tue Sep 2 11:14:38 2014
@@ -52,13 +52,11 @@ import org.apache.lucene.search.grouping
import org.apache.lucene.search.grouping.term.TermFirstPassGroupingCollector;
import org.apache.lucene.store.Directory;
import org.apache.lucene.util.BytesRef;
-import org.apache.lucene.util.LuceneTestCase.SuppressCodecs;
import org.apache.lucene.util.TestUtil;
import org.apache.lucene.util.mutable.MutableValue;
import org.apache.lucene.util.mutable.MutableValueStr;
-@SuppressCodecs({"Lucene40", "Lucene41", "Lucene42"}) // we need missing support... i think?
public class DistinctValuesCollectorTest extends AbstractGroupingTestCase {
private final static NullComparator nullComparator = new NullComparator();
Modified: lucene/dev/trunk/lucene/grouping/src/test/org/apache/lucene/search/grouping/GroupFacetCollectorTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/grouping/src/test/org/apache/lucene/search/grouping/GroupFacetCollectorTest.java?rev=1621960&r1=1621959&r2=1621960&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/grouping/src/test/org/apache/lucene/search/grouping/GroupFacetCollectorTest.java (original)
+++ lucene/dev/trunk/lucene/grouping/src/test/org/apache/lucene/search/grouping/GroupFacetCollectorTest.java Tue Sep 2 11:14:38 2014
@@ -48,12 +48,9 @@ import org.apache.lucene.search.TermQuer
import org.apache.lucene.search.grouping.term.TermGroupFacetCollector;
import org.apache.lucene.store.Directory;
import org.apache.lucene.util.BytesRef;
-import org.apache.lucene.util.LuceneTestCase.SuppressCodecs;
import org.apache.lucene.util.TestUtil;
-// Need SSDV, ord=-1 for missing:
-@SuppressCodecs({"Lucene40", "Lucene41", "Lucene42"})
public class GroupFacetCollectorTest extends AbstractGroupingTestCase {
public void testSimple() throws Exception {
Modified: lucene/dev/trunk/lucene/grouping/src/test/org/apache/lucene/search/grouping/TestGrouping.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/grouping/src/test/org/apache/lucene/search/grouping/TestGrouping.java?rev=1621960&r1=1621959&r2=1621960&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/grouping/src/test/org/apache/lucene/search/grouping/TestGrouping.java (original)
+++ lucene/dev/trunk/lucene/grouping/src/test/org/apache/lucene/search/grouping/TestGrouping.java Tue Sep 2 11:14:38 2014
@@ -41,7 +41,6 @@ import org.apache.lucene.search.grouping
import org.apache.lucene.store.Directory;
import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.LuceneTestCase;
-import org.apache.lucene.util.LuceneTestCase.SuppressCodecs;
import org.apache.lucene.util.TestUtil;
import org.apache.lucene.util.mutable.MutableValue;
import org.apache.lucene.util.mutable.MutableValueStr;
@@ -55,7 +54,6 @@ import java.util.*;
// - test ties
// - test compound sort
-@SuppressCodecs({"Lucene40", "Lucene41", "Lucene42"}) // we need missing support... i think?
public class TestGrouping extends LuceneTestCase {
public void testBasic() throws Exception {
Modified: lucene/dev/trunk/lucene/join/src/test/org/apache/lucene/search/join/TestBlockJoin.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/join/src/test/org/apache/lucene/search/join/TestBlockJoin.java?rev=1621960&r1=1621959&r2=1621960&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/join/src/test/org/apache/lucene/search/join/TestBlockJoin.java (original)
+++ lucene/dev/trunk/lucene/join/src/test/org/apache/lucene/search/join/TestBlockJoin.java Tue Sep 2 11:14:38 2014
@@ -33,9 +33,7 @@ import org.apache.lucene.search.grouping
import org.apache.lucene.search.grouping.TopGroups;
import org.apache.lucene.store.Directory;
import org.apache.lucene.util.*;
-import org.apache.lucene.util.LuceneTestCase.SuppressCodecs;
-@SuppressCodecs({"Lucene40", "Lucene41", "Lucene42"}) // needs working "missing"
public class TestBlockJoin extends LuceneTestCase {
// One resume...
Modified: lucene/dev/trunk/lucene/join/src/test/org/apache/lucene/search/join/TestJoinUtil.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/join/src/test/org/apache/lucene/search/join/TestJoinUtil.java?rev=1621960&r1=1621959&r2=1621960&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/join/src/test/org/apache/lucene/search/join/TestJoinUtil.java (original)
+++ lucene/dev/trunk/lucene/join/src/test/org/apache/lucene/search/join/TestJoinUtil.java Tue Sep 2 11:14:38 2014
@@ -68,11 +68,9 @@ import org.apache.lucene.util.Bits;
import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.FixedBitSet;
import org.apache.lucene.util.LuceneTestCase;
-import org.apache.lucene.util.LuceneTestCase.SuppressCodecs;
import org.apache.lucene.util.TestUtil;
import org.junit.Test;
-@SuppressCodecs({"Lucene40", "Lucene41", "Lucene42"}) // we need SortedSet, docsWithField
public class TestJoinUtil extends LuceneTestCase {
public void testSimple() throws Exception {
Modified: lucene/dev/trunk/lucene/misc/src/test/org/apache/lucene/index/sorter/SorterTestBase.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/misc/src/test/org/apache/lucene/index/sorter/SorterTestBase.java?rev=1621960&r1=1621959&r2=1621960&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/misc/src/test/org/apache/lucene/index/sorter/SorterTestBase.java (original)
+++ lucene/dev/trunk/lucene/misc/src/test/org/apache/lucene/index/sorter/SorterTestBase.java Tue Sep 2 11:14:38 2014
@@ -182,14 +182,10 @@ public abstract class SorterTestBase ext
doc.add(norms);
doc.add(new BinaryDocValuesField(BINARY_DV_FIELD, new BytesRef(Integer.toString(id))));
doc.add(new SortedDocValuesField(SORTED_DV_FIELD, new BytesRef(Integer.toString(id))));
- if (defaultCodecSupportsSortedSet()) {
- doc.add(new SortedSetDocValuesField(SORTED_SET_DV_FIELD, new BytesRef(Integer.toString(id))));
- doc.add(new SortedSetDocValuesField(SORTED_SET_DV_FIELD, new BytesRef(Integer.toString(id + 1))));
- }
- if (defaultCodecSupportsSortedNumeric()) {
- doc.add(new SortedNumericDocValuesField(SORTED_NUMERIC_DV_FIELD, id));
- doc.add(new SortedNumericDocValuesField(SORTED_NUMERIC_DV_FIELD, id + 1));
- }
+ doc.add(new SortedSetDocValuesField(SORTED_SET_DV_FIELD, new BytesRef(Integer.toString(id))));
+ doc.add(new SortedSetDocValuesField(SORTED_SET_DV_FIELD, new BytesRef(Integer.toString(id + 1))));
+ doc.add(new SortedNumericDocValuesField(SORTED_NUMERIC_DV_FIELD, id));
+ doc.add(new SortedNumericDocValuesField(SORTED_NUMERIC_DV_FIELD, id + 1));
doc.add(new Field(TERM_VECTORS_FIELD, Integer.toString(id), TERM_VECTORS_TYPE));
return doc;
}
@@ -381,7 +377,6 @@ public abstract class SorterTestBase ext
@Test
public void testSortedSetDocValuesField() throws Exception {
- assumeTrue("default codec does not support SORTED_SET", defaultCodecSupportsSortedSet());
SortedSetDocValues dv = reader.getSortedSetDocValues(SORTED_SET_DV_FIELD);
int maxDoc = reader.maxDoc();
for (int i = 0; i < maxDoc; i++) {
@@ -397,7 +392,6 @@ public abstract class SorterTestBase ext
@Test
public void testSortedNumericDocValuesField() throws Exception {
- assumeTrue("default codec does not support SORTED_NUMERIC", defaultCodecSupportsSortedNumeric());
SortedNumericDocValues dv = reader.getSortedNumericDocValues(SORTED_NUMERIC_DV_FIELD);
int maxDoc = reader.maxDoc();
for (int i = 0; i < maxDoc; i++) {
Modified: lucene/dev/trunk/lucene/misc/src/test/org/apache/lucene/index/sorter/TestSortingMergePolicy.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/misc/src/test/org/apache/lucene/index/sorter/TestSortingMergePolicy.java?rev=1621960&r1=1621959&r2=1621960&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/misc/src/test/org/apache/lucene/index/sorter/TestSortingMergePolicy.java (original)
+++ lucene/dev/trunk/lucene/misc/src/test/org/apache/lucene/index/sorter/TestSortingMergePolicy.java Tue Sep 2 11:14:38 2014
@@ -135,13 +135,11 @@ public class TestSortingMergePolicy exte
iw1.w.addDocument(doc);
iw2.w.addDocument(doc);
- if (defaultCodecSupportsFieldUpdates()) {
- // update NDV of docs belonging to one term (covers many documents)
- final long value = random().nextLong();
- final String term = RandomPicks.randomFrom(random(), terms);
- iw1.w.updateNumericDocValue(new Term("s", term), "ndv", value);
- iw2.w.updateNumericDocValue(new Term("s", term), "ndv", value);
- }
+ // update NDV of docs belonging to one term (covers many documents)
+ final long value = random().nextLong();
+ final String term = RandomPicks.randomFrom(random(), terms);
+ iw1.w.updateNumericDocValue(new Term("s", term), "ndv", value);
+ iw2.w.updateNumericDocValue(new Term("s", term), "ndv", value);
iw1.forceMerge(1);
iw2.forceMerge(1);
Modified: lucene/dev/trunk/lucene/misc/src/test/org/apache/lucene/uninverting/TestFieldCache.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/misc/src/test/org/apache/lucene/uninverting/TestFieldCache.java?rev=1621960&r1=1621959&r2=1621960&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/misc/src/test/org/apache/lucene/uninverting/TestFieldCache.java (original)
+++ lucene/dev/trunk/lucene/misc/src/test/org/apache/lucene/uninverting/TestFieldCache.java Tue Sep 2 11:14:38 2014
@@ -430,10 +430,8 @@ public class TestFieldCache extends Luce
doc.add(new BinaryDocValuesField("binary", new BytesRef("binary value")));
doc.add(new SortedDocValuesField("sorted", new BytesRef("sorted value")));
doc.add(new NumericDocValuesField("numeric", 42));
- if (defaultCodecSupportsSortedSet()) {
- doc.add(new SortedSetDocValuesField("sortedset", new BytesRef("sortedset value1")));
- doc.add(new SortedSetDocValuesField("sortedset", new BytesRef("sortedset value2")));
- }
+ doc.add(new SortedSetDocValuesField("sortedset", new BytesRef("sortedset value1")));
+ doc.add(new SortedSetDocValuesField("sortedset", new BytesRef("sortedset value2")));
iw.addDocument(doc);
DirectoryReader ir = iw.getReader();
iw.close();
@@ -525,37 +523,35 @@ public class TestFieldCache extends Luce
assertTrue(bits.get(0));
// SortedSet type: can be retrieved via getDocTermOrds()
- if (defaultCodecSupportsSortedSet()) {
- try {
- FieldCache.DEFAULT.getNumerics(ar, "sortedset", FieldCache.NUMERIC_UTILS_INT_PARSER, false);
- fail();
- } catch (IllegalStateException expected) {}
-
- try {
- FieldCache.DEFAULT.getTerms(ar, "sortedset", true);
- fail();
- } catch (IllegalStateException expected) {}
-
- try {
- FieldCache.DEFAULT.getTermsIndex(ar, "sortedset");
- fail();
- } catch (IllegalStateException expected) {}
-
- try {
- new DocTermOrds(ar, null, "sortedset");
- fail();
- } catch (IllegalStateException expected) {}
-
- sortedSet = FieldCache.DEFAULT.getDocTermOrds(ar, "sortedset", null);
- sortedSet.setDocument(0);
- assertEquals(0, sortedSet.nextOrd());
- assertEquals(1, sortedSet.nextOrd());
- assertEquals(SortedSetDocValues.NO_MORE_ORDS, sortedSet.nextOrd());
- assertEquals(2, sortedSet.getValueCount());
+ try {
+ FieldCache.DEFAULT.getNumerics(ar, "sortedset", FieldCache.NUMERIC_UTILS_INT_PARSER, false);
+ fail();
+ } catch (IllegalStateException expected) {}
- bits = FieldCache.DEFAULT.getDocsWithField(ar, "sortedset");
- assertTrue(bits.get(0));
- }
+ try {
+ FieldCache.DEFAULT.getTerms(ar, "sortedset", true);
+ fail();
+ } catch (IllegalStateException expected) {}
+
+ try {
+ FieldCache.DEFAULT.getTermsIndex(ar, "sortedset");
+ fail();
+ } catch (IllegalStateException expected) {}
+
+ try {
+ new DocTermOrds(ar, null, "sortedset");
+ fail();
+ } catch (IllegalStateException expected) {}
+
+ sortedSet = FieldCache.DEFAULT.getDocTermOrds(ar, "sortedset", null);
+ sortedSet.setDocument(0);
+ assertEquals(0, sortedSet.nextOrd());
+ assertEquals(1, sortedSet.nextOrd());
+ assertEquals(SortedSetDocValues.NO_MORE_ORDS, sortedSet.nextOrd());
+ assertEquals(2, sortedSet.getValueCount());
+
+ bits = FieldCache.DEFAULT.getDocsWithField(ar, "sortedset");
+ assertTrue(bits.get(0));
ir.close();
dir.close();
Modified: lucene/dev/trunk/lucene/misc/src/test/org/apache/lucene/uninverting/TestFieldCacheVsDocValues.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/misc/src/test/org/apache/lucene/uninverting/TestFieldCacheVsDocValues.java?rev=1621960&r1=1621959&r2=1621960&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/misc/src/test/org/apache/lucene/uninverting/TestFieldCacheVsDocValues.java (original)
+++ lucene/dev/trunk/lucene/misc/src/test/org/apache/lucene/uninverting/TestFieldCacheVsDocValues.java Tue Sep 2 11:14:38 2014
@@ -25,7 +25,6 @@ import java.util.List;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.MockAnalyzer;
-import org.apache.lucene.codecs.lucene42.Lucene42DocValuesFormat;
import org.apache.lucene.document.BinaryDocValuesField;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
@@ -100,7 +99,6 @@ public class TestFieldCacheVsDocValues e
}
public void testSortedSetFixedLengthVsUninvertedField() throws Exception {
- assumeTrue("Codec does not support SORTED_SET", defaultCodecSupportsSortedSet());
int numIterations = atLeast(1);
for (int i = 0; i < numIterations; i++) {
int fixedLength = TestUtil.nextInt(random(), 1, 10);
@@ -109,7 +107,6 @@ public class TestFieldCacheVsDocValues e
}
public void testSortedSetVariableLengthVsUninvertedField() throws Exception {
- assumeTrue("Codec does not support SORTED_SET", defaultCodecSupportsSortedSet());
int numIterations = atLeast(1);
for (int i = 0; i < numIterations; i++) {
doTestSortedSetVsUninvertedField(1, 10);
@@ -211,6 +208,8 @@ public class TestFieldCacheVsDocValues e
d.close();
}
+ private static final int LARGE_BINARY_FIELD_LENGTH = (1 << 15) - 2;
+
// TODO: get this out of here and into the deprecated codecs (4.0, 4.2)
public void testHugeBinaryValueLimit() throws Exception {
// We only test DVFormats that have a limit
@@ -226,7 +225,7 @@ public class TestFieldCacheVsDocValues e
// Sometimes make all values fixed length since some
// codecs have different code paths for this:
numDocs = TestUtil.nextInt(random(), 10, 20);
- fixedLength = Lucene42DocValuesFormat.MAX_BINARY_FIELD_LENGTH;
+ fixedLength = LARGE_BINARY_FIELD_LENGTH;
} else {
numDocs = TestUtil.nextInt(random(), 100, 200);
}
@@ -243,9 +242,9 @@ public class TestFieldCacheVsDocValues e
if (doFixed) {
numBytes = fixedLength;
} else if (docID == 0 || random().nextInt(5) == 3) {
- numBytes = Lucene42DocValuesFormat.MAX_BINARY_FIELD_LENGTH;
+ numBytes = LARGE_BINARY_FIELD_LENGTH;
} else {
- numBytes = TestUtil.nextInt(random(), 1, Lucene42DocValuesFormat.MAX_BINARY_FIELD_LENGTH);
+ numBytes = TestUtil.nextInt(random(), 1, LARGE_BINARY_FIELD_LENGTH);
}
totalBytes += numBytes;
if (totalBytes > 5 * 1024*1024) {
@@ -402,7 +401,6 @@ public class TestFieldCacheVsDocValues e
}
private void doTestMissingVsFieldCache(LongProducer longs) throws Exception {
- assumeTrue("Codec does not support getDocsWithField", defaultCodecSupportsDocsWithField());
Directory dir = newDirectory();
IndexWriterConfig conf = newIndexWriterConfig(new MockAnalyzer(random()));
RandomIndexWriter writer = new RandomIndexWriter(random(), dir, conf);
Modified: lucene/dev/trunk/lucene/module-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/module-build.xml?rev=1621960&r1=1621959&r2=1621960&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/module-build.xml (original)
+++ lucene/dev/trunk/lucene/module-build.xml Tue Sep 2 11:14:38 2014
@@ -433,6 +433,28 @@
<property name="codecs-javadocs.uptodate" value="true"/>
</target>
+ <property name="backward-codecs.jar" value="${common.dir}/build/backward-codecs/lucene-backward-codecs-${version}.jar"/>
+ <target name="check-backward-codecs-uptodate" unless="backward-codecs.uptodate">
+ <module-uptodate name="backward-codecs" jarfile="${backward-codecs.jar}" property="backward-codecs.uptodate"/>
+ </target>
+ <target name="jar-backward-codecs" unless="backward-codecs.uptodate" depends="check-backward-codecs-uptodate">
+ <ant dir="${common.dir}/backward-codecs" target="jar-core" inheritall="false">
+ <propertyset refid="uptodate.and.compiled.properties"/>
+ </ant>
+ <property name="backward-codecs.uptodate" value="true"/>
+ </target>
+
+ <property name="backward-codecs-javadoc.jar" value="${common.dir}/build/backward-codecs/lucene-backward-codecs-${version}-javadoc.jar"/>
+ <target name="check-backward-codecs-javadocs-uptodate" unless="backward-codecs-javadocs.uptodate">
+ <module-uptodate name="backward-codecs" jarfile="${backward-codecs-javadoc.jar}" property="backward-codecs-javadocs.uptodate"/>
+ </target>
+ <target name="javadocs-backward-codecs" unless="backward-codecs-javadocs.uptodate" depends="check-backward-codecs-javadocs-uptodate">
+ <ant dir="${common.dir}/backward-codecs" target="javadocs" inheritAll="false">
+ <propertyset refid="uptodate.and.compiled.properties"/>
+ </ant>
+ <property name="backward-codecs-javadocs.uptodate" value="true"/>
+ </target>
+
<property name="expressions.jar" value="${common.dir}/build/expressions/lucene-expressions-${version}.jar"/>
<target name="check-expressions-uptodate" unless="expressions.uptodate">
<module-uptodate name="expressions" jarfile="${expressions.jar}" property="expressions.uptodate"/>
Modified: lucene/dev/trunk/lucene/queries/src/test/org/apache/lucene/queries/function/TestSortedSetFieldSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/queries/src/test/org/apache/lucene/queries/function/TestSortedSetFieldSource.java?rev=1621960&r1=1621959&r2=1621960&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/queries/src/test/org/apache/lucene/queries/function/TestSortedSetFieldSource.java (original)
+++ lucene/dev/trunk/lucene/queries/src/test/org/apache/lucene/queries/function/TestSortedSetFieldSource.java Tue Sep 2 11:14:38 2014
@@ -29,9 +29,7 @@ import org.apache.lucene.queries.functio
import org.apache.lucene.store.Directory;
import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.LuceneTestCase;
-import org.apache.lucene.util.LuceneTestCase.SuppressCodecs;
-@SuppressCodecs({"Lucene40", "Lucene41"}) // avoid codecs that don't support sortedset
public class TestSortedSetFieldSource extends LuceneTestCase {
public void testSimple() throws Exception {
Directory dir = newDirectory();
Modified: lucene/dev/trunk/lucene/queryparser/src/test/org/apache/lucene/queryparser/analyzing/TestAnalyzingQueryParser.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/queryparser/src/test/org/apache/lucene/queryparser/analyzing/TestAnalyzingQueryParser.java?rev=1621960&r1=1621959&r2=1621960&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/queryparser/src/test/org/apache/lucene/queryparser/analyzing/TestAnalyzingQueryParser.java (original)
+++ lucene/dev/trunk/lucene/queryparser/src/test/org/apache/lucene/queryparser/analyzing/TestAnalyzingQueryParser.java Tue Sep 2 11:14:38 2014
@@ -41,11 +41,9 @@ import org.apache.lucene.search.IndexSea
import org.apache.lucene.search.Query;
import org.apache.lucene.store.Directory;
import org.apache.lucene.util.LuceneTestCase;
-import org.apache.lucene.util.LuceneTestCase.SuppressCodecs;
/**
*/
-@SuppressCodecs("Lucene3x") // binary terms
public class TestAnalyzingQueryParser extends LuceneTestCase {
private final static String FIELD = "field";
Modified: lucene/dev/trunk/lucene/replicator/src/test/org/apache/lucene/replicator/ReplicatorTestCase.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/replicator/src/test/org/apache/lucene/replicator/ReplicatorTestCase.java?rev=1621960&r1=1621959&r2=1621960&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/replicator/src/test/org/apache/lucene/replicator/ReplicatorTestCase.java (original)
+++ lucene/dev/trunk/lucene/replicator/src/test/org/apache/lucene/replicator/ReplicatorTestCase.java Tue Sep 2 11:14:38 2014
@@ -22,7 +22,6 @@ import java.util.Random;
import org.apache.http.conn.HttpClientConnectionManager;
import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
import org.apache.lucene.util.LuceneTestCase;
-import org.apache.lucene.util.LuceneTestCase.SuppressCodecs;
import org.eclipse.jetty.server.Connector;
import org.eclipse.jetty.server.Handler;
import org.eclipse.jetty.server.Server;
@@ -35,7 +34,6 @@ import org.eclipse.jetty.util.ssl.SslCon
import org.eclipse.jetty.util.thread.QueuedThreadPool;
import org.junit.AfterClass;
-@SuppressCodecs("Lucene3x")
public abstract class ReplicatorTestCase extends LuceneTestCase {
private static HttpClientConnectionManager clientConnectionManager;