You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by mi...@apache.org on 2012/03/27 20:17:31 UTC
svn commit: r1305938 - in /lucene/dev/branches/branch_3x: ./ lucene/
lucene/core/src/
lucene/test-framework/src/java/org/apache/lucene/index/RandomIndexWriter.java
lucene/test-framework/src/java/org/apache/lucene/util/LuceneTestCase.java
Author: mikemccand
Date: Tue Mar 27 18:17:30 2012
New Revision: 1305938
URL: http://svn.apache.org/viewvc?rev=1305938&view=rev
Log:
create fewer random DV fields in tests; reduce frequency of force merge
Modified:
lucene/dev/branches/branch_3x/ (props changed)
lucene/dev/branches/branch_3x/lucene/ (props changed)
lucene/dev/branches/branch_3x/lucene/core/src/ (props changed)
lucene/dev/branches/branch_3x/lucene/test-framework/src/java/org/apache/lucene/index/RandomIndexWriter.java
lucene/dev/branches/branch_3x/lucene/test-framework/src/java/org/apache/lucene/util/LuceneTestCase.java
Modified: lucene/dev/branches/branch_3x/lucene/test-framework/src/java/org/apache/lucene/index/RandomIndexWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/test-framework/src/java/org/apache/lucene/index/RandomIndexWriter.java?rev=1305938&r1=1305937&r2=1305938&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/test-framework/src/java/org/apache/lucene/index/RandomIndexWriter.java (original)
+++ lucene/dev/branches/branch_3x/lucene/test-framework/src/java/org/apache/lucene/index/RandomIndexWriter.java Tue Mar 27 18:17:30 2012
@@ -92,6 +92,10 @@ public class RandomIndexWriter implement
if (LuceneTestCase.VERBOSE) {
System.out.println("RIW config=" + w.getConfig());
}
+
+ // Make sure we sometimes test indices that don't get
+ // any forced merges:
+ doRandomForceMerge = r.nextBoolean();
}
/**
@@ -220,7 +224,7 @@ public class RandomIndexWriter implement
public IndexReader getReader(boolean applyDeletions) throws IOException {
getReaderCalled = true;
- if (r.nextInt(4) == 2) {
+ if (r.nextInt(20) == 2) {
doRandomForceMerge();
}
if (r.nextBoolean()) {
Modified: lucene/dev/branches/branch_3x/lucene/test-framework/src/java/org/apache/lucene/util/LuceneTestCase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/test-framework/src/java/org/apache/lucene/util/LuceneTestCase.java?rev=1305938&r1=1305937&r2=1305938&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/test-framework/src/java/org/apache/lucene/util/LuceneTestCase.java (original)
+++ lucene/dev/branches/branch_3x/lucene/test-framework/src/java/org/apache/lucene/util/LuceneTestCase.java Tue Mar 27 18:17:30 2012
@@ -1075,6 +1075,9 @@ public abstract class LuceneTestCase ext
Directory impl = newDirectoryImpl(r, TEST_DIRECTORY);
MockDirectoryWrapper dir = new MockDirectoryWrapper(r, maybeNRTWrap(r, impl));
stores.put(dir, Thread.currentThread().getStackTrace());
+ if (VERBOSE) {
+ System.out.println("NOTE: LuceneTestCase.newDirectory: returning " + dir);
+ }
return dir;
}