Return-Path: Delivered-To: apmail-db-derby-commits-archive@www.apache.org Received: (qmail 44311 invoked from network); 7 May 2007 22:19:38 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 7 May 2007 22:19:38 -0000 Received: (qmail 99180 invoked by uid 500); 7 May 2007 22:19:45 -0000 Delivered-To: apmail-db-derby-commits-archive@db.apache.org Received: (qmail 99155 invoked by uid 500); 7 May 2007 22:19:45 -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 99143 invoked by uid 99); 7 May 2007 22:19:45 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 07 May 2007 15:19:45 -0700 X-ASF-Spam-Status: No, hits=-99.5 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 07 May 2007 15:19:38 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id B8F781A9838; Mon, 7 May 2007 15:19:17 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r536007 - in /db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute: DeleteCascadeResultSet.java DeleteResultSet.java Date: Mon, 07 May 2007 22:19:16 -0000 To: derby-commits@db.apache.org From: kahatlen@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070507221917.B8F781A9838@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: kahatlen Date: Mon May 7 15:19:12 2007 New Revision: 536007 URL: http://svn.apache.org/viewvc?view=rev&rev=536007 Log: DERBY-827 (partial) Performance can be improved by re-using language ResultSets across Activation executions The patch makes two changes: 1) Adds a call to RowChanger.close() in DeleteResultSet.cleanUp() 2) In DeleteCascadeResultSet.open() it moves the call to cleanUp() (which in turn calls DeleteResultSet.cleanUp()) into the finally block so that it gets called even when an exception is thrown. Contributed by Dyre Tjeldvoll. Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DeleteCascadeResultSet.java db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DeleteResultSet.java Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DeleteCascadeResultSet.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DeleteCascadeResultSet.java?view=diff&rev=536007&r1=536006&r2=536007 ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DeleteCascadeResultSet.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DeleteCascadeResultSet.java Mon May 7 15:19:12 2007 @@ -142,9 +142,10 @@ runFkChecker(false); //check for all constraint violations rowChangerFinish(); fireAfterTriggers(); - cleanUp(); }finally { + cleanUp(); + //clear the parent result sets hash table activation.clearParentResultSets(); } Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DeleteResultSet.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DeleteResultSet.java?view=diff&rev=536007&r1=536006&r2=536007 ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DeleteResultSet.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DeleteResultSet.java Mon May 7 15:19:12 2007 @@ -641,6 +641,9 @@ deferredBaseCC.close(); deferredBaseCC = null; + if (rc != null) { + rc.close(); + } super.close(); }