db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d..@apache.org
Subject svn commit: r448286 - in /db/derby/code/trunk/java/engine/org/apache/derby: iapi/sql/execute/ impl/sql/compile/ impl/sql/execute/
Date Wed, 20 Sep 2006 18:24:26 GMT
Author: djd
Date: Wed Sep 20 11:24:25 2006
New Revision: 448286

URL: http://svn.apache.org/viewvc?view=rev&rev=448286
Log:
DERBY-1700 Next step that changes the methods in ResultSetFactory not to have a closeCleanup
method parameter
which due to the previous patches was always being passed in as null. Changed all callers
to not pass the null
and thus remove the closeMethodArgument in ResultSetNode.
Since most of the calls are to ResultSetFactory methods are by generated code cannot rely
on compile time checks
to ensure all callers are correct. Needed to reduced the argument count by one for the generated
method call for
any getXXXResultSet that no longer passes the closeCleanup (null) argument. Have confidence
in the change as derbyall
passes and the code coverage numbers at http://wiki.apache.org/db-derby/CodeCoverage show
complete coverage of these
factory methods except for ones related to VTIs.

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/DistinctNode.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/FromBaseTable.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/FromVTI.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/GroupByNode.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/HashJoinStrategy.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/HashTableNode.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/IndexToBaseRowNode.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/IntersectOrExceptNode.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/JoinNode.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/MaterializeResultSetNode.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/NestedLoopJoinStrategy.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/NormalizeResultSetNode.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/OrderByList.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ProjectRestrictNode.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ResultSetNode.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/RowResultSetNode.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ScrollInsensitiveResultSetNode.java
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/UnionNode.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=448286&r1=448285&r2=448286
==============================================================================
--- 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
Wed Sep 20 11:24:25 2006
@@ -293,7 +293,6 @@
 		@param optimizerEstimatedRowCount	Estimated total # of rows by
 											optimizer
 		@param optimizerEstimatedCost		Estimated total cost by optimizer
-		@param closeCleanup	any cleanup the activation needs to do on close.
 		@return the project restrict operation as a result set.
 		@exception StandardException thrown when unable to create the
 			result set
@@ -306,8 +305,7 @@
 		boolean reuseResult,
 		boolean doesProjection,
 		double optimizerEstimatedRowCount,
-		double optimizerEstimatedCost,
-		GeneratedMethod closeCleanup) throws StandardException;
+		double optimizerEstimatedCost) throws StandardException;
 
 	/**
 		A hash table result set builds a hash table on its source,
@@ -340,7 +338,6 @@
 		@param optimizerEstimatedRowCount	Estimated total # of rows by
 											optimizer
 		@param optimizerEstimatedCost		Estimated total cost by optimizer
-		@param closeCleanup	any cleanup the activation needs to do on close.
 		@return the project restrict operation as a result set.
 		@exception StandardException thrown when unable to create the
 			result set
@@ -357,8 +354,7 @@
 		int	initialCapacity,
 		float loadFactor,
 		double optimizerEstimatedRowCount,
-		double optimizerEstimatedCost,
-		GeneratedMethod closeCleanup)
+		double optimizerEstimatedCost)
 			 throws StandardException;
 
 	/**
@@ -385,7 +381,6 @@
 		@param optimizerEstimatedRowCount	Estimated total # of rows by
 											optimizer
 		@param optimizerEstimatedCost		Estimated total cost by optimizer
-		@param closeCleanup	any cleanup the activation needs to do on close.
 		@return the distinct operation as a result set.
 		@exception StandardException thrown when unable to create the
 			result set
@@ -398,8 +393,7 @@
 		int rowSize,
 		int resultSetNumber, 
 		double optimizerEstimatedRowCount,
-		double optimizerEstimatedCost,
-		GeneratedMethod closeCleanup) 
+		double optimizerEstimatedCost) 
 			throws StandardException;
 
 	/**
@@ -419,7 +413,6 @@
 		@param optimizerEstimatedRowCount	Estimated total # of rows by
 											optimizer
 		@param optimizerEstimatedCost		Estimated total cost by optimizer
-		@param closeCleanup	any cleanup the activation needs to do on close.
 		@return the scalar aggregation operation as a result set.
 		@exception StandardException thrown when unable to create the
 			result set
@@ -433,8 +426,7 @@
 		int resultSetNumber, 
 		boolean singleInputRow,
 		double optimizerEstimatedRowCount,
-		double optimizerEstimatedCost,
-		GeneratedMethod closeCleanup) 
+		double optimizerEstimatedCost) 
 			throws StandardException;
 
 	/**
@@ -457,7 +449,6 @@
 		@param optimizerEstimatedRowCount	Estimated total # of rows by
 											optimizer
 		@param optimizerEstimatedCost		Estimated total cost by optimizer
-		@param closeCleanup	any cleanup the activation needs to do on close.
 		@return the scalar aggregation operation as a result set.
 		@exception StandardException thrown when unable to create the
 			result set
@@ -471,8 +462,7 @@
 		int resultSetNumber, 
 		boolean singleInputRow,
 		double optimizerEstimatedRowCount,
-		double optimizerEstimatedCost,
-		GeneratedMethod closeCleanup) 
+		double optimizerEstimatedCost) 
 			throws StandardException;
 
 	/**
@@ -491,7 +481,6 @@
 		@param optimizerEstimatedRowCount	Estimated total # of rows by
 											optimizer
 		@param optimizerEstimatedCost		Estimated total cost by optimizer
-		@param closeCleanup	any cleanup the activation needs to do on close.
 		@return the scalar aggregation operation as a result set.
 		@exception StandardException thrown when unable to create the
 			result set
@@ -504,8 +493,7 @@
 		int rowSize,
 		int resultSetNumber, 
 		double optimizerEstimatedRowCount,
-		double optimizerEstimatedCost,
-		GeneratedMethod closeCleanup) 
+		double optimizerEstimatedCost) 
 			throws StandardException;
 
 	/**
@@ -527,7 +515,6 @@
 		@param optimizerEstimatedRowCount	Estimated total # of rows by
 											optimizer
 		@param optimizerEstimatedCost		Estimated total cost by optimizer
-		@param closeCleanup	any cleanup the activation needs to do on close.
 		@return the scalar aggregation operation as a result set.
 		@exception StandardException thrown when unable to create the
 			result set
@@ -540,8 +527,7 @@
 		int rowSize,
 		int resultSetNumber, 
 		double optimizerEstimatedRowCount,
-		double optimizerEstimatedCost,
-		GeneratedMethod closeCleanup) 
+		double optimizerEstimatedCost) 
 			throws StandardException;
 
 	/**
@@ -623,7 +609,6 @@
 		@param optimizerEstimatedRowCount	Estimated total # of rows by
 											optimizer
 		@param optimizerEstimatedCost		Estimated total cost by optimizer
-		@param closeCleanup	any cleanup the activation needs to do on close.
 		@return the row as a result set.
 		@exception StandardException thrown when unable to create the
 			result set
@@ -632,8 +617,7 @@
 							  boolean canCacheRow,
 							  int resultSetNumber,
 							  double optimizerEstimatedRowCount,
-							  double optimizerEstimatedCost,
-							  GeneratedMethod closeCleanup)
+							  double optimizerEstimatedCost)
 		throws StandardException;
 
 	/**
@@ -657,7 +641,6 @@
 		@param optimizerEstimatedRowCount	Estimated total # of rows by
 											optimizer
 		@param optimizerEstimatedCost		Estimated total cost by optimizer
-		@param closeCleanup	any cleanup the activation needs to do on close.
 		@return the row as a result set.
 		@exception StandardException thrown when unable to create the
 			result set
@@ -673,8 +656,7 @@
 									 boolean isTarget,
 									 int scanIsolationLevel,
 									 double optimizerEstimatedRowCount,
-									 double optimizerEstimatedCost,
-								     GeneratedMethod closeCleanup)
+									 double optimizerEstimatedCost)
 		 throws StandardException;
 
 	/**
@@ -734,7 +716,6 @@
 		@param optimizerEstimatedRowCount	Estimated total # of rows by
 											optimizer
 		@param optimizerEstimatedCost		Estimated total cost by optimizer
-		@param closeCleanup	any cleanup the activation needs to do on close.
 		@return the table scan operation as a result set.
 		@exception StandardException thrown when unable to create the
 			result set
@@ -767,8 +748,7 @@
 								boolean tableLocked,
 								int isolationLevel,
 								double optimizerEstimatedRowCount,
-								double optimizerEstimatedCost,
-								GeneratedMethod closeCleanup)
+								double optimizerEstimatedCost)
 			throws StandardException;
 
 	/**
@@ -802,7 +782,6 @@
 		@param optimizerEstimatedRowCount	Estimated total # of rows by
 											optimizer
 		@param optimizerEstimatedCost		Estimated total cost by optimizer
-		@param closeCleanup	any cleanup the activation needs to do on close.
 		@return the table scan operation as a result set.
 		@exception StandardException thrown when unable to create the
 			result set
@@ -823,8 +802,7 @@
 								boolean tableLocked,
 								int isolationLevel,
 								double optimizerEstimatedRowCount,
-								double optimizerEstimatedCost,
-								GeneratedMethod closeCleanup)
+								double optimizerEstimatedCost)
 			throws StandardException;
 
 	/**
@@ -885,7 +863,6 @@
 		@param optimizerEstimatedRowCount	Estimated total # of rows by
 											optimizer
 		@param optimizerEstimatedCost		Estimated total cost by optimizer
-		@param closeCleanup	any cleanup the activation needs to do on close.
 
 		@return the table scan operation as a result set.
 		@exception StandardException thrown when unable to create the
@@ -915,8 +892,7 @@
 								int isolationLevel,
 								boolean oneRowScan,
 								double optimizerEstimatedRowCount,
-								double optimizerEstimatedCost,
-								GeneratedMethod closeCleanup)
+								double optimizerEstimatedCost)
 			throws StandardException;
 
 	/**
@@ -978,7 +954,6 @@
 		@param optimizerEstimatedRowCount	Estimated total # of rows by
 											optimizer
 		@param optimizerEstimatedCost		Estimated total cost by optimizer
-		@param closeCleanup	any cleanup the activation needs to do on close.
 
 		@return the table scan operation as a result set.
 		@exception StandardException thrown when unable to create the
@@ -1009,8 +984,7 @@
 								int rowsPerRead,
 								boolean oneRowScan,
 								double optimizerEstimatedRowCount,
-								double optimizerEstimatedCost,
-								GeneratedMethod closeCleanup)
+								double optimizerEstimatedCost)
 			throws StandardException;
 	/**
 		An index row to base row result set gets an index row from its source
@@ -1042,7 +1016,6 @@
 		@param optimizerEstimatedRowCount	Estimated total # of rows by
 											optimizer
 		@param optimizerEstimatedCost		Estimated total cost by optimizer
-		@param closeCleanup	any cleanup the activation needs to do on close.
 
 		@return the index row to base row operation as a result set.
 		@exception StandardException thrown when unable to create the
@@ -1061,8 +1034,7 @@
 								GeneratedMethod restriction,
 								boolean forUpdate,
 								double optimizerEstimatedRowCount,
-								double optimizerEstimatedCost,
-								GeneratedMethod closeCleanup)
+								double optimizerEstimatedCost)
 			throws StandardException;
 
 	/**
@@ -1095,7 +1067,6 @@
 											optimizer
 		@param optimizerEstimatedCost		Estimated total cost by optimizer
 		@param userSuppliedOptimizerOverrides		Overrides specified by the user on the sql
-		@param closeCleanup	any cleanup the activation needs to do on close.
 		@return the nested loop join operation as a result set.
 		@exception StandardException thrown when unable to create the
 			result set
@@ -1110,8 +1081,7 @@
 								   boolean notExistsRightSide,
 								   double optimizerEstimatedRowCount,
 								   double optimizerEstimatedCost,
-								   String userSuppliedOptimizerOverrides,
-								   GeneratedMethod closeCleanup)
+								   String userSuppliedOptimizerOverrides)
 			throws StandardException;
 
 	/**
@@ -1137,7 +1107,6 @@
 											optimizer
 		@param optimizerEstimatedCost		Estimated total cost by optimizer
 		@param userSuppliedOptimizerOverrides		Overrides specified by the user on the sql
-		@param closeCleanup	any cleanup the activation needs to do on close.
 		@return the nested loop join operation as a result set.
 		@exception StandardException thrown when unable to create the
 			result set
@@ -1152,8 +1121,7 @@
 								   boolean notExistsRightSide,
 								   double optimizerEstimatedRowCount,
 								   double optimizerEstimatedCost,
-								   String userSuppliedOptimizerOverrides,
-								   GeneratedMethod closeCleanup)
+								   String userSuppliedOptimizerOverrides)
 			throws StandardException;
 
 
@@ -1189,7 +1157,6 @@
 		@param optimizerEstimatedRowCount	Estimated total # of rows by
 											optimizer
 		@param optimizerEstimatedCost		Estimated total cost by optimizer
-		@param closeCleanup	any cleanup the activation needs to do on close.
 		@param userSuppliedOptimizerOverrides		Overrides specified by the user on the sql
 		@return the nested loop join operation as a result set.
 		@exception StandardException thrown when unable to create the
@@ -1207,8 +1174,7 @@
 								   boolean notExistsRightSide,
 								   double optimizerEstimatedRowCount,
 								   double optimizerEstimatedCost,
-								   String userSuppliedOptimizerOverrides,
-								   GeneratedMethod closeCleanup)
+								   String userSuppliedOptimizerOverrides)
 			throws StandardException;
 
 	/**
@@ -1237,7 +1203,6 @@
 											optimizer
 		@param optimizerEstimatedCost		Estimated total cost by optimizer
 		@param userSuppliedOptimizerOverrides		Overrides specified by the user on the sql
-		@param closeCleanup	any cleanup the activation needs to do on close.
 		@return the nested loop join operation as a result set.
 		@exception StandardException thrown when unable to create the
 			result set
@@ -1254,8 +1219,7 @@
 								   boolean notExistsRightSide,
 								   double optimizerEstimatedRowCount,
 								   double optimizerEstimatedCost,
-								   String userSuppliedOptimizerOverrides,
-								   GeneratedMethod closeCleanup)
+								   String userSuppliedOptimizerOverrides)
 			throws StandardException;
 
 	/**
@@ -1268,7 +1232,6 @@
 		@param optimizerEstimatedRowCount	Estimated total # of rows by
 											optimizer
 		@param optimizerEstimatedCost		Estimated total cost by optimizer
-		@param closeCleanup	any cleanup the activation needs to do on close.
 		@return the materialization operation as a result set.
 
 	 	@exception StandardException		Thrown on failure
@@ -1276,8 +1239,7 @@
 	NoPutResultSet getMaterializedResultSet(NoPutResultSet source, 
 											int resultSetNumber,
 											double optimizerEstimatedRowCount,
-											double optimizerEstimatedCost,
-										   GeneratedMethod closeCleanup) 
+											double optimizerEstimatedCost) 
 		throws StandardException;
 
 	/**
@@ -1293,7 +1255,6 @@
 		@param optimizerEstimatedRowCount	Estimated total # of rows by
 											optimizer
 		@param optimizerEstimatedCost		Estimated total cost by optimizer
-		@param closeCleanup	any cleanup the activation needs to do on close.
 		@return the materialization operation as a result set.
 
 	 	@exception StandardException		Thrown on failure
@@ -1303,8 +1264,7 @@
 											int sourceRowWidth,
 											boolean scrollable,
 											double optimizerEstimatedRowCount,
-											double optimizerEstimatedCost,
-										   GeneratedMethod closeCleanup) 
+											double optimizerEstimatedCost) 
 		throws StandardException;
 
 	/**
@@ -1317,7 +1277,6 @@
 		@param optimizerEstimatedRowCount	Estimated total # of rows by
 											optimizer
 		@param optimizerEstimatedCost		Estimated total cost by optimizer
-		@param closeCleanup	any cleanup the activation needs to do on close.
 		@return the normalization operation as a result set.
 
 	 	@exception StandardException		Thrown on failure
@@ -1326,8 +1285,7 @@
 										 int resultSetNumber, int erdNumber,
 										 double optimizerEstimatedRowCount,
 										 double optimizerEstimatedCost,
-										 boolean forUpdate,
-										 GeneratedMethod closeCleanup) 
+										 boolean forUpdate) 
 		throws StandardException;
 
 	/**
@@ -1356,7 +1314,6 @@
 	 * @param source2	The second ResultSet whose rows go into the
 	 *			union
 	 *	@param resultSetNumber	The resultSetNumber for the ResultSet
-	 *	@param closeCleanup	any cleanup the activation needs to do on close.
 	 *	@param optimizerEstimatedRowCount	Estimated total # of rows by
 	 *										optimizer
 	 *	@param optimizerEstimatedCost		Estimated total cost by optimizer
@@ -1370,8 +1327,7 @@
 					NoPutResultSet source2,
 					int resultSetNumber,
 					double optimizerEstimatedRowCount,
-					double optimizerEstimatedCost,
-					GeneratedMethod closeCleanup)
+					double optimizerEstimatedCost)
 					throws StandardException;
 
 
@@ -1388,7 +1344,6 @@
      * @param opType IntersectOrExceptNode.INTERSECT_OP or EXCEPT_OP
      * @param all true if the operation is an INTERSECT ALL or an EXCEPT ALL,
      *            false if the operation is an INTERSECT DISCTINCT or an EXCEPT DISCTINCT
-     * @param closeCleanup a method to be called by close
      * @param intermediateOrderByColumnsSavedObject The saved object index for the array
of order by columns for the
      *        ordering of the left and right sources. That is, both the left and right sources
have an order by
      *        clause of the form ORDER BY intermediateOrderByColumns[0],intermediateOrderByColumns[1],...
@@ -1408,7 +1363,6 @@
                                       double optimizerEstimatedCost,
                                       int opType,
                                       boolean all,
-                                      GeneratedMethod closeCleanup,
                                       int intermediateOrderByColumnsSavedObject,
                                       int intermediateOrderByDirectionSavedObject)
         throws StandardException;
@@ -1446,7 +1400,6 @@
 	 * @param optimizerEstimatedRowCount	Estimated total # of rows by
 	 * 										optimizer
 	 * @param optimizerEstimatedCost		Estimated total cost by optimizer
-	 * @param closeCleanup		any cleanup the activation needs to do on close.
 	 *
 	 * @return the scan operation as a result set.
  	 *
@@ -1467,8 +1420,7 @@
 		boolean				tableLocked,
 		int					isolationLevel,
 		double				optimizerEstimatedRowCount,
-		double 				optimizerEstimatedCost,
-		GeneratedMethod 	closeCleanup
+		double 				optimizerEstimatedCost
 	) throws StandardException;
 
 
@@ -1526,7 +1478,6 @@
 		@param optimizerEstimatedRowCount	Estimated total # of rows by
 											optimizer
 		@param optimizerEstimatedCost		Estimated total cost by optimizer
-		@param closeCleanup	any cleanup the activation needs to do on close.
 		@param parentResultSetId  Id to access the materlized temporary result
                             	  set from the refence stored in the activation.
 		@param fkIndexConglomId foreign key index conglomerate id.
@@ -1563,7 +1514,6 @@
 									boolean oneRowScan,
 									double optimizerEstimatedRowCount,
 									double optimizerEstimatedCost,
-									GeneratedMethod closeCleanup,
 									String parentResultSetId,
 									long fkIndexConglomId,
 									int fkColArrayItem,

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DistinctNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DistinctNode.java?view=diff&rev=448286&r1=448285&r2=448286
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DistinctNode.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DistinctNode.java Wed
Sep 20 11:24:25 2006
@@ -338,8 +338,8 @@
 		mb.push(resultSetNumber);
 		mb.push(costEstimate.rowCount());
 		mb.push(costEstimate.getEstimatedCost());
-		closeMethodArgument(acb, mb);
 
-		mb.callMethod(VMOpcode.INVOKEINTERFACE, (String) null, "getSortResultSet", ClassName.NoPutResultSet,
10);
+		mb.callMethod(VMOpcode.INVOKEINTERFACE, (String) null, "getSortResultSet",
+                ClassName.NoPutResultSet, 9);
 	}
 }

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/FromBaseTable.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/FromBaseTable.java?view=diff&rev=448286&r1=448285&r2=448286
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/FromBaseTable.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/FromBaseTable.java Wed
Sep 20 11:24:25 2006
@@ -3168,10 +3168,9 @@
 		mb.push(getCompilerContext().getScanIsolationLevel());
 		mb.push(costEstimate.singleScanRowCount());
 		mb.push(costEstimate.getEstimatedCost());
-		closeMethodArgument(acb, mb);
 
 		mb.callMethod(VMOpcode.INVOKEINTERFACE, (String) null, "getLastIndexKeyResultSet",
-					ClassName.NoPutResultSet, 14);
+					ClassName.NoPutResultSet, 13);
 
 
 	}
@@ -3264,11 +3263,9 @@
 		mb.push(getCompilerContext().getScanIsolationLevel());
 		mb.push(costEstimate.singleScanRowCount());
 		mb.push(costEstimate.getEstimatedCost());
-		closeMethodArgument(acb, mb);
-
 		
 		mb.callMethod(VMOpcode.INVOKEINTERFACE, (String) null, "getDistinctScanResultSet",
-							ClassName.NoPutResultSet, 17);
+							ClassName.NoPutResultSet, 16);
 	}
 
 
@@ -3383,8 +3380,6 @@
 											getCompilerContext().getScanIsolationLevel(),
 											ap.getOptimizer().getMaxMemoryPerTable()
 											);
-
-		closeMethodArgument(acb, mb);
 
 		return nargs;
 	}

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/FromVTI.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/FromVTI.java?view=diff&rev=448286&r1=448285&r2=448286
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/FromVTI.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/FromVTI.java Wed Sep
20 11:24:25 2006
@@ -1172,7 +1172,7 @@
 
 		acb.pushGetResultSetFactoryExpression(mb);
 		int nargs = getScanArguments(acb, mb);
-		mb.callMethod(VMOpcode.INVOKEINTERFACE, (String) null, "getVTIResultSet", ClassName.NoPutResultSet,
nargs);
+		mb.callMethod(VMOpcode.INVOKEINTERFACE, (String) null, "getVTIResultSet",ClassName.NoPutResultSet,
nargs);
 	}
 
 	private int getScanArguments(ActivationClassBuilder acb,
@@ -1264,10 +1264,7 @@
 		// estimated cost
 		mb.push(costEstimate.getEstimatedCost());
 
-		// let the superclass deal with statement level argument
-		closeMethodArgument(acb, mb);
-
-		return 15;
+		return 14;
 	}
 
 	private void generateConstructor(ActivationClassBuilder acb,

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/GroupByNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/GroupByNode.java?view=diff&rev=448286&r1=448285&r2=448286
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/GroupByNode.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/GroupByNode.java Wed
Sep 20 11:24:25 2006
@@ -905,7 +905,6 @@
 		 *  arg7: row size
 		 *  arg8: resultSetNumber
 		 *  arg9: Whether or not to perform min optimization.
-		 *  arg12: closeCleanup
 		 */
 		String resultSet = (addDistinctAggregate) ? "getDistinctScalarAggregateResultSet" : "getScalarAggregateResultSet";
 
@@ -913,9 +912,8 @@
 		mb.push(costEstimate.rowCount());
 		mb.push(costEstimate.getEstimatedCost());
 
-		closeMethodArgument(acb, mb);
-
-		mb.callMethod(VMOpcode.INVOKEINTERFACE, (String) null, resultSet, ClassName.NoPutResultSet,
11);
+		mb.callMethod(VMOpcode.INVOKEINTERFACE, (String) null, resultSet,
+                ClassName.NoPutResultSet, 10);
 	}
 
 	/**
@@ -943,9 +941,8 @@
 		mb.push(costEstimate.rowCount());
 		mb.push(costEstimate.getEstimatedCost());
 
-		closeMethodArgument(acb, mb);
-
-		mb.callMethod(VMOpcode.INVOKEINTERFACE, (String) null, resultSet, ClassName.NoPutResultSet,
10);
+		mb.callMethod(VMOpcode.INVOKEINTERFACE, (String) null, resultSet,
+                ClassName.NoPutResultSet, 9);
 
 	}
 

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/HashJoinStrategy.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/HashJoinStrategy.java?view=diff&rev=448286&r1=448285&r2=448286
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/HashJoinStrategy.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/HashJoinStrategy.java
Wed Sep 20 11:24:25 2006
@@ -366,7 +366,7 @@
 						tableLocked,
 						isolationLevel);
 
-		return 29;
+		return 28;
 	}
 
 	/**

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/HashTableNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/HashTableNode.java?view=diff&rev=448286&r1=448285&r2=448286
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/HashTableNode.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/HashTableNode.java Wed
Sep 20 11:24:25 2006
@@ -404,9 +404,9 @@
 		mb.push(loadFactor);
 		mb.push(costEstimate.singleScanRowCount());
 		mb.push(costEstimate.getEstimatedCost());
-		closeMethodArgument(acb, mb);
 
-		mb.callMethod(VMOpcode.INVOKEINTERFACE, (String) null, "getHashTableResultSet", ClassName.NoPutResultSet,
15);
+		mb.callMethod(VMOpcode.INVOKEINTERFACE, (String) null, "getHashTableResultSet",
+                ClassName.NoPutResultSet, 14);
 	}
 
 	/**

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/IndexToBaseRowNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/IndexToBaseRowNode.java?view=diff&rev=448286&r1=448285&r2=448286
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/IndexToBaseRowNode.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/IndexToBaseRowNode.java
Wed Sep 20 11:24:25 2006
@@ -261,10 +261,9 @@
 		mb.push(forUpdate);
 		mb.push(costEstimate.rowCount());
 		mb.push(costEstimate.getEstimatedCost());
-		closeMethodArgument(acb, mb);
 
 		mb.callMethod(VMOpcode.INVOKEINTERFACE, (String) null, "getIndexRowToBaseRowResultSet",
-						ClassName.NoPutResultSet, 14);
+						ClassName.NoPutResultSet, 13);
 
 		/* The IndexRowToBaseRowResultSet generator is what we return */
 

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/IntersectOrExceptNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/IntersectOrExceptNode.java?view=diff&rev=448286&r1=448285&r2=448286
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/IntersectOrExceptNode.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/IntersectOrExceptNode.java
Wed Sep 20 11:24:25 2006
@@ -361,14 +361,13 @@
         mb.push( costEstimate.getEstimatedCost());
         mb.push( getOpType());
         mb.push( all);
-        closeMethodArgument(acb, mb);
         mb.push( getCompilerContext().addSavedObject( intermediateOrderByColumns));
         mb.push( getCompilerContext().addSavedObject( intermediateOrderByDirection));
 
 		mb.callMethod(VMOpcode.INVOKEINTERFACE,
                       (String) null,
                       "getSetOpResultSet",
-                      ClassName.NoPutResultSet, 11);
+                      ClassName.NoPutResultSet, 10);
 	} // end of generate
 
 	/**

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/JoinNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/JoinNode.java?view=diff&rev=448286&r1=448285&r2=448286
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/JoinNode.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/JoinNode.java Wed Sep
20 11:24:25 2006
@@ -1652,8 +1652,6 @@
 			mb.push(PropertyUtil.sortProperties(joinOrderStrategyProperties));
 		else
 			mb.pushNull("java.lang.String");
-		
-		closeMethodArgument(acb, mb);
 
 		return numArgs;
 
@@ -1701,7 +1699,7 @@
 	 */
 	protected int getNumJoinArguments()
 	{
-		return 12;
+		return 11;
 	}
 
 	/**

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/MaterializeResultSetNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/MaterializeResultSetNode.java?view=diff&rev=448286&r1=448285&r2=448286
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/MaterializeResultSetNode.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/MaterializeResultSetNode.java
Wed Sep 20 11:24:25 2006
@@ -119,9 +119,8 @@
 		mb.push(resultSetNumber);
 		mb.push(costEstimate.rowCount());
 		mb.push(costEstimate.getEstimatedCost());
-		closeMethodArgument(acb, mb);
 
 		mb.callMethod(VMOpcode.INVOKEINTERFACE, (String) null, "getMaterializedResultSet",
-						ClassName.NoPutResultSet, 5);
+						ClassName.NoPutResultSet, 4);
 	}
 }

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/NestedLoopJoinStrategy.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/NestedLoopJoinStrategy.java?view=diff&rev=448286&r1=448285&r2=448286
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/NestedLoopJoinStrategy.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/NestedLoopJoinStrategy.java
Wed Sep 20 11:24:25 2006
@@ -225,11 +225,11 @@
 
 		if (bulkFetch > 1)
 		{
-			numArgs = 26;
+			numArgs = 25;
 		}
 		else
 		{
-			numArgs = 25;
+			numArgs = 24 ;
 		}
 
 		fillInScanArgs1(tc, mb,

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/NormalizeResultSetNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/NormalizeResultSetNode.java?view=diff&rev=448286&r1=448285&r2=448286
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/NormalizeResultSetNode.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/NormalizeResultSetNode.java
Wed Sep 20 11:24:25 2006
@@ -126,9 +126,9 @@
 		mb.push(costEstimate.rowCount());
 		mb.push(costEstimate.getEstimatedCost());
 		mb.push(forUpdate);
-		closeMethodArgument(acb, mb);
+
 		mb.callMethod(VMOpcode.INVOKEINTERFACE, (String) null, "getNormalizeResultSet",
-					ClassName.NoPutResultSet, 7);
+					ClassName.NoPutResultSet, 6);
 	}
 
 	/**

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/OrderByList.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/OrderByList.java?view=diff&rev=448286&r1=448285&r2=448286
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/OrderByList.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/OrderByList.java Wed
Sep 20 11:24:25 2006
@@ -402,16 +402,8 @@
 		mb.push(costEstimate.rowCount());
 		mb.push(costEstimate.getEstimatedCost());
 
-		/**
-			if this is the statement result set (today, it always is), 
-			and there is a current
-			date/time request, then a method will have been generated.
-			Otherwise, a simple null is passed in to the result set method.
-		 */
-        mb.pushNull(ClassName.GeneratedMethod);
-
 		mb.callMethod(VMOpcode.INVOKEINTERFACE, (String) null, "getSortResultSet",
-							ClassName.NoPutResultSet, 10);
+							ClassName.NoPutResultSet, 9);
 
 	}
 

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ProjectRestrictNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ProjectRestrictNode.java?view=diff&rev=448286&r1=448285&r2=448286
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ProjectRestrictNode.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ProjectRestrictNode.java
Wed Sep 20 11:24:25 2006
@@ -1565,10 +1565,9 @@
 		mb.push(doesProjection);
 		mb.push(costEstimate.rowCount());
 		mb.push(costEstimate.getEstimatedCost());
-		closeMethodArgument(acb, mb);
 
 		mb.callMethod(VMOpcode.INVOKEINTERFACE, (String) null, "getProjectRestrictResultSet",
-					ClassName.NoPutResultSet, 11);
+					ClassName.NoPutResultSet, 10);
 	}
 
 	/**

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ResultSetNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ResultSetNode.java?view=diff&rev=448286&r1=448285&r2=448286
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ResultSetNode.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ResultSetNode.java Wed
Sep 20 11:24:25 2006
@@ -1041,20 +1041,6 @@
 	}
 
 	/**
-		This utility method is used by result set nodes that can be
-		statement nodes to determine what their final argument is;
-		if they are the statement result set, and there is a current
-		date/time request, then a method will have been generated.
-		Otherwise, a simple null is passed in to the result set method.
-	 */
-	void closeMethodArgument(ExpressionClassBuilder acb,
-									MethodBuilder mb)
-	{
-
-			mb.pushNull(ClassName.GeneratedMethod);
-	}
-
-	/**
 	 * This ResultSet is the source for an Insert.  The target RCL
 	 * is in a different order and/or a superset of this RCL.  In most cases
 	 * we will reorder and/or add defaults to the current RCL so that is
@@ -1519,10 +1505,9 @@
 		mb.push(getCostEstimate().rowCount());
 		mb.push(getCostEstimate().getEstimatedCost());
 		mb.push(false);
-		closeMethodArgument(acb, mb);
 
 		mb.callMethod(VMOpcode.INVOKEINTERFACE, (String) null, "getNormalizeResultSet",
-					ClassName.NoPutResultSet, 7);
+					ClassName.NoPutResultSet, 6);
 	}
 
 	/**

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/RowResultSetNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/RowResultSetNode.java?view=diff&rev=448286&r1=448285&r2=448286
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/RowResultSetNode.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/RowResultSetNode.java
Wed Sep 20 11:24:25 2006
@@ -693,9 +693,8 @@
 		mb.push(resultSetNumber);
 		mb.push(costEstimate.rowCount());
 		mb.push(costEstimate.getEstimatedCost());
-		closeMethodArgument(acb, mb);
-
-		mb.callMethod(VMOpcode.INVOKEINTERFACE, (String) null, "getRowResultSet", ClassName.NoPutResultSet,
7);
+		mb.callMethod(VMOpcode.INVOKEINTERFACE, (String) null, "getRowResultSet",
+                ClassName.NoPutResultSet, 6);
 	}
 
 	/**

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ScrollInsensitiveResultSetNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ScrollInsensitiveResultSetNode.java?view=diff&rev=448286&r1=448285&r2=448286
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ScrollInsensitiveResultSetNode.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ScrollInsensitiveResultSetNode.java
Wed Sep 20 11:24:25 2006
@@ -118,9 +118,8 @@
 
 		mb.push(costEstimate.rowCount());
 		mb.push(costEstimate.getEstimatedCost());
-		closeMethodArgument(acb, mb);
 
 		mb.callMethod(VMOpcode.INVOKEINTERFACE, (String) null, "getScrollInsensitiveResultSet",
-						ClassName.NoPutResultSet, 8);
+						ClassName.NoPutResultSet, 7);
 	}
 }

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/UnionNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/UnionNode.java?view=diff&rev=448286&r1=448285&r2=448286
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/UnionNode.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/UnionNode.java Wed Sep
20 11:24:25 2006
@@ -626,9 +626,9 @@
 		mb.push(resultSetNumber);
 		mb.push(costEstimate.rowCount());
 		mb.push(costEstimate.getEstimatedCost());
-		closeMethodArgument(acb, mb);
 
-		mb.callMethod(VMOpcode.INVOKEINTERFACE, (String) null, "getUnionResultSet", ClassName.NoPutResultSet,
6);
+		mb.callMethod(VMOpcode.INVOKEINTERFACE, (String) null, "getUnionResultSet",
+                ClassName.NoPutResultSet, 5);
 	}
 
 	/**

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=448286&r1=448285&r2=448286
==============================================================================
--- 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
Wed Sep 20 11:24:25 2006
@@ -233,8 +233,7 @@
 		boolean reuseResult,
 		boolean doesProjection,
 		double optimizerEstimatedRowCount,
-		double optimizerEstimatedCost,
-		GeneratedMethod closeCleanup)
+		double optimizerEstimatedCost)
 			throws StandardException
 	{
 		return new ProjectRestrictResultSet(source, source.getActivation(), 
@@ -262,8 +261,7 @@
 		int	initialCapacity,
 		float loadFactor,
 		double optimizerEstimatedRowCount,
-		double optimizerEstimatedCost,
-		GeneratedMethod closeCleanup)
+		double optimizerEstimatedCost)
 			throws StandardException
 	{
 		return new HashTableResultSet(source, source.getActivation(), 
@@ -293,8 +291,7 @@
 		int maxRowSize,
 		int resultSetNumber, 
 		double optimizerEstimatedRowCount,
-		double optimizerEstimatedCost,
-		GeneratedMethod closeCleanup)
+		double optimizerEstimatedCost)
 			throws StandardException
 	{
 		return new SortResultSet(source, 
@@ -322,8 +319,7 @@
 		int resultSetNumber, 
 		boolean singleInputRow,
 		double optimizerEstimatedRowCount,
-		double optimizerEstimatedCost,
-		GeneratedMethod closeCleanup) 
+		double optimizerEstimatedCost) 
 			throws StandardException
 	{
 		return new ScalarAggregateResultSet(
@@ -346,8 +342,7 @@
 		int resultSetNumber, 
 		boolean singleInputRow,
 		double optimizerEstimatedRowCount,
-		double optimizerEstimatedCost,
-		GeneratedMethod closeCleanup) 
+		double optimizerEstimatedCost) 
 			throws StandardException
 	{
 		return new DistinctScalarAggregateResultSet(
@@ -369,8 +364,7 @@
 		int maxRowSize,
 		int resultSetNumber, 
 		double optimizerEstimatedRowCount,
-		double optimizerEstimatedCost,
-		GeneratedMethod closeCleanup) 
+		double optimizerEstimatedCost) 
 			throws StandardException
 	{
 		return new GroupedAggregateResultSet(
@@ -391,8 +385,7 @@
 		int maxRowSize,
 		int resultSetNumber, 
 		double optimizerEstimatedRowCount,
-		double optimizerEstimatedCost,
-		GeneratedMethod closeCleanup) 
+		double optimizerEstimatedCost) 
 			throws StandardException
 	{
 		return new DistinctGroupedAggregateResultSet(
@@ -447,8 +440,7 @@
 									 boolean canCacheRow,
 									 int resultSetNumber,
 									 double optimizerEstimatedRowCount,
-									 double optimizerEstimatedCost,
-								     GeneratedMethod closeCleanup)
+									 double optimizerEstimatedCost)
 	{
 		return new RowResultSet(activation, row, canCacheRow, resultSetNumber, 
 							    optimizerEstimatedRowCount,
@@ -471,8 +463,7 @@
 									 boolean isTarget,
 									 int scanIsolationLevel,
 									 double optimizerEstimatedRowCount,
-									 double optimizerEstimatedCost,
-								     GeneratedMethod closeCleanup)
+									 double optimizerEstimatedCost)
 		throws StandardException
 	{
 		return new VTIResultSet(activation, row, resultSetNumber, 
@@ -521,8 +512,7 @@
 									boolean tableLocked,
 									int isolationLevel,
 									double optimizerEstimatedRowCount,
-									double optimizerEstimatedCost,
-									GeneratedMethod closeCleanup)
+									double optimizerEstimatedCost)
 			throws StandardException
 	{
         StaticCompiledOpenConglomInfo scoci = (StaticCompiledOpenConglomInfo)(activation.getPreparedStatement().
@@ -580,8 +570,7 @@
 									boolean tableLocked,
 									int isolationLevel,
 									double optimizerEstimatedRowCount,
-									double optimizerEstimatedCost,
-									GeneratedMethod closeCleanup)
+									double optimizerEstimatedCost)
 			throws StandardException
 	{
         StaticCompiledOpenConglomInfo scoci = (StaticCompiledOpenConglomInfo)(activation.getPreparedStatement().
@@ -634,8 +623,7 @@
 									int isolationLevel,
 									boolean oneRowScan,
 									double optimizerEstimatedRowCount,
-									double optimizerEstimatedCost,
-									GeneratedMethod closeCleanup)
+									double optimizerEstimatedCost)
 			throws StandardException
 	{
         StaticCompiledOpenConglomInfo scoci = (StaticCompiledOpenConglomInfo)(activation.getPreparedStatement().
@@ -698,8 +686,7 @@
 									int rowsPerRead,
 									boolean oneRowScan,
 									double optimizerEstimatedRowCount,
-									double optimizerEstimatedCost,
-									GeneratedMethod closeCleanup)
+									double optimizerEstimatedCost)
 			throws StandardException
 	{
 		//Prior to Cloudscape 10.0 release, holdability was false by default. Programmers had to
explicitly
@@ -756,8 +743,7 @@
 								GeneratedMethod restriction,
 								boolean forUpdate,
 								double optimizerEstimatedRowCount,
-								double optimizerEstimatedCost,
-								GeneratedMethod closeCleanup)
+								double optimizerEstimatedCost)
 			throws StandardException
 	{
 		return new IndexRowToBaseRowResultSet(
@@ -792,8 +778,7 @@
 								   boolean notExistsRightSide,
 								   double optimizerEstimatedRowCount,
 								   double optimizerEstimatedCost,
-								   String userSuppliedOptimizerOverrides,
-								   GeneratedMethod closeCleanup)
+								   String userSuppliedOptimizerOverrides)
 			throws StandardException
 	{
 		return new NestedLoopJoinResultSet(leftResultSet, leftNumCols,
@@ -822,8 +807,7 @@
 								   boolean notExistsRightSide,
 								   double optimizerEstimatedRowCount,
 								   double optimizerEstimatedCost,
-								   String userSuppliedOptimizerOverrides,
-								   GeneratedMethod closeCleanup)
+								   String userSuppliedOptimizerOverrides)
 			throws StandardException
 	{
 		return new HashJoinResultSet(leftResultSet, leftNumCols,
@@ -854,8 +838,7 @@
 								   boolean notExistsRightSide,
 								   double optimizerEstimatedRowCount,
 								   double optimizerEstimatedCost,
-								   String userSuppliedOptimizerOverrides,
-								   GeneratedMethod closeCleanup)
+								   String userSuppliedOptimizerOverrides)
 			throws StandardException
 	{
 		return new NestedLoopLeftOuterJoinResultSet(leftResultSet, leftNumCols,
@@ -888,8 +871,7 @@
 								   boolean notExistsRightSide,
 								   double optimizerEstimatedRowCount,
 								   double optimizerEstimatedCost,
-								   String userSuppliedOptimizerOverrides,
-								   GeneratedMethod closeCleanup)
+								   String userSuppliedOptimizerOverrides)
 			throws StandardException
 	{
 		return new HashLeftOuterJoinResultSet(leftResultSet, leftNumCols,
@@ -924,8 +906,7 @@
 	public NoPutResultSet getMaterializedResultSet(NoPutResultSet source,
 							int resultSetNumber,
 						    double optimizerEstimatedRowCount,
-							double optimizerEstimatedCost,
-								   GeneratedMethod closeCleanup)
+							double optimizerEstimatedCost)
 		throws StandardException
 	{
 		return new MaterializedResultSet(source, source.getActivation(), 
@@ -943,8 +924,7 @@
 							int sourceRowWidth,
 							boolean scrollable,
 						    double optimizerEstimatedRowCount,
-							double optimizerEstimatedCost,
-								   GeneratedMethod closeCleanup)
+							double optimizerEstimatedCost)
 		throws StandardException
 	{
 		/* ResultSet tree is dependent on whether or not this is
@@ -974,8 +954,7 @@
 							int erdNumber,
 						    double optimizerEstimatedRowCount,
 							double optimizerEstimatedCost,
-							boolean forUpdate,					
-							GeneratedMethod closeCleanup)
+							boolean forUpdate)
 		throws StandardException
 	{
 		return new NormalizeResultSet(source, source.getActivation(), 
@@ -1024,8 +1003,7 @@
 								   NoPutResultSet rightResultSet,
 								   int resultSetNumber,
 								   double optimizerEstimatedRowCount,
-								   double optimizerEstimatedCost,
-								   GeneratedMethod closeCleanup)
+								   double optimizerEstimatedCost)
 			throws StandardException
 	{
 		return new UnionResultSet(leftResultSet, rightResultSet, 
@@ -1043,8 +1021,7 @@
                                              double optimizerEstimatedCost,
                                              int opType,
                                              boolean all,
-                                             GeneratedMethod closeCleanup,
-                                             int intermediateOrderByColumnsSavedObject,
+                                            int intermediateOrderByColumnsSavedObject,
                                              int intermediateOrderByDirectionSavedObject)
         throws StandardException
     {
@@ -1086,7 +1063,6 @@
 	 * @param optimizerEstimatedRowCount	Estimated total # of rows by
 	 * 										optimizer
 	 * @param optimizerEstimatedCost		Estimated total cost by optimizer
-	 * @param closeCleanup		any cleanup the activation needs to do on close.
 	 *
 	 * @return the scan operation as a result set.
  	 *
@@ -1107,8 +1083,7 @@
 		boolean				tableLocked,
 		int					isolationLevel,
 		double				optimizerEstimatedRowCount,
-		double 				optimizerEstimatedCost,
-		GeneratedMethod 	closeCleanup
+		double 				optimizerEstimatedCost
 	) throws StandardException
 	{
 		return new LastIndexKeyResultSet(
@@ -1159,7 +1134,6 @@
 									boolean oneRowScan,
 									double optimizerEstimatedRowCount,
 									double optimizerEstimatedCost,
-									GeneratedMethod closeCleanup,
 									String parentResultSetId,
 									long fkIndexConglomId,
 									int fkColArrayItem,



Mime
View raw message