db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kahat...@apache.org
Subject svn commit: r1496859 - in /db/derby/code/branches/10.9: ./ java/engine/org/apache/derby/ java/engine/org/apache/derby/iapi/services/timer/ java/engine/org/apache/derby/impl/services/ java/engine/org/apache/derby/impl/services/timer/ java/engine/org/apa...
Date Wed, 26 Jun 2013 09:40:56 GMT
Author: kahatlen
Date: Wed Jun 26 09:40:55 2013
New Revision: 1496859

URL: http://svn.apache.org/r1496859
Log:
DERBY-6114: OOME in XAMemTest.testDerby4137_TransactionTimeoutSpecifiedNotExceeded

Merged revision 1492127 from 10.10.

Added:
    db/derby/code/branches/10.9/java/engine/org/apache/derby/impl/services/timer/Java5SingletonTimerFactory.java
      - copied unchanged from r1492127, db/derby/code/branches/10.10/java/engine/org/apache/derby/impl/services/timer/Java5SingletonTimerFactory.java
Modified:
    db/derby/code/branches/10.9/   (props changed)
    db/derby/code/branches/10.9/java/engine/org/apache/derby/iapi/services/timer/TimerFactory.java
    db/derby/code/branches/10.9/java/engine/org/apache/derby/impl/services/build.xml
    db/derby/code/branches/10.9/java/engine/org/apache/derby/impl/services/timer/SingletonTimerFactory.java
    db/derby/code/branches/10.9/java/engine/org/apache/derby/impl/sql/conn/GenericStatementContext.java
    db/derby/code/branches/10.9/java/engine/org/apache/derby/jdbc/XATransactionState.java
    db/derby/code/branches/10.9/java/engine/org/apache/derby/modules.properties
    db/derby/code/branches/10.9/java/testing/org/apache/derbyTesting/functionTests/tests/memory/_Suite.java

Propchange: db/derby/code/branches/10.9/
------------------------------------------------------------------------------
  Merged /db/derby/code/trunk:r1492094
  Merged /db/derby/code/branches/10.10:r1492127

Modified: db/derby/code/branches/10.9/java/engine/org/apache/derby/iapi/services/timer/TimerFactory.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.9/java/engine/org/apache/derby/iapi/services/timer/TimerFactory.java?rev=1496859&r1=1496858&r2=1496859&view=diff
==============================================================================
--- db/derby/code/branches/10.9/java/engine/org/apache/derby/iapi/services/timer/TimerFactory.java
(original)
+++ db/derby/code/branches/10.9/java/engine/org/apache/derby/iapi/services/timer/TimerFactory.java
Wed Jun 26 09:40:55 2013
@@ -21,7 +21,7 @@
 
 package org.apache.derby.iapi.services.timer;
 
-import java.util.Timer;
+import java.util.TimerTask;
 
 /**
  * This class provides access to Timer objects for various purposes.
@@ -30,10 +30,17 @@ import java.util.Timer;
 public interface TimerFactory
 {
     /**
-     * Returns a Timer object that can be used for adding TimerTasks
-     * that cancel executing statements.
+     * Schedule a task.
      *
-     * @return a Timer object for cancelling statements.
+     * @param task the task to schedule
+     * @param delay how many milliseconds to wait before executing the task
      */
-    public Timer getCancellationTimer();
+    void schedule(TimerTask task, long delay);
+
+    /**
+     * Cancel a task.
+     *
+     * @param task the task to cancel
+     */
+    void cancel(TimerTask task);
 }

Modified: db/derby/code/branches/10.9/java/engine/org/apache/derby/impl/services/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.9/java/engine/org/apache/derby/impl/services/build.xml?rev=1496859&r1=1496858&r2=1496859&view=diff
==============================================================================
--- db/derby/code/branches/10.9/java/engine/org/apache/derby/impl/services/build.xml (original)
+++ db/derby/code/branches/10.9/java/engine/org/apache/derby/impl/services/build.xml Wed Jun
26 09:40:55 2013
@@ -59,6 +59,7 @@
       <exclude name="${derby.dir}/impl/services/cache/*Policy.java"/>
       <exclude name="${derby.dir}/impl/services/cache/BackgroundCleaner.java"/>
       <exclude name="${derby.dir}/impl/services/jmx/**"/>
+      <exclude name="${derby.dir}/impl/services/timer/Java5*"/>
     </javac>
  </target>
  
@@ -86,6 +87,7 @@
      <include name="${derby.dir}/impl/services/cache/*Policy.java"/>
      <include name="${derby.dir}/impl/services/cache/BackgroundCleaner.java"/>
    	 <include name="${derby.dir}/impl/services/jmx/**"/>
+     <include name="${derby.dir}/impl/services/timer/Java5*"/>
    </javac>
  </target>
 

Modified: db/derby/code/branches/10.9/java/engine/org/apache/derby/impl/services/timer/SingletonTimerFactory.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.9/java/engine/org/apache/derby/impl/services/timer/SingletonTimerFactory.java?rev=1496859&r1=1496858&r2=1496859&view=diff
==============================================================================
--- db/derby/code/branches/10.9/java/engine/org/apache/derby/impl/services/timer/SingletonTimerFactory.java
(original)
+++ db/derby/code/branches/10.9/java/engine/org/apache/derby/impl/services/timer/SingletonTimerFactory.java
Wed Jun 26 09:40:55 2013
@@ -29,6 +29,7 @@ import java.security.AccessController;
 import java.security.PrivilegedAction;
 import java.util.Timer;
 import java.util.Properties;
+import java.util.TimerTask;
 
 
 /**
@@ -119,17 +120,27 @@ public class SingletonTimerFactory
      * Returns a Timer object that can be used for adding TimerTasks
      * that cancel executing statements.
      *
-     * Implements the TimerFactory interface.
-     *
      * @return a Timer object for cancelling statements.
-     *
-     * @see TimerFactory
      */
-    public Timer getCancellationTimer()
+    Timer getCancellationTimer()
     {
         return singletonTimer;
     }
 
+    // TimerFactory interface methods
+
+    /** {@inheritDoc} */
+    public void schedule(TimerTask task, long delay) {
+        singletonTimer.schedule(task, delay);
+    }
+
+    /** {@inheritDoc} */
+    public void cancel(TimerTask task) {
+        task.cancel();
+    }
+
+    // ModuleControl interface methods
+
     /**
      * Currently does nothing, singleton Timer instance is initialized
      * in the constructor.

Modified: db/derby/code/branches/10.9/java/engine/org/apache/derby/impl/sql/conn/GenericStatementContext.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.9/java/engine/org/apache/derby/impl/sql/conn/GenericStatementContext.java?rev=1496859&r1=1496858&r2=1496859&view=diff
==============================================================================
--- db/derby/code/branches/10.9/java/engine/org/apache/derby/impl/sql/conn/GenericStatementContext.java
(original)
+++ db/derby/code/branches/10.9/java/engine/org/apache/derby/impl/sql/conn/GenericStatementContext.java
Wed Jun 26 09:40:55 2013
@@ -50,7 +50,6 @@ import org.apache.derby.iapi.error.Excep
 import org.apache.derby.iapi.reference.SQLState;
 import java.util.ArrayList;
 import java.util.Iterator;
-import java.util.Timer;
 import java.util.TimerTask;
 
 /**
@@ -184,10 +183,14 @@ final class GenericStatementContext 
             synchronized (this) {
                 statementContext = null;
             }
-            cancel();
+            getTimerFactory().cancel(this);
         }
     }
 
+    private static TimerFactory getTimerFactory() {
+        return Monitor.getMonitor().getTimerFactory();
+    }
+
 	// StatementContext Interface
 
 	public void setInUse
@@ -209,10 +212,8 @@ final class GenericStatementContext 
 		this.pvs = pvs;
 		rollbackParentContext = false;
         if (timeoutMillis > 0) {
-            TimerFactory factory = Monitor.getMonitor().getTimerFactory();
-            Timer timer = factory.getCancellationTimer();
             cancelTask = new CancelQueryTask(this);
-            timer.schedule(cancelTask, timeoutMillis);
+            getTimerFactory().schedule(cancelTask, timeoutMillis);
         }
 	}
 

Modified: db/derby/code/branches/10.9/java/engine/org/apache/derby/jdbc/XATransactionState.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.9/java/engine/org/apache/derby/jdbc/XATransactionState.java?rev=1496859&r1=1496858&r2=1496859&view=diff
==============================================================================
--- db/derby/code/branches/10.9/java/engine/org/apache/derby/jdbc/XATransactionState.java
(original)
+++ db/derby/code/branches/10.9/java/engine/org/apache/derby/jdbc/XATransactionState.java
Wed Jun 26 09:40:55 2013
@@ -23,7 +23,6 @@ package org.apache.derby.jdbc;
 
 
 import java.sql.SQLException;
-import java.util.Timer;
 import java.util.TimerTask;
 import org.apache.derby.iapi.services.monitor.Monitor;
 import org.apache.derby.iapi.services.timer.TimerFactory;
@@ -120,7 +119,9 @@ final class XATransactionState extends C
         }
     }
 
-
+    private static TimerFactory getTimerFactory() {
+        return Monitor.getMonitor().getTimerFactory();
+    }
 
 	XATransactionState(ContextManager cm, EmbedConnection conn, 
                 EmbedXAResource resource, XAXactId xid) {
@@ -315,7 +316,7 @@ final class XATransactionState extends C
 	}
 
    /**
-    * Schedule a timeout task wich will rollback the global transaction
+    * Schedule a timeout task which will rollback the global transaction
     * after the specified time will elapse.
     *
     * @param timeoutMillis The number of milliseconds to be elapsed before
@@ -327,10 +328,8 @@ final class XATransactionState extends C
         // schedule a time out task if the timeout was specified
         if (timeoutMillis > 0) {
             // take care of the transaction timeout
-            TimerFactory timerFactory = Monitor.getMonitor().getTimerFactory();
-            Timer timer = timerFactory.getCancellationTimer();
             timeoutTask = new CancelXATransactionTask(this);
-            timer.schedule(timeoutTask, timeoutMillis);
+            getTimerFactory().schedule(timeoutTask, timeoutMillis);
         } else {
             timeoutTask = null;
         }
@@ -375,7 +374,7 @@ final class XATransactionState extends C
       */
     private void xa_finalize() {
         if (timeoutTask != null) {
-            timeoutTask.cancel();
+            getTimerFactory().cancel(timeoutTask);
             timeoutTask = null;
         }
         performTimeoutRollback = false;

Modified: db/derby/code/branches/10.9/java/engine/org/apache/derby/modules.properties
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.9/java/engine/org/apache/derby/modules.properties?rev=1496859&r1=1496858&r2=1496859&view=diff
==============================================================================
--- db/derby/code/branches/10.9/java/engine/org/apache/derby/modules.properties (original)
+++ db/derby/code/branches/10.9/java/engine/org/apache/derby/modules.properties Wed Jun 26
09:40:55 2013
@@ -129,8 +129,13 @@
 derby.module.uuidJ1=org.apache.derby.impl.services.uuid.BasicUUIDFactory
 cloudscape.config.uuidJ1=all
 
-derby.module.timer=org.apache.derby.impl.services.timer.SingletonTimerFactory
-cloudscape.config.timer=all
+derby.module.timerJ1=org.apache.derby.impl.services.timer.SingletonTimerFactory
+cloudscape.config.timerJ1=all
+
+# Use a different TimerFactory on Java 5 to take advantage of Timer.purge().
+derby.module.timerJ6=org.apache.derby.impl.services.timer.Java5SingletonTimerFactory
+derby.env.jdk.timerJ6=6
+cloudscape.config.timerJ6=all
 
 derby.module.cacheManagerJ1=org.apache.derby.impl.services.cache.ClockFactory
 derby.env.jdk.cacheManagerJ1=1

Modified: db/derby/code/branches/10.9/java/testing/org/apache/derbyTesting/functionTests/tests/memory/_Suite.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.9/java/testing/org/apache/derbyTesting/functionTests/tests/memory/_Suite.java?rev=1496859&r1=1496858&r2=1496859&view=diff
==============================================================================
--- db/derby/code/branches/10.9/java/testing/org/apache/derbyTesting/functionTests/tests/memory/_Suite.java
(original)
+++ db/derby/code/branches/10.9/java/testing/org/apache/derbyTesting/functionTests/tests/memory/_Suite.java
Wed Jun 26 09:40:55 2013
@@ -43,8 +43,6 @@ public class _Suite extends BaseJDBCTest
         suite.addTest(Derby3009Test.suite());
         suite.addTest(Derby5730Test.suite());
         suite.addTest(MemoryLeakFixesTest.suite());
-
-        // DERBY-5394: Let this test run as the last test - it eats up memory.
         suite.addTest(XAMemTest.suite());
         return suite;
     }



Mime
View raw message