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 2007/01/24 09:50:01 UTC
svn commit: r499316 - in
/db/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks:
Deadlock.java LockSet.java SinglePool.java
Author: kahatlen
Date: Wed Jan 24 00:50:00 2007
New Revision: 499316
URL: http://svn.apache.org/viewvc?view=rev&rev=499316
Log:
DERBY-1704 (partial) Allow more concurrency in the lock manager
Removed some unused code.
Modified:
db/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/Deadlock.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/LockSet.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/SinglePool.java
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/Deadlock.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/Deadlock.java?view=diff&rev=499316&r1=499315&r2=499316
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/Deadlock.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/Deadlock.java Wed Jan 24 00:50:00 2007
@@ -32,7 +32,6 @@
import org.apache.derby.iapi.store.access.TransactionInfo;
import java.util.Hashtable;
-import java.util.Enumeration;
import java.util.Dictionary;
import java.util.Stack;
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/LockSet.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/LockSet.java?view=diff&rev=499316&r1=499315&r2=499316
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/LockSet.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/LockSet.java Wed Jan 24 00:50:00 2007
@@ -319,8 +319,6 @@
willQuitWait =
(wakeupReason != Constants.WAITING_LOCK_GRANT);
- StandardException deadlockException = null;
-
if (((wakeupReason == Constants.WAITING_LOCK_IN_WAIT) &&
deadlockWait) ||
(wakeupReason == Constants.WAITING_LOCK_DEADLOCK))
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/SinglePool.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/SinglePool.java?view=diff&rev=499316&r1=499315&r2=499316
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/SinglePool.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/SinglePool.java Wed Jan 24 00:50:00 2007
@@ -505,19 +505,6 @@
/*
- ** Non-public methods
- */
-
-//EXCLUDE-START-debug-
-
- public String toDebugString()
- {
- return(lockTable.toDebugString());
- }
-
-//EXCLUDE-END-debug-
-
- /*
** Methods of PropertySetCallback
*/