Return-Path: X-Original-To: apmail-db-derby-commits-archive@www.apache.org Delivered-To: apmail-db-derby-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id EEDA510463 for ; Thu, 6 Mar 2014 19:57:09 +0000 (UTC) Received: (qmail 56250 invoked by uid 500); 6 Mar 2014 19:57:08 -0000 Delivered-To: apmail-db-derby-commits-archive@db.apache.org Received: (qmail 55785 invoked by uid 500); 6 Mar 2014 19:57:07 -0000 Mailing-List: contact derby-commits-help@db.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: "Derby Development" List-Id: Delivered-To: mailing list derby-commits@db.apache.org Received: (qmail 55456 invoked by uid 99); 6 Mar 2014 19:57:07 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 06 Mar 2014 19:57:07 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 06 Mar 2014 19:57:05 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 055922388860; Thu, 6 Mar 2014 19:56:44 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit 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 -0000 To: derby-commits@db.apache.org From: rhillegas@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140306195644.055922388860@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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 )