db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d..@apache.org
Subject svn commit: r514029 - in /db/derby/code/trunk/java/engine/org/apache/derby: iapi/sql/execute/ResultSetFactory.java impl/sql/compile/CurrentOfNode.java impl/sql/execute/CurrentOfResultSet.java impl/sql/execute/GenericResultSetFactory.java
Date Sat, 03 Mar 2007 00:33:12 GMT
Author: djd
Date: Fri Mar  2 16:33:12 2007
New Revision: 514029

URL: http://svn.apache.org/viewvc?view=rev&rev=514029
Log:
Don't pass the prepared statement name into CurrentOfResultSet since it was never used.

Modified:
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/ResultSetFactory.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CurrentOfNode.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/CurrentOfResultSet.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/GenericResultSetFactory.java

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/ResultSetFactory.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/ResultSetFactory.java?view=diff&rev=514029&r1=514028&r2=514029
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/ResultSetFactory.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/ResultSetFactory.java
Fri Mar  2 16:33:12 2007
@@ -1300,12 +1300,10 @@
 		positioned update and delete, using the result set paradigm.
 
 		@param cursorName the name of the cursor providing the row.
-		@param activation the activation for this result set,
-			used to provide information about the result set.
 		@param resultSetNumber	The resultSetNumber for the ResultSet
 	 */
 	NoPutResultSet getCurrentOfResultSet(String cursorName, Activation activation, 
-									int resultSetNumber, String psName);
+									int resultSetNumber);
 
 	/**
 	 * The Union interface is used to evaluate the union (all) of two ResultSets.

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CurrentOfNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CurrentOfNode.java?view=diff&rev=514029&r1=514028&r2=514029
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CurrentOfNode.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CurrentOfNode.java Fri
Mar  2 16:33:12 2007
@@ -477,10 +477,9 @@
 		  mb.push(cursorName);
 		  acb.pushThisAsActivation(mb);
 		  mb.push(resultSetNumber);
-		  mb.push(preStmt.getObjectName());
 		
 		mb.callMethod(VMOpcode.INVOKEINTERFACE, (String) null, "getCurrentOfResultSet",
-						ClassName.NoPutResultSet, 4);
+						ClassName.NoPutResultSet, 3);
 
 		mb.cast(ClassName.CursorResultSet);
 

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/CurrentOfResultSet.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/CurrentOfResultSet.java?view=diff&rev=514029&r1=514028&r2=514029
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/CurrentOfResultSet.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/CurrentOfResultSet.java
Fri Mar  2 16:33:12 2007
@@ -49,7 +49,7 @@
  *
  * @author ames
  */
-public class CurrentOfResultSet extends NoPutResultSetImpl
+class CurrentOfResultSet extends NoPutResultSetImpl
 	implements CursorResultSet {
 
     private boolean next;
@@ -62,19 +62,17 @@
     // set in constructor and not altered during
     // life of object.
 	private final String cursorName;
-	private final String psName;
 
     //
     // class interface
     //
-    public CurrentOfResultSet(String cursorName, Activation activation, 
-							  int resultSetNumber, String psName)
+    CurrentOfResultSet(String cursorName, Activation activation, 
+							  int resultSetNumber)
 	{
 		super(activation, resultSetNumber, 0.0d, 0.0d);
 		if (SanityManager.DEBUG)
 			SanityManager.ASSERT( cursorName!=null, "current of scan must get cursor name");
         this.cursorName = cursorName;
-		this.psName = psName;
     }
 
 	//

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/GenericResultSetFactory.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/GenericResultSetFactory.java?view=diff&rev=514029&r1=514028&r2=514029
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/GenericResultSetFactory.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/GenericResultSetFactory.java
Fri Mar  2 16:33:12 2007
@@ -969,9 +969,9 @@
 		@see ResultSetFactory#getCurrentOfResultSet
 	 */
 	public NoPutResultSet getCurrentOfResultSet(String cursorName, 
-	    Activation activation, int resultSetNumber, String psName)
+	    Activation activation, int resultSetNumber)
 	{
-		return new CurrentOfResultSet(cursorName, activation, resultSetNumber, psName);
+		return new CurrentOfResultSet(cursorName, activation, resultSetNumber);
 	}
 
 	/**



Mime
View raw message