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 2010/11/30 10:33:04 UTC
svn commit: r1040449 - in /lucene/dev/branches/branch_3x: ./ lucene/
lucene/src/test/org/apache/lucene/search/BaseTestRangeFilter.java solr/
Author: mikemccand
Date: Tue Nov 30 09:33:04 2010
New Revision: 1040449
URL: http://svn.apache.org/viewvc?rev=1040449&view=rev
Log:
fix false random test failure (take 2)
Modified:
lucene/dev/branches/branch_3x/ (props changed)
lucene/dev/branches/branch_3x/lucene/ (props changed)
lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/BaseTestRangeFilter.java
lucene/dev/branches/branch_3x/solr/ (props changed)
Modified: lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/BaseTestRangeFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/BaseTestRangeFilter.java?rev=1040449&r1=1040448&r2=1040449&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/BaseTestRangeFilter.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/search/BaseTestRangeFilter.java Tue Nov 30 09:33:04 2010
@@ -115,11 +115,7 @@ public class BaseTestRangeFilter extends
private static IndexReader build(Random random, TestIndex index) throws IOException {
/* build an index */
- RandomIndexWriter writer = new RandomIndexWriter(random, index.index,
- newIndexWriterConfig(random, TEST_VERSION_CURRENT, new SimpleAnalyzer(TEST_VERSION_CURRENT))
- .setOpenMode(OpenMode.CREATE).setMaxBufferedDocs(_TestUtil.nextInt(random, 50, 1000)));
- _TestUtil.reduceOpenFiles(writer.w);
-
+
Document doc = new Document();
Field idField = newField(random, "id", "", Field.Store.YES, Field.Index.NOT_ANALYZED);
Field randField = newField(random, "rand", "", Field.Store.YES, Field.Index.NOT_ANALYZED);
@@ -128,11 +124,17 @@ public class BaseTestRangeFilter extends
doc.add(randField);
doc.add(bodyField);
- int minCount = 0;
- int maxCount = 0;
-
+ RandomIndexWriter writer = new RandomIndexWriter(random, index.index,
+ newIndexWriterConfig(random, TEST_VERSION_CURRENT, new SimpleAnalyzer(TEST_VERSION_CURRENT))
+ .setOpenMode(OpenMode.CREATE).setMaxBufferedDocs(_TestUtil.nextInt(random, 50, 1000)));
+ _TestUtil.reduceOpenFiles(writer.w);
while(true) {
+ int minCount = 0;
+ int maxCount = 0;
+
+ _TestUtil.reduceOpenFiles(writer.w);
+
for (int d = minId; d <= maxId; d++) {
idField.setValue(pad(d));
int r = index.allowNegativeRandomInts ? random.nextInt() : random
@@ -160,15 +162,14 @@ public class BaseTestRangeFilter extends
// max, so, we loop until we satisfy that. it should be
// exceedingly rare (Yonik calculates 1 in ~429,000)
// times) that this loop requires more than one try:
- break;
+ IndexReader ir = writer.getReader();
+ writer.close();
+ return ir;
}
// try again
+ writer.deleteAll();
}
-
- IndexReader ir = writer.getReader();
- writer.close();
- return ir;
}
@Test