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 2011/05/05 16:58:55 UTC
svn commit: r1099832 - in /lucene/dev/branches/branch_3x: ./ lucene/
lucene/backwards/
lucene/src/test-framework/org/apache/lucene/index/MockRandomMergePolicy.java
solr/
Author: mikemccand
Date: Thu May 5 14:58:55 2011
New Revision: 1099832
URL: http://svn.apache.org/viewvc?rev=1099832&view=rev
Log:
make MockRandomMergePolicy slightly less evil; fixes 2 recent test failures (merge from trunk)
Modified:
lucene/dev/branches/branch_3x/ (props changed)
lucene/dev/branches/branch_3x/lucene/ (props changed)
lucene/dev/branches/branch_3x/lucene/backwards/ (props changed)
lucene/dev/branches/branch_3x/lucene/src/test-framework/org/apache/lucene/index/MockRandomMergePolicy.java
lucene/dev/branches/branch_3x/solr/ (props changed)
Modified: lucene/dev/branches/branch_3x/lucene/src/test-framework/org/apache/lucene/index/MockRandomMergePolicy.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/test-framework/org/apache/lucene/index/MockRandomMergePolicy.java?rev=1099832&r1=1099831&r2=1099832&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/test-framework/org/apache/lucene/index/MockRandomMergePolicy.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/test-framework/org/apache/lucene/index/MockRandomMergePolicy.java Thu May 5 14:58:55 2011
@@ -67,7 +67,8 @@ public class MockRandomMergePolicy exten
Collections.shuffle(segmentInfos2, random);
int upto = 0;
while(upto < segmentInfos.size()) {
- int inc = _TestUtil.nextInt(random, 1, segmentInfos.size()-upto);
+ int max = Math.min(10, segmentInfos.size()-upto);
+ int inc = max <= 2 ? max : _TestUtil.nextInt(random, 2, max);
mergeSpec.add(new OneMerge(segmentInfos2.range(upto, upto+inc)));
upto += inc;
}
@@ -88,6 +89,7 @@ public class MockRandomMergePolicy exten
@Override
public boolean useCompoundFile(SegmentInfos infos, SegmentInfo mergedInfo) throws IOException {
- return random.nextBoolean();
+ // 80% of the time we create CFS:
+ return random.nextInt(5) != 1;
}
}