db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
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 GMT
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 {



Mime
View raw message