You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ho...@apache.org on 2011/11/01 22:31:37 UTC
svn commit: r1196292 - in
/lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr:
SolrTestCaseJ4.java util/AbstractSolrTestCase.java
Author: hossman
Date: Tue Nov 1 21:31:35 2011
New Revision: 1196292
URL: http://svn.apache.org/viewvc?rev=1196292&view=rev
Log:
SOLR-2860: remove broken code for tracking solrindexwriter open/close pairs -- redundent because of SOLR-2279
Modified:
lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java
lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/util/AbstractSolrTestCase.java
Modified: lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java?rev=1196292&r1=1196291&r2=1196292&view=diff
==============================================================================
--- lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java (original)
+++ lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java Tue Nov 1 21:31:35 2011
@@ -41,7 +41,6 @@ import org.apache.solr.schema.IndexSchem
import org.apache.solr.schema.SchemaField;
import org.apache.solr.search.SolrIndexSearcher;
import org.apache.solr.servlet.DirectSolrConnection;
-import org.apache.solr.update.SolrIndexWriter;
import org.apache.solr.util.TestHarness;
import org.junit.AfterClass;
import org.junit.BeforeClass;
@@ -65,7 +64,6 @@ public abstract class SolrTestCaseJ4 ext
@BeforeClass
public static void beforeClassSolrTestCase() throws Exception {
startTrackingSearchers();
- startTrackingWriters();
ignoreException("ignore_exception");
}
@@ -74,7 +72,6 @@ public abstract class SolrTestCaseJ4 ext
deleteCore();
resetExceptionIgnores();
endTrackingSearchers();
- endTrackingWriters();
}
@Override
@@ -130,28 +127,6 @@ public abstract class SolrTestCaseJ4 ext
}
}
- static long numWriterOpens;
- static long numWriterCloses;
- public static void startTrackingWriters() {
- numOpens = SolrIndexWriter.numOpens.get();
- numCloses = SolrIndexWriter.numCloses.get();
- }
-
- public static void endTrackingWriters() {
- long endNumOpens = SolrIndexWriter.numOpens.get();
- long endNumCloses = SolrIndexWriter.numCloses.get();
-
- SolrIndexWriter.numOpens.getAndSet(0);
- SolrIndexWriter.numCloses.getAndSet(0);
-
- if (endNumOpens-numOpens != endNumCloses-numCloses) {
- String msg = "ERROR: SolrIndexWriter opens=" + (endNumOpens-numWriterOpens) + " closes=" + (endNumCloses-numWriterCloses);
- log.error(msg);
- testsFailed = true;
- fail(msg);
- }
- }
-
/** Causes an exception matching the regex pattern to not be logged. */
public static void ignoreException(String pattern) {
if (SolrException.ignorePatterns == null)
Modified: lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/util/AbstractSolrTestCase.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/util/AbstractSolrTestCase.java?rev=1196292&r1=1196291&r2=1196292&view=diff
==============================================================================
--- lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/util/AbstractSolrTestCase.java (original)
+++ lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/util/AbstractSolrTestCase.java Tue Nov 1 21:31:35 2011
@@ -97,13 +97,11 @@ public abstract class AbstractSolrTestCa
@BeforeClass
public static void beforeClassAbstractSolrTestCase() throws Exception {
SolrTestCaseJ4.startTrackingSearchers();
- SolrTestCaseJ4.startTrackingWriters();
}
@AfterClass
public static void afterClassAbstractSolrTestCase() throws Exception {
SolrTestCaseJ4.endTrackingSearchers();
- SolrTestCaseJ4.endTrackingWriters();
}
/**