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 da...@apache.org on 2006/02/01 23:48:11 UTC
svn commit: r374198 [5/7] - in /db/derby/code/trunk/java:
client/org/apache/derby/client/net/ drda/org/apache/derby/impl/drda/
engine/org/apache/derby/catalog/ engine/org/apache/derby/catalog/types/
engine/org/apache/derby/database/ engine/org/apache/d...
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/OrderByList.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/OrderByList.java?rev=374198&r1=374197&r2=374198&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/OrderByList.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/OrderByList.java Wed Feb 1 14:46:09 2006
@@ -228,8 +228,6 @@
* We need them to point to the RCL under that one. This is useful
* when combining sorts where we need to reorder the sorting
* columns.
- *
- * @return Nothing.
*/
void resetToSourceRCs()
{
@@ -596,8 +594,6 @@
/**
* Remap all ColumnReferences in this tree to be clones of the
* underlying expression.
- *
- * @return Nothing.
*
* @exception StandardException Thrown on error
*/
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/OrderedColumn.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/OrderedColumn.java?rev=374198&r1=374197&r2=374198&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/OrderedColumn.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/OrderedColumn.java Wed Feb 1 14:46:09 2006
@@ -79,8 +79,6 @@
/**
* Set the position of this column
- *
- * @return Nothing
*/
public void setColumnPosition(int columnPosition)
{
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ParameterNode.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ParameterNode.java?rev=374198&r1=374197&r2=374198&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 Feb 1 14:46:09 2006
@@ -121,10 +121,8 @@
/**
* Set the descriptor array
*
- * @param The array of DataTypeServices to fill in when the parameters
+ * @param descriptors The array of DataTypeServices to fill in when the parameters
* are bound.
- *
- * @return Nothing
*/
void setDescriptors(DataTypeDescriptor[] descriptors)
@@ -146,8 +144,6 @@
* Set the DataTypeServices for this parameter
*
* @param descriptor The DataTypeServices to set for this parameter
- *
- * @return Nothing
*/
public void setType(DataTypeDescriptor descriptor) throws StandardException
@@ -392,8 +388,6 @@
* @param acb The ExpressionClassBuilder for the class we're building
* @param numberOfParameters number of parameters for this statement
* @param parameterList The parameter list for the statement.
- *
- * @return Nothing
*
* @exception StandardException on error
*/
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ParserImpl.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ParserImpl.java?rev=374198&r1=374197&r2=374198&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ParserImpl.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ParserImpl.java Wed Feb 1 14:46:09 2006
@@ -117,11 +117,9 @@
* Parse a statement and return a query tree. Implements the Parser
* interface
*
- * @param statementSQLTextThe Statement to parse
+ * @param statementSQLText Statement to parse
* @param paramDefaults parameter defaults. Passed around as an array
* of objects, but is really an array of StorableDataValues
- * @param topLevel true if this is a top level statement, false if not (as in
- * create/copy publication target ddl)*
* @return A QueryTree representing the parsed statement
*
* @exception StandardException Thrown on error
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/Predicate.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/Predicate.java?rev=374198&r1=374197&r2=374198&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 Feb 1 14:46:09 2006
@@ -343,8 +343,6 @@
* Set the andNode.
*
* @param andNode The new andNode.
- *
- * @return Nothing.
*/
public void setAndNode(AndNode andNode)
{
@@ -375,8 +373,6 @@
* Set the equivalence class, if any, for this predicate.
*
* @param equivalenceClass The equivalence class for this predicate.
- *
- * @return Nothing.
*/
void setEquivalenceClass(int equivalenceClass)
{
@@ -397,8 +393,6 @@
* Categorize this predicate. Initially, this means
* building a bit map of the referenced tables for each predicate.
*
- * @return None.
- *
* @exception StandardException Thrown on error
*/
public void categorize() throws StandardException
@@ -554,7 +548,6 @@
* @param ro The search clause that we are currently considering
* as the source for transitive closure
*
- * @return Nothing.
*/
void setTransitiveSearchClauseAdded(RelationalOperator ro)
{
@@ -622,8 +615,6 @@
/**
* Clear the start/stop position and qualifier flags
- *
- * @return Nothing.
*/
void clearScanFlags()
{
@@ -634,8 +625,6 @@
/**
* Clear the qualifier flag.
- *
- * @return Nothing.
*/
void clearQualifierFlag()
{
@@ -725,8 +714,6 @@
* how tree printing is supposed to work.
*
* @param depth The depth of this node in the tree
- *
- * @return Nothing
*/
public void printSubNodes(int depth)
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/PredicateList.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/PredicateList.java?rev=374198&r1=374197&r2=374198&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 Feb 1 14:46:09 2006
@@ -892,8 +892,6 @@
*
* @param predicate A Predicate to add to the list
*
- * @return Nothing
- *
* @exception StandardException Thrown on error
*/
@@ -919,8 +917,6 @@
* @param optTable The optimizable that we want qualifiers for
* @param otherPL ParameterList for non-qualifiers
*
- * @return Nothing
- *
* @exception StandardException Thrown on error
*/
protected void transferNonQualifiers(Optimizable optTable, PredicateList otherPL)
@@ -951,7 +947,6 @@
* Categorize the predicates in the list. Initially, this means
* building a bit map of the referenced tables for each predicate.
*
- * @return None.
* @exception StandardException Thrown on error
*/
public void categorize()
@@ -971,8 +966,6 @@
* how tree printing is supposed to work.
*
* @param depth The depth of this node in the tree
- *
- * @return Nothing
*/
public void printSubNodes(int depth)
@@ -999,8 +992,6 @@
* This is useful when checking for a NOP PRN as the
* Like transformation on c1 like 'ASDF%' can leave
* one of these predicates in the list.
- *
- * @return Nothing.
*/
public void eliminateBooleanTrueAndBooleanTrue()
{
@@ -1211,8 +1202,6 @@
* Remap all ColumnReferences in this tree to be clones of the
* underlying expression.
*
- * @return Nothing.
- *
* @exception StandardException Thrown on error
*/
public void remapColumnReferencesToExpressions() throws StandardException
@@ -1241,8 +1230,6 @@
* @param numTables Number of tables in the DML Statement
* @param searchClause The search clause to operate on.
*
- * @return None.
- *
* @exception StandardException Thrown on error
*/
void pullExpressions(int numTables,
@@ -1301,8 +1288,6 @@
* multi-table predicates.
*
* @param fromMap The JBitSet to XOR with.
- *
- * @return Nothing.
*/
public void xorReferencedSet(JBitSet fromMap)
{
@@ -1355,8 +1340,6 @@
* @param copyPredicate Whether to make a copy of the predicate
* before pushing
*
- * @return Nothing.
- *
* @exception StandardException Thrown on error
*/
void pushExpressionsIntoSelect(SelectNode select, boolean copyPredicate)
@@ -1509,8 +1492,6 @@
* Mark all of the RCs and the RCs in their RC/VCN chain
* referenced in the predicate list as referenced.
*
- * @return Nothing.
- *
* @exception StandardException Thrown on error
*/
void markReferencedColumns()
@@ -1541,9 +1522,6 @@
*
* @param tableNumber The tableNumber of the table from which
* the columns of interest come from.
- * @param eqAllCols Array of booleans for noting which columns
- * are in = predicates, regardless of the source
- * of the columns being joined with.
* @param eqOuterCols Array of booleans for noting which columns
* are in = predicates with constants or
* correlation columns.
@@ -1551,8 +1529,6 @@
* @param resultColTable tableNumber is the table the result columns are
* coming from
*
- * @return Nothing.
- *
* @exception StandardException Thrown on error
*/
void checkTopPredicatesForEqualsConditions(
@@ -1650,8 +1626,6 @@
*
* @param fromList The subquery's FROM list.
* @param decrement Decrement size.
- *
- * @return Nothing.
*/
void decrementLevel(FromList fromList, int decrement)
{
@@ -1739,8 +1713,6 @@
* @param fromList The FromList in question.
* @param cc The CompilerContext to use
*
- * @return Nothing.
- *
* @exception StandardException Thrown on error
*/
void joinClauseTransitiveClosure(int numTables,
@@ -2068,8 +2040,6 @@
* @param numTables The number of tables in the query
* @param hashJoinSpecified Whether or not user specified a hash join
*
- * @return Nothing.
- *
* @exception StandardException Thrown on error
*/
void searchClauseTransitiveClosure(int numTables, boolean hashJoinSpecified)
@@ -2345,8 +2315,6 @@
* class (!= -1) and there are other predicates in the same equivalence
* class after it in the list. (Actually, we remove all of the predicates
* in the same equivalence class that appear after this one.)
- *
- * @return Nothing.
*/
void removeRedundantPredicates()
{
@@ -3231,7 +3199,6 @@
* Generate the indexable row for a start key or stop key.
*
* @param acb The ActivationClassBuilder for the class we're building
- * @param mb The method the generated code is to go into
* @param numberOfColumns The number of columns in the key
*
* @return The field that holds the indexable row
@@ -3380,8 +3347,6 @@
* @param acb The ActivationClassBuilder for the class we're building
* @param exprFun The MethodBuilder for the method we're building
* @param rowField The name of the field that holds the indexable row
- *
- * @return An Expression that evaluates to the start or stop key getter
*/
private void finishKey(ExpressionClassBuilder acb,
MethodBuilder mb,
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/PrivilegeNode.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/PrivilegeNode.java?rev=374198&r1=374197&r2=374198&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/PrivilegeNode.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/PrivilegeNode.java Wed Feb 1 14:46:09 2006
@@ -92,7 +92,7 @@
* Bind this GrantNode. Resolve all table, column, and routine references. Register
* a dependency on the object of the privilege if it has not already been done
*
- * @dependencies The list of privilege objects that this statement has already seen.
+ * @param dependencies The list of privilege objects that this statement has already seen.
* If the object of this privilege is not in the list then this statement is registered
* as dependent on the object.
*
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ProjectRestrictNode.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ProjectRestrictNode.java?rev=374198&r1=374197&r2=374198&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 Feb 1 14:46:09 2006
@@ -839,8 +839,6 @@
* how tree printing is supposed to work.
*
* @param depth The depth of this node in the tree
- *
- * @return Nothing
*/
public void printSubNodes(int depth)
@@ -1048,7 +1046,7 @@
* Optimize this ProjectRestrictNode.
*
* @param dataDictionary The DataDictionary to use for optimization
- * @param predicateList The PredicateList to optimize. This should
+ * @param predicates The PredicateList to optimize. This should
* be a join predicate.
* @param outerRows The number of outer joining rows
*
@@ -1159,7 +1157,7 @@
/**
* General logic shared by Core compilation.
*
- * @param ecb The ExpressionClassBuilder for the class being built
+ * @param acb The ExpressionClassBuilder for the class being built
* @param mb The method the expression will go into
*
*
@@ -1176,11 +1174,9 @@
/**
* Logic shared by generate() and generateResultSet().
*
- * @param ecb The ExpressionClassBuilder for the class being built
+ * @param acb The ExpressionClassBuilder for the class being built
* @param mb The method the expression will go into
*
- * @return The compiled Expression
- *
* @exception StandardException Thrown on error
*/
@@ -1643,8 +1639,6 @@
/**
* Mark the underlying scan as a distinct scan.
- *
- * @return Nothing.
*/
void markForDistinctScan()
{
@@ -1688,8 +1682,6 @@
/**
* set the Information gathered from the parent table that is
* required to peform a referential action on dependent table.
- *
- * @return Nothing.
*/
public void setRefActionInfo(long fkIndexConglomId,
int[]fkColArray,
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/QuantifiedBinaryOperatorNode.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/QuantifiedBinaryOperatorNode.java?rev=374198&r1=374197&r2=374198&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/QuantifiedBinaryOperatorNode.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/QuantifiedBinaryOperatorNode.java Wed Feb 1 14:46:09 2006
@@ -68,8 +68,6 @@
* how tree printing is supposed to work.
*
* @param depth The depth of this node in the tree
- *
- * @return Nothing
*/
public void printSubNodes(int depth)
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/QuantifiedUnaryOperatorNode.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/QuantifiedUnaryOperatorNode.java?rev=374198&r1=374197&r2=374198&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/QuantifiedUnaryOperatorNode.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/QuantifiedUnaryOperatorNode.java Wed Feb 1 14:46:09 2006
@@ -58,8 +58,6 @@
* how tree printing is supposed to work.
*
* @param depth The depth of this node in the tree
- *
- * @return Nothing
*/
public void printSubNodes(int depth)
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/QueryTreeNode.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/QueryTreeNode.java?rev=374198&r1=374197&r2=374198&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 Feb 1 14:46:09 2006
@@ -98,8 +98,6 @@
* Set the ContextManager for this node.
*
* @param cm The ContextManager.
- *
- * @return Nothing.
*/
public void setContextManager(ContextManager cm)
{
@@ -211,7 +209,7 @@
* Sets the beginning offset of the SQL substring which this
* query node represents.
*
- * @param The beginning offset of the SQL substring.
+ * @param beginOffset The beginning offset of the SQL substring.
*
*/
public void setBeginOffset( int beginOffset )
@@ -232,7 +230,7 @@
* Sets the ending offset of the SQL substring which this
* query node represents.
*
- * @param The ending offset of the SQL substring.
+ * @param endOffset The ending offset of the SQL substring.
*
*/
public void setEndOffset( int endOffset )
@@ -321,8 +319,6 @@
* Print this tree for debugging purposes. This recurses through
* all the sub-nodes and prints them indented by their depth in
* the tree.
- *
- * @return Nothing
*/
public void treePrint()
@@ -343,8 +339,6 @@
*
* @param depth The depth of this node in the tree, thus,
* the amount to indent it when printing it.
- *
- * @return Nothing
*/
public void treePrint(int depth)
@@ -361,8 +355,6 @@
* Print a String for debugging
*
* @param outputString The String to print
- *
- * @return Nothing
*/
public static void debugPrint(String outputString)
@@ -374,8 +366,6 @@
/**
* Flush the debug stream out
- *
- * @return Nothing
*/
protected static void debugFlush()
{
@@ -407,8 +397,6 @@
* wouldn't get to the right super-class.
*
* @param depth The depth to indent the sub-nodes
- *
- * @return Nothing
*/
public void printSubNodes(int depth)
@@ -444,8 +432,6 @@
* @param depth The depth of indentation to use when printing
* the label
* @param label The String to print
- *
- * @return Nothing
*/
public void printLabel(int depth, String label)
@@ -675,8 +661,6 @@
* Set the node type for this node.
*
* @param nodeType The node type.
- *
- * @return Nothing.
*/
public void setNodeType(int nodeType)
{
@@ -787,7 +771,7 @@
* Parse some query text and return a parse tree.
*
* @param compilerContext The CompilerContext to use
- * @param createViewText Query text to parse.
+ * @param queryText Query text to parse.
* @param paramDefaults array of parameter defaults used to
* initialize parameter nodes, and ultimately
* for the optimization of statements with
@@ -1576,8 +1560,6 @@
/**
* set the Information gathered from the parent table that is
* required to peform a referential action on dependent table.
- *
- * @return Nothing.
*/
public void setRefActionInfo(long fkIndexConglomId,
int[]fkColArray,
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/RelationalOperator.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/RelationalOperator.java?rev=374198&r1=374197&r2=374198&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/RelationalOperator.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/RelationalOperator.java Wed Feb 1 14:46:09 2006
@@ -240,9 +240,6 @@
* @param mb The method the generated code is to go into
* @param optTable The Optimizable table the Qualifier will qualify
*
- * @return An expression that evaluates to the GeneratedMethod that
- * returns the Orderable to be returned by Qualifier.getOrderable()
- *
* @exception StandardException Thrown on error.
*/
void generateQualMethod(ExpressionClassBuilder acb,
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ReplaceAggregatesWithCRVisitor.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ReplaceAggregatesWithCRVisitor.java?rev=374198&r1=374197&r2=374198&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ReplaceAggregatesWithCRVisitor.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ReplaceAggregatesWithCRVisitor.java Wed Feb 1 14:46:09 2006
@@ -44,7 +44,6 @@
*
* @param rcl the result column list
* @param tableNumber The tableNumber for the new CRs
- * @param nodeToSkip don't examine anything below nodeToSkip
*/
public ReplaceAggregatesWithCRVisitor(ResultColumnList rcl, int tableNumber)
{
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ResultColumn.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ResultColumn.java?rev=374198&r1=374197&r2=374198&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 Feb 1 14:46:09 2006
@@ -116,27 +116,39 @@
/**
* Different types of initializer parameters indicate different
- * types of initialization.
+ * types of initialization. Parameters may be:
*
- * @param arg1 The name of the column, if any.
- * @param arg2 The expression this result column represents
+ * <ul>
+ * <li>arg1 The name of the column, if any.</li>
+ * <li>arg2 The expression this result column represents</li>
+ * </ul>
*
+ * <p>
* - OR -
+ * </p>
*
- * @param arg1 a column reference node
- * @param arg2 The expression this result column represents
+ * <ul>
+ * <li>arg1 a column reference node</li>
+ * <li>arg2 The expression this result column represents</li>
+ * </ul>
*
+ * <p>
* - OR -
+ * </p>
*
- * @param arg1 The column descriptor.
- * @param arg2 The expression this result column represents
+ * <ul>
+ * <li>arg1 The column descriptor.</li>
+ * <li>arg2 The expression this result column represents</li>
+ * </ul>
*
+ * <p>
* - OR -
+ * </p>
*
- * @param dtd The type of the column
- * @param expression The expression this result column represents
- *
- * @return The newly initialized ResultColumn
+ * <ul>
+ * <li>dtd The type of the column</li>
+ * <li>expression The expression this result column represents</li>
+ * </ul>
*/
public void init(Object arg1, Object arg2) throws StandardException
{
@@ -306,8 +318,6 @@
* be hooked up.
*
* @param expression The expression to be set in this ResultColumn
- *
- * @return Nothing
*/
public void setExpression(ValueNode expression)
@@ -330,8 +340,6 @@
* Set the expression to a null node of the
* correct type.
*
- * @return Nothing.
- *
* @exception StandardException Thrown on error
*/
void setExpressionToNullNode()
@@ -349,8 +357,6 @@
* table they came from.
*
* @param name The name to set in this ResultColumn
- *
- * @return Nothing
*/
public void setName(String name)
@@ -392,8 +398,6 @@
* back pointer to the RSN.
*
* @param resultSetNumber The resultSetNumber.
- *
- * @return Nothing.
*/
public void setResultSetNumber(int resultSetNumber)
{
@@ -414,8 +418,6 @@
* Set the clause that this node appears in.
*
* @param clause The clause that this node appears in.
- *
- * @return Nothing.
*/
public void setClause(int clause)
{
@@ -436,8 +438,6 @@
* Adjust the virtualColumnId for this ResultColumn by the specified amount
*
* @param adjust The adjustment for the virtualColumnId
- *
- * @return Nothing
*/
public void adjustVirtualColumnId(int adjust)
@@ -449,8 +449,6 @@
* Set the virtualColumnId for this ResultColumn
*
* @param id The virtualColumnId for this ResultColumn
- *
- * @return Nothing
*/
public void setVirtualColumnId(int id)
@@ -472,8 +470,6 @@
* Generate a unique (across the entire statement) column name for unnamed
* ResultColumns
*
- * @return None.
- *
* @exception StandardException Thrown on error
*/
public void guaranteeColumnName() throws StandardException
@@ -524,8 +520,6 @@
* how tree printing is supposed to work.
*
* @param depth The depth of this node in the tree
- *
- * @return Nothing
*/
public void printSubNodes(int depth)
@@ -611,8 +605,6 @@
* @param columnId The ordinal position of the column
* in the table, starting at 1.
*
- * @return Nothing
- *
* @exception StandardException Thrown on error
*/
@@ -659,8 +651,6 @@
* in the table, starting at 1. (Used to
* set the VirtualColumnId.)
*
- * @return Nothing
- *
* @exception StandardException Thrown on error
*/
@@ -693,10 +683,6 @@
/**
* Change an untyped null to a typed null.
*
- * @param typeId The type of the null.
- *
- * @return Nothing.
- *
* @exception StandardException Thrown on error
*/
public void typeUntypedNullExpression( ResultColumn bindingRC)
@@ -734,7 +720,6 @@
* @param columnDescriptor The ColumnDescriptor to set in
* this ResultColumn.
*
- * @return Nothing
* @exception StandardException tableNameMismatch
*/
void setColumnDescriptor(TableDescriptor tableDescriptor,
@@ -777,8 +762,6 @@
* This is useful for SELECT statements, where the result type
* of each column is the type of the column's expression.
*
- * @return Nothing
- *
* @exception StandardException Thrown on error
*/
public void bindResultColumnToExpression()
@@ -907,9 +890,6 @@
* @param eb The ExpressionBlock that the generate code is to go into
* @param getColumnExpression "fieldx.getColumn(y)"
*
- * @return An Expression representing a Null for the result
- * column.
- *
* @exception StandardException Thrown on error
*/
/*PUSHCOMPILE
@@ -1168,8 +1148,6 @@
/**
* Mark this a columm as a generated column
- *
- * @return None.
*/
public void markGenerated()
{
@@ -1180,8 +1158,6 @@
/**
* Mark this a columm as generated for an unmatched column in an insert
- *
- * @return None.
*/
public void markGeneratedForUnmatchedColumnInInsert()
{
@@ -1202,8 +1178,6 @@
/**
* Mark this column as a referenced column.
- *
- * @return None.
*/
public void setReferenced()
{
@@ -1234,8 +1208,6 @@
/**
* Mark this column as an unreferenced column.
- *
- * @return None.
*/
public void setUnreferenced()
{
@@ -1245,8 +1217,6 @@
/**
* Mark this RC and all RCs in the underlying
* RC/VCN chain as referenced.
- *
- * @return Nothing.
*/
void markAllRCsInChainReferenced()
{
@@ -1275,8 +1245,6 @@
/**
* Mark this ResultColumn as redundant.
- *
- * @return None.
*/
public void setRedundant()
{
@@ -1285,8 +1253,6 @@
/**
* Mark this ResultColumn as a grouping column in the SELECT list
- *
- * @return Nothing.
*/
public void markAsGroupingColumn()
{
@@ -1297,8 +1263,6 @@
* Look for and reject ?/-?/+? parameter under this ResultColumn. This is
* called for SELECT statements.
*
- * @return Nothing
- *
* @exception StandardException Thrown if a ?/-?/+? parameter was found
* directly under this ResultColumn.
*/
@@ -1543,8 +1507,6 @@
/**
* Verify that this RC is orderable.
*
- * @return Nothing.
- *
* @exception StandardException Thrown on error
*/
void verifyOrderable() throws StandardException
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ResultColumnList.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ResultColumnList.java?rev=374198&r1=374197&r2=374198&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 Feb 1 14:46:09 2006
@@ -1,5 +1,4 @@
/*
-
Derby - Class org.apache.derby.impl.sql.compile.ResultColumnList
Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
@@ -133,8 +132,6 @@
* AllResultColumn) to the list
*
* @param resultColumn The ResultColumn to add to the list
- *
- * @return Nothing
*/
public void addResultColumn(ResultColumn resultColumn)
@@ -151,8 +148,6 @@
* @param resultColumns The ResultColumnList to be appended
* @param destructiveCopy Whether or not this is a descructive copy
* from resultColumns
- *
- * @return Nothing
*/
public void appendResultColumns(ResultColumnList resultColumns,
boolean destructiveCopy)
@@ -489,9 +484,6 @@
*
* @param nameList The ResultColumnList from which to copy
* the column names
- *
- * @return Nothing
- *
*/
void copyResultColumnNames(ResultColumnList nameList)
@@ -526,8 +518,6 @@
* nodes, and these have to be printed and indented properly.
*
* @param depth The depth at which to indent the sub-nodes
- *
- * @return Nothing
*/
public void treePrint(int depth)
@@ -550,8 +540,6 @@
* @param subqueryList The subquery list being built as we find SubqueryNodes
* @param aggregateVector The aggregate vector being built as we find AggregateNodes
*
- * @return Nothing
- *
* @exception StandardException Thrown on error
*/
public void bindExpressions(
@@ -580,8 +568,6 @@
* to each result column. This is useful for SELECT statements, where
* the result type of each column is the type of the column's expression.
*
- * @return Nothing
- *
* @exception StandardException Thrown on error
*/
public void bindResultColumnsToExpressions()
@@ -599,9 +585,7 @@
* like "GRANT SELECT ON t(c1,c1,c3) TO george", where the user specified a column list.
* This method does not check for duplicate column names.
*
- * @param tableDescriptor The descriptor for the table
- *
- * @return Nothing
+ * @param targetTableDescriptor The descriptor for the table
*
* @exception StandardException Thrown on error
*/
@@ -629,7 +613,7 @@
* NOTE: We pass the ResultColumns position in the ResultColumnList so
* that the VirtualColumnId gets set.
*
- * @param tableDescriptor The descriptor for the table being
+ * @param targetTableDescriptor The descriptor for the table being
* updated or inserted into
* @param statement DMLStatementNode containing this list, null if no duplicate checking is to be done
*
@@ -686,8 +670,6 @@
* @param fullRCL The full RCL for the target table
* @param statement DMLStatementNode containing this list
*
- * @return Nothing
- *
* @exception StandardException Thrown on error
*/
public void bindResultColumnsByName(ResultColumnList fullRCL,
@@ -757,11 +739,9 @@
* INSERT statements like "insert into t values (1, 2, 3)", where the
* user did not specify a column list.
*
- * @param tableDescriptor The descriptor for the table being
+ * @param targetTableDescriptor The descriptor for the table being
* inserted into
*
- * @return Nothing
- *
* @exception StandardException Thrown on error
*/
public void bindResultColumnsByPosition(TableDescriptor targetTableDescriptor)
@@ -793,8 +773,6 @@
* @param outerSubqueryList SubqueryList from outer query block
* @param outerPredicateList PredicateList from outer query block
*
- * @return Nothing
- *
* @exception StandardException Thrown on error
*/
public void preprocess(int numTables,
@@ -1387,8 +1365,6 @@
* @param rowAllocatorType The row type.
* @param numCols The number of columns in the row.
*
- * @return Nothing.
- *
* @exception StandardException Thrown on error
*/
private void genCreateRow(ExpressionClassBuilder acb,
@@ -1450,9 +1426,6 @@
* each ResultColumn has a name. (All generated names will be unique across the
* entire statement.)
*
- * @param compilerContext The CompilerContext to use.
- *
- * @return None.
*
* @exception StandardException Thrown on error
*/
@@ -1529,8 +1502,6 @@
* Generate (unique across the entire statement) column names for those
* ResultColumns in this list which are not named.
*
- * @return None.
- *
* @exception StandardException Thrown on error
*/
public void nameAllResultColumns()
@@ -1551,9 +1522,7 @@
* to another RCL (the source).
* This is useful when adding a NormalizeResultSetNode.
*
- * @param sourcRCL The source RCL
- *
- * @return Nothing.
+ * @param sourceRCL The source RCL
*/
public void copyTypesAndLengthsToSource(ResultColumnList sourceRCL) throws StandardException
{
@@ -1746,9 +1715,6 @@
* NOTE: This flavor marks all of the underlying RCs as referenced.
*
* @param sourceResultSet ResultSetNode that is source of value
- * @param sourceResultColumn ResultColumn that is source of value
- *
- * @return None.
*
* @exception StandardException Thrown on error
*/
@@ -1767,12 +1733,9 @@
* up the query tree.
*
* @param sourceResultSet ResultSetNode that is source of value
- * @param sourceResultColumn ResultColumn that is source of value
* @param markReferenced Whether or not to mark the underlying RCs
* as referenced
*
- * @return None.
- *
* @exception StandardException Thrown on error
*/
public void genVirtualColumnNodes(ResultSetNode sourceResultSet,
@@ -1810,9 +1773,7 @@
* by the specified amount. If ResultColumn.expression is a VirtualColumnNode,
* then we adjust the columnId there as well.
*
- * @param increment The size of the increment.
- *
- * @return None.
+ * @param adjust The size of the increment.
*/
public void adjustVirtualColumnIds(int adjust)
{
@@ -1844,8 +1805,6 @@
* reset the virtual column ids in the referenced ResultColumns.
* If all ResultColumns are projected out, then the list is not empty.
*
- * @return None.
- *
* @exception StandardException Thrown on error
*/
public void doProjection() throws StandardException
@@ -1936,8 +1895,6 @@
* @param derivedRCL The derived column list
* @param tableName The table name for the FromTable
*
- * @return None.
- *
* @exception StandardException Thrown on error
*/
public void propagateDCLInfo(ResultColumnList derivedRCL, String tableName)
@@ -1967,8 +1924,6 @@
* Look for and reject ? parameters under ResultColumns. This is done for
* SELECT statements.
*
- * @return Nothing
- *
* @exception StandardException Thrown if a ? parameter found directly
* under a ResultColumn
*/
@@ -2022,8 +1977,6 @@
* (user-specified) list must have been added internally
* and will not be returned to the user.
*
- * @return Nothing
- *
* @exception StandardException Thrown if an XML value found
* directly under a ResultColumn
*/
@@ -2053,8 +2006,6 @@
* Set the resultSetNumber in all of the ResultColumns.
*
* @param resultSetNumber The resultSetNumber
- *
- * @return Nothing.
*/
public void setResultSetNumber(int resultSetNumber)
{
@@ -2070,8 +2021,6 @@
* Mark all of the ResultColumns as redundant.
* Useful when chopping a ResultSetNode out of a tree when there are
* still references to its RCL.
- *
- * @return Nothing.
*/
public void setRedundant()
{
@@ -2090,8 +2039,6 @@
* @param ucl The cursor's FOR UPDATE OF list. (May be null.)
* @param cursorName The cursor's name.
*
- * @return Nothing.
- *
* @exception StandardException Thrown on error
*/
public void checkColumnUpdateability(String[] ucl, String cursorName)
@@ -2129,8 +2076,6 @@
* @param level The nesting level for the UNION.
* @param operatorName "UNION", "INTERSECT", or "EXCEPT"
*
- * @return Nothing.
- *
* @exception StandardException Thrown on error
*/
public void setUnionResultExpression(ResultColumnList otherRCL,
@@ -2505,8 +2450,6 @@
/**
* Mark all the columns in this list as updated by an update statement.
- *
- * @return Nothing.
*/
void markUpdated()
{
@@ -2526,8 +2469,6 @@
* to tell which ones the user is really trying to update so we can
* determine correctly whether all the updated columns are in the
* "for update" list.
- *
- * @return Nothing.
*/
void markUpdatableByCursor()
{
@@ -2545,7 +2486,6 @@
* Verify that all of the column names in this list are contained
* within the ColumnDefinitionNodes within the TableElementList.
*
- * @param TableElementList tel
*
* @return String The 1st column name, if any, that is not in the list.
*/
@@ -2569,8 +2509,6 @@
* Export the result column names to the passed in String[].
*
* @param columnNames String[] to hold the column names.
- *
- * @return Nothing.
*/
public void exportNames(String[] columnNames)
{
@@ -2829,8 +2767,6 @@
* Remap all ColumnReferences in this tree to be clones of the
* underlying expression.
*
- * @return Nothing.
- *
* @exception StandardException Thrown on error
*/
public void remapColumnReferencesToExpressions() throws StandardException
@@ -2949,8 +2885,6 @@
*
* @param idArray int[] for column ids
* @param basis 0 (for 0-based ids) or 1 (for 1-based ids)
- *
- * @return Nothing.
*/
public void recordColumnReferences(int[] idArray, int basis)
{
@@ -2978,8 +2912,6 @@
* @param colArray1 boolean[] for columns
* @param tableColMap JBitSet[] for tables
* @param tableNumber Table number of column references
- *
- * @return Nothing.
*/
public void recordColumnReferences(boolean[] colArray1, JBitSet[] tableColMap,
int tableNumber)
@@ -3043,8 +2975,6 @@
/**
* Clear the column references from the RCL. (Restore RCL back to a state
* where none of the RCs are marked as referenced.)
- *
- * @return Nothing.
*/
public void clearColumnReferences()
{
@@ -3064,8 +2994,6 @@
* Copy the referenced RCs from this list to the supplied target list.
*
* @param targetList The list to copy to
- *
- * @return Nothing.
*/
public void copyReferencedColumnsToNewList(ResultColumnList targetList)
{
@@ -3086,8 +3014,6 @@
*
* @param targetList The list to copy to,
* @param copyList 1 based bitMap we copy columns associated with set bits.
- *
- * @return Nothing.
*/
public void copyColumnsToNewList(ResultColumnList targetList, FormatableBitSet copyList)
{
@@ -3155,8 +3081,6 @@
* via ALTER TABLE.
*
* @param allowed Whether or not a mismatch is allowed.
- *
- * @return Nothing.
*/
protected void setCountMismatchAllowed(boolean allowed)
{
@@ -3205,8 +3129,6 @@
* @param tableName The TableName for the BCNs.
* @param javaClassName The name of the VTI
*
- * @return Nothing.
- *
* @exception StandardException Thrown on error
*/
public void createListFromResultSetMetaData(ResultSetMetaData rsmd,
@@ -3318,8 +3240,6 @@
* and generate the expected code. (We really should create yet another new node
* type with its own code generation.)
*
- * @return Nothing.
- *
* @exception StandardException Thrown on error
*/
public void addRCForRID()
@@ -3350,8 +3270,6 @@
* when deciding which columns need to be returned from a non-matching
* index scan (as opposed to those returned from the base table).
*
- * @return None.
- *
* @exception StandardException Thrown on error
*/
public void markAllUnreferenced()
@@ -3498,7 +3416,7 @@
* belongs to is for update w/o a column list
* @param always Whether or not caller always wants a non-null FormatableBitSet if
* all RCs are referenced.
- * @param If true, only set bit if expression is a BaseColumnNode,
+ * @param onlyBCNs If true, only set bit if expression is a BaseColumnNode,
* otherwise set bit for all referenced RCs.
*
* @return The FormatableBitSet representing the referenced RCs.
@@ -3631,8 +3549,6 @@
* for a JOIN with a USING clause.
*
* @param joinColumns The list of join columns
- *
- * @return Nothing.
*/
void removeJoinColumns(ResultColumnList joinColumns)
{
@@ -3699,8 +3615,6 @@
/**
* Reset the virtual column ids for all of the
* underlying RCs. (Virtual column ids are 1-based.)
- *
- * @return Nothing.
*/
void resetVirtualColumnIds()
{
@@ -3871,8 +3785,6 @@
* NOTE: The grammar allows:
* VALUES DEFAULT;
*
- * @return Nothing.
- *
* @exception StandardException Thrown on error
*/
void checkForInvalidDefaults()
@@ -3897,8 +3809,6 @@
/**
* Verify that all of the RCs in this list are comparable.
*
- * @return Nothing.
- *
* @exception StandardException Thrown on error
*/
void verifyAllOrderable()
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ResultSetNode.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ResultSetNode.java?rev=374198&r1=374197&r2=374198&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 Feb 1 14:46:09 2006
@@ -127,8 +127,6 @@
* how tree printing is supposed to work.
*
* @param depth The depth of this node in the tree
- *
- * @return Nothing
*/
public void printSubNodes(int depth)
@@ -199,8 +197,6 @@
* Assign the next resultSetNumber to the resultSetNumber in this ResultSetNode.
* Expected to be done during generate().
*
- * @return Nothing.
- *
* @exception StandardException Thrown on error
*/
@@ -252,8 +248,6 @@
*
* @param fromListParam FromList to use/append to.
*
- * @return Nothing
- *
* @exception StandardException Thrown on error
*/
public void bindExpressions(FromList fromListParam)
@@ -272,8 +266,6 @@
*
* @param fromListParam FromList to use/append to.
*
- * @return Nothing
- *
* @exception StandardException Thrown on error
*/
public void bindExpressionsWithTables(FromList fromListParam)
@@ -292,8 +284,6 @@
* need to validate the target list before blowing it away and replacing
* it with a SELECT true.
*
- * @return Nothing
- *
* @exception StandardException Thrown on error
*/
@@ -470,8 +460,6 @@
* @param outerFromList The FromList from the outer query block(s)
* @param subqueryType The subquery type
*
- * @return None
- *
* @exception StandardException Thrown on error
*/
public void verifySelectStarSubquery(FromList outerFromList, int subqueryType)
@@ -539,8 +527,6 @@
*
* @param onlyConvertAlls Boolean, whether or not to just convert *'s
*
- * @return Nothing.
- *
* @exception StandardException Thrown on error
*/
public void setResultToBooleanTrueNode(boolean onlyConvertAlls)
@@ -614,8 +600,6 @@
*
* @param fromListParam FromList to use/append to.
*
- * @return Nothing
- *
* @exception StandardException Thrown on error
*/
@@ -649,8 +633,6 @@
* @param statement Calling DMLStatementNode (Insert or Update)
* @param fromListParam FromList to use/append to.
*
- * @return Nothing
- *
* @exception StandardException Thrown on error
*/
@@ -858,7 +840,7 @@
* can appear above a SelectNode.
*
* @param dataDictionary The DataDictionary to use for optimization
- * @param predicateList The PredicateList to apply.
+ * @param predicates The PredicateList to apply.
* @param outerRows The number of outer joining rows
*
* @return ResultSetNode The top of the optimized query tree
@@ -919,9 +901,7 @@
/**
* Set the resultColumns in this ResultSetNode
*
- * @param resultColumns The new ResultColumnList for this ResultSetNode
- *
- * @return None.
+ * @param newRCL The new ResultColumnList for this ResultSetNode
*/
public void setResultColumns(ResultColumnList newRCL)
{
@@ -942,8 +922,6 @@
* Set the referencedTableMap in this ResultSetNode
*
* @param newRTM The new referencedTableMap for this ResultSetNode
- *
- * @return None.
*/
public void setReferencedTableMap(JBitSet newRTM)
{
@@ -964,8 +942,6 @@
* Fill the referencedTableMap with this ResultSetNode.
*
* @param passedMap The table map to fill in.
- *
- * @return Nothing.
*/
public void fillInReferencedTableMap(JBitSet passedMap)
{
@@ -975,8 +951,6 @@
* Check for (and reject) ? parameters directly under the ResultColumns.
* This is done for SELECT statements.
*
- * @return Nothing
- *
* @exception StandardException Thrown if a ? parameter found
* directly under a ResultColumn
*/
@@ -997,8 +971,6 @@
* and thus there's no standard way to pass such a type back
* to a JDBC application.
*
- * @return Nothing
- *
* @exception StandardException Thrown if an XML value found
* directly under a ResultColumn
*/
@@ -1069,7 +1041,7 @@
* NOTE - The new or enhanced RCL will be fully bound.
*
* @param numTargetColumns # of columns in target RCL
- * @param colMap[] int array representation of correspondence between
+ * @param colMap int array representation of correspondence between
* RCLs - colmap[i] = -1 -> missing in current RCL
* colmap[i] = j -> targetRCL(i) <-> thisRCL(j+1)
* @param dataDictionary DataDictionary to use
@@ -1734,8 +1706,6 @@
* This is useful when flattening a subquery.
*
* @param decrement The amount to decrement by.
- *
- * @return Nothing;
*/
abstract void decrementLevel(int decrement);
@@ -1746,8 +1716,6 @@
* consider sort avoidance.
*
* @param orderByList The order by list
- *
- * @return Nothing.
*/
void pushOrderByList(OrderByList orderByList)
{
@@ -1763,8 +1731,8 @@
* compiler. A couple ResultSets (the ones used by PREPARE SELECT FILTER)
* implement this method.
*
- * @param ecb The ExpressionClassBuilder for the class being built
- * @param eb The method the expression will go into
+ * @param acb The ExpressionClassBuilder for the class being built
+ * @param mb The method the expression will go into
*
*
* @exception StandardException Thrown on error
@@ -1797,8 +1765,6 @@
/**
* Mark this node and its children as not being a flattenable join.
- *
- * @return Nothing.
*/
void notFlattenableJoin()
{
@@ -1866,8 +1832,6 @@
/**
* Mark the underlying scan as a distinct scan.
- *
- * @return Nothing.
*/
void markForDistinctScan()
{
@@ -1883,8 +1847,6 @@
* Notify the underlying result set tree that the result is
* ordering dependent. (For example, no bulk fetch on an index
* if under an IndexRowToBaseRow.)
- *
- * @return Nothing.
*/
void markOrderingDependent()
{
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/RowResultSetNode.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/RowResultSetNode.java?rev=374198&r1=374197&r2=374198&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 Feb 1 14:46:09 2006
@@ -115,8 +115,6 @@
* how tree printing is supposed to work.
*
* @param depth The depth of this node in the tree
- *
- * @return Nothing
*/
public void printSubNodes(int depth)
@@ -197,8 +195,6 @@
* sub-expressions, as well as figuring out what the return type is
* for each expression.
*
- * @return Nothing
- *
* @exception StandardException Thrown on error
*/
@@ -257,8 +253,6 @@
*
* @param fromListParam FromList to use/append to.
*
- * @return Nothing
- *
* @exception StandardException Thrown on error
*/
public void bindExpressionsWithTables(FromList fromListParam)
@@ -275,8 +269,6 @@
* need to validate the target list before blowing it away and replacing
* it with a SELECT true.
*
- * @return Nothing
- *
* @exception StandardException Thrown on error
*/
@@ -351,8 +343,6 @@
* @param outerFromList The FromList from the outer query block(s)
* @param subqueryType The subquery type
*
- * @return None
- *
* @exception StandardException Thrown on error
*/
public void verifySelectStarSubquery(FromList outerFromList, int subqueryType)
@@ -368,8 +358,6 @@
* consider sort avoidance.
*
* @param orderByList The order by list
- *
- * @return Nothing.
*/
void pushOrderByList(OrderByList orderByList)
{
@@ -656,8 +644,6 @@
* RowResultSet -- for the VALUES clause
*
*
- * @return A compiled Expression returning a ResultSet
- *
* @exception StandardException Thrown on error
*/
public void generate(ActivationClassBuilder acb,
@@ -727,8 +713,6 @@
* else. This is useful for a RowResultSetNode as a derived table
* because it doesn't get optimized otherwise.
*
- * @return Nothing.
- *
* @exception StandardException Thrown on error
*/
void optimizeSubqueries(DataDictionary dd, double rowCount)
@@ -741,8 +725,6 @@
* Notify the underlying result set tree that the result is
* ordering dependent. (For example, no bulk fetch on an index
* if under an IndexRowToBaseRow.)
- *
- * @return Nothing.
*/
void markOrderingDependent()
{
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SQLToJavaValueNode.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SQLToJavaValueNode.java?rev=374198&r1=374197&r2=374198&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 Feb 1 14:46:09 2006
@@ -77,8 +77,6 @@
* how tree printing is supposed to work.
*
* @param depth The depth of this node in the tree
- *
- * @return Nothing
*/
public void printSubNodes(int depth)
@@ -173,8 +171,6 @@
* Set the clause that this node appears in.
*
* @param clause The clause that this node appears in.
- *
- * @return Nothing.
*/
public void setClause(int clause)
{
@@ -267,8 +263,6 @@
* @param outerSubqueryList SubqueryList from outer query block
* @param outerPredicateList PredicateList from outer query block
*
- * @return Nothing.
- *
* @exception StandardException Thrown on error
*/
public void preprocess(int numTables,
@@ -361,8 +355,7 @@
*
*
* @param acb The ExpressionClassBuilder for the class being built
- * @param mb The method the expression will go into
- * @param SQLValue An Expression holding the SQLValue.
+ * @param mbex The method the expression will go into
*
*
* @exception StandardException Thrown on error
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SelectNode.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SelectNode.java?rev=374198&r1=374197&r2=374198&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 Feb 1 14:46:09 2006
@@ -190,8 +190,6 @@
/**
* Mark this SelectNode as being generated for a GROUP BY clause.
- *
- * @return Nothing.
*/
public void markAsForGroupByClause()
{
@@ -210,8 +208,6 @@
/**
* Mark this SelectNode as being generated for a HAVING clause.
- *
- * @return Nothing.
*/
public void markAsForHavingClause()
{
@@ -223,8 +219,6 @@
* how tree printing is supposed to work.
*
* @param depth The depth of this node in the tree
- *
- * @return Nothing
*/
public void printSubNodes(int depth)
@@ -489,8 +483,6 @@
*
* @param fromListParam FromList to use/append to.
*
- * @return Nothing
- *
* @exception StandardException Thrown on error
*/
public void bindExpressions(FromList fromListParam)
@@ -649,8 +641,6 @@
*
* @param fromListParam FromList to use/append to.
*
- * @return Nothing
- *
* @exception StandardException Thrown on error
*/
public void bindExpressionsWithTables(FromList fromListParam)
@@ -667,8 +657,6 @@
* need to validate the target list before blowing it away and replacing
* it with a SELECT true.
*
- * @return Nothing
- *
* @exception StandardException Thrown on error
*/
@@ -688,8 +676,6 @@
*
* @param fromListParam FromList to use/append to.
*
- * @return Nothing
- *
* @exception StandardException Thrown on error
*/
@@ -740,8 +726,6 @@
* @param statement Calling DMLStatementNode (Insert or Update)
* @param fromListParam FromList to use/append to.
*
- * @return Nothing
- *
* @exception StandardException Thrown on error
*/
@@ -773,8 +757,6 @@
*
* @param predicate The predicate that we attempt to push
*
- * @return None
- *
* @exception StandardException Thrown on error
*/
void pushExpressionsIntoSelect(Predicate predicate)
@@ -791,8 +773,6 @@
* @param outerFromList The FromList from the outer query block(s)
* @param subqueryType The subquery type
*
- * @return None
- *
* @exception StandardException Thrown on error
*/
public void verifySelectStarSubquery(FromList outerFromList, int subqueryType)
@@ -864,8 +844,6 @@
* Check for (and reject) ? parameters directly under the ResultColumns.
* This is done for SELECT statements.
*
- * @return Nothing
- *
* @exception StandardException Thrown if a ? parameter found
* directly under a ResultColumn
*/
@@ -883,8 +861,6 @@
* consider sort avoidance.
*
* @param orderByList The order by list
- *
- * @return Nothing.
*/
void pushOrderByList(OrderByList orderByList)
{
@@ -1151,8 +1127,6 @@
*
* @param numTables The number of tables in the query
*
- * @return None.
- *
* @exception StandardException Thrown on error
*/
private void performTransitiveClosure(int numTables)
@@ -1167,8 +1141,6 @@
/** Put the expression trees in conjunctive normal form
*
- * @return None.
- *
* @exception StandardException Thrown on error
*/
private void normExpressions()
@@ -1883,8 +1855,6 @@
* This is useful when flattening a subquery.
*
* @param decrement The amount to decrement by.
- *
- * @return Nothing;
*/
void decrementLevel(int decrement)
{
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SetOperatorNode.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SetOperatorNode.java?rev=374198&r1=374197&r2=374198&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 Feb 1 14:46:09 2006
@@ -115,8 +115,6 @@
*
* @param fromListParam FromList to use/append to.
*
- * @return Nothing
- *
* @exception StandardException Thrown on error
*/
public void bindResultColumns(FromList fromListParam)
@@ -152,8 +150,6 @@
* @param statement Calling DMLStatementNode (Insert or Update)
* @param fromListParam FromList to use/append to.
*
- * @return Nothing
- *
* @exception StandardException Thrown on error
*/
@@ -177,8 +173,6 @@
* Build the RCL for this node. We propagate the RCL up from the
* left child to form this node's RCL.
*
- * @return Nothing
- *
* @exception StandardException Thrown on error
*/
@@ -313,8 +307,6 @@
* need to validate the target list before blowing it away and replacing
* it with a SELECT true.
*
- * @return Nothing
- *
* @exception StandardException Thrown on error
*/
@@ -332,8 +324,6 @@
* consider sort avoidance.
*
* @param orderByList The order by list
- *
- * @return Nothing.
*/
void pushOrderByList(OrderByList orderByList)
{
@@ -441,8 +431,6 @@
* @param outerFromList The FromList from the outer query block(s)
* @param subqueryType The subquery type
*
- * @return None
- *
* @exception StandardException Thrown on error
*/
public void verifySelectStarSubquery(FromList outerFromList, int subqueryType)
@@ -488,8 +476,6 @@
*
* @param onlyConvertAlls Boolean, whether or not to just convert *'s
*
- * @return Nothing.
- *
* @exception StandardException Thrown on error
*/
public void setResultToBooleanTrueNode(boolean onlyConvertAlls)
@@ -510,7 +496,7 @@
* NOTE - The new or enhanced RCL will be fully bound.
*
* @param numTargetColumns # of columns in target RCL
- * @param colMap[] int array representation of correspondence between
+ * @param colMap int array representation of correspondence between
* RCLs - colmap[i] = -1 -> missing in current RCL
* colmap[i] = j -> targetRCL(i) <-> thisRCL(j+1)
* @param dataDictionary DataDictionary to use
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SetSchemaNode.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SetSchemaNode.java?rev=374198&r1=374197&r2=374198&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SetSchemaNode.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SetSchemaNode.java Wed Feb 1 14:46:09 2006
@@ -109,8 +109,6 @@
* @param acb The ActivationClassBuilder for the class being built
* @param mb the method for the execute() method to be built
*
- * @return A compiled expression returning the RepCreatePublicationResultSet
- *
* @exception StandardException Thrown on error
*/
@@ -139,8 +137,6 @@
* all the parameters being set.
*
* @param acb The ActivationClassBuilder for the class we're building
- *
- * @return Nothing
*/
void generateParameterValueSet(ActivationClassBuilder acb)
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SimpleStringOperatorNode.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SimpleStringOperatorNode.java?rev=374198&r1=374197&r2=374198&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 Feb 1 14:46:09 2006
@@ -132,8 +132,6 @@
/**
* Bind a ? parameter operand of the upper/lower function.
*
- * @return Nothing
- *
* @exception StandardException Thrown on error
*/
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SingleChildResultSetNode.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SingleChildResultSetNode.java?rev=374198&r1=374197&r2=374198&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 Feb 1 14:46:09 2006
@@ -117,8 +117,6 @@
* Set the childResult for this node.
*
* @param childResult The new childResult for this node.
- *
- * @return Nothing.
*/
void setChildResult(ResultSetNode childResult)
{
@@ -170,8 +168,6 @@
* how tree printing is supposed to work.
*
* @param depth The depth of this node in the tree
- *
- * @return Nothing
*/
public void printSubNodes(int depth)
@@ -221,8 +217,6 @@
* Set the (query block) level (0-based) for this FromTable.
*
* @param level The query block level for this FromTable.
- *
- * @return Nothing
*/
public void setLevel(int level)
{
@@ -365,7 +359,7 @@
* Optimize this SingleChildResultSetNode.
*
* @param dataDictionary The DataDictionary to use for optimization
- * @param predicateList The PredicateList to optimize. This should
+ * @param predicates The PredicateList to optimize. This should
* be a join predicate.
* @param outerRows The number of outer joining rows
*
@@ -547,8 +541,6 @@
* Notify the underlying result set tree that the result is
* ordering dependent. (For example, no bulk fetch on an index
* if under an IndexRowToBaseRow.)
- *
- * @return Nothing.
*/
void markOrderingDependent()
{
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/StatementNode.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/StatementNode.java?rev=374198&r1=374197&r2=374198&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/StatementNode.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/StatementNode.java Wed Feb 1 14:46:09 2006
@@ -155,7 +155,7 @@
/**
* Do code generation for this statement.
*
- * @param the generated byte code for this statement.
+ * @param byteCode the generated byte code for this statement.
* if non-null, then the byte code is saved
* here.
*
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/StaticClassFieldReferenceNode.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/StaticClassFieldReferenceNode.java?rev=374198&r1=374197&r2=374198&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/StaticClassFieldReferenceNode.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/StaticClassFieldReferenceNode.java Wed Feb 1 14:46:09 2006
@@ -135,8 +135,6 @@
* @param outerSubqueryList SubqueryList from outer query block
* @param outerPredicateList PredicateList from outer query block
*
- * @return Nothing.
- *
* @exception StandardException Thrown on error
*/
public void preprocess(int numTables,
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SubqueryList.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SubqueryList.java?rev=374198&r1=374197&r2=374198&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SubqueryList.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SubqueryList.java Wed Feb 1 14:46:09 2006
@@ -42,8 +42,6 @@
* how tree printing is supposed to work.
*
* @param depth The depth of this node in the tree
- *
- * @return Nothing
*/
public void printSubNodes(int depth)
@@ -67,9 +65,6 @@
*
* @param subqueryNode A SubqueryNode to add to the list
*
- * @return Nothing
- *
- * @exception StandardException Thrown on error
*/
public void addSubqueryNode(SubqueryNode subqueryNode) throws StandardException
@@ -86,8 +81,6 @@
* @param outerSubqueryList SubqueryList from outer query block
* @param outerPredicateList PredicateList from outer query block
*
- * @return None.
- *
* @exception StandardException Thrown on error
*/
public void preprocess(int numTables,
@@ -115,8 +108,6 @@
* @param outerRows The optimizer's estimate of the number of
* times this subquery will be executed.
*
- * @return Nothing
- *
* @exception StandardException Thrown on error
*/
@@ -215,8 +206,6 @@
*
* @param pointOfAttachment The point of attachment
*
- * @return Nothing.
- *
* @exception StandardException Thrown on error
*/
public void setPointOfAttachment(int pointOfAttachment)
@@ -239,8 +228,6 @@
* This is useful when flattening a subquery.
*
* @param decrement The amount to decrement by.
- *
- * @return Nothing;
*/
void decrementLevel(int decrement)
{
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SubqueryNode.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SubqueryNode.java?rev=374198&r1=374197&r2=374198&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 Feb 1 14:46:09 2006
@@ -256,8 +256,6 @@
* how tree printing is supposed to work.
*
* @param depth The depth of this node in the tree
- *
- * @return Nothing
*/
public void printSubNodes(int depth)
@@ -303,9 +301,7 @@
/**
* Set the type of this subquery.
*
- * @param Type of this subquery.
- *
- * @return None.
+ * @param subqueryType of this subquery.
*/
public void setSubqueryType(int subqueryType)
{
@@ -317,8 +313,6 @@
*
* @param pointOfAttachment The point of attachment of this subquery.
*
- * @return None.
- *
* @exception StandardException Thrown on error
*/
public void setPointOfAttachment(int pointOfAttachment)
@@ -377,8 +371,6 @@
* expression subqueries.
*
* @param parent The parent BCON.
- *
- * @return Nothing.
*/
void setParentComparisonOperator(BinaryComparisonOperatorNode parent)
{
@@ -1677,8 +1669,6 @@
* @param outerRows The optimizer's estimate of the number of
* times this subquery will be executed.
*
- * @return Nothing
- *
* @exception StandardException Thrown on error
*/
@@ -2196,8 +2186,6 @@
/**
* Convert this IN/ANY subquery, which is known to return at most 1 row,
* to an equivalent expression subquery.
- *
- * @return Nothing
*
* @exception StandardException Thrown on error
*/
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SumAvgAggregateDefinition.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SumAvgAggregateDefinition.java?rev=374198&r1=374197&r2=374198&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SumAvgAggregateDefinition.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SumAvgAggregateDefinition.java Wed Feb 1 14:46:09 2006
@@ -63,8 +63,7 @@
* sum on anything that implements plus(). In which
* case avg() would need divide().
*
- * @param the input type, either a user type or a java.lang object
- * @param implementsInterface the interface it implements
+ * @param inputType the input type, either a user type or a java.lang object
*
* @return the output Class (null if cannot operate on
* value expression of this type.
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/TableName.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/TableName.java?rev=374198&r1=374197&r2=374198&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/TableName.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/TableName.java Wed Feb 1 14:46:09 2006
@@ -121,8 +121,6 @@
* Set the schema name.
*
* @param schemaName Schema name as a String
- *
- * @return Nothing.
*/
public void setSchemaName(String schemaName)
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/TableOperatorNode.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/TableOperatorNode.java?rev=374198&r1=374197&r2=374198&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/TableOperatorNode.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/TableOperatorNode.java Wed Feb 1 14:46:09 2006
@@ -182,8 +182,6 @@
* how tree printing is supposed to work.
*
* @param depth The depth of this node in the tree
- *
- * @return Nothing
*/
public void printSubNodes(int depth)
@@ -254,8 +252,6 @@
* Set the (query block) level (0-based) for this FromTable.
*
* @param level The query block level for this FromTable.
- *
- * @return Nothing
*/
public void setLevel(int level)
{
@@ -287,8 +283,6 @@
* since some trees get created left deep and others right deep.)
*
* @param nestedInParens Whether or not this node is nested in parens.
- *
- * @return Nothing.
*/
public void setNestedInParens(boolean nestedInParens)
{
@@ -364,8 +358,6 @@
* binding the sub-expressions, as well as figuring out what the
* return type is for each expression.
*
- * @return Nothing
- *
* @exception StandardException Thrown on error
*/
@@ -392,8 +384,6 @@
* This is done for SELECT statements. For TableOperatorNodes, we
* simply pass the check through to the left and right children.
*
- * @return Nothing
- *
* @exception StandardException Thrown if a ? parameter found
* directly under a ResultColumn
*/
@@ -411,8 +401,6 @@
*
* @param fromListParam FromList to use/append to.
*
- * @return Nothing
- *
* @exception StandardException Thrown on error
*/
public void bindExpressionsWithTables(FromList fromListParam)
@@ -441,8 +429,6 @@
*
* @param fromListParam FromList to use/append to.
*
- * @return Nothing
- *
* @exception StandardException Thrown on error
*/
public void bindResultColumns(FromList fromListParam)
@@ -476,8 +462,6 @@
* @param statement Calling DMLStatementNode (Insert or Update)
* @param fromListParam FromList to use/append to.
*
- * @return Nothing
- *
* @exception StandardException Thrown on error
*/
@@ -807,8 +791,6 @@
* This is useful when flattening a subquery.
*
* @param decrement The amount to decrement by.
- *
- * @return Nothing;
*/
void decrementLevel(int decrement)
{
@@ -835,8 +817,6 @@
* Notify the underlying result set tree that the result is
* ordering dependent. (For example, no bulk fetch on an index
* if under an IndexRowToBaseRow.)
- *
- * @return Nothing.
*/
void markOrderingDependent()
{
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/TernaryOperatorNode.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/TernaryOperatorNode.java?rev=374198&r1=374197&r2=374198&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 Feb 1 14:46:09 2006
@@ -157,8 +157,6 @@
* Set the clause that this node appears in.
*
* @param clause The clause that this node appears in.
- *
- * @return Nothing.
*/
public void setClause(int clause)
{
@@ -176,8 +174,6 @@
* how tree printing is supposed to work.
*
* @param depth The depth of this node in the tree
- *
- * @return Nothing
*/
public void printSubNodes(int depth)
@@ -369,8 +365,6 @@
* Set the leftOperand to the specified ValueNode
*
* @param newLeftOperand The new leftOperand
- *
- * @return None.
*/
public void setLeftOperand(ValueNode newLeftOperand)
{
@@ -391,8 +385,6 @@
* Set the rightOperand to the specified ValueNode
*
* @param newRightOperand The new rightOperand
- *
- * @return None.
*/
public void setRightOperand(ValueNode newRightOperand)
{
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/TestConstraintNode.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/TestConstraintNode.java?rev=374198&r1=374197&r2=374198&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 Feb 1 14:46:09 2006
@@ -52,7 +52,7 @@
/**
* Initializer for a TestConstraintNode
*
- * @param operand The operand of the constraint test
+ * @param booleanValue The operand of the constraint test
* @param sqlState The SQLState of the exception to throw if the
* constraint has failed
* @param tableName The name of the table that the constraint is on
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/UnaryArithmeticOperatorNode.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/UnaryArithmeticOperatorNode.java?rev=374198&r1=374197&r2=374198&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 Feb 1 14:46:09 2006
@@ -108,8 +108,6 @@
* We throw an exception if the parameter doesn't have a datatype
* assigned to it yet.
*
- * @return Nothing
- *
* @exception StandardException Thrown if ? parameter doesn't
* have a type bound to it yet.
* ? parameter where it isn't allowed.
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/UnaryComparisonOperatorNode.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/UnaryComparisonOperatorNode.java?rev=374198&r1=374197&r2=374198&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 Feb 1 14:46:09 2006
@@ -88,8 +88,6 @@
* binding and when we generate nodes within the language module outside
* of the parser.
*
- * @return Nothing
- *
* @exception StandardException Thrown on error
*/
public void bindComparisonOperator()
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/UnaryLogicalOperatorNode.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/UnaryLogicalOperatorNode.java?rev=374198&r1=374197&r2=374198&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 Feb 1 14:46:09 2006
@@ -100,8 +100,6 @@
* this node. Extracts out tasks that must be done by both bind()
* and post-bind() AndNode generation.
*
- * @return None.
- *
* @exception StandardException Thrown on error
*/
protected void setFullTypeInfo()
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/UnaryOperatorNode.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/UnaryOperatorNode.java?rev=374198&r1=374197&r2=374198&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 Feb 1 14:46:09 2006
@@ -114,12 +114,13 @@
private Object [] additionalArgs;
/**
- * Initializer for a UnaryOperatorNode
+ * Initializer for a UnaryOperatorNode.
*
+ * <ul>
* @param operand The operand of the node
* @param operatorOrOpType Either 1) the name of the operator,
* OR 2) an Integer holding the operatorType for this operator.
- * @param methodNameOrParams Either 1) name of the method
+ * @param methodNameOrAddedArgs Either 1) name of the method
* to call for this operator, or 2) an array of Objects
* from which primitive method parameters can be
* retrieved.
@@ -173,8 +174,6 @@
* Set the operator.
*
* @param operator The operator.
- *
- * @return Nothing.
*/
void setOperator(String operator)
{
@@ -196,8 +195,6 @@
* Set the methodName.
*
* @param methodName The methodName.
- *
- * @return Nothing.
*/
void setMethodName(String methodName)
{
@@ -231,8 +228,6 @@
* how tree printing is supposed to work.
*
* @param depth The depth of this node in the tree
- *
- * @return Nothing
*/
public void printSubNodes(int depth)
@@ -285,8 +280,6 @@
* Set the clause that this node appears in.
*
* @param clause The clause that this node appears in.
- *
- * @return Nothing.
*/
public void setClause(int clause)
{
@@ -592,8 +585,6 @@
*
* We throw an exception if the parameter doesn't have a datatype
* assigned to it yet.
- *
- * @return Nothing
*
* @exception StandardException Thrown if ? parameter doesn't
* have a type bound to it yet.
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/UnionNode.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/UnionNode.java?rev=374198&r1=374197&r2=374198&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/UnionNode.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/UnionNode.java Wed Feb 1 14:46:09 2006
@@ -116,8 +116,6 @@
* table constructor has at least one non-? column. The latter case
* is checked below, in bindExpressions().
*
- * @return Nothing
- *
* @exception StandardException Thrown if a ? parameter found
* directly under a ResultColumn
*/
@@ -275,8 +273,6 @@
*
* @param predicateList List of single table predicates to push
*
- * @return Nothing
- *
* @exception StandardException Thrown on error
*/
public void pushExpressions(PredicateList predicateList)
@@ -440,8 +436,6 @@
* Bind the expressions under this TableOperatorNode. This means
* binding the sub-expressions, as well as figuring out what the
* return type is for each expression.
- *
- * @return Nothing
*
* @exception StandardException Thrown on error
*/
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/UpdateNode.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/UpdateNode.java?rev=374198&r1=374197&r2=374198&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 Feb 1 14:46:09 2006
@@ -149,8 +149,6 @@
* how tree printing is supposed to work.
*
* @param depth The depth of this node in the tree
- *
- * @return Nothing
*/
public void printSubNodes(int depth)
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/UserTypeConstantNode.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/UserTypeConstantNode.java?rev=374198&r1=374197&r2=374198&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/UserTypeConstantNode.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/UserTypeConstantNode.java Wed Feb 1 14:46:09 2006
@@ -84,15 +84,20 @@
/**
* Initializer for a typed null node
- * or a date, time, or timestamp value
+ * or a date, time, or timestamp value. Parameters may be:
*
- * @param arg1 The TypeId for the type of the node
- * @param arg2 The factory to get the TypeId
- * and DataTypeServices factories from.
+ * <ul>
+ * <li>arg1 The TypeId for the type of the node</li>
+ * <li>arg2 The factory to get the TypeId and DataTypeServices factories from.</li>
+ * </ul>
*
+ * <p>
* - OR -
+ * </p>
*
- * @param arg1 the date, time, or timestamp value
+ * <ul>
+ * <li>arg1 the date, time, or timestamp value</li>
+ * </ul>
*
* @exception StandardException thrown on failure
*/
@@ -221,7 +226,7 @@
/**
* Sets the object value of this user defined type
*
- * @param the value of this constant. can't use setValue() for this.
+ * @param newValue the value of this constant. can't use setValue() for this.
*/
public void setObjectValue( Object newValue ) { value = newValue; }
@@ -347,8 +352,6 @@
*
* @param acb The ExpressionClassBuilder for the class being built
* @param mb The method the expression will go into
- *
- * @return The compiled Expression,
*
* @exception StandardException Thrown on error
*/
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ValueNode.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ValueNode.java?rev=374198&r1=374197&r2=374198&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 Feb 1 14:46:09 2006
@@ -100,8 +100,6 @@
* @param isNullable The nullability of this new node
* @param maximumWidth The maximum width of this new node
*
- * @return Nothing
- *
* @exception StandardException
*/
@@ -232,8 +230,6 @@
*
* @param dataTypeServices The DataTypeServices to set in this
* ValueNode
- *
- * @return Nothing
*/
public void setType(DataTypeDescriptor dataTypeServices) throws StandardException
@@ -280,8 +276,6 @@
* Set the clause that this node appears in.
*
* @param clause The clause that this node appears in.
- *
- * @return Nothing.
*/
public void setClause(int clause)
{
@@ -293,8 +287,6 @@
* were generated from it). This will help us with ensure that the
* predicate does not get calculated into the selectivity multiple
* times.
- *
- * @return Nothing.
*/
void setTransformed()
{
@@ -1029,8 +1021,6 @@
* @param resultColTable True if tableNumber is the table containing result
* columns
*
- * @return Nothing.
- *
* @exception StandardException Thrown on error
*
*/
@@ -1107,7 +1097,7 @@
* Generate code for this calculation. This is a place-holder method -
* it should not be called.
*
- * @param ecb The ExpressionClassBuilder for the class being built
+ * @param acb The ExpressionClassBuilder for the class being built
* @param mb The method the expression will go into
*
*
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ValueNodeList.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ValueNodeList.java?rev=374198&r1=374197&r2=374198&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 Feb 1 14:46:09 2006
@@ -58,8 +58,6 @@
* how tree printing is supposed to work.
*
* @param depth The depth of this node in the tree
- *
- * @return Nothing
*/
public void printSubNodes(int depth)
@@ -81,8 +79,6 @@
* Set the clause that this node appears in.
*
* @param clause The clause that this node appears in.
- *
- * @return Nothing.
*/
public void setClause(int clause)
{
@@ -101,8 +97,6 @@
*
* @param valueNode A ValueNode to add to the list
*
- * @return Nothing
- *
* @exception StandardException Thrown on error
*/
@@ -120,8 +114,6 @@
* @param subqueryList The subquery list being built as we find SubqueryNodes
* @param aggregateVector The aggregate vector being built as we find AggregateNodes
*
- * @return Nothing
- *
* @exception StandardException Thrown on error
*/
public void bindExpression(FromList fromList,
@@ -148,8 +140,6 @@
* This is useful when doing comparisons, built-in functions, etc. on
* java types which have a direct mapping to system built-in types.
*
- * @return Nothing.
- *
* @exception StandardException Thrown on error
*/
public void genSQLJavaSQLTrees()
@@ -310,8 +300,6 @@
*
* @param leftOperand The left side of the expression
*
- * @return Nothing.
- *
* @exception StandardException Thrown on error
*/
public void comparable(ValueNode leftOperand) throws StandardException
@@ -427,7 +415,6 @@
* (All values are assumed to be constants.)
*
* @param judgeODV In case of type not exactly matching, the judging type.
- * @return Nothing.
*
* @exception StandardException Thrown on error
*/
@@ -477,8 +464,6 @@
*
* @param descriptor The DataTypeServices to set for the parameters
*
- * @return Nothing
- *
* @exception StandardException Thrown on error
*/
public void setParameterDescriptor(DataTypeDescriptor descriptor)
@@ -505,8 +490,6 @@
* @param outerFromList FromList from outer query block
* @param outerSubqueryList SubqueryList from outer query block
* @param outerPredicateList PredicateList from outer query block
- *
- * @return Nothing.
*
* @exception StandardException Thrown on error
*/
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/VarbitConstantNode.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/VarbitConstantNode.java?rev=374198&r1=374197&r2=374198&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/VarbitConstantNode.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/VarbitConstantNode.java Wed Feb 1 14:46:09 2006
@@ -39,11 +39,7 @@
/**
* Initializer for a VarbitConstantNode.
*
- * @param arg1 The TypeId for the type of the node
- *
- * - OR -
- *
- * @param arg1 A Bit containing the value of the constant
+ * @param arg1 The TypeId for the type of the node OR A Bit containing the value of the constant
*
* @exception StandardException
*/