db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
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 GMT
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();
 	}
 
 	/**



Mime
View raw message