You are viewing a plain text version of this content. The canonical link for it is here.
Posted to derby-commits@db.apache.org by ka...@apache.org on 2013/05/10 11:31:16 UTC
svn commit: r1480960 - in /db/derby/code/branches/10.8: ./
java/client/org/apache/derby/client/net/NetCursor.java
java/testing/org/apache/derbyTesting/functionTests/tests/store/ClobReclamationTest.java
Author: kahatlen
Date: Fri May 10 09:31:16 2013
New Revision: 1480960
URL: http://svn.apache.org/r1480960
Log:
DERBY-6215: derby.log grows enormously during StressMultiTest
Merged revision 1480947 from trunk.
Modified:
db/derby/code/branches/10.8/ (props changed)
db/derby/code/branches/10.8/java/client/org/apache/derby/client/net/NetCursor.java (props changed)
db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/tests/store/ClobReclamationTest.java
Propchange: db/derby/code/branches/10.8/
------------------------------------------------------------------------------
Merged /db/derby/code/trunk:r1480947
Propchange: db/derby/code/branches/10.8/java/client/org/apache/derby/client/net/NetCursor.java
------------------------------------------------------------------------------
Merged /db/derby/code/trunk/java/client/org/apache/derby/client/net/NetCursor.java:r1480947
Modified: db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/tests/store/ClobReclamationTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/tests/store/ClobReclamationTest.java?rev=1480960&r1=1480959&r2=1480960&view=diff
==============================================================================
--- db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/tests/store/ClobReclamationTest.java (original)
+++ db/derby/code/branches/10.8/java/testing/org/apache/derbyTesting/functionTests/tests/store/ClobReclamationTest.java Fri May 10 09:31:16 2013
@@ -26,15 +26,13 @@ import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.Statement;
-import java.util.Properties;
-
import junit.framework.Test;
+import org.apache.derby.iapi.services.sanity.SanityManager;
import org.apache.derbyTesting.functionTests.util.Formatters;
import org.apache.derbyTesting.junit.BaseJDBCTestCase;
import org.apache.derbyTesting.junit.CleanDatabaseTestSetup;
import org.apache.derbyTesting.junit.JDBC;
-import org.apache.derbyTesting.junit.SystemPropertyTestSetup;
import org.apache.derbyTesting.junit.TestConfiguration;
/**
@@ -281,17 +279,17 @@ public class ClobReclamationTest extends
}
public static Test suite() {
-
- Properties sysProps = new Properties();
- sysProps.put("derby.debug.true", "DaemonTrace");
Test suite = TestConfiguration.embeddedSuite(ClobReclamationTest.class);
- return new CleanDatabaseTestSetup(new SystemPropertyTestSetup(suite,
- sysProps, true)) {
+ return new CleanDatabaseTestSetup(suite) {
/**
* Creates the table used in the test cases.
*
*/
protected void decorateSQL(Statement s) throws SQLException {
+ if (SanityManager.DEBUG) {
+ SanityManager.DEBUG_SET("DaemonTrace");
+ }
+
Connection conn = s.getConnection();
s
.executeUpdate("CREATE TABLE CLOBTAB (I INT PRIMARY KEY NOT NULL, c CLOB)");
@@ -307,6 +305,13 @@ public class ClobReclamationTest extends
s.executeUpdate("CREATE TABLE CLOBTAB3 (I INT, C CLOB)");
}
+ protected void tearDown() throws Exception {
+ if (SanityManager.DEBUG) {
+ SanityManager.DEBUG_CLEAR("DaemonTrace");
+ }
+ super.tearDown();
+ }
+
};
}