You are viewing a plain text version of this content. The canonical link for it is here.
Posted to derby-commits@db.apache.org by ka...@apache.org on 2013/03/06 10:40:33 UTC
svn commit: r1453240 -
/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/
Author: kahatlen
Date: Wed Mar 6 09:40:32 2013
New Revision: 1453240
URL: http://svn.apache.org/r1453240
Log:
DERBY-6075: Use modern collections in impl/sql/compile
Replace use of Vector in method signatures and field declarations
with List. The actual instances are still Vectors.
Modified:
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ColumnDefinitionNode.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CompilerContextImpl.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CreateAliasNode.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CreateIndexNode.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CreateTriggerNode.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DeleteNode.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/GroupByList.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/IndexToBaseRowNode.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/ParameterNode.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/PredicateList.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/QueryTreeNodeVector.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/RowCountNode.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/SelectNode.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SingleChildResultSetNode.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/TableElementList.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/UntypedNullConstantNode.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/WindowNode.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/WindowReferenceNode.java
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ColumnDefinitionNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ColumnDefinitionNode.java?rev=1453240&r1=1453239&r2=1453240&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ColumnDefinitionNode.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ColumnDefinitionNode.java Wed Mar 6 09:40:32 2013
@@ -22,7 +22,7 @@
package org.apache.derby.impl.sql.compile;
import java.sql.Types;
-import java.util.Vector;
+import java.util.List;
import org.apache.derby.catalog.DefaultInfo;
import org.apache.derby.catalog.UUID;
import org.apache.derby.catalog.types.DefaultInfoImpl;
@@ -614,7 +614,7 @@ public class ColumnDefinitionNode extend
getNodeFactory().doJoinOrderOptimization(),
getContextManager()),
(SubqueryList) null,
- (Vector) null);
+ (List) null);
TypeId columnTypeId = getType().getTypeId();
TypeId defaultTypeId = defaultTree.getTypeId();
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CompilerContextImpl.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CompilerContextImpl.java?rev=1453240&r1=1453239&r2=1453240&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CompilerContextImpl.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CompilerContextImpl.java Wed Mar 6 09:40:32 2013
@@ -341,8 +341,7 @@ public class CompilerContextImpl extends
public Object[] getSavedObjects() {
if (savedObjects == null) return null;
- Object[] retVal = new Object[savedObjects.size()];
- savedObjects.copyInto(retVal);
+ Object[] retVal = savedObjects.toArray();
savedObjects = null; // erase to start over
return retVal;
}
@@ -461,10 +460,10 @@ public class CompilerContextImpl extends
lcc.getTransactionCompile().openStoreCost(conglomerateNumber);
/* Put it in the array */
- storeCostControllers.add(storeCostControllers.size(), retval);
+ storeCostControllers.add(retval);
/* Put the conglomerate number in its array */
- storeCostConglomIds.add(storeCostConglomIds.size(), new Long(conglomerateNumber));
+ storeCostConglomIds.add(new Long(conglomerateNumber));
return retval;
}
@@ -1023,7 +1022,7 @@ public class CompilerContextImpl extends
private int scanIsolationLevel;
private int nextEquivalenceClass = -1;
private long nextClassName;
- private Vector savedObjects;
+ private List savedObjects;
private String classPrefix;
private SchemaDescriptor compilationSchema;
@@ -1036,8 +1035,8 @@ public class CompilerContextImpl extends
private ProviderList currentAPL;
private boolean returnParameterFlag;
- private Vector storeCostControllers = new Vector();
- private Vector storeCostConglomIds = new Vector();
+ private final List storeCostControllers = new Vector();
+ private final List storeCostConglomIds = new Vector();
private SortCostController sortCostController;
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CreateAliasNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CreateAliasNode.java?rev=1453240&r1=1453239&r2=1453240&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CreateAliasNode.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CreateAliasNode.java Wed Mar 6 09:40:32 2013
@@ -22,7 +22,6 @@
package org.apache.derby.impl.sql.compile;
import java.util.List;
-import java.util.Vector;
import org.apache.derby.catalog.AliasInfo;
import org.apache.derby.catalog.TypeDescriptor;
import org.apache.derby.catalog.types.AggregateAliasInfo;
@@ -31,7 +30,6 @@ import org.apache.derby.catalog.types.Sy
import org.apache.derby.catalog.types.UDTAliasInfo;
import org.apache.derby.iapi.error.StandardException;
import org.apache.derby.iapi.reference.JDBC40Translation;
-import org.apache.derby.iapi.reference.Limits;
import org.apache.derby.iapi.reference.SQLState;
import org.apache.derby.iapi.services.sanity.SanityManager;
import org.apache.derby.iapi.sql.dictionary.AliasDescriptor;
@@ -192,7 +190,7 @@ public class CreateAliasNode extends DDL
Object[] routineElements = (Object[]) aliasSpecificInfo;
Object[] parameters = (Object[]) routineElements[PARAMETER_ARRAY];
- int paramCount = ((Vector) parameters[0]).size();
+ int paramCount = ((List) parameters[0]).size();
// Support for Java signatures in Derby was added in 10.1
// Check to see the catalogs have been upgraded to 10.1 before
@@ -213,15 +211,15 @@ public class CreateAliasNode extends DDL
if (paramCount != 0) {
- names = new String[paramCount];
- ((Vector) parameters[0]).copyInto(names);
+ names = (String[]) ((List) parameters[0]).toArray(
+ new String[paramCount]);
- types = new TypeDescriptor[paramCount];
- ((Vector) parameters[1]).copyInto(types);
+ types = (TypeDescriptor[]) ((List) parameters[1]).toArray(
+ new TypeDescriptor[paramCount]);
modes = new int[paramCount];
for (int i = 0; i < paramCount; i++) {
- int currentMode = ((Integer) (((Vector) parameters[2]).get(i))).intValue();
+ int currentMode = ((Integer) (((List) parameters[2]).get(i))).intValue();
modes[i] = currentMode;
//
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CreateIndexNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CreateIndexNode.java?rev=1453240&r1=1453239&r2=1453240&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CreateIndexNode.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CreateIndexNode.java Wed Mar 6 09:40:32 2013
@@ -22,8 +22,8 @@
package org.apache.derby.impl.sql.compile;
import java.util.Hashtable;
+import java.util.List;
import java.util.Properties;
-import java.util.Vector;
import org.apache.derby.catalog.UUID;
import org.apache.derby.iapi.error.StandardException;
@@ -54,7 +54,7 @@ public class CreateIndexNode extends DDL
String indexType;
TableName indexName;
TableName tableName;
- Vector columnNameList;
+ List columnNameList;
String[] columnNames = null;
boolean[] isAscending;
int[] boundColumnIDs;
@@ -88,7 +88,7 @@ public class CreateIndexNode extends DDL
this.indexType = (String) indexType;
this.indexName = (TableName) indexName;
this.tableName = (TableName) tableName;
- this.columnNameList = (Vector) columnNameList;
+ this.columnNameList = (List) columnNameList;
this.properties = (Properties) properties;
}
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CreateTriggerNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CreateTriggerNode.java?rev=1453240&r1=1453239&r2=1453240&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CreateTriggerNode.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CreateTriggerNode.java Wed Mar 6 09:40:32 2013
@@ -24,10 +24,9 @@ package org.apache.derby.impl.sql.compil
import java.sql.Timestamp;
import java.util.Collections;
import java.util.Comparator;
-import java.util.Enumeration;
import java.util.Hashtable;
+import java.util.Iterator;
import java.util.List;
-import java.util.Vector;
import org.apache.derby.catalog.UUID;
import org.apache.derby.iapi.error.StandardException;
@@ -60,7 +59,7 @@ public class CreateTriggerNode extends D
private boolean isBefore;
private boolean isRow;
private boolean isEnabled;
- private Vector refClause;
+ private List refClause;
private ValueNode whenClause;
private String whenText;
private int whenOffset;
@@ -264,7 +263,7 @@ public class CreateTriggerNode extends D
this.isBefore = ((Boolean) isBefore).booleanValue();
this.isRow = ((Boolean) isRow).booleanValue();
this.isEnabled = ((Boolean) isEnabled).booleanValue();
- this.refClause = (Vector) refClause;
+ this.refClause = (List) refClause;
this.whenClause = (ValueNode) whenClause;
this.whenText = (whenText == null) ? null : ((String) whenText).trim();
this.whenOffset = ((Integer) whenOffset).intValue();
@@ -782,14 +781,14 @@ public class CreateTriggerNode extends D
*/
private void validateReferencesClause(DataDictionary dd) throws StandardException
{
- if ((refClause == null) || (refClause.size() == 0))
+ if ((refClause == null) || refClause.isEmpty())
{
return;
}
- for (Enumeration e = refClause.elements(); e.hasMoreElements(); )
+ for (Iterator it = refClause.iterator(); it.hasNext(); )
{
- TriggerReferencingStruct trn = (TriggerReferencingStruct)e.nextElement();
+ TriggerReferencingStruct trn = (TriggerReferencingStruct) it.next();
/*
** 1) Make sure that we don't try to refer
@@ -907,11 +906,11 @@ public class CreateTriggerNode extends D
if (refClause != null)
{
StringBuffer buf = new StringBuffer();
- for (Enumeration e = refClause.elements(); e.hasMoreElements(); )
+ for (Iterator it = refClause.iterator(); it.hasNext(); )
{
buf.append("\t");
TriggerReferencingStruct trn =
- (TriggerReferencingStruct)e.nextElement();
+ (TriggerReferencingStruct) it.next();
buf.append(trn.toString());
buf.append("\n");
}
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=1453240&r1=1453239&r2=1453240&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 Mar 6 09:40:32 2013
@@ -60,6 +60,7 @@ import org.apache.derby.iapi.services.io
import java.util.Vector;
import java.util.Hashtable;
import java.util.Iterator;
+import java.util.List;
import java.util.Properties;
import org.apache.derby.iapi.sql.compile.NodeFactory;
import org.apache.derby.iapi.util.ReuseFactory;
@@ -913,7 +914,7 @@ public class DeleteNode extends DMLModSt
private static FormatableBitSet getDeleteReadMap
(
TableDescriptor baseTable,
- Vector conglomVector,
+ List conglomVector,
GenericDescriptorList relevantTriggers,
boolean[] needsDeferredProcessing
)
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?rev=1453240&r1=1453239&r2=1453240&view=diff
==============================================================================
--- 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 Mar 6 09:40:32 2013
@@ -21,14 +21,13 @@
package org.apache.derby.impl.sql.compile;
+import java.util.List;
+
import org.apache.derby.iapi.sql.compile.Optimizable;
-import org.apache.derby.iapi.sql.compile.OptimizableList;
import org.apache.derby.iapi.sql.compile.OptimizablePredicate;
import org.apache.derby.iapi.sql.compile.OptimizablePredicateList;
import org.apache.derby.iapi.sql.compile.Optimizer;
import org.apache.derby.iapi.sql.compile.CostEstimate;
-import org.apache.derby.iapi.sql.compile.Visitable;
-import org.apache.derby.iapi.sql.compile.Visitor;
import org.apache.derby.iapi.sql.compile.RequiredRowOrdering;
import org.apache.derby.iapi.sql.compile.RowOrdering;
import org.apache.derby.iapi.sql.compile.C_NodeTypes;
@@ -36,25 +35,16 @@ import org.apache.derby.iapi.sql.compile
import org.apache.derby.iapi.sql.dictionary.DataDictionary;
import org.apache.derby.iapi.sql.dictionary.ConglomerateDescriptor;
-import org.apache.derby.iapi.sql.Activation;
-import org.apache.derby.iapi.sql.ResultSet;
import org.apache.derby.iapi.reference.ClassName;
import org.apache.derby.iapi.services.classfile.VMOpcode;
import org.apache.derby.iapi.error.StandardException;
-import org.apache.derby.impl.sql.compile.ActivationClassBuilder;
-
import org.apache.derby.iapi.services.compiler.MethodBuilder;
import org.apache.derby.iapi.services.sanity.SanityManager;
-import org.apache.derby.iapi.util.JBitSet;
-
-
-import java.util.Properties;
-import java.util.Vector;
/**
* A DistinctNode represents a result set for a disinct operation
@@ -264,7 +254,7 @@ public class DistinctNode extends Single
* @return Whether the underlying ResultSet tree
* is ordered on the specified column.
*/
- boolean isOrderedOn(ColumnReference[] crs, boolean permuteOrdering, Vector fbtVector)
+ boolean isOrderedOn(ColumnReference[] crs, boolean permuteOrdering, List fbtVector)
{
/* RESOLVE - DistinctNodes are ordered on their RCLs.
* Walk RCL to see if cr is 1st non-constant column in the
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=1453240&r1=1453239&r2=1453240&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 Mar 6 09:40:32 2013
@@ -101,7 +101,7 @@ import org.apache.derby.impl.sql.catalog
* </pre></i> Ideally, the cursor only selects cint. Then,
* something akin to an IndexRowToBaseRow is generated to
* take the CursorResultSet and get the appropriate columns
- * out of the base table from the RowLocation retunrned by the
+ * out of the base table from the RowLocation returned by the
* cursor. Then the update node can generate the appropriate
* NormalizeResultSet (or whatever else it might need) to
* get things into the correct format for the UpdateResultSet.
@@ -2205,9 +2205,9 @@ public class FromBaseTable extends FromT
/**
* Clear the bits from the dependency map when join nodes are flattened
*
- * @param locations vector of bit numbers to be cleared
+ * @param locations list of bit numbers to be cleared
*/
- void clearDependency(Vector locations)
+ void clearDependency(List locations)
{
if (this.dependencyMap != null)
{
@@ -4277,7 +4277,7 @@ public class FromBaseTable extends FromT
*
* @exception StandardException Thrown on error
*/
- boolean isOrderedOn(ColumnReference[] crs, boolean permuteOrdering, Vector fbtVector)
+ boolean isOrderedOn(ColumnReference[] crs, boolean permuteOrdering, List fbtVector)
throws StandardException
{
/* The following conditions must be met, regardless of the value of permuteOrdering,
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=1453240&r1=1453239&r2=1453240&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 Mar 6 09:40:32 2013
@@ -21,22 +21,13 @@
package org.apache.derby.impl.sql.compile;
+import java.util.List;
import org.apache.derby.iapi.sql.compile.C_NodeTypes;
-
import org.apache.derby.iapi.services.sanity.SanityManager;
-
import org.apache.derby.iapi.error.StandardException;
-
-import org.apache.derby.iapi.sql.dictionary.DataDictionary;
-
import org.apache.derby.iapi.reference.SQLState;
import org.apache.derby.iapi.reference.Limits;
-import org.apache.derby.impl.sql.compile.ActivationClassBuilder;
-
-import org.apache.derby.iapi.util.ReuseFactory;
-
-import java.util.Vector;
/**
* A GroupByList represents the list of expressions in a GROUP BY clause in
@@ -110,8 +101,7 @@ public class GroupByList extends Ordered
*
* @exception StandardException Thrown on error
*/
- public void bindGroupByColumns(SelectNode select,
- Vector aggregateVector)
+ void bindGroupByColumns(SelectNode select, List aggregateVector)
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=1453240&r1=1453239&r2=1453240&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 Mar 6 09:40:32 2013
@@ -26,6 +26,7 @@ import java.util.Vector;
import java.util.ArrayList;
import java.util.Comparator;
import java.util.Collections;
+import java.util.List;
import org.apache.derby.catalog.IndexDescriptor;
import org.apache.derby.iapi.error.StandardException;
@@ -84,7 +85,7 @@ public class GroupByNode extends SingleC
* The list of all aggregates in the query block
* that contains this group by.
*/
- Vector aggregateVector;
+ private List aggregateVector;
/**
* Information that is used at execution time to
@@ -146,7 +147,7 @@ public class GroupByNode extends SingleC
{
// Aggregage vector can be null if we have a having clause.
// select c1 from t1 group by c1 having c1 > 1;
-// SanityManager.ASSERT(((Vector) aggregateVector).size() > 0,
+// SanityManager.ASSERT(((List) aggregateVector).size() > 0,
// "aggregateVector expected to be non-empty");
if (!(childResult instanceof Optimizable))
{
@@ -162,7 +163,7 @@ public class GroupByNode extends SingleC
ResultColumnList newBottomRCL;
this.groupingList = (GroupByList) groupingList;
- this.aggregateVector = (Vector) aggregateVector;
+ this.aggregateVector = (List) aggregateVector;
this.parent = this;
/*
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=1453240&r1=1453239&r2=1453240&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 Mar 6 09:40:32 2013
@@ -21,30 +21,20 @@
package org.apache.derby.impl.sql.compile;
-import org.apache.derby.iapi.services.context.ContextManager;
+import java.util.List;
import org.apache.derby.iapi.sql.compile.AccessPath;
import org.apache.derby.iapi.sql.compile.CostEstimate;
import org.apache.derby.iapi.sql.compile.Optimizable;
import org.apache.derby.iapi.sql.compile.RequiredRowOrdering;
-import org.apache.derby.iapi.sql.compile.Visitable;
import org.apache.derby.iapi.sql.compile.Visitor;
import org.apache.derby.iapi.sql.dictionary.ConglomerateDescriptor;
-import org.apache.derby.impl.sql.compile.ActivationClassBuilder;
-
import org.apache.derby.iapi.error.StandardException;
import org.apache.derby.iapi.services.compiler.MethodBuilder;
-import org.apache.derby.iapi.sql.execute.NoPutResultSet;
-
-import org.apache.derby.iapi.sql.Activation;
-import org.apache.derby.iapi.sql.ResultSet;
-
-import org.apache.derby.iapi.services.loader.GeneratedMethod;
-
import org.apache.derby.iapi.store.access.StaticCompiledOpenConglomInfo;
import org.apache.derby.iapi.services.io.FormatableBitSet;
@@ -53,8 +43,6 @@ import org.apache.derby.catalog.types.Re
import org.apache.derby.iapi.reference.ClassName;
import org.apache.derby.iapi.services.classfile.VMOpcode;
-import java.util.Properties;
-import java.util.Vector;
/**
* This node type translates an index row to a base row. It takes a
@@ -147,7 +135,7 @@ public class IndexToBaseRowNode extends
*
* @exception StandardException Thrown on error
*/
- boolean isOrderedOn(ColumnReference[] crs, boolean permuteOrdering, Vector fbtVector)
+ boolean isOrderedOn(ColumnReference[] crs, boolean permuteOrdering, List fbtVector)
throws StandardException
{
return source.isOrderedOn(crs, permuteOrdering, fbtVector);
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=1453240&r1=1453239&r2=1453240&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 Mar 6 09:40:32 2013
@@ -21,7 +21,6 @@
package org.apache.derby.impl.sql.compile;
-import org.apache.derby.iapi.services.context.ContextManager;
import org.apache.derby.iapi.services.compiler.MethodBuilder;
@@ -34,13 +33,11 @@ import org.apache.derby.iapi.sql.compile
import org.apache.derby.iapi.sql.compile.OptimizablePredicate;
import org.apache.derby.iapi.sql.compile.OptimizablePredicateList;
import org.apache.derby.iapi.sql.compile.Optimizer;
-import org.apache.derby.iapi.sql.compile.Visitable;
import org.apache.derby.iapi.sql.compile.Visitor;
import org.apache.derby.iapi.sql.compile.CostEstimate;
import org.apache.derby.iapi.sql.compile.RowOrdering;
import org.apache.derby.iapi.sql.compile.C_NodeTypes;
-import org.apache.derby.iapi.sql.dictionary.DataDictionary;
import org.apache.derby.iapi.sql.dictionary.TableDescriptor;
import org.apache.derby.iapi.sql.dictionary.ConglomerateDescriptor;
@@ -50,15 +47,8 @@ import org.apache.derby.iapi.types.DataT
import org.apache.derby.iapi.reference.SQLState;
import org.apache.derby.iapi.reference.ClassName;
-import org.apache.derby.iapi.sql.Activation;
-import org.apache.derby.iapi.sql.ResultSet;
-
import org.apache.derby.iapi.store.access.TransactionController;
-import org.apache.derby.iapi.services.loader.GeneratedMethod;
-
-import org.apache.derby.impl.sql.compile.ActivationClassBuilder;
-
import org.apache.derby.iapi.util.JBitSet;
import org.apache.derby.iapi.util.PropertyUtil;
import org.apache.derby.iapi.services.classfile.VMOpcode;
@@ -98,7 +88,7 @@ public class JoinNode extends TableOpera
private PredicateList rightPredicateList;
protected boolean flattenableJoin = true;
- Vector aggregateVector;
+ List aggregateVector;
SubqueryList subqueryList;
ValueNode joinClause;
boolean joinClauseNormalized;
@@ -1912,7 +1902,7 @@ public class JoinNode extends TableOpera
*
* @exception StandardException Thrown on error
*/
- boolean isOrderedOn(ColumnReference[] crs, boolean permuteOrdering, Vector fbtVector)
+ boolean isOrderedOn(ColumnReference[] crs, boolean permuteOrdering, List fbtVector)
throws StandardException
{
/* RESOLVE - easiest thing for now is to only consider the leftmost child */
@@ -1963,7 +1953,7 @@ public class JoinNode extends TableOpera
this.subqueryList = subqueryList;
}
- void setAggregateVector(Vector aggregateVector)
+ void setAggregateVector(List aggregateVector)
{
this.aggregateVector = aggregateVector;
}
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ParameterNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ParameterNode.java?rev=1453240&r1=1453239&r2=1453240&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ParameterNode.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ParameterNode.java Wed Mar 6 09:40:32 2013
@@ -23,7 +23,6 @@ package org.apache.derby.impl.sql.compil
import java.sql.Types;
import java.util.List;
-import java.util.Vector;
import org.apache.derby.iapi.error.StandardException;
import org.apache.derby.iapi.reference.ClassName;
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=1453240&r1=1453239&r2=1453240&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 Mar 6 09:40:32 2013
@@ -3947,12 +3947,11 @@ 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, Vector ret,
+ private int chooseLongestMatch(PredicateWrapperList[] predArray, List ret,
int numWorkingPredicates)
{
int max = 0, maxWeight = 0;
int position = -1;
- int weight;
for (int i = 0; i < predArray.length; i++)
{
@@ -3993,7 +3992,7 @@ public class PredicateList extends Query
* [p2] shuld be considered again later.
*/
PredicateWrapperList pwl = predArray[position];
- Vector uniquepreds = pwl.createLeadingUnique();
+ List uniquepreds = pwl.createLeadingUnique();
/* uniqueprds is a vector of predicate (along with wrapper) that I'm
going to use to get statistics from-- we now have to delete these
@@ -4223,7 +4222,7 @@ public class PredicateList extends Query
* I need to extract out 0 1 2 3.
* leaving 0 2 3 in there.
*/
- Vector createLeadingUnique()
+ private List createLeadingUnique()
{
Vector scratch = new Vector();
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=1453240&r1=1453239&r2=1453240&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 Mar 6 09:40:32 2013
@@ -24,10 +24,9 @@ package org.apache.derby.impl.sql.compil
import org.apache.derby.iapi.services.sanity.SanityManager;
import org.apache.derby.iapi.sql.compile.Visitor;
-import org.apache.derby.iapi.sql.compile.Visitable;
import org.apache.derby.iapi.error.StandardException;
-import java.util.Enumeration;
+import java.util.List;
import java.util.Vector;
/**
@@ -39,31 +38,31 @@ import java.util.Vector;
abstract class QueryTreeNodeVector extends QueryTreeNode
{
- private Vector v = new Vector();
+ private final List v = new Vector();
public final int size()
{
return v.size();
}
- QueryTreeNode elementAt(int index)
+ final QueryTreeNode elementAt(int index)
{
- return (QueryTreeNode) v.elementAt(index);
+ return (QueryTreeNode) v.get(index);
}
final void addElement(QueryTreeNode qt)
{
- v.addElement(qt);
+ v.add(qt);
}
final void removeElementAt(int index)
{
- v.removeElementAt(index);
+ v.remove(index);
}
final void removeElement(QueryTreeNode qt)
{
- v.removeElement(qt);
+ v.remove(qt);
}
final Object remove(int index)
@@ -78,7 +77,7 @@ abstract class QueryTreeNodeVector exten
final void setElementAt(QueryTreeNode qt, int index)
{
- v.setElementAt(qt, index);
+ v.set(index, qt);
}
void destructiveAppend(QueryTreeNodeVector qtnv)
@@ -89,21 +88,17 @@ abstract class QueryTreeNodeVector exten
void nondestructiveAppend(QueryTreeNodeVector qtnv)
{
- int qtnvSize = qtnv.size();
- for (int index = 0; index < qtnvSize; index++)
- {
- v.addElement(qtnv.elementAt(index));
- }
+ v.addAll(qtnv.v);
}
final void removeAllElements()
{
- v.removeAllElements();
+ v.clear();
}
final void insertElementAt(QueryTreeNode qt, int index)
{
- v.insertElementAt(qt, index);
+ v.add(index, qt);
}
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=1453240&r1=1453239&r2=1453240&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 Mar 6 09:40:32 2013
@@ -57,7 +57,7 @@ import org.apache.derby.iapi.services.cl
import org.apache.derby.catalog.types.DefaultInfoImpl;
-import java.util.Vector;
+import java.util.List;
import java.util.Set;
/**
@@ -1032,7 +1032,7 @@ public abstract class ResultSetNode exte
String defaultText = defaultInfo.getDefaultText();
ValueNode defaultTree = parseDefault(defaultText);
defaultTree = defaultTree.bindExpression
- (getFromList(), (SubqueryList) null, (Vector) null);
+ (getFromList(), (SubqueryList) null, (List) null);
newResultColumn = (ResultColumn) getNodeFactory().getNode
( C_NodeTypes.RESULT_COLUMN, defaultTree.getTypeServices(), defaultTree, getContextManager());
}
@@ -1736,14 +1736,14 @@ public abstract class ResultSetNode exte
*
* @param crs The specified ColumnReference[]
* @param permuteOrdering Whether or not the order of the CRs in the array can be permuted
- * @param fbtVector Vector that is to be filled with the FromBaseTable
+ * @param fbtVector Vector that is to be filled with the FromBaseTable
*
* @return Whether the underlying ResultSet tree
* is ordered on the specified column.
*
* @exception StandardException Thrown on error
*/
- boolean isOrderedOn(ColumnReference[] crs, boolean permuteOrdering, Vector fbtVector)
+ boolean isOrderedOn(ColumnReference[] crs, boolean permuteOrdering, List fbtVector)
throws StandardException
{
return false;
@@ -1868,7 +1868,7 @@ public abstract class ResultSetNode exte
*
* @return number of aggregates
*/
- protected static final int numDistinctAggregates(Vector aggregateVector)
+ protected static final int numDistinctAggregates(List aggregateVector)
{
int count = 0;
int size = aggregateVector.size();
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/RowCountNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/RowCountNode.java?rev=1453240&r1=1453239&r2=1453240&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/RowCountNode.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/RowCountNode.java Wed Mar 6 09:40:32 2013
@@ -21,13 +21,10 @@
package org.apache.derby.impl.sql.compile;
-import java.util.Vector;
import org.apache.derby.iapi.error.StandardException;
import org.apache.derby.iapi.services.compiler.MethodBuilder;
import org.apache.derby.iapi.services.sanity.SanityManager;
-import org.apache.derby.iapi.reference.ClassName;
import org.apache.derby.iapi.services.classfile.VMOpcode;
-import org.apache.derby.iapi.types.SQLLongint;
import org.apache.derby.iapi.reference.ClassName;
/**
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=1453240&r1=1453239&r2=1453240&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 Mar 6 09:40:32 2013
@@ -21,6 +21,7 @@
package org.apache.derby.impl.sql.compile;
+import java.util.List;
import org.apache.derby.iapi.sql.compile.CostEstimate;
import org.apache.derby.iapi.sql.compile.Optimizer;
import org.apache.derby.iapi.sql.compile.Optimizable;
@@ -59,7 +60,7 @@ import java.util.Vector;
public class RowResultSetNode extends FromTable
{
SubqueryList subquerys;
- Vector aggregateVector;
+ private List aggregateVector;
OrderByList orderByList;
ValueNode offset; // OFFSET n ROWS
ValueNode fetchFirst; // FETCH FIRST n ROWS ONLY
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=1453240&r1=1453239&r2=1453240&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 Mar 6 09:40:32 2013
@@ -69,9 +69,10 @@ public class SelectNode extends ResultSe
FromTable targetTable;
/* Aggregate Vectors for select and where clauses */
- Vector selectAggregates ;
- Vector whereAggregates;
- Vector havingAggregates;
+ private List selectAggregates;
+ private List whereAggregates;
+ private List havingAggregates;
+
/**
* The ValueNode for the WHERE clause must represent a boolean
* expression. The binding phase will enforce this - the parser
@@ -1189,8 +1190,8 @@ public class SelectNode extends ResultSe
*/
if (groupByList != null &&
havingClause == null &&
- selectAggregates.size() == 0 &&
- whereAggregates.size() == 0)
+ selectAggregates.isEmpty() &&
+ whereAggregates.isEmpty())
{
isDistinct = true;
groupByList = null;
@@ -1544,7 +1545,7 @@ public class SelectNode extends ResultSe
if (((selectAggregates != null) && (selectAggregates.size() > 0))
|| (groupByList != null))
{
- Vector aggs = selectAggregates;
+ List aggs = selectAggregates;
if (havingAggregates != null && !havingAggregates.isEmpty()) {
havingAggregates.addAll(selectAggregates);
aggs = havingAggregates;
@@ -1863,7 +1864,7 @@ public class SelectNode extends ResultSe
}
}
- return newTopRSN.isOrderedOn(crs, permuteOrdering, (Vector)null);
+ return newTopRSN.isOrderedOn(crs, permuteOrdering, (List) null);
}
/**
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=1453240&r1=1453239&r2=1453240&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 Mar 6 09:40:32 2013
@@ -21,36 +21,25 @@
package org.apache.derby.impl.sql.compile;
-import org.apache.derby.iapi.services.context.ContextManager;
+import java.util.List;
import org.apache.derby.iapi.sql.compile.AccessPath;
import org.apache.derby.iapi.sql.compile.CostEstimate;
import org.apache.derby.iapi.sql.compile.Optimizable;
-import org.apache.derby.iapi.sql.compile.OptimizableList;
-import org.apache.derby.iapi.sql.compile.OptimizablePredicate;
import org.apache.derby.iapi.sql.compile.OptimizablePredicateList;
import org.apache.derby.iapi.sql.compile.Optimizer;
-import org.apache.derby.iapi.sql.compile.Visitable;
import org.apache.derby.iapi.sql.compile.Visitor;
import org.apache.derby.iapi.sql.compile.RequiredRowOrdering;
import org.apache.derby.iapi.sql.compile.C_NodeTypes;
import org.apache.derby.iapi.sql.dictionary.DataDictionary;
-import org.apache.derby.iapi.sql.dictionary.TableDescriptor;
-
-import org.apache.derby.iapi.sql.Activation;
-import org.apache.derby.iapi.sql.ResultSet;
import org.apache.derby.iapi.error.StandardException;
-import org.apache.derby.impl.sql.compile.ActivationClassBuilder;
-
import org.apache.derby.iapi.services.sanity.SanityManager;
import org.apache.derby.iapi.util.JBitSet;
-import java.util.Properties;
-import java.util.Vector;
/**
* A SingleChildResultSetNode represents a result set with a single child.
@@ -510,7 +499,7 @@ abstract class SingleChildResultSetNode
*
* @exception StandardException Thrown on error
*/
- boolean isOrderedOn(ColumnReference[] crs, boolean permuteOrdering, Vector fbtVector)
+ boolean isOrderedOn(ColumnReference[] crs, boolean permuteOrdering, List fbtVector)
throws StandardException
{
return childResult.isOrderedOn(crs, permuteOrdering, fbtVector);
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=1453240&r1=1453239&r2=1453240&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 Mar 6 09:40:32 2013
@@ -191,7 +191,9 @@ public class TableElementList extends Qu
//if the constraint type is not primary key or unique key, ignore it.
if (cd.getConstraintType() == DataDictionary.PRIMARYKEY_CONSTRAINT ||
cd.getConstraintType() == DataDictionary.UNIQUE_CONSTRAINT)
- constraintsVector.addElement(cd);
+ {
+ constraintsVector.add(cd);
+ }
}
}
}
@@ -267,7 +269,7 @@ public class TableElementList extends Qu
for (int i=0; i<constraintsVector.size();i++)
{
- destConstraint = constraintsVector.elementAt(i);
+ destConstraint = constraintsVector.get(i);
if (destConstraint instanceof ConstraintDefinitionNode)
{
ConstraintDefinitionNode destCDN = (ConstraintDefinitionNode)destConstraint;
@@ -286,7 +288,7 @@ public class TableElementList extends Qu
throw StandardException.newException(SQLState.LANG_MULTIPLE_CONSTRAINTS_WITH_SAME_COLUMNS,
cdn.getConstraintMoniker(), destName);
}
- constraintsVector.addElement(cdn);
+ constraintsVector.add(cdn);
}
/* Make sure that there are no duplicate constraint names in the list */
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/UntypedNullConstantNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/UntypedNullConstantNode.java?rev=1453240&r1=1453239&r2=1453240&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/UntypedNullConstantNode.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/UntypedNullConstantNode.java Wed Mar 6 09:40:32 2013
@@ -23,16 +23,12 @@ package org.apache.derby.impl.sql.compil
import java.util.List;
import org.apache.derby.iapi.services.compiler.MethodBuilder;
-
import org.apache.derby.iapi.services.sanity.SanityManager;
-
import org.apache.derby.iapi.error.StandardException;
-
import org.apache.derby.iapi.types.DataValueDescriptor;
import org.apache.derby.iapi.types.DataTypeDescriptor;
-import java.util.Vector;
/**
* An UntypedNullConstantNode represents a SQL NULL before it has
* been bound. The bind() operation will replace the UntypedNullConstantNodes
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/WindowNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/WindowNode.java?rev=1453240&r1=1453239&r2=1453240&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/WindowNode.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/WindowNode.java Wed Mar 6 09:40:32 2013
@@ -22,11 +22,6 @@
package org.apache.derby.impl.sql.compile;
import org.apache.derby.iapi.error.StandardException;
-import org.apache.derby.iapi.types.TypeId;
-import org.apache.derby.iapi.services.sanity.SanityManager;
-
-import java.sql.Types;
-import java.util.Vector;
/**
* Superclass of window definition and window reference.
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/WindowReferenceNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/WindowReferenceNode.java?rev=1453240&r1=1453239&r2=1453240&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/WindowReferenceNode.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/WindowReferenceNode.java Wed Mar 6 09:40:32 2013
@@ -22,11 +22,6 @@
package org.apache.derby.impl.sql.compile;
import org.apache.derby.iapi.error.StandardException;
-import org.apache.derby.iapi.types.TypeId;
-import org.apache.derby.iapi.services.sanity.SanityManager;
-
-import java.sql.Types;
-import java.util.Vector;
/**
* Represents a reference to an explicitly defined window