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 2013/10/14 22:21:05 UTC
svn commit: r1532060 - in /lucene/dev/trunk/lucene:
codecs/src/java/org/apache/lucene/codecs/bloom/
core/src/test/org/apache/lucene/index/
test-framework/src/java/org/apache/lucene/codecs/bloom/
Author: mikemccand
Date: Mon Oct 14 20:21:04 2013
New Revision: 1532060
URL: http://svn.apache.org/r1532060
Log:
LUCENE-5268: fix test failures: bloom must first call delegate.write, then write its own
Modified:
lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/bloom/BloomFilteringPostingsFormat.java
lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestTransactions.java
lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/codecs/bloom/TestBloomFilteredLucene41Postings.java
Modified: lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/bloom/BloomFilteringPostingsFormat.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/bloom/BloomFilteringPostingsFormat.java?rev=1532060&r1=1532059&r2=1532060&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/bloom/BloomFilteringPostingsFormat.java (original)
+++ lucene/dev/trunk/lucene/codecs/src/java/org/apache/lucene/codecs/bloom/BloomFilteringPostingsFormat.java Mon Oct 14 20:21:04 2013
@@ -405,6 +405,15 @@ public final class BloomFilteringPosting
@Override
public void write(Fields fields) throws IOException {
+
+ // Delegate must write first: it may have opened files
+ // on creating the class
+ // (e.g. Lucene41PostingsConsumer), and write() will
+ // close them; alternatively, if we delayed pulling
+ // the fields consumer until here, we could do it
+ // afterwards:
+ delegateFieldsConsumer.write(fields);
+
try {
for(String field : fields) {
Terms terms = fields.terms(field);
@@ -441,8 +450,6 @@ public final class BloomFilteringPosting
} finally {
close();
}
-
- delegateFieldsConsumer.write(fields);
}
public void close() throws IOException {
@@ -492,4 +499,9 @@ public final class BloomFilteringPosting
rightSizedSet.serialize(bloomOutput);
}
}
+
+ @Override
+ public String toString() {
+ return "BloomFilteringPostingsFormat(" + delegatePostingsFormat + ")";
+ }
}
Modified: lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestTransactions.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestTransactions.java?rev=1532060&r1=1532059&r2=1532060&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestTransactions.java (original)
+++ lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestTransactions.java Mon Oct 14 20:21:04 2013
@@ -38,6 +38,10 @@ public class TestTransactions extends Lu
@Override
public void eval(MockDirectoryWrapper dir) throws IOException {
if (TestTransactions.doFail && random().nextInt() % 10 <= 3) {
+ if (VERBOSE) {
+ System.out.println(Thread.currentThread().getName() + " TEST: now fail on purpose");
+ new Throwable().printStackTrace(System.out);
+ }
throw new IOException("now failing randomly but on purpose");
}
}
Modified: lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/codecs/bloom/TestBloomFilteredLucene41Postings.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/codecs/bloom/TestBloomFilteredLucene41Postings.java?rev=1532060&r1=1532059&r2=1532060&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/codecs/bloom/TestBloomFilteredLucene41Postings.java (original)
+++ lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/codecs/bloom/TestBloomFilteredLucene41Postings.java Mon Oct 14 20:21:04 2013
@@ -71,4 +71,9 @@ public final class TestBloomFilteredLuce
throws IOException {
return delegate.fieldsProducer(state);
}
+
+ @Override
+ public String toString() {
+ return "TestBloomFilteredLucene41Postings(" + delegate + ")";
+ }
}