Return-Path: Delivered-To: apmail-db-derby-commits-archive@www.apache.org Received: (qmail 81988 invoked from network); 21 Dec 2007 06:00:30 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 21 Dec 2007 06:00:30 -0000 Received: (qmail 69930 invoked by uid 500); 21 Dec 2007 06:00:19 -0000 Delivered-To: apmail-db-derby-commits-archive@db.apache.org Received: (qmail 69898 invoked by uid 500); 21 Dec 2007 06:00:19 -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 69887 invoked by uid 99); 21 Dec 2007 06:00:19 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 20 Dec 2007 22:00:19 -0800 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED 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; Fri, 21 Dec 2007 06:00:15 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 4F2CD1A983A; Thu, 20 Dec 2007 22:00:07 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r606106 - in /db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute: AlterTableConstantAction.java NoRowsResultSetImpl.java Date: Fri, 21 Dec 2007 06:00:06 -0000 To: derby-commits@db.apache.org From: mamta@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20071221060007.4F2CD1A983A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: mamta Date: Thu Dec 20 22:00:06 2007 New Revision: 606106 URL: http://svn.apache.org/viewvc?rev=606106&view=rev Log: DERBY-3037 With this commit, I am removing the Language Resultset.finish from AlterTableConstantAction. In addition, since what's being created in this part of AlterTableConstantAction is a single use activation it should be closed when its language Resultset is closed. In order to achieve that, I have added following code in NoRowsResultSetImpl.close to take care of the activation + if (activation.isSingleExecution()) + activation.close(); The derbyall and junit tests have run with no problems. Will merge this into 10.3 codeline later. Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/AlterTableConstantAction.java db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/NoRowsResultSetImpl.java Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/AlterTableConstantAction.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/AlterTableConstantAction.java?rev=606106&r1=606105&r2=606106&view=diff ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/AlterTableConstantAction.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/AlterTableConstantAction.java Thu Dec 20 22:00:06 2007 @@ -2239,7 +2239,6 @@ // timeout to its parent statement's timeout settings. ResultSet rs = ps.execute(lcc, true, 0L); rs.close(); - rs.finish(); } /** Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/NoRowsResultSetImpl.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/NoRowsResultSetImpl.java?rev=606106&r1=606105&r2=606106&view=diff ============================================================================== --- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/NoRowsResultSetImpl.java (original) +++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/NoRowsResultSetImpl.java Thu Dec 20 22:00:06 2007 @@ -330,6 +330,9 @@ */ public void close() throws StandardException { + if (!isOpen) + return; + if (! dumpedStats) { /* @@ -386,7 +389,11 @@ } subqueryTrackingArray[index].close(); } + isOpen = false; + + if (activation.isSingleExecution()) + activation.close(); } /**