From derby-commits-return-9041-apmail-db-derby-commits-archive=db.apache.org@db.apache.org Thu Dec 13 18:59:30 2007 Return-Path: Delivered-To: apmail-db-derby-commits-archive@www.apache.org Received: (qmail 57753 invoked from network); 13 Dec 2007 18:59:30 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 13 Dec 2007 18:59:30 -0000 Received: (qmail 5514 invoked by uid 500); 13 Dec 2007 18:59:19 -0000 Delivered-To: apmail-db-derby-commits-archive@db.apache.org Received: (qmail 5490 invoked by uid 500); 13 Dec 2007 18:59: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 5479 invoked by uid 99); 13 Dec 2007 18:59:19 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 13 Dec 2007 10:59: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; Thu, 13 Dec 2007 18:59:06 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id A2A901A9832; Thu, 13 Dec 2007 10:59:09 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r603980 - in /db/derby/code/branches/10.3/java/engine/org/apache/derby/impl: jdbc/EmbedResultSet.java sql/execute/JoinResultSet.java Date: Thu, 13 Dec 2007 18:59:09 -0000 To: derby-commits@db.apache.org From: mamta@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20071213185909.A2A901A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: mamta Date: Thu Dec 13 10:59:08 2007 New Revision: 603980 URL: http://svn.apache.org/viewvc?rev=603980&view=rev Log: Merging changes from trunk(603823) into 10.3 codeline for DERBY-3261 and part of DERBY-3037 The commit comments for trunk were as follows The outerjoin.sql was failing because the part of the runtime statistcis info was getting erased before LanguageResultSet.close() code collected it all. I moved the erasing of runtime stat code so that it happened once the stat was collected successfully. In addition, I removed redundant code of closing and finishing the LanguageResultSet from EmbedResultSet.java because these steps happen as part of activation.close Modified: db/derby/code/branches/10.3/java/engine/org/apache/derby/impl/jdbc/EmbedResultSet.java db/derby/code/branches/10.3/java/engine/org/apache/derby/impl/sql/execute/JoinResultSet.java Modified: db/derby/code/branches/10.3/java/engine/org/apache/derby/impl/jdbc/EmbedResultSet.java URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.3/java/engine/org/apache/derby/impl/jdbc/EmbedResultSet.java?rev=603980&r1=603979&r2=603980&view=diff ============================================================================== --- db/derby/code/branches/10.3/java/engine/org/apache/derby/impl/jdbc/EmbedResultSet.java (original) +++ db/derby/code/branches/10.3/java/engine/org/apache/derby/impl/jdbc/EmbedResultSet.java Thu Dec 13 10:59:08 2007 @@ -3668,8 +3668,6 @@ //execute the insert org.apache.derby.iapi.sql.ResultSet rs = ps.execute(act, true, 0L); - rs.close(); - rs.finish(); act.close(); lcc.popStatementContext(statementContext, null); @@ -3748,8 +3746,6 @@ if (w != null) { addWarning(w); } - rs.close(); - rs.finish(); act.close(); //For forward only resultsets, after a update, the ResultSet will be positioned right before the next row. if (getType() == TYPE_FORWARD_ONLY) { @@ -3812,8 +3808,6 @@ if (w != null) { addWarning(w); } - rs.close(); - rs.finish(); act.close(); //After a delete, the ResultSet will be positioned right before //the next row. Modified: db/derby/code/branches/10.3/java/engine/org/apache/derby/impl/sql/execute/JoinResultSet.java URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.3/java/engine/org/apache/derby/impl/sql/execute/JoinResultSet.java?rev=603980&r1=603979&r2=603980&view=diff ============================================================================== --- db/derby/code/branches/10.3/java/engine/org/apache/derby/impl/sql/execute/JoinResultSet.java (original) +++ db/derby/code/branches/10.3/java/engine/org/apache/derby/impl/sql/execute/JoinResultSet.java Thu Dec 13 10:59:08 2007 @@ -196,7 +196,6 @@ */ public void close() throws StandardException { - clearScanState(); if ( isOpen ) { @@ -212,6 +211,7 @@ if (SanityManager.DEBUG) SanityManager.DEBUG("CloseRepeatInfo","Close of JoinResultSet repeated"); + clearScanState(); } public void finish() throws StandardException {