db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rhille...@apache.org
Subject svn commit: r1485333 [2/3] - in /db/derby/code/trunk/java/engine/org/apache/derby: iapi/jdbc/ iapi/services/io/ iapi/services/loader/ iapi/sql/compile/ iapi/sql/conn/ iapi/sql/dictionary/ iapi/sql/execute/ iapi/transaction/ impl/jdbc/ impl/services/dae...
Date Wed, 22 May 2013 18:51:18 GMT
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DeleteNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DeleteNode.java?rev=1485333&r1=1485332&r2=1485333&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DeleteNode.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DeleteNode.java Wed May 22 18:51:15 2013
@@ -30,6 +30,7 @@ import org.apache.derby.iapi.sql.diction
 import org.apache.derby.iapi.sql.dictionary.GenericDescriptorList;
 import org.apache.derby.iapi.sql.dictionary.ColumnDescriptor;
 import org.apache.derby.iapi.sql.dictionary.ColumnDescriptorList;
+import org.apache.derby.iapi.sql.dictionary.ConglomerateDescriptor;
 import org.apache.derby.iapi.sql.dictionary.TriggerDescriptor;
 
 import org.apache.derby.iapi.sql.StatementType;
@@ -688,7 +689,7 @@ public class DeleteNode extends DMLModSt
 		boolean[]	needsDeferredProcessing = new boolean[1];
 		needsDeferredProcessing[0] = requiresDeferredProcessing();
 
-        ArrayList conglomerates = new ArrayList();
+        ArrayList<ConglomerateDescriptor> conglomerates = new ArrayList<ConglomerateDescriptor>();
 		relevantTriggers = new GenericDescriptorList();
 
         FormatableBitSet columnMap = DeleteNode.getDeleteReadMap(baseTable,
@@ -914,7 +915,7 @@ public class DeleteNode extends DMLModSt
 	private static FormatableBitSet getDeleteReadMap
 	(
 		TableDescriptor				baseTable,
-        List                        conglomerates,
+        List<ConglomerateDescriptor>  conglomerates,
 		GenericDescriptorList		relevantTriggers,
 		boolean[]					needsDeferredProcessing
 	)

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ExtractOperatorNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ExtractOperatorNode.java?rev=1485333&r1=1485332&r2=1485333&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ExtractOperatorNode.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ExtractOperatorNode.java Wed May 22 18:51:15 2013
@@ -81,7 +81,7 @@ public class ExtractOperatorNode extends
 	 */
 
     ValueNode bindExpression(
-        FromList fromList, SubqueryList subqueryList, List aggregates)
+        FromList fromList, SubqueryList subqueryList, List<AggregateNode> aggregates)
 			throws StandardException 
 	{
 		int	operandType;

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?rev=1485333&r1=1485332&r2=1485333&view=diff
==============================================================================
--- 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 May 22 18:51:15 2013
@@ -4284,7 +4284,7 @@ public class FromBaseTable extends FromT
 	 *
 	 * @exception StandardException		Thrown on error
 	 */
-    boolean isOrderedOn(ColumnReference[] crs, boolean permuteOrdering, List fbtHolder)
+    boolean isOrderedOn(ColumnReference[] crs, boolean permuteOrdering, List<FromBaseTable> fbtHolder)
 				throws StandardException
 	{
 		/* The following conditions must be met, regardless of the value of permuteOrdering,
@@ -4365,7 +4365,7 @@ public class FromBaseTable extends FromT
 			return false;
 		}
 
-		HashSet columns = new HashSet();
+		HashSet<ValueNode> columns = new HashSet<ValueNode>();
 		for (int i = 0; i < resultColumns.size(); i++) {
 			ResultColumn rc = (ResultColumn) resultColumns.elementAt(i);
 			columns.add(rc.getExpression());

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/FromList.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/FromList.java?rev=1485333&r1=1485332&r2=1485333&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/FromList.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/FromList.java Wed May 22 18:51:15 2013
@@ -723,7 +723,7 @@ public class FromList extends QueryTreeN
 									throws StandardException
 	{
 		boolean			flattened = true;
-		ArrayList		flattenedTableNumbers = new ArrayList();
+		ArrayList<Integer>		flattenedTableNumbers = new ArrayList<Integer>();
 
 		if (SanityManager.DEBUG)
 		{

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/FromTable.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/FromTable.java?rev=1485333&r1=1485332&r2=1485333&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/FromTable.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/FromTable.java Wed May 22 18:51:15 2013
@@ -98,7 +98,7 @@ abstract class FromTable extends ResultS
 	 idea of what this Optimizable's "best access path" is, so we have to
 	 keep track of them all.
 	*/
-	private HashMap bestPlanMap;
+	private HashMap<Object,AccessPathImpl> bestPlanMap;
 
 	/** Operations that can be performed on bestPlanMap. */
 	protected static final short REMOVE_PLAN = 0;
@@ -530,9 +530,9 @@ abstract class FromTable extends ResultS
 			// If the bestPlanMap already exists, search for an
 			// AccessPath for the received key and use that if we can.
 			if (bestPlanMap == null)
-				bestPlanMap = new HashMap();
+				bestPlanMap = new HashMap<Object,AccessPathImpl>();
 			else
-				ap = (AccessPathImpl)bestPlanMap.get(planKey);
+				ap = bestPlanMap.get(planKey);
 
 			// If we don't already have an AccessPath for the key,
 			// create a new one.  If the key is an OptimizerImpl then
@@ -560,7 +560,7 @@ abstract class FromTable extends ResultS
 		if (bestPlanMap == null)
 			return;
 
-		ap = (AccessPathImpl)bestPlanMap.get(planKey);
+		ap = bestPlanMap.get(planKey);
 
 		// It might be the case that there is no plan stored for
 		// the key, in which case there's nothing to load.

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?rev=1485333&r1=1485332&r2=1485333&view=diff
==============================================================================
--- 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 May 22 18:51:15 2013
@@ -132,10 +132,10 @@ public class FromVTI extends FromTable i
     //         ( select * from table (syscs_diag.space_table( systabs.tablename )) as t2 ) tt
     //     where systabs.tabletype = 'T' and systabs.tableid = tt.tableid;
     //
-    private ArrayList   outerFromLists = new ArrayList();
+    private ArrayList<FromList>   outerFromLists = new ArrayList<FromList>();
     
     // for remapping column references in VTI args at code generation time
-    private HashMap argSources = new HashMap();
+    private HashMap<Integer,FromTable> argSources = new HashMap<Integer,FromTable>();
 
     /**
 	 * @param invocation		The constructor or static method for the VTI
@@ -541,7 +541,7 @@ public class FromVTI extends FromTable i
 		 * Correlated subqueries are not allowed as parameters to
 		 * a VTI, so pass an empty FromList.
 		 */
-        ArrayList aggregates = new ArrayList();
+        ArrayList<AggregateNode> aggregates = new ArrayList<AggregateNode>();
         methodCall.bindExpression(fromListParam, subqueryList, aggregates);
 
 		// Is the parameter list to the constructor valid for a VTI?
@@ -902,7 +902,7 @@ public class FromVTI extends FromTable i
 		 * These CRs will have uninitialized column and table numbers.
 		 */
 		List colRefs = getNodesFromParameters(ColumnReference.class);
-        ArrayList aggregates = null;
+        ArrayList<AggregateNode> aggregates = null;
 		for (Iterator it = colRefs.iterator(); it.hasNext(); )
 		{
 			ColumnReference ref = (ColumnReference) it.next();
@@ -929,7 +929,7 @@ public class FromVTI extends FromTable i
                 //
                 for ( int i = 0; i < outerFromLists.size(); i++ )
                 {
-                    FromTable   fromTable = columnInFromList( (FromList) outerFromLists.get( i ), ref );
+                    FromTable   fromTable = columnInFromList( outerFromLists.get( i ), ref );
 
                     if ( fromTable != null )
                     {
@@ -965,7 +965,7 @@ public class FromVTI extends FromTable i
 				// we need a fake agg list
                 if (aggregates == null)
 				{
-                    aggregates = new ArrayList();
+                    aggregates = new ArrayList<AggregateNode>();
 				}
 				ref.bindExpression(fromListParam,
 									subqueryList,
@@ -1305,9 +1305,9 @@ public class FromVTI extends FromTable i
      * to the actual names of columns in the table function. This is useful
      * because the predicate refers to the exposed column names.
      */
-    private HashMap computeProjection( ) throws StandardException
+    private HashMap<String,String> computeProjection( ) throws StandardException
     {
-        HashMap  nameMap = new HashMap();
+        HashMap<String,String>  nameMap = new HashMap<String,String>();
 
         ResultColumnList allVTIColumns = getResultColumns();
         int              totalColumnCount = allVTIColumns.size();
@@ -1337,7 +1337,7 @@ public class FromVTI extends FromTable i
      * @param parentPredicates The full list of predicates to be applied by the parent ProjectRestrictNode
      * @param columnNameMap Mapping between the exposed column names used in the predicates and the actual column names declared for the table function at CREATE FUNCTION time.
      */
-    private void computeRestriction( PredicateList parentPredicates, HashMap columnNameMap )
+    private void computeRestriction( PredicateList parentPredicates, HashMap<String,String> columnNameMap )
         throws StandardException
     {
         if ( parentPredicates == null )  { return; }
@@ -1613,7 +1613,7 @@ public class FromVTI extends FromTable i
 		for (Iterator it = colRefs.iterator(); it.hasNext(); )
 		{
 			ColumnReference ref = (ColumnReference) it.next();
-            FromTable   fromTable = (FromTable) argSources.get( new Integer( ref.getTableNumber() ) );
+            FromTable   fromTable = argSources.get( new Integer( ref.getTableNumber() ) );
 
             if ( fromTable != null )
             {
@@ -2022,8 +2022,8 @@ public class FromVTI extends FromTable i
         throws StandardException
     {
         Constructor     constructor = null;
-        Class           vtiClass = lookupClass( className );
-        Class           vtiCostingClass = lookupClass( VTICosting.class.getName() );
+        Class<?>           vtiClass = lookupClass( className );
+        Class<?>           vtiCostingClass = lookupClass( VTICosting.class.getName() );
 
         try {
             if ( !vtiCostingClass.isAssignableFrom( vtiClass ) ) { return false; }
@@ -2059,7 +2059,7 @@ public class FromVTI extends FromTable i
         if ( !isDerbyStyleTableFunction ) { return (version2) ? (VTICosting) ps : (VTICosting) rs; }
         
         String              className = methodCall.getJavaClassName();
-        Class               vtiClass = lookupClass( className );
+        Class<?>               vtiClass = lookupClass( className );
         
         try {
             Constructor         constructor = vtiClass.getConstructor( new Class[] {} );

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/GenerationClauseNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/GenerationClauseNode.java?rev=1485333&r1=1485332&r2=1485333&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/GenerationClauseNode.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/GenerationClauseNode.java Wed May 22 18:51:15 2013
@@ -95,7 +95,7 @@ public class GenerationClauseNode extend
 	 * Binding the generation clause.
 	 */
     ValueNode bindExpression
-        ( FromList fromList, SubqueryList subqueryList, List aggregates)
+        ( FromList fromList, SubqueryList subqueryList, List<AggregateNode> aggregates)
         throws StandardException
 	{
         _boundExpression = _generationExpression.bindExpression( fromList, subqueryList, aggregates );

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/GroupByColumn.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/GroupByColumn.java?rev=1485333&r1=1485332&r2=1485333&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/GroupByColumn.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/GroupByColumn.java Wed May 22 18:51:15 2013
@@ -97,7 +97,7 @@ public class GroupByColumn extends Order
     void bindExpression(
 			FromList fromList, 
 			SubqueryList subqueryList,
-            List aggregates)
+            List<AggregateNode> aggregates)
 				throws StandardException
 	{
 		/* Bind the ColumnReference to the FromList */

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/GroupByList.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/GroupByList.java?rev=1485333&r1=1485332&r2=1485333&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/GroupByList.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/GroupByList.java Wed May 22 18:51:15 2013
@@ -101,7 +101,7 @@ public class GroupByList extends Ordered
 	 *
 	 * @exception StandardException		Thrown on error
 	 */
-    void bindGroupByColumns(SelectNode select, List aggregates)
+    void bindGroupByColumns(SelectNode select, List<AggregateNode> aggregates)
 					throws StandardException
 	{
 		FromList		 fromList = select.getFromList();

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?rev=1485333&r1=1485332&r2=1485333&view=diff
==============================================================================
--- 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 May 22 18:51:15 2013
@@ -217,7 +217,7 @@ public class GroupByNode extends SingleC
 				
 			}
 			if (index == glSize) {
-				isInSortedOrder = childResult.isOrderedOn(crs, true, (List)null);
+				isInSortedOrder = childResult.isOrderedOn(crs, true, (List<FromBaseTable>)null);
 			}
 		}
 	}
@@ -351,15 +351,15 @@ public class GroupByNode extends SingleC
 	 *
 	 * @see #addNewColumnsForAggregation
 	 */
-	private ArrayList addUnAggColumns() throws StandardException
+	private ArrayList<SubstituteExpressionVisitor> addUnAggColumns() throws StandardException
 	{
 		ResultColumnList bottomRCL  = childResult.getResultColumns();
 		ResultColumnList groupByRCL = resultColumns;
 
-		ArrayList referencesToSubstitute = new ArrayList();
-		ArrayList havingRefsToSubstitute = null;
+		ArrayList<SubstituteExpressionVisitor> referencesToSubstitute = new ArrayList<SubstituteExpressionVisitor>();
+		ArrayList<SubstituteExpressionVisitor> havingRefsToSubstitute = null;
 		if (havingClause != null)
-			havingRefsToSubstitute = new ArrayList();
+			havingRefsToSubstitute = new ArrayList<SubstituteExpressionVisitor>();
 		int sz = groupingList.size();
 		for (int i = 0; i < sz; i++) 
 		{
@@ -454,11 +454,11 @@ public class GroupByNode extends SingleC
 			}
 			gbc.setColumnPosition(bottomRCL.size());
 		}
-		Comparator sorter = new ExpressionSorter();
+		ExpressionSorter sorter = new ExpressionSorter();
 		Collections.sort(referencesToSubstitute,sorter);
 		for (int r = 0; r < referencesToSubstitute.size(); r++)
 			parent.getResultColumns().accept(
-				(SubstituteExpressionVisitor)referencesToSubstitute.get(r));
+				referencesToSubstitute.get(r));
 		if (havingRefsToSubstitute != null)
 		{
 			Collections.sort(havingRefsToSubstitute,sorter);
@@ -547,7 +547,7 @@ public class GroupByNode extends SingleC
 		throws StandardException
 	{
 		aggInfo = new AggregatorInfoList();
-		ArrayList havingRefsToSubstitute = null;
+		ArrayList<SubstituteExpressionVisitor> havingRefsToSubstitute = null;
 
 		if (groupingList != null)
 		{
@@ -1247,7 +1247,7 @@ public class GroupByNode extends SingleC
 
                         // Holder list for the FromBaseTable. We expect no more
                         // than one table, hence initial capacity is 1.
-                        ArrayList fbtHolder = new ArrayList(1);
+                        ArrayList<FromBaseTable> fbtHolder = new ArrayList<FromBaseTable>(1);
 
                         boolean minMaxOptimizationPossible = isOrderedOn(crs, false, fbtHolder);
 						if (SanityManager.DEBUG)
@@ -1354,13 +1354,13 @@ public class GroupByNode extends SingleC
 	 * we'll process those expressions in the order: a*(a+b),
 	 * a+b+c, a+b, then a.
 	 */
-	private static final class ExpressionSorter implements Comparator
+	private static final class ExpressionSorter implements Comparator<SubstituteExpressionVisitor>
 	{
-		public int compare(Object o1, Object o2)
+		public int compare(SubstituteExpressionVisitor o1, SubstituteExpressionVisitor o2)
 		{
 			try {
-				ValueNode v1 = ((SubstituteExpressionVisitor)o1).getSource();
-				ValueNode v2 = ((SubstituteExpressionVisitor)o2).getSource();
+				ValueNode v1 = o1.getSource();
+				ValueNode v2 = o2.getSource();
 				int refCount1, refCount2;
 				CollectNodesVisitor vis = new CollectNodesVisitor(
 				ColumnReference.class);

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?rev=1485333&r1=1485332&r2=1485333&view=diff
==============================================================================
--- 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 May 22 18:51:15 2013
@@ -135,7 +135,7 @@ public class IndexToBaseRowNode extends 
 	 *
 	 * @exception StandardException		Thrown on error
 	 */
-    boolean isOrderedOn(ColumnReference[] crs, boolean permuteOrdering, List fbtHolder)
+    boolean isOrderedOn(ColumnReference[] crs, boolean permuteOrdering, List<FromBaseTable> fbtHolder)
 				throws StandardException
 	{
         return source.isOrderedOn(crs, permuteOrdering, fbtHolder);

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/IsNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/IsNode.java?rev=1485333&r1=1485332&r2=1485333&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/IsNode.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/IsNode.java Wed May 22 18:51:15 2013
@@ -68,7 +68,7 @@ public class IsNode extends BinaryLogica
 	 */
 
     ValueNode bindExpression(
-        FromList fromList, SubqueryList subqueryList, List aggregates)
+        FromList fromList, SubqueryList subqueryList, List<AggregateNode> aggregates)
 			throws StandardException
 	{
         super.bindExpression(fromList, subqueryList, aggregates);

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/JavaToSQLValueNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/JavaToSQLValueNode.java?rev=1485333&r1=1485332&r2=1485333&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/JavaToSQLValueNode.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/JavaToSQLValueNode.java Wed May 22 18:51:15 2013
@@ -220,7 +220,7 @@ public class JavaToSQLValueNode extends 
 	 *
 	 * @exception StandardException		Thrown on error
 	 */
-    ValueNode bindExpression(FromList fromList, SubqueryList subqueryList, List aggregates)
+    ValueNode bindExpression(FromList fromList, SubqueryList subqueryList, List<AggregateNode> aggregates)
 			throws StandardException
 	{
 		// method invocations are not allowed in ADD TABLE clauses.

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/JavaValueNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/JavaValueNode.java?rev=1485333&r1=1485332&r2=1485333&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/JavaValueNode.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/JavaValueNode.java Wed May 22 18:51:15 2013
@@ -216,7 +216,7 @@ abstract class JavaValueNode extends Que
 	 *
 	 * @exception StandardException		Thrown on error
 	 */
-    abstract JavaValueNode bindExpression(FromList fromList, SubqueryList subqueryList, List aggregates)
+    abstract JavaValueNode bindExpression(FromList fromList, SubqueryList subqueryList, List<AggregateNode> aggregates)
 							throws StandardException;
 	/**
 	 * @see ValueNode#preprocess

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?rev=1485333&r1=1485332&r2=1485333&view=diff
==============================================================================
--- 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 May 22 18:51:15 2013
@@ -87,7 +87,7 @@ public class JoinNode extends TableOpera
 	private PredicateList rightPredicateList;
 
 	protected boolean flattenableJoin = true;
-    List                aggregates;
+    List<AggregateNode>                aggregates;
 	SubqueryList		subqueryList;
 	ValueNode			joinClause;
 	boolean	            joinClauseNormalized;
@@ -806,7 +806,7 @@ public class JoinNode extends TableOpera
 		subqueryList = (SubqueryList) getNodeFactory().getNode(
 											C_NodeTypes.SUBQUERY_LIST,
 											getContextManager());
-        aggregates = new ArrayList();
+        aggregates = new ArrayList<AggregateNode>();
 
         CompilerContext cc = getCompilerContext();
         
@@ -973,7 +973,7 @@ public class JoinNode extends TableOpera
         ResultColumnList rightRCL =
                 getRightResultSet().getAllResultColumns(null);
 
-        List columnNames = extractColumnNames(leftRCL);
+        List<String> columnNames = extractColumnNames(leftRCL);
         columnNames.retainAll(extractColumnNames(rightRCL));
 
         ResultColumnList commonColumns =
@@ -1000,8 +1000,8 @@ public class JoinNode extends TableOpera
      * @param rcl the result column list to extract the names from
      * @return a list of all the column names in the RCL
      */
-    private static List extractColumnNames(ResultColumnList rcl) {
-        ArrayList names = new ArrayList();
+    private static List<String> extractColumnNames(ResultColumnList rcl) {
+        ArrayList<String> names = new ArrayList<String>();
 
         for (int i = 0; i < rcl.size(); i++) {
             ResultColumn rc = (ResultColumn) rcl.elementAt(i);
@@ -1897,7 +1897,7 @@ public class JoinNode extends TableOpera
 	 *
 	 * @exception StandardException		Thrown on error
 	 */
-    boolean isOrderedOn(ColumnReference[] crs, boolean permuteOrdering, List fbtHolder)
+    boolean isOrderedOn(ColumnReference[] crs, boolean permuteOrdering, List<FromBaseTable> fbtHolder)
 				throws StandardException
 	{
 		/* RESOLVE - easiest thing for now is to only consider the leftmost child */
@@ -1948,7 +1948,7 @@ public class JoinNode extends TableOpera
 		this.subqueryList = subqueryList;
 	}
 
-    void setAggregates(List aggregates)
+    void setAggregates(List<AggregateNode> aggregates)
 	{
         this.aggregates = aggregates;
 	}

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/LengthOperatorNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/LengthOperatorNode.java?rev=1485333&r1=1485332&r2=1485333&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/LengthOperatorNode.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/LengthOperatorNode.java Wed May 22 18:51:15 2013
@@ -83,7 +83,7 @@ public final class LengthOperatorNode ex
 	 */
 
     ValueNode bindExpression(
-        FromList fromList, SubqueryList subqueryList, List aggregates)
+        FromList fromList, SubqueryList subqueryList, List<AggregateNode> aggregates)
 			throws StandardException
 	{
 		TypeId	operandType;

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/LikeEscapeOperatorNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/LikeEscapeOperatorNode.java?rev=1485333&r1=1485332&r2=1485333&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/LikeEscapeOperatorNode.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/LikeEscapeOperatorNode.java Wed May 22 18:51:15 2013
@@ -141,7 +141,7 @@ public final class LikeEscapeOperatorNod
      * @exception StandardException thrown on failure
      */
     ValueNode bindExpression(
-    FromList fromList, SubqueryList subqueryList, List aggregates)
+    FromList fromList, SubqueryList subqueryList, List<AggregateNode> aggregates)
         throws StandardException
     {
         super.bindExpression(fromList, subqueryList, aggregates);

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/MethodCallNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/MethodCallNode.java?rev=1485333&r1=1485332&r2=1485333&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/MethodCallNode.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/MethodCallNode.java Wed May 22 18:51:15 2013
@@ -308,7 +308,7 @@ abstract class MethodCallNode extends Ja
 	 * @exception StandardException		Thrown on error
 	 */
 	final void bindParameters(
-        FromList fromList, SubqueryList subqueryList, List aggregates)
+        FromList fromList, SubqueryList subqueryList, List<AggregateNode> aggregates)
 			throws StandardException
 	{
 		/* Bind the parameters */

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/NewInvocationNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/NewInvocationNode.java?rev=1485333&r1=1485332&r2=1485333&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/NewInvocationNode.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/NewInvocationNode.java Wed May 22 18:51:15 2013
@@ -219,7 +219,7 @@ public class NewInvocationNode extends M
 	 * @exception StandardException		Thrown on error
 	 */
     JavaValueNode bindExpression(
-        FromList fromList, SubqueryList subqueryList, List aggregates)
+        FromList fromList, SubqueryList subqueryList, List<AggregateNode> aggregates)
 			throws StandardException
 	{
         bindParameters(fromList, subqueryList, aggregates);

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/NonStaticMethodCallNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/NonStaticMethodCallNode.java?rev=1485333&r1=1485332&r2=1485333&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/NonStaticMethodCallNode.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/NonStaticMethodCallNode.java Wed May 22 18:51:15 2013
@@ -111,7 +111,7 @@ public class NonStaticMethodCallNode ext
 	 * @exception StandardException		Thrown on error
 	 */
     JavaValueNode bindExpression(
-        FromList fromList, SubqueryList subqueryList, List aggregates)
+        FromList fromList, SubqueryList subqueryList, List<AggregateNode> aggregates)
 			throws StandardException
 	{
 		/* NULL and ? not allowed as receivers */

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/OptimizerImpl.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/OptimizerImpl.java?rev=1485333&r1=1485332&r2=1485333&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/OptimizerImpl.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/OptimizerImpl.java Wed May 22 18:51:15 2013
@@ -152,7 +152,7 @@ public class OptimizerImpl implements Op
 	// of Optimizer.  Each outer query could potentially have a different
 	// idea of what this OptimizerImpl's "best join order" is, so we have
 	// to keep track of them all.
-	private HashMap savedJoinOrders;
+	private HashMap<Object,int[]> savedJoinOrders;
 
 	// Value used to figure out when/if we've timed out for this
 	// Optimizable.
@@ -2639,9 +2639,9 @@ public class OptimizerImpl implements Op
 				// If the savedJoinOrder map already exists, search for the
 				// join order for the target optimizer and reuse that.
 				if (savedJoinOrders == null)
-					savedJoinOrders = new HashMap();
+					savedJoinOrders = new HashMap<Object,int[]>();
 				else
-					joinOrder = (int[])savedJoinOrders.get(planKey);
+					joinOrder = savedJoinOrders.get(planKey);
 
 				// If we don't already have a join order array for the optimizer,
 				// create a new one.
@@ -2664,7 +2664,7 @@ public class OptimizerImpl implements Op
 				// for which there was no valid plan.
 				if (savedJoinOrders != null)
 				{
-					joinOrder = (int[])savedJoinOrders.get(planKey);
+					joinOrder = savedJoinOrders.get(planKey);
 					if (joinOrder != null)
 					{
 						// Load the join order we found into our

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/OrNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/OrNode.java?rev=1485333&r1=1485332&r2=1485333&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/OrNode.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/OrNode.java Wed May 22 18:51:15 2013
@@ -72,7 +72,7 @@ public class OrNode extends BinaryLogica
 	 */
 
     ValueNode bindExpression(
-        FromList fromList, SubqueryList subqueryList, List aggregates)
+        FromList fromList, SubqueryList subqueryList, List<AggregateNode> aggregates)
 			throws StandardException
 	{
         super.bindExpression(fromList, subqueryList, aggregates);

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/OrderedColumnList.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/OrderedColumnList.java?rev=1485333&r1=1485332&r2=1485333&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/OrderedColumnList.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/OrderedColumnList.java Wed May 22 18:51:15 2013
@@ -51,7 +51,7 @@ public abstract class OrderedColumnList 
 			We don't know how many columns are in the source,
 			so we use a hashtable for lookup of the positions
 		*/
-        HashSet hashColumns = new HashSet();
+        HashSet<Integer> hashColumns = new HashSet<Integer>();
 
 		actualCols = 0;
 

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/Predicate.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/Predicate.java?rev=1485333&r1=1485332&r2=1485333&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/Predicate.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/Predicate.java Wed May 22 18:51:15 2013
@@ -68,7 +68,7 @@ public final class Predicate extends Que
 	/* Hashtable used for tracking the search clause types that have been
 	 * pushed through this predicate (if an equijoin) via transitive closure.
 	 */
-    private Set searchClauses;
+    private Set<Integer> searchClauses;
 
 	// Whether or not this predicate has been scoped; see the
 	// getPredScopedForResultSet() method of this class for more.
@@ -571,7 +571,7 @@ public final class Predicate extends Que
 	void setTransitiveSearchClauseAdded(RelationalOperator ro)
 	{
         if (searchClauses == null) {
-            searchClauses = new HashSet();
+            searchClauses = new HashSet<Integer>();
         }
 		/* I have to remember that this ro has been added to this predicate as a
 		 * transitive search clause.

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/PredicateList.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/PredicateList.java?rev=1485333&r1=1485332&r2=1485333&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/PredicateList.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/PredicateList.java Wed May 22 18:51:15 2013
@@ -1966,7 +1966,7 @@ public class PredicateList extends Query
 			/* Put all of the join clauses that already have an equivalence 
              * class at the head of the outer list to optimize search.
 			 */
-			ArrayList movePreds = new ArrayList();
+			ArrayList<Predicate> movePreds = new ArrayList<Predicate>();
 			for (int jcIndex = outerJCL.size() - 1; jcIndex >= 0; jcIndex--)
 			{
 				Predicate predicate = (Predicate) outerJCL.elementAt(jcIndex);
@@ -3209,7 +3209,7 @@ public class PredicateList extends Query
                 // of Or's in order to first generate the allocateQualArray()
                 // call, then we walk the list assigning each of the OR's to
                 // entries in the array in generateSingleQualifierCode().
-                ArrayList a_list = new ArrayList();
+                ArrayList<RelationalOperator> a_list = new ArrayList<RelationalOperator>();
 
                 QueryTreeNode node = pred.getAndNode().getLeftOperand();
 
@@ -3221,7 +3221,7 @@ public class PredicateList extends Query
                     // (ie. A = 1)
                     if (or_node.getLeftOperand() instanceof RelationalOperator)
                     {
-                        a_list.add(or_node.getLeftOperand());
+                        a_list.add( (RelationalOperator) or_node.getLeftOperand());
                     }
 
                     // The next OR node in the list if linked to the right.
@@ -3249,7 +3249,7 @@ public class PredicateList extends Query
                             optTable,
                             absolute,
                             acb,
-                            (RelationalOperator) a_list.get(i),
+                            a_list.get(i),
                             qualField,
                             and_idx,
                             i);
@@ -3892,7 +3892,7 @@ public class PredicateList extends Query
 		 *--------------------------------------------------------------------*/
 		double selectivity = 1.0;
 
-		ArrayList maxPreds = new ArrayList();
+		ArrayList<Predicate> maxPreds = new ArrayList<Predicate>();
 
 		while (true)
 		{
@@ -3966,7 +3966,7 @@ public class PredicateList extends Query
 	 * choose the statistic which has the maximum match with the predicates.
 	 * value is returned in ret.
 	 */
-	private int chooseLongestMatch(PredicateWrapperList[] predArray, List ret,
+	private int chooseLongestMatch(PredicateWrapperList[] predArray, List<Predicate> ret,
 								   int numWorkingPredicates)
 	{
 		int max = 0, maxWeight = 0;
@@ -4118,14 +4118,14 @@ public class PredicateList extends Query
 	 */
 	private class PredicateWrapperList
 	{
-		private final ArrayList pwList;
+		private final ArrayList<PredicateWrapper> pwList;
 		int numPreds;
 		int numDuplicates;
 		int weight;
 
 		PredicateWrapperList(int maxValue)
 		{
-			pwList = new ArrayList(maxValue);
+			pwList = new ArrayList<PredicateWrapper>(maxValue);
 		}
 		
 		void removeElement(Predicate p)
@@ -4152,7 +4152,7 @@ public class PredicateList extends Query
 
 		PredicateWrapper elementAt(int i)
 		{
-			return (PredicateWrapper)pwList.get(i);
+			return pwList.get(i);
 		}
 
 		void insert(PredicateWrapper pw)
@@ -4232,7 +4232,7 @@ public class PredicateList extends Query
 		 * I need to extract out 0 1 2 3.
 		 * leaving 0 2 3 in there.
 		 */
-		private List createLeadingUnique()
+		private List<PredicateWrapper> createLeadingUnique()
 		{
 			if (numPreds == 0)
 				return null;
@@ -4242,7 +4242,7 @@ public class PredicateList extends Query
 			if (lastIndexPosition != 0)
 				return null;
 
-            ArrayList scratch = new ArrayList();
+            ArrayList<PredicateWrapper> scratch = new ArrayList<PredicateWrapper>();
 			scratch.add(elementAt(0));	// always add 0.
 
 			for (int i = 1; i < numPreds; i++)

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?rev=1485333&r1=1485332&r2=1485333&view=diff
==============================================================================
--- 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 May 22 18:51:15 2013
@@ -1811,7 +1811,7 @@ public class ProjectRestrictNode extends
 			return false;
 		}
 
-		HashSet columns = new HashSet();
+		HashSet<BaseColumnNode> columns = new HashSet<BaseColumnNode>();
 		for (int i = 0; i < resultColumns.size(); i++) {
 			ResultColumn rc = (ResultColumn) resultColumns.elementAt(i);
 			BaseColumnNode bc = rc.getBaseColumnNode();

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/QueryTreeNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/QueryTreeNode.java?rev=1485333&r1=1485332&r2=1485333&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/QueryTreeNode.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/QueryTreeNode.java Wed May 22 18:51:15 2013
@@ -376,7 +376,7 @@ public abstract class QueryTreeNode impl
 	{
 		if (SanityManager.DEBUG)
 		{
-			Map printed =
+			Map<Object,Object> printed =
 				getLanguageConnectionContext().getPrintedObjectsMap();
 
 			if (printed.containsKey(this)) {

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/QueryTreeNodeVector.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/QueryTreeNodeVector.java?rev=1485333&r1=1485332&r2=1485333&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/QueryTreeNodeVector.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/QueryTreeNodeVector.java Wed May 22 18:51:15 2013
@@ -35,7 +35,7 @@ import org.apache.derby.iapi.error.Stand
 
 abstract class QueryTreeNodeVector extends QueryTreeNode
 {
-	private final ArrayList v = new ArrayList();
+	private final ArrayList<QueryTreeNode> v = new ArrayList<QueryTreeNode>();
 
 	public final int size()
 	{

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ResultColumn.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ResultColumn.java?rev=1485333&r1=1485332&r2=1485333&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ResultColumn.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ResultColumn.java Wed May 22 18:51:15 2013
@@ -702,7 +702,7 @@ public class ResultColumn extends ValueN
 	 * @exception StandardException		Thrown on error
 	 */
 
-    ValueNode bindExpression(FromList fromList, SubqueryList subqueryList, List aggregates)
+    ValueNode bindExpression(FromList fromList, SubqueryList subqueryList, List<AggregateNode> aggregates)
 				throws StandardException
 	{
 		/*

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ResultColumnList.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ResultColumnList.java?rev=1485333&r1=1485332&r2=1485333&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ResultColumnList.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ResultColumnList.java Wed May 22 18:51:15 2013
@@ -817,7 +817,7 @@ public class ResultColumnList extends Qu
 	 * @exception StandardException		Thrown on error
 	 */
     void bindExpressions(
-            FromList fromList, SubqueryList subqueryList, List aggregates)
+            FromList fromList, SubqueryList subqueryList, List<AggregateNode> aggregates)
 				throws StandardException
 	{
 		/* First we expand the *'s in the result column list */
@@ -951,7 +951,7 @@ public class ResultColumnList extends Qu
 					throws StandardException
 	{
 		int			size = size();
-        HashSet     seenNames = new HashSet(size + 2, 0.999f);
+        HashSet<String>     seenNames = new HashSet<String>(size + 2, 0.999f);
 
 		for (int index = 0; index < size; index++)
 		{
@@ -2096,7 +2096,7 @@ public class ResultColumnList extends Qu
 					throws StandardException
 	{
 		int size = size();
-        HashSet seenNames = new HashSet(size + 2, 0.999f);
+        HashSet<String> seenNames = new HashSet<String>(size + 2, 0.999f);
 		ResultColumn rc;
 
 		for (int index = 0; index < size; index++)
@@ -3626,7 +3626,7 @@ public class ResultColumnList extends Qu
 		ResultColumn	resultColumn;
 
         // key: virtual column number, value: index
-        Map seenMap = new HashMap();
+        Map<Integer,Integer> seenMap = new HashMap<Integer,Integer>();
 
 		int size = size();
 
@@ -4388,7 +4388,7 @@ public class ResultColumnList extends Qu
 
     private static void updateArrays(int[] mapArray,
                              boolean[] cloneMap,
-                             Map seenMap,
+                             Map<Integer,Integer> seenMap,
                              ResultColumn rc,
                              int index) {
 

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?rev=1485333&r1=1485332&r2=1485333&view=diff
==============================================================================
--- 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 May 22 18:51:15 2013
@@ -1030,7 +1030,7 @@ public abstract class ResultSetNode exte
                         String defaultText = defaultInfo.getDefaultText();
                         ValueNode defaultTree = parseDefault(defaultText);
                         defaultTree = defaultTree.bindExpression
-                            (getFromList(), (SubqueryList) null, (List) null);
+                            (getFromList(), (SubqueryList) null, (List<AggregateNode>) null);
                         newResultColumn = (ResultColumn) getNodeFactory().getNode
                             ( C_NodeTypes.RESULT_COLUMN, defaultTree.getTypeServices(), defaultTree, getContextManager());
                     }
@@ -1742,7 +1742,7 @@ public abstract class ResultSetNode exte
 	 *
 	 * @exception StandardException		Thrown on error
 	 */
-    boolean isOrderedOn(ColumnReference[] crs, boolean permuteOrdering, List fbtHolder)
+    boolean isOrderedOn(ColumnReference[] crs, boolean permuteOrdering, List<FromBaseTable> fbtHolder)
 				throws StandardException
 	{
 		return false;

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/RowNumberFunctionNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/RowNumberFunctionNode.java?rev=1485333&r1=1485332&r2=1485333&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/RowNumberFunctionNode.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/RowNumberFunctionNode.java Wed May 22 18:51:15 2013
@@ -56,7 +56,7 @@ public final class RowNumberFunctionNode
      * @see ValueNode#bindExpression
      */
     ValueNode bindExpression(
-                    FromList fromList, SubqueryList subqueryList, List aggregates)
+                    FromList fromList, SubqueryList subqueryList, List<AggregateNode> aggregates)
             throws StandardException
     {
         super.bindExpression(fromList, subqueryList, aggregates);

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/RowOrderingImpl.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/RowOrderingImpl.java?rev=1485333&r1=1485332&r2=1485333&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/RowOrderingImpl.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/RowOrderingImpl.java Wed May 22 18:51:15 2013
@@ -34,7 +34,7 @@ import org.apache.derby.iapi.error.Stand
 class RowOrderingImpl implements RowOrdering {
 
     /** List of ColumnOrderings. */
-	private final ArrayList ordering = new ArrayList();
+	private final ArrayList<ColumnOrdering> ordering = new ArrayList<ColumnOrdering>();
 
 	/*
 	** This ColumnOrdering represents the columns that can be considered
@@ -50,12 +50,12 @@ class RowOrderingImpl implements RowOrde
      * List of table numbers for tables that are always ordered.
      * This happens for one-row tables.
      */
-    private final ArrayList alwaysOrderedOptimizables = new ArrayList();
+    private final ArrayList<Optimizable> alwaysOrderedOptimizables = new ArrayList<Optimizable>();
 
 	ColumnOrdering	currentColumnOrdering;
 
     /** List of unordered Optimizables. */
-    private final ArrayList unorderedOptimizables = new ArrayList();
+    private final ArrayList<Optimizable> unorderedOptimizables = new ArrayList<Optimizable>();
 
 	RowOrderingImpl() {
 		columnsAlwaysOrdered = new ColumnOrdering(RowOrdering.DONTCARE);
@@ -174,7 +174,7 @@ class RowOrderingImpl implements RowOrde
 		else
 		{
 			currentColumnOrdering =
-				(ColumnOrdering) ordering.get(ordering.size() - 1);
+				ordering.get(ordering.size() - 1);
 		}
 
 		if (SanityManager.DEBUG)
@@ -256,9 +256,9 @@ class RowOrderingImpl implements RowOrde
 	/** @see RowOrdering#alwaysOrdered */
 	public boolean alwaysOrdered(int tableNumber)
 	{
-        Iterator it = alwaysOrderedOptimizables.iterator();
+        Iterator<Optimizable> it = alwaysOrderedOptimizables.iterator();
         while (it.hasNext()) {
-            Optimizable optTable = (Optimizable) it.next();
+            Optimizable optTable = it.next();
 
             if (optTable.hasTableNumber()) {
                 if (optTable.getTableNumber() == tableNumber) {
@@ -353,7 +353,7 @@ class RowOrderingImpl implements RowOrde
 		}
 
 		for (int i = 0; i < ordering.size(); i++) {
-			ColumnOrdering co = (ColumnOrdering) ordering.get(i);
+			ColumnOrdering co = ordering.get(i);
 
 			dest.ordering.add(co.cloneMe());
 
@@ -397,7 +397,7 @@ class RowOrderingImpl implements RowOrde
 
 			for (i = 0; i < alwaysOrderedOptimizables.size(); i++) 
 			{
-				Optimizable opt = (Optimizable) alwaysOrderedOptimizables.get(i);
+				Optimizable opt = alwaysOrderedOptimizables.get(i);
 				if (opt.getBaseTableName() != null)
 				{
 					retval += opt.getBaseTableName();
@@ -427,7 +427,7 @@ class RowOrderingImpl implements RowOrde
 		for (int i = 0; i < unorderedOptimizables.size(); i++)
 		{
 			Optimizable thisOpt =
-				(Optimizable) unorderedOptimizables.get(i);
+				unorderedOptimizables.get(i);
 
 			if (thisOpt != optimizable)
 				return true;

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?rev=1485333&r1=1485332&r2=1485333&view=diff
==============================================================================
--- 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 May 22 18:51:15 2013
@@ -60,7 +60,7 @@ import org.apache.derby.iapi.services.cl
 public class RowResultSetNode extends FromTable
 {
 	SubqueryList subquerys;
-    private List aggregates;
+    private List<AggregateNode> aggregates;
 	OrderByList	 orderByList;
     ValueNode    offset; // OFFSET n ROWS
     ValueNode    fetchFirst; // FETCH FIRST n ROWS ONLY
@@ -231,7 +231,7 @@ public class RowResultSetNode extends Fr
 										C_NodeTypes.SUBQUERY_LIST,
 										getContextManager());
 
-        aggregates = new ArrayList();
+        aggregates = new ArrayList<AggregateNode>();
 
 		/* Verify that there are no DEFAULTs in the RCL.
 		 * DEFAULT is only valid for an insert, and it has

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SQLToJavaValueNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SQLToJavaValueNode.java?rev=1485333&r1=1485332&r2=1485333&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SQLToJavaValueNode.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SQLToJavaValueNode.java Wed May 22 18:51:15 2013
@@ -185,7 +185,7 @@ public class SQLToJavaValueNode extends 
 	 * @exception StandardException		Thrown on error
 	 */
     JavaValueNode bindExpression(
-        FromList fromList, SubqueryList subqueryList, List aggregates)
+        FromList fromList, SubqueryList subqueryList, List<AggregateNode> aggregates)
 			throws StandardException
 	{
 		/* Bind the expression under us */

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SelectNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SelectNode.java?rev=1485333&r1=1485332&r2=1485333&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SelectNode.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SelectNode.java Wed May 22 18:51:15 2013
@@ -69,11 +69,11 @@ public class SelectNode extends ResultSe
 	FromTable targetTable;
 
     /** Aggregates in the SELECT list. */
-    private List selectAggregates;
+    private List<AggregateNode> selectAggregates;
     /** Aggregates in the WHERE clause. */
-    private List whereAggregates;
+    private List<AggregateNode> whereAggregates;
     /** Aggregates in the HAVING clause. */
-    private List havingAggregates;
+    private List<AggregateNode> havingAggregates;
 
 	/**
 	 * The ValueNode for the WHERE clause must represent a boolean
@@ -97,7 +97,7 @@ public class SelectNode extends ResultSe
 	/**
 	 * List of window function calls (e.g. ROW_NUMBER, AVG(i), DENSE_RANK).
 	 */
-	List windowFuncCalls;
+	List<WindowFunctionNode> windowFuncCalls;
 
 	/** User specified a group by without aggregates and we turned 
 	 * it into a select distinct 
@@ -188,15 +188,15 @@ public class SelectNode extends ResultSe
             // any inside nested SELECTs) used in result columns, and
             // check them for any <in-line window specification>s.
 
-			CollectNodesVisitor cnvw =
-                new CollectNodesVisitor(WindowFunctionNode.class,
+			CollectNodesVisitor<WindowFunctionNode> cnvw =
+                new CollectNodesVisitor<WindowFunctionNode>(WindowFunctionNode.class,
                                         SelectNode.class);
 			resultColumns.accept(cnvw);
 			windowFuncCalls = cnvw.getList();
 
 			for (int i=0; i < windowFuncCalls.size(); i++) {
 				WindowFunctionNode wfn =
-					(WindowFunctionNode) windowFuncCalls.get(i);
+					windowFuncCalls.get(i);
 
 				// Some window function, e.g. ROW_NUMBER() contains an inline
 				// window specification, so we add it to our list of window
@@ -556,7 +556,7 @@ public class SelectNode extends ResultSe
 		selectSubquerys = (SubqueryList) getNodeFactory().getNode(
 											C_NodeTypes.SUBQUERY_LIST,
 											getContextManager());
-		selectAggregates = new ArrayList();
+		selectAggregates = new ArrayList<AggregateNode>();
 
 		/* Splice our FromList on to the beginning of fromListParam, before binding
 		 * the expressions, for correlated column resolution.
@@ -594,7 +594,7 @@ public class SelectNode extends ResultSe
 			return;
 		}
 
-		whereAggregates = new ArrayList();
+		whereAggregates = new ArrayList<AggregateNode>();
 		whereSubquerys = (SubqueryList) getNodeFactory().getNode(
 												C_NodeTypes.SUBQUERY_LIST,
 												getContextManager());
@@ -640,7 +640,7 @@ public class SelectNode extends ResultSe
         {
             int previousReliability = orReliability( CompilerContext.HAVING_CLAUSE_RESTRICTION );
 
-			havingAggregates = new ArrayList();
+			havingAggregates = new ArrayList<AggregateNode>();
 			havingSubquerys = (SubqueryList) getNodeFactory().getNode(
 					C_NodeTypes.SUBQUERY_LIST,
 					getContextManager());
@@ -672,7 +672,7 @@ public class SelectNode extends ResultSe
 		{
             // We expect zero aggregates, so initialize the holder array
             // with zero capacity.
-            ArrayList groupByAggregates = new ArrayList(0);
+            ArrayList<AggregateNode> groupByAggregates = new ArrayList<AggregateNode>(0);
 
             groupByList.bindGroupByColumns(this, groupByAggregates);
 
@@ -1545,7 +1545,7 @@ public class SelectNode extends ResultSe
 		if (((selectAggregates != null) && (selectAggregates.size() > 0)) 
 			|| (groupByList != null))
 		{
-			List aggs = selectAggregates;
+			List<AggregateNode> aggs = selectAggregates;
 			if (havingAggregates != null && !havingAggregates.isEmpty()) {
 				havingAggregates.addAll(selectAggregates);
 				aggs = havingAggregates;
@@ -1632,7 +1632,7 @@ public class SelectNode extends ResultSe
 			if (origFromListSize == 1 && !orderByAndDistinctMerged)
 			{
 				boolean simpleColumns = true;
-				HashSet distinctColumns = new HashSet();
+				HashSet<BaseColumnNode> distinctColumns = new HashSet<BaseColumnNode>();
 				int size = resultColumns.size();
 				for (int i = 1; i <= size; i++) {
 					BaseColumnNode bc = resultColumns.getResultColumn(i).getBaseColumnNode();
@@ -1864,7 +1864,7 @@ public class SelectNode extends ResultSe
 			}
 		}
 
-		return newTopRSN.isOrderedOn(crs, permuteOrdering, (List) null);
+		return newTopRSN.isOrderedOn(crs, permuteOrdering, (List<FromBaseTable> ) null);
 	}
 
 	/**

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SetOperatorNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SetOperatorNode.java?rev=1485333&r1=1485332&r2=1485333&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SetOperatorNode.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SetOperatorNode.java Wed May 22 18:51:15 2013
@@ -79,8 +79,8 @@ abstract class SetOperatorNode extends T
 
 	// Mapping of original predicates to scoped predicates, used to
 	// avoid re-scoping predicates unnecessarily.
-	private HashMap leftScopedPreds;
-	private HashMap rightScopedPreds;
+	private HashMap<Predicate,Predicate> leftScopedPreds;
+	private HashMap<Predicate,Predicate> rightScopedPreds;
 
 	/**
 	 * Initializer for a SetOperatorNode.
@@ -396,9 +396,9 @@ abstract class SetOperatorNode extends T
 		// and if so just use that.
 		Predicate scopedPred = null;
 		if (leftScopedPreds == null)
-			leftScopedPreds = new HashMap();
+			leftScopedPreds = new HashMap<Predicate,Predicate>();
 		else
-			scopedPred = (Predicate)leftScopedPreds.get(pred);
+			scopedPred = leftScopedPreds.get(pred);
 		if (scopedPred == null)
 		{
 			scopedPred = pred.getPredScopedForResultSet(
@@ -411,9 +411,9 @@ abstract class SetOperatorNode extends T
 
 		scopedPred = null;
 		if (rightScopedPreds == null)
-			rightScopedPreds = new HashMap();
+			rightScopedPreds = new HashMap<Predicate,Predicate>();
 		else
-			scopedPred = (Predicate)rightScopedPreds.get(pred);
+			scopedPred = rightScopedPreds.get(pred);
 		if (scopedPred == null)
 		{
 			scopedPred = pred.getPredScopedForResultSet(

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SimpleStringOperatorNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SimpleStringOperatorNode.java?rev=1485333&r1=1485332&r2=1485333&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SimpleStringOperatorNode.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SimpleStringOperatorNode.java Wed May 22 18:51:15 2013
@@ -69,7 +69,7 @@ public class SimpleStringOperatorNode ex
 	 */
 
     ValueNode bindExpression(
-        FromList fromList, SubqueryList subqueryList, List aggregates)
+        FromList fromList, SubqueryList subqueryList, List<AggregateNode> aggregates)
 			throws StandardException
 	{
 		TypeId	operandType;

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SingleChildResultSetNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SingleChildResultSetNode.java?rev=1485333&r1=1485332&r2=1485333&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SingleChildResultSetNode.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SingleChildResultSetNode.java Wed May 22 18:51:15 2013
@@ -499,7 +499,7 @@ abstract class SingleChildResultSetNode 
 	 *
 	 * @exception StandardException		Thrown on error
 	 */
-    boolean isOrderedOn(ColumnReference[] crs, boolean permuteOrdering, List fbtHolder)
+    boolean isOrderedOn(ColumnReference[] crs, boolean permuteOrdering, List<FromBaseTable> fbtHolder)
 				throws StandardException
 	{
         return childResult.isOrderedOn(crs, permuteOrdering, fbtHolder);

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/StaticMethodCallNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/StaticMethodCallNode.java?rev=1485333&r1=1485332&r2=1485333&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/StaticMethodCallNode.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/StaticMethodCallNode.java Wed May 22 18:51:15 2013
@@ -176,7 +176,7 @@ public class StaticMethodCallNode extend
 	 * @exception StandardException		Thrown on error
 	 */
     JavaValueNode bindExpression(
-        FromList fromList, SubqueryList subqueryList, List aggregates)
+        FromList fromList, SubqueryList subqueryList, List<AggregateNode> aggregates)
 			throws StandardException
 	{
 		// for a function we can get called recursively
@@ -494,7 +494,7 @@ public class StaticMethodCallNode extend
 	 * be required.
 	 */
     private void resolveRoutine(FromList fromList, SubqueryList subqueryList,
-                                List aggregates, SchemaDescriptor sd)
+                                List<AggregateNode> aggregates, SchemaDescriptor sd)
             throws StandardException {
 		if (sd.getUUID() != null) {
 
@@ -672,7 +672,7 @@ public class StaticMethodCallNode extend
         (
          FromList fromList,
          SubqueryList subqueryList,
-         List aggregates,
+         List<AggregateNode> aggregates,
          RoutineAliasInfo rai,
          int    parameterCount, // number of declared routine args
          DataTypeDescriptor paramdtd,   // declared type of routine arg

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SubqueryNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SubqueryNode.java?rev=1485333&r1=1485332&r2=1485333&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SubqueryNode.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SubqueryNode.java Wed May 22 18:51:15 2013
@@ -449,7 +449,7 @@ public class SubqueryNode extends ValueN
 	 *
 	 * @exception StandardException		Thrown on error
 	 */
-    ValueNode bindExpression(FromList fromList, SubqueryList subqueryList, List aggregates)
+    ValueNode bindExpression(FromList fromList, SubqueryList subqueryList, List<AggregateNode> aggregates)
 				throws StandardException
 	{
 		ResultColumnList	resultColumns;

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/TableElementList.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/TableElementList.java?rev=1485333&r1=1485332&r2=1485333&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/TableElementList.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/TableElementList.java Wed May 22 18:51:15 2013
@@ -168,10 +168,10 @@ public class TableElementList extends Qu
 		int numAutoCols = 0;
 
 		int			size = size();
-        HashSet columnNames = new HashSet(size + 2, 0.999f);
-        HashSet constraintNames = new HashSet(size + 2, 0.999f);
+        HashSet<String> columnNames = new HashSet<String>(size + 2, 0.999f);
+        HashSet<String> constraintNames = new HashSet<String>(size + 2, 0.999f);
 		//all the primary key/unique key constraints for this table
-        ArrayList constraints = new ArrayList();
+        ArrayList<Object> constraints = new ArrayList<Object>();
 
 		//special case for alter table (td is not null in case of alter table)
 		if (td != null)
@@ -610,7 +610,7 @@ public class TableElementList extends Qu
 
 		cc = getCompilerContext();
 
-        ArrayList aggregates = new ArrayList();
+        ArrayList<AggregateNode> aggregates = new ArrayList<AggregateNode>();
 
 		for (int index = 0; index < size; index++)
 		{
@@ -738,7 +738,7 @@ public class TableElementList extends Qu
         
 		cc = getCompilerContext();
 
-        ArrayList aggregates = new ArrayList();
+        ArrayList<AggregateNode> aggregates = new ArrayList<AggregateNode>();
 
 		for (int index = 0; index < size; index++)
 		{
@@ -887,8 +887,8 @@ public class TableElementList extends Qu
 	void findIllegalGenerationReferences( FromList fromList, TableDescriptor baseTable )
 		throws StandardException
 	{
-        ArrayList   generatedColumns = new ArrayList();
-        HashSet     names = new HashSet();
+        ArrayList<ColumnDefinitionNode>   generatedColumns = new ArrayList<ColumnDefinitionNode>();
+        HashSet<String>     names = new HashSet<String>();
 		int         size = size();
 
         // add in existing generated columns if this is an ALTER TABLE statement
@@ -1371,7 +1371,7 @@ public class TableElementList extends Qu
 	 * @exception StandardException		Thrown on error
 	 */
 	private void checkForDuplicateColumns(DDLStatementNode ddlStmt,
-									Set seenNames,
+									Set<String> seenNames,
 									String colName)
 			throws StandardException
 	{
@@ -1399,7 +1399,7 @@ public class TableElementList extends Qu
 	 * @exception StandardException		Thrown on error
 	 */
 	private void checkForDuplicateConstraintNames(DDLStatementNode ddlStmt,
-									Set seenNames,
+									Set<String> seenNames,
 									String constraintName)
 			throws StandardException
 	{

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/TernaryOperatorNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/TernaryOperatorNode.java?rev=1485333&r1=1485332&r2=1485333&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/TernaryOperatorNode.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/TernaryOperatorNode.java Wed May 22 18:51:15 2013
@@ -193,7 +193,7 @@ public class TernaryOperatorNode extends
 	 * @exception StandardException		Thrown on error
 	 */
 
-    ValueNode bindExpression(FromList fromList, SubqueryList subqueryList, List aggregates)
+    ValueNode bindExpression(FromList fromList, SubqueryList subqueryList, List<AggregateNode> aggregates)
 			throws StandardException
 	{
 		receiver = receiver.bindExpression(fromList, subqueryList, 

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/TestConstraintNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/TestConstraintNode.java?rev=1485333&r1=1485332&r2=1485333&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/TestConstraintNode.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/TestConstraintNode.java Wed May 22 18:51:15 2013
@@ -83,7 +83,7 @@ public class TestConstraintNode extends 
 	 */
 
     ValueNode bindExpression(
-        FromList fromList, SubqueryList subqueryList, List aggregates)
+        FromList fromList, SubqueryList subqueryList, List<AggregateNode> aggregates)
 			throws StandardException
 	{
         bindOperand(fromList, subqueryList, aggregates);

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/TimestampOperatorNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/TimestampOperatorNode.java?rev=1485333&r1=1485332&r2=1485333&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/TimestampOperatorNode.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/TimestampOperatorNode.java Wed May 22 18:51:15 2013
@@ -75,7 +75,7 @@ public class TimestampOperatorNode exten
 	 */
 
     ValueNode bindExpression(
-        FromList fromList, SubqueryList subqueryList, List aggregates)
+        FromList fromList, SubqueryList subqueryList, List<AggregateNode> aggregates)
 			throws StandardException
 	{
 		leftOperand = leftOperand.bindExpression(fromList, subqueryList, 

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/UnaryArithmeticOperatorNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/UnaryArithmeticOperatorNode.java?rev=1485333&r1=1485332&r2=1485333&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/UnaryArithmeticOperatorNode.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/UnaryArithmeticOperatorNode.java Wed May 22 18:51:15 2013
@@ -148,7 +148,7 @@ public class UnaryArithmeticOperatorNode
 	 */
 
     ValueNode bindExpression(
-        FromList fromList, SubqueryList subqueryList, List aggregates)
+        FromList fromList, SubqueryList subqueryList, List<AggregateNode> aggregates)
 			throws StandardException
 	{
 		//Return with no binding, if the type of unary minus/plus parameter is not set yet.

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/UnaryComparisonOperatorNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/UnaryComparisonOperatorNode.java?rev=1485333&r1=1485332&r2=1485333&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/UnaryComparisonOperatorNode.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/UnaryComparisonOperatorNode.java Wed May 22 18:51:15 2013
@@ -66,7 +66,7 @@ public abstract class UnaryComparisonOpe
 	 */
 
     ValueNode bindExpression(
-        FromList fromList, SubqueryList subqueryList, List aggregates)
+        FromList fromList, SubqueryList subqueryList, List<AggregateNode> aggregates)
 			throws StandardException
 	{
         bindOperand(fromList, subqueryList, aggregates);

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/UnaryDateTimestampOperatorNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/UnaryDateTimestampOperatorNode.java?rev=1485333&r1=1485332&r2=1485333&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/UnaryDateTimestampOperatorNode.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/UnaryDateTimestampOperatorNode.java Wed May 22 18:51:15 2013
@@ -97,7 +97,7 @@ public class UnaryDateTimestampOperatorN
 	 * @exception StandardException		Thrown on error
 	 */
     ValueNode bindExpression (
-                    FromList fromList, SubqueryList subqueryList, List aggregates)
+                    FromList fromList, SubqueryList subqueryList, List<AggregateNode> aggregates)
 				throws StandardException
 	{
         boolean isIdentity = false; // Is this function the identity operator?

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/UnaryLogicalOperatorNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/UnaryLogicalOperatorNode.java?rev=1485333&r1=1485332&r2=1485333&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/UnaryLogicalOperatorNode.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/UnaryLogicalOperatorNode.java Wed May 22 18:51:15 2013
@@ -64,7 +64,7 @@ public abstract class UnaryLogicalOperat
 	 */
 
     ValueNode bindExpression(
-        FromList fromList, SubqueryList subqueryList, List aggregates)
+        FromList fromList, SubqueryList subqueryList, List<AggregateNode> aggregates)
 			throws StandardException
 	{
         bindOperand(fromList, subqueryList, aggregates);

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/UnaryOperatorNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/UnaryOperatorNode.java?rev=1485333&r1=1485332&r2=1485333&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/UnaryOperatorNode.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/UnaryOperatorNode.java Wed May 22 18:51:15 2013
@@ -306,7 +306,7 @@ public class UnaryOperatorNode extends O
 	 */
 
     ValueNode bindExpression(
-            FromList fromList, SubqueryList subqueryList, List aggregates)
+            FromList fromList, SubqueryList subqueryList, List<AggregateNode> aggregates)
 				throws StandardException
 	{
         bindOperand(fromList, subqueryList, aggregates);
@@ -324,7 +324,7 @@ public class UnaryOperatorNode extends O
      * method to bind the operand.
 	 */
 	protected void bindOperand(
-            FromList fromList, SubqueryList subqueryList, List aggregates)
+            FromList fromList, SubqueryList subqueryList, List<AggregateNode> aggregates)
 				throws StandardException
 	{
         operand = operand.bindExpression(fromList, subqueryList, aggregates);

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/UpdateNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/UpdateNode.java?rev=1485333&r1=1485332&r2=1485333&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/UpdateNode.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/UpdateNode.java Wed May 22 18:51:15 2013
@@ -886,7 +886,7 @@ public final class UpdateNode extends DM
 		boolean[]	needsDeferredProcessing = new boolean[1];
 		needsDeferredProcessing[0] = requiresDeferredProcessing();
 
-        ArrayList conglomerates = new ArrayList();
+        ArrayList<ConglomerateDescriptor> conglomerates = new ArrayList<ConglomerateDescriptor>();
 		relevantCdl = new ConstraintDescriptorList();
 		relevantTriggers =  new GenericDescriptorList();
 
@@ -987,7 +987,7 @@ public final class UpdateNode extends DM
 		DataDictionary		dd,
 		TableDescriptor				baseTable,
 		ResultColumnList			updateColumnList,
-        List                        conglomerates,
+        List<ConglomerateDescriptor>     conglomerates,
 		ConstraintDescriptorList	relevantConstraints,
 		GenericDescriptorList		relevantTriggers,
 		boolean[]					needsDeferredProcessing,
@@ -1225,7 +1225,7 @@ public final class UpdateNode extends DM
         ColumnDescriptorList    generatedColumns = baseTable.getGeneratedColumns();
         int                                 generatedColumnCount = generatedColumns.size();
 		int		                        columnCount = baseTable.getMaxColumnID();
-        HashSet                     updatedColumns = new HashSet();
+        HashSet<String>           updatedColumns = new HashSet<String>();
         UUID                            tableID = baseTable.getObjectID();
         
 		for (int ix = 0; ix < count; ix++)

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/UserAggregateDefinition.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/UserAggregateDefinition.java?rev=1485333&r1=1485332&r2=1485333&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/UserAggregateDefinition.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/UserAggregateDefinition.java Wed May 22 18:51:15 2013
@@ -114,8 +114,8 @@ public class UserAggregateDefinition imp
             ClassFactory    classFactory = cc.getClassFactory();
             TypeCompilerFactory tcf = cc.getTypeCompilerFactory();
 
-            Class   derbyAggregatorInterface = classFactory.loadApplicationClass( "org.apache.derby.agg.Aggregator" );
-            Class   userAggregatorClass = classFactory.loadApplicationClass( _alias.getJavaClassName() );
+            Class<?>   derbyAggregatorInterface = classFactory.loadApplicationClass( "org.apache.derby.agg.Aggregator" );
+            Class<?>   userAggregatorClass = classFactory.loadApplicationClass( _alias.getJavaClassName() );
 
             Class[][]   typeBounds = classFactory.getClassInspector().getTypeBounds
                 ( derbyAggregatorInterface, userAggregatorClass );
@@ -143,8 +143,8 @@ public class UserAggregateDefinition imp
             AggregateAliasInfo  aai = (AggregateAliasInfo) _alias.getAliasInfo();
             DataTypeDescriptor  expectedInputType = DataTypeDescriptor.getType( aai.getForType() );
             DataTypeDescriptor  expectedReturnType = DataTypeDescriptor.getType( aai.getReturnType() );
-            Class       expectedInputClass = getJavaClass( classFactory, expectedInputType );
-            Class       expectedReturnClass = getJavaClass( classFactory, expectedReturnType );
+            Class<?>       expectedInputClass = getJavaClass( classFactory, expectedInputType );
+            Class<?>       expectedReturnClass = getJavaClass( classFactory, expectedReturnType );
 
             // the input operand must be coercible to the expected input type of the aggregate
             if ( !tcf.getTypeCompiler( expectedInputType.getTypeId() ).storable( inputType.getTypeId(), classFactory ) )
@@ -158,7 +158,7 @@ public class UserAggregateDefinition imp
             for ( int i = 0; i < inputBounds.length; i++ )
             {
                 vetCompatibility
-                    ( inputBounds[ i ], expectedInputClass, SQLState.LANG_UDA_WRONG_INPUT_TYPE );
+                    ( (Class<?>) inputBounds[ i ], expectedInputClass, SQLState.LANG_UDA_WRONG_INPUT_TYPE );
             }
             if ( genericParameterTypes[ INPUT_TYPE ] != null )
             {
@@ -192,7 +192,7 @@ public class UserAggregateDefinition imp
     /**
      * Verify that an actual type is compatible with the expected type.
      */
-    private void    vetCompatibility( Class actualClass, Class expectedClass, String sqlState )
+    private void    vetCompatibility( Class<?> actualClass, Class<?> expectedClass, String sqlState )
         throws StandardException
     {
         if ( !actualClass.isAssignableFrom( expectedClass ) )

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/VTIDeferModPolicy.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/VTIDeferModPolicy.java?rev=1485333&r1=1485332&r2=1485333&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/VTIDeferModPolicy.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/VTIDeferModPolicy.java Wed May 22 18:51:15 2013
@@ -113,7 +113,7 @@ class VTIDeferModPolicy implements Visit
     private DeferModification deferralControl;
     private int statementType;
     private int tableNumber;
-    private final HashSet columns = new HashSet();
+    private final HashSet<String> columns = new HashSet<String>();
 
     private VTIDeferModPolicy( FromVTI targetVTI,
                                String[] columnNames,

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ValueNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ValueNode.java?rev=1485333&r1=1485332&r2=1485333&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ValueNode.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ValueNode.java Wed May 22 18:51:15 2013
@@ -366,7 +366,7 @@ public abstract class ValueNode extends 
 
 	
     ValueNode bindExpression(
-            FromList fromList, SubqueryList subqueryList, List aggregates)
+            FromList fromList, SubqueryList subqueryList, List<AggregateNode> aggregates)
 		throws StandardException
 	{
         return bindExpression(fromList, subqueryList, aggregates, false);

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ValueNodeList.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ValueNodeList.java?rev=1485333&r1=1485332&r2=1485333&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ValueNodeList.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ValueNodeList.java Wed May 22 18:51:15 2013
@@ -74,7 +74,7 @@ public class ValueNodeList extends Query
 	 *
 	 * @exception StandardException		Thrown on error
 	 */
-    void bindExpression(FromList fromList, SubqueryList subqueryList, List aggregates)
+    void bindExpression(FromList fromList, SubqueryList subqueryList, List<AggregateNode> aggregates)
 			throws StandardException
 	{
 		int size = size();

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/WindowFunctionNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/WindowFunctionNode.java?rev=1485333&r1=1485332&r2=1485333&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/WindowFunctionNode.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/WindowFunctionNode.java Wed May 22 18:51:15 2013
@@ -105,7 +105,7 @@ public abstract class WindowFunctionNode
      * @see ValueNode#bindExpression
      */
     ValueNode bindExpression(
-            FromList fromList, SubqueryList subqueryList, List aggregates)
+            FromList fromList, SubqueryList subqueryList, List<AggregateNode> aggregates)
         throws StandardException
     {
         if (window instanceof WindowReferenceNode) {

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/WindowResultSetNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/WindowResultSetNode.java?rev=1485333&r1=1485332&r2=1485333&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/WindowResultSetNode.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/WindowResultSetNode.java Wed May 22 18:51:15 2013
@@ -158,7 +158,7 @@ public class WindowResultSetNode extends
 
         // Find all unique columns referenced and add those to windowing result
         // set.
-        ArrayList uniqueCols = new ArrayList();
+        ArrayList<ValueNode> uniqueCols = new ArrayList<ValueNode>();
         for (int i= 0; i< colRefs.size(); i++) {
             ColumnReference cr = (ColumnReference) colRefs.get(i);
             if (!colRefAlreadySeen(uniqueCols, cr)) {
@@ -170,11 +170,11 @@ public class WindowResultSetNode extends
         // substitute references in original node to point to the Windowing
         // result set. Happens for example when we have a window over a group
         // by.
-        CollectNodesVisitor getVCVisitor =
-            new CollectNodesVisitor(VirtualColumnNode.class);
+        CollectNodesVisitor<VirtualColumnNode> getVCVisitor =
+            new CollectNodesVisitor<VirtualColumnNode>(VirtualColumnNode.class);
 
         parent.getResultColumns().accept(getVCVisitor);
-        List vcs = getVCVisitor.getList();
+        List<VirtualColumnNode> vcs = getVCVisitor.getList();
 
         // Add any virtual columns to windowing result.
         for (int i= 0; i< vcs.size(); i++) {

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/conn/GenericLanguageConnectionContext.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/conn/GenericLanguageConnectionContext.java?rev=1485333&r1=1485332&r2=1485333&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/conn/GenericLanguageConnectionContext.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/conn/GenericLanguageConnectionContext.java Wed May 22 18:51:15 2013
@@ -282,7 +282,7 @@ public class GenericLanguageConnectionCo
      * To support lastAutoincrementValue: This is a hashtable which maps
      * schemaName,tableName,columnName to a Long value.
      */
-    private HashMap<Object,Long> autoincrementHT;
+    private HashMap<String,Long> autoincrementHT;
     /**
      * whether to allow updates or not. 
      */
@@ -3437,13 +3437,13 @@ public class GenericLanguageConnectionCo
             return;
 
         if (autoincrementHT == null)
-            autoincrementHT = new HashMap<Object,Long>();
+            autoincrementHT = new HashMap<String,Long>();
 
         DataDictionary dd = getDataDictionary();
         for (Iterator<String> it = autoincrementCacheHashtable.keySet().iterator();
              it.hasNext(); )
         {
-            Object key = it.next();
+            String key = it.next();
             AutoincrementCounter aic = 
                 autoincrementCacheHashtable.get(key);
             Long value = aic.getCurrentValue();
@@ -3461,12 +3461,12 @@ public class GenericLanguageConnectionCo
      * into autoincrementHT, the cache of autoincrement values 
      * kept in the languageconnectioncontext.
      */
-    public void copyHashtableToAIHT(Map<Object,Long> from)
+    public void copyHashtableToAIHT(Map<String,Long> from)
     {
         if (from.isEmpty())
             return;
         if (autoincrementHT == null)
-            autoincrementHT = new HashMap<Object,Long>();
+            autoincrementHT = new HashMap<String,Long>();
         
         autoincrementHT.putAll(from);
     }
@@ -3793,14 +3793,14 @@ public class GenericLanguageConnectionCo
      * compiler phase, so as to be able to avoid printing a node more than once.
      * @see org.apache.derby.impl.sql.compile.QueryTreeNode#treePrint(int)
      */
-    Map printedObjectsMap = null;
+    Map<Object,Object> printedObjectsMap = null;
 
     /**
      * @see org.apache.derby.iapi.sql.conn.LanguageConnectionContext#getPrintedObjectsMap
      */
-    public Map getPrintedObjectsMap() {
+    public Map<Object,Object> getPrintedObjectsMap() {
         if (printedObjectsMap == null) {
-            printedObjectsMap = new IdentityHashMap();
+            printedObjectsMap = new IdentityHashMap<Object,Object>();
         }
         return printedObjectsMap;
     }



Mime
View raw message