You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rm...@apache.org on 2011/10/29 18:30:50 UTC
svn commit: r1194923 - in
/lucene/dev/branches/lucene2621/lucene/src/test-framework/org/apache/lucene:
index/RandomIndexWriter.java util/LuceneTestCase.java
Author: rmuir
Date: Sat Oct 29 16:30:50 2011
New Revision: 1194923
URL: http://svn.apache.org/viewvc?rev=1194923&view=rev
Log:
LUCENE-3490: more LTC fixes, fix RIW
Modified:
lucene/dev/branches/lucene2621/lucene/src/test-framework/org/apache/lucene/index/RandomIndexWriter.java
lucene/dev/branches/lucene2621/lucene/src/test-framework/org/apache/lucene/util/LuceneTestCase.java
Modified: lucene/dev/branches/lucene2621/lucene/src/test-framework/org/apache/lucene/index/RandomIndexWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/lucene/src/test-framework/org/apache/lucene/index/RandomIndexWriter.java?rev=1194923&r1=1194922&r2=1194923&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/lucene/src/test-framework/org/apache/lucene/index/RandomIndexWriter.java (original)
+++ lucene/dev/branches/lucene2621/lucene/src/test-framework/org/apache/lucene/index/RandomIndexWriter.java Sat Oct 29 16:30:50 2011
@@ -171,7 +171,7 @@ public class RandomIndexWriter implement
ValueType[] values = ValueType.values();
ValueType type = values[random.nextInt(values.length)];
String name = "random_" + type.name() + "" + docValuesFieldPrefix;
- if ("PreFlex".equals(codecProvider.getDefaultCodec().getName()) || doc.getField(name) != null)
+ if ("Lucene3x".equals(codecProvider.getDefaultCodec().getName()) || doc.getField(name) != null)
return;
IndexDocValuesField docValuesField = new IndexDocValuesField(name);
switch (type) {
@@ -367,7 +367,7 @@ public class RandomIndexWriter implement
// If we are writing with PreFlexRW, force a full
// IndexReader.open so terms are sorted in codepoint
// order during searching:
- if (!applyDeletions || !w.codecs.getDefaultCodec().getName().equals("PreFlex") && r.nextBoolean()) {
+ if (!applyDeletions || !w.codecs.getDefaultCodec().getName().equals("Lucene3x") && r.nextBoolean()) {
if (LuceneTestCase.VERBOSE) {
System.out.println("RIW.getReader: use NRT reader");
}
Modified: lucene/dev/branches/lucene2621/lucene/src/test-framework/org/apache/lucene/util/LuceneTestCase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/lucene/src/test-framework/org/apache/lucene/util/LuceneTestCase.java?rev=1194923&r1=1194922&r2=1194923&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/lucene/src/test-framework/org/apache/lucene/util/LuceneTestCase.java (original)
+++ lucene/dev/branches/lucene2621/lucene/src/test-framework/org/apache/lucene/util/LuceneTestCase.java Sat Oct 29 16:30:50 2011
@@ -347,7 +347,7 @@ public abstract class LuceneTestCase ext
}
}
- String codecDescription = CodecProvider.getDefault().toString();
+ String codecDescription = CodecProvider.getDefault().getDefaultCodec().toString();
CodecProvider.setDefault(savedCodecProvider);
Locale.setDefault(savedLocale);
TimeZone.setDefault(savedTimeZone);