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 2016/02/18 23:18:44 UTC
[1/2] lucene-solr git commit: yet more verbosity for this test that
only fails rarely on OS X
Repository: lucene-solr
Updated Branches:
refs/heads/branch_5_5 3f01556db -> 82d73e4d9
yet more verbosity for this test that only fails rarely on OS X
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/c450544f
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/c450544f
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/c450544f
Branch: refs/heads/branch_5_5
Commit: c450544fe953c3fe8b5115f8578d3a16c8a587de
Parents: 3f01556
Author: Mike McCandless <mi...@apache.org>
Authored: Thu Feb 18 09:27:21 2016 -0500
Committer: Mike McCandless <mi...@apache.org>
Committed: Thu Feb 18 16:47:16 2016 -0500
----------------------------------------------------------------------
.../apache/lucene/TestMergeSchedulerExternal.java | 16 ++++++++++++++--
1 file changed, 14 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/c450544f/lucene/core/src/test/org/apache/lucene/TestMergeSchedulerExternal.java
----------------------------------------------------------------------
diff --git a/lucene/core/src/test/org/apache/lucene/TestMergeSchedulerExternal.java b/lucene/core/src/test/org/apache/lucene/TestMergeSchedulerExternal.java
index d4aaeb1..7a4cb61 100644
--- a/lucene/core/src/test/org/apache/lucene/TestMergeSchedulerExternal.java
+++ b/lucene/core/src/test/org/apache/lucene/TestMergeSchedulerExternal.java
@@ -20,6 +20,8 @@ package org.apache.lucene;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.PrintStream;
+import java.io.PrintWriter;
+import java.io.StringWriter;
import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.document.Document;
@@ -36,6 +38,7 @@ import org.apache.lucene.store.Directory;
import org.apache.lucene.store.MockDirectoryWrapper;
import org.apache.lucene.store.RAMDirectory;
import org.apache.lucene.util.IOUtils;
+import org.apache.lucene.util.InfoStream;
import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.util.PrintStreamInfoStream;
@@ -48,6 +51,7 @@ public class TestMergeSchedulerExternal extends LuceneTestCase {
volatile boolean mergeCalled;
volatile boolean mergeThreadCreated;
volatile boolean excCalled;
+ volatile static InfoStream infoStream;
private class MyMergeScheduler extends ConcurrentMergeScheduler {
@@ -84,7 +88,14 @@ public class TestMergeSchedulerExternal extends LuceneTestCase {
StackTraceElement[] trace = new Exception().getStackTrace();
for (int i = 0; i < trace.length; i++) {
if ("doMerge".equals(trace[i].getMethodName())) {
- throw new IOException("now failing during merge");
+ IOException ioe = new IOException("now failing during merge");
+ StringWriter sw = new StringWriter();
+ PrintWriter pw = new PrintWriter(sw);
+ ioe.printStackTrace(pw);
+ if (infoStream.isEnabled("IW")) {
+ infoStream.message("IW", "TEST: now throw exc:\n" + sw.toString());
+ }
+ throw ioe;
}
}
}
@@ -104,7 +115,8 @@ public class TestMergeSchedulerExternal extends LuceneTestCase {
.setMergePolicy(newLogMergePolicy());
ByteArrayOutputStream baos = new ByteArrayOutputStream();
- iwc.setInfoStream(new PrintStreamInfoStream(new PrintStream(baos, true, IOUtils.UTF_8)));
+ infoStream = new PrintStreamInfoStream(new PrintStream(baos, true, IOUtils.UTF_8));
+ iwc.setInfoStream(infoStream);
IndexWriter writer = new IndexWriter(dir, iwc);
LogMergePolicy logMP = (LogMergePolicy) writer.getConfig().getMergePolicy();
[2/2] lucene-solr git commit: fix static member leak
Posted by mi...@apache.org.
fix static member leak
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/82d73e4d
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/82d73e4d
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/82d73e4d
Branch: refs/heads/branch_5_5
Commit: 82d73e4d9c046ed56ec850b2208bb3deb7c97bf6
Parents: c450544
Author: Mike McCandless <mi...@apache.org>
Authored: Thu Feb 18 10:11:03 2016 -0500
Committer: Mike McCandless <mi...@apache.org>
Committed: Thu Feb 18 16:47:23 2016 -0500
----------------------------------------------------------------------
.../test/org/apache/lucene/TestMergeSchedulerExternal.java | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/82d73e4d/lucene/core/src/test/org/apache/lucene/TestMergeSchedulerExternal.java
----------------------------------------------------------------------
diff --git a/lucene/core/src/test/org/apache/lucene/TestMergeSchedulerExternal.java b/lucene/core/src/test/org/apache/lucene/TestMergeSchedulerExternal.java
index 7a4cb61..6abf2fa 100644
--- a/lucene/core/src/test/org/apache/lucene/TestMergeSchedulerExternal.java
+++ b/lucene/core/src/test/org/apache/lucene/TestMergeSchedulerExternal.java
@@ -14,8 +14,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.lucene;
+package org.apache.lucene;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
@@ -41,6 +41,7 @@ import org.apache.lucene.util.IOUtils;
import org.apache.lucene.util.InfoStream;
import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.util.PrintStreamInfoStream;
+import org.junit.AfterClass;
/**
* Holds tests cases to verify external APIs are accessible
@@ -101,6 +102,11 @@ public class TestMergeSchedulerExternal extends LuceneTestCase {
}
}
+ @AfterClass
+ public static void afterClass() {
+ infoStream = null;
+ }
+
public void testSubclassConcurrentMergeScheduler() throws IOException {
MockDirectoryWrapper dir = newMockDirectory();
dir.failOn(new FailOnlyOnMerge());