db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rhille...@apache.org
Subject svn commit: r1575026 - /db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/MergeNode.java
Date Thu, 06 Mar 2014 19:56:43 GMT
Author: rhillegas
Date: Thu Mar  6 19:56:43 2014
New Revision: 1575026

URL: http://svn.apache.org/r1575026
Log:
DERBY-3155: Add lock mode comment to master MERGE node; commit derby-3155-36-aa-lockModeComment.diff.

Modified:
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/MergeNode.java

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/MergeNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/MergeNode.java?rev=1575026&r1=1575025&r2=1575026&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/MergeNode.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/MergeNode.java Thu Mar
 6 19:56:43 2014
@@ -878,12 +878,10 @@ public final class MergeNode extends DML
 		/* First optimize the left join */
 		_leftJoinCursor.optimizeStatement();
 
-		/* In language we always set it to row lock, it's up to store to
-		 * upgrade it to table lock.  This makes sense for the default read
-		 * committed isolation level and update lock.  For more detail, see
-		 * Beetle 4133.
-		 */
-		//lockMode = TransactionController.MODE_RECORD;
+        //
+        // No need to set lockMode in the master MergeNode. The individual
+        // actions and the driving left-join will set their own lock modes.
+        //
 
         // now optimize the INSERT/UPDATE/DELETE actions
         for ( MatchingClauseNode mcn : _matchingClauses )



Mime
View raw message