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/05/08 10:57:48 UTC
svn commit: r1480187 -
/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/
Author: kahatlen
Date: Wed May 8 08:57:47 2013
New Revision: 1480187
URL: http://svn.apache.org/r1480187
Log:
DERBY-6169: Reduce visibility of classes and methods under impl/sql
Reduce visibility of the following methods, and all overrides of them,
to package:
- QueryTreeNode.generate()
- QueryTreeNode.getNullNode()
- ResultSetNode.bindResultColumns()
- ResultSetNode.generateNormalizationResultSet()
- ResultSetNode.generateResultSet()
- ResultSetNode.getFromTableByName()
- ValueNode.generateExpression()
Remove unused method:
- ValueNode.generateFilter()
Modified:
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/AggregateNode.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/BaseColumnNode.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/BetweenOperatorNode.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/BinaryLogicalOperatorNode.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/BinaryOperatorNode.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CallStatementNode.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CastNode.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CoalesceFunctionNode.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ColumnReference.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ConditionalNode.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ConstantNode.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CurrentDatetimeOperatorNode.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CurrentOfNode.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CurrentRowLocationNode.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CursorNode.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DB2LengthOperatorNode.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DDLStatementNode.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DefaultNode.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/FromSubquery.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/FromTable.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/FromVTI.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/GenerationClauseNode.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/HalfOuterJoinNode.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/HashTableNode.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/InListOperatorNode.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/InsertNode.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/IntersectOrExceptNode.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/IsNode.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/JavaToSQLValueNode.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/JavaValueNode.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/LikeEscapeOperatorNode.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/MaterializeResultSetNode.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/MaterializeSubqueryNode.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/MiscellaneousStatementNode.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/NextSequenceNode.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/NormalizeResultSetNode.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/NotNode.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/OrderByNode.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/ProjectRestrictNode.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/QueryTreeNode.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ResultColumn.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ResultColumnList.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/ScrollInsensitiveResultSetNode.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/SetOperatorNode.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SetRoleNode.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SetSchemaNode.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SetTransactionIsolationNode.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/SpecialFunctionNode.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SubqueryNode.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/TableOperatorNode.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/TernaryOperatorNode.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/TestConstraintNode.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/TimestampOperatorNode.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/UnaryArithmeticOperatorNode.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/UnaryDateTimestampOperatorNode.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/UnaryOperatorNode.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/UnionNode.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/UpdateNode.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/UserTypeConstantNode.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ValueNode.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/VirtualColumnNode.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/WindowResultSetNode.java
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/AggregateNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/AggregateNode.java?rev=1480187&r1=1480186&r2=1480187&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/AggregateNode.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/AggregateNode.java Wed May 8 08:57:47 2013
@@ -667,8 +667,7 @@ public class AggregateNode extends Unary
*
* @exception StandardException Thrown on error
*/
- public void generateExpression(ExpressionClassBuilder acb,
- MethodBuilder mb)
+ void generateExpression(ExpressionClassBuilder acb, MethodBuilder mb)
throws StandardException
{
if (SanityManager.DEBUG)
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/BaseColumnNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/BaseColumnNode.java?rev=1480187&r1=1480186&r2=1480187&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/BaseColumnNode.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/BaseColumnNode.java Wed May 8 08:57:47 2013
@@ -147,8 +147,7 @@ public class BaseColumnNode extends Valu
* @exception StandardException Thrown on error
*/
- public void generateExpression(ExpressionClassBuilder acb,
- MethodBuilder mb)
+ void generateExpression(ExpressionClassBuilder acb, MethodBuilder mb)
throws StandardException
{
throw StandardException.newException(SQLState.LANG_UNABLE_TO_GENERATE,
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/BetweenOperatorNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/BetweenOperatorNode.java?rev=1480187&r1=1480186&r2=1480187&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/BetweenOperatorNode.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/BetweenOperatorNode.java Wed May 8 08:57:47 2013
@@ -277,8 +277,7 @@ public class BetweenOperatorNode extends
* @exception StandardException Thrown on error
*/
- public void generateExpression(ExpressionClassBuilder acb,
- MethodBuilder mb)
+ void generateExpression(ExpressionClassBuilder acb, MethodBuilder mb)
throws StandardException
{
AndNode newAnd;
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/BinaryLogicalOperatorNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/BinaryLogicalOperatorNode.java?rev=1480187&r1=1480186&r2=1480187&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/BinaryLogicalOperatorNode.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/BinaryLogicalOperatorNode.java Wed May 8 08:57:47 2013
@@ -117,8 +117,7 @@ abstract class BinaryLogicalOperatorNode
* @exception StandardException Thrown on error
*/
- public void generateExpression(ExpressionClassBuilder acb,
- MethodBuilder mb)
+ void generateExpression(ExpressionClassBuilder acb, MethodBuilder mb)
throws StandardException
{
/*
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/BinaryOperatorNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/BinaryOperatorNode.java?rev=1480187&r1=1480186&r2=1480187&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/BinaryOperatorNode.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/BinaryOperatorNode.java Wed May 8 08:57:47 2013
@@ -443,8 +443,7 @@ public class BinaryOperatorNode extends
* @exception StandardException Thrown on error
*/
- public void generateExpression(ExpressionClassBuilder acb,
- MethodBuilder mb)
+ void generateExpression(ExpressionClassBuilder acb, MethodBuilder mb)
throws StandardException
{
/* If this BinaryOperatorNode was created as a part of an IN-list
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CallStatementNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CallStatementNode.java?rev=1480187&r1=1480186&r2=1480187&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CallStatementNode.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CallStatementNode.java Wed May 8 08:57:47 2013
@@ -183,8 +183,7 @@ public class CallStatementNode extends D
*
* @exception StandardException Thrown on error
*/
- public void generate(ActivationClassBuilder acb,
- MethodBuilder mb)
+ void generate(ActivationClassBuilder acb, MethodBuilder mb)
throws StandardException
{
JavaValueNode methodCallBody;
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CastNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CastNode.java?rev=1480187&r1=1480186&r2=1480187&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CastNode.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CastNode.java Wed May 8 08:57:47 2013
@@ -864,8 +864,7 @@ public class CastNode extends ValueNode
* @exception StandardException Thrown on error
*/
- public void generateExpression(ExpressionClassBuilder acb,
- MethodBuilder mb)
+ void generateExpression(ExpressionClassBuilder acb, MethodBuilder mb)
throws StandardException
{
castOperand.generateExpression(acb, mb);
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CoalesceFunctionNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CoalesceFunctionNode.java?rev=1480187&r1=1480186&r2=1480187&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CoalesceFunctionNode.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CoalesceFunctionNode.java Wed May 8 08:57:47 2013
@@ -192,8 +192,7 @@ public class CoalesceFunctionNode extend
* @exception StandardException Thrown on error
*/
- public void generateExpression(ExpressionClassBuilder acb,
- MethodBuilder mb)
+ void generateExpression(ExpressionClassBuilder acb, MethodBuilder mb)
throws StandardException
{
int argumentsListSize = argumentsList.size();
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ColumnReference.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ColumnReference.java?rev=1480187&r1=1480186&r2=1480187&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ColumnReference.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ColumnReference.java Wed May 8 08:57:47 2013
@@ -995,8 +995,7 @@ public class ColumnReference extends Val
*
* @exception StandardException Thrown on error
*/
- public void generateExpression(ExpressionClassBuilder acb,
- MethodBuilder mb)
+ void generateExpression(ExpressionClassBuilder acb, MethodBuilder mb)
throws StandardException
{
int sourceResultSetNumber = source.getResultSetNumber();
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ConditionalNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ConditionalNode.java?rev=1480187&r1=1480186&r2=1480187&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ConditionalNode.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ConditionalNode.java Wed May 8 08:57:47 2013
@@ -697,8 +697,7 @@ public class ConditionalNode extends Val
* @exception StandardException Thrown on error
*/
- public void generateExpression(ExpressionClassBuilder acb,
- MethodBuilder mb)
+ void generateExpression(ExpressionClassBuilder acb, MethodBuilder mb)
throws StandardException
{
testCondition.generateExpression(acb, mb);
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ConstantNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ConstantNode.java?rev=1480187&r1=1480186&r2=1480187&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ConstantNode.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ConstantNode.java Wed May 8 08:57:47 2013
@@ -210,11 +210,9 @@ abstract class ConstantNode extends Valu
*
* @exception StandardException Thrown on error
*/
- public void generateExpression
+ void generateExpression
(
- ExpressionClassBuilder acb,
- MethodBuilder mb
- ) throws StandardException
+ ExpressionClassBuilder acb, MethodBuilder mb) throws StandardException
{
/* Are we generating a SQL null value? */
if (isNull())
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CurrentDatetimeOperatorNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CurrentDatetimeOperatorNode.java?rev=1480187&r1=1480186&r2=1480187&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CurrentDatetimeOperatorNode.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CurrentDatetimeOperatorNode.java Wed May 8 08:57:47 2013
@@ -133,8 +133,7 @@ public class CurrentDatetimeOperatorNode
*
* @exception StandardException Thrown on error
*/
- public void generateExpression(ExpressionClassBuilder acb,
- MethodBuilder mb)
+ void generateExpression(ExpressionClassBuilder acb, MethodBuilder mb)
throws StandardException
{
/*
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CurrentOfNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CurrentOfNode.java?rev=1480187&r1=1480186&r2=1480187&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CurrentOfNode.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CurrentOfNode.java Wed May 8 08:57:47 2013
@@ -430,8 +430,7 @@ public final class CurrentOfNode extends
*
* @exception StandardException Thrown on error
*/
- public void generate(ActivationClassBuilder acb,
- MethodBuilder mb)
+ void generate(ActivationClassBuilder acb, MethodBuilder mb)
throws StandardException {
if (SanityManager.DEBUG)
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CurrentRowLocationNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CurrentRowLocationNode.java?rev=1480187&r1=1480186&r2=1480187&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CurrentRowLocationNode.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CurrentRowLocationNode.java Wed May 8 08:57:47 2013
@@ -107,8 +107,7 @@ public class CurrentRowLocationNode exte
*
* @exception StandardException Thrown on error
*/
- public void generateExpression(ExpressionClassBuilder acb,
- MethodBuilder mbex)
+ void generateExpression(ExpressionClassBuilder acb, MethodBuilder mbex)
throws StandardException
{
/* Generate a new method */
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CursorNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CursorNode.java?rev=1480187&r1=1480186&r2=1480187&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CursorNode.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CursorNode.java Wed May 8 08:57:47 2013
@@ -615,8 +615,7 @@ public class CursorNode extends DMLState
* @exception StandardException Thrown on error
*/
- public void generate(ActivationClassBuilder acb,
- MethodBuilder mb) throws StandardException
+ void generate(ActivationClassBuilder acb, MethodBuilder mb) throws StandardException
{
if (indexOfSessionTableNamesInSavedObjects != -1 ) //if this cursor references session schema tables, do following
{
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DB2LengthOperatorNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DB2LengthOperatorNode.java?rev=1480187&r1=1480186&r2=1480187&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DB2LengthOperatorNode.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DB2LengthOperatorNode.java Wed May 8 08:57:47 2013
@@ -108,8 +108,7 @@ public final class DB2LengthOperatorNode
* @exception StandardException Thrown on error
*/
- public void generateExpression(ExpressionClassBuilder acb,
- MethodBuilder mb)
+ void generateExpression(ExpressionClassBuilder acb, MethodBuilder mb)
throws StandardException
{
if (operand == null)
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DDLStatementNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DDLStatementNode.java?rev=1480187&r1=1480186&r2=1480187&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DDLStatementNode.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DDLStatementNode.java Wed May 8 08:57:47 2013
@@ -173,8 +173,7 @@ abstract class DDLStatementNode extends
* @exception StandardException Thrown on error
*/
- public final void generate(ActivationClassBuilder acb,
- MethodBuilder mb)
+ final void generate(ActivationClassBuilder acb, MethodBuilder mb)
throws StandardException
{
if (SanityManager.DEBUG) {
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DefaultNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DefaultNode.java?rev=1480187&r1=1480186&r2=1480187&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DefaultNode.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DefaultNode.java Wed May 8 08:57:47 2013
@@ -279,8 +279,7 @@ public class DefaultNode extends ValueN
/**
* @exception StandardException Thrown on failure
*/
- public void generateExpression(ExpressionClassBuilder acb,
- MethodBuilder mb)
+ void generateExpression(ExpressionClassBuilder acb, MethodBuilder mb)
throws StandardException
{
if (SanityManager.DEBUG)
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=1480187&r1=1480186&r2=1480187&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DeleteNode.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DeleteNode.java Wed May 8 08:57:47 2013
@@ -500,8 +500,7 @@ public class DeleteNode extends DMLModSt
*
* @exception StandardException Thrown on error
*/
- public void generate(ActivationClassBuilder acb,
- MethodBuilder mb)
+ void generate(ActivationClassBuilder acb, MethodBuilder mb)
throws StandardException
{
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=1480187&r1=1480186&r2=1480187&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 May 8 08:57:47 2013
@@ -269,8 +269,7 @@ public class DistinctNode extends Single
*
* @exception StandardException Thrown on error
*/
- public void generate(ActivationClassBuilder acb,
- MethodBuilder mb)
+ void generate(ActivationClassBuilder acb, MethodBuilder mb)
throws StandardException
{
/* Get the next ResultSet#, so we can number this ResultSetNode, its
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=1480187&r1=1480186&r2=1480187&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/FromBaseTable.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/FromBaseTable.java Wed May 8 08:57:47 2013
@@ -2530,7 +2530,7 @@ public class FromBaseTable extends FromT
*
* @exception StandardException Thrown on error
*/
- protected FromTable getFromTableByName(String name, String schemaName, boolean exactMatch)
+ FromTable getFromTableByName(String name, String schemaName, boolean exactMatch)
throws StandardException
{
// ourSchemaName can be null if correlation name is specified.
@@ -3266,8 +3266,7 @@ public class FromBaseTable extends FromT
*
* @exception StandardException Thrown on error
*/
- public void generate(ActivationClassBuilder acb,
- MethodBuilder mb)
+ void generate(ActivationClassBuilder acb, MethodBuilder mb)
throws StandardException
{
//
@@ -3315,8 +3314,7 @@ public class FromBaseTable extends FromT
*
* @exception StandardException Thrown on error
*/
- public void generateResultSet(ExpressionClassBuilder acb,
- MethodBuilder mb)
+ void generateResultSet(ExpressionClassBuilder acb, MethodBuilder mb)
throws StandardException
{
/* We must have been a best conglomerate descriptor here */
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/FromSubquery.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/FromSubquery.java?rev=1480187&r1=1480186&r2=1480187&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/FromSubquery.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/FromSubquery.java Wed May 8 08:57:47 2013
@@ -152,7 +152,7 @@ public class FromSubquery extends FromTa
*
* @exception StandardException Thrown on error
*/
- protected FromTable getFromTableByName(String name, String schemaName, boolean exactMatch)
+ FromTable getFromTableByName(String name, String schemaName, boolean exactMatch)
throws StandardException
{
if (schemaName != null && origTableName != null) {
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/FromTable.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/FromTable.java?rev=1480187&r1=1480186&r2=1480187&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/FromTable.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/FromTable.java Wed May 8 08:57:47 2013
@@ -1335,7 +1335,7 @@ abstract class FromTable extends ResultS
*
* @exception StandardException Thrown on error
*/
- protected FromTable getFromTableByName(String name, String schemaName, boolean exactMatch)
+ FromTable getFromTableByName(String name, String schemaName, boolean exactMatch)
throws StandardException
{
// Only FromBaseTables have schema names
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/FromVTI.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/FromVTI.java?rev=1480187&r1=1480186&r2=1480187&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/FromVTI.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/FromVTI.java Wed May 8 08:57:47 2013
@@ -1572,8 +1572,7 @@ public class FromVTI extends FromTable i
*
* @exception StandardException Thrown on error
*/
- public void generate(ActivationClassBuilder acb,
- MethodBuilder mb)
+ void generate(ActivationClassBuilder acb, MethodBuilder mb)
throws StandardException
{
// If necessary, compute the projection to be pushed into the table
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/GenerationClauseNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/GenerationClauseNode.java?rev=1480187&r1=1480186&r2=1480187&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/GenerationClauseNode.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/GenerationClauseNode.java Wed May 8 08:57:47 2013
@@ -111,8 +111,7 @@ public class GenerationClauseNode extend
*
* @exception StandardException Thrown on error
*/
- public void generateExpression(ExpressionClassBuilder acb,
- MethodBuilder mb)
+ void generateExpression(ExpressionClassBuilder acb, MethodBuilder mb)
throws StandardException
{
throw StandardException.newException( SQLState.HEAP_UNIMPLEMENTED_FEATURE );
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=1480187&r1=1480186&r2=1480187&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/GroupByNode.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/GroupByNode.java Wed May 8 08:57:47 2013
@@ -1011,8 +1011,7 @@ public class GroupByNode extends SingleC
*
* @exception StandardException Thrown on error
*/
- public void generate(ActivationClassBuilder acb,
- MethodBuilder mb)
+ void generate(ActivationClassBuilder acb, MethodBuilder mb)
throws StandardException
{
int orderingItem = 0;
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/HalfOuterJoinNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/HalfOuterJoinNode.java?rev=1480187&r1=1480186&r2=1480187&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/HalfOuterJoinNode.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/HalfOuterJoinNode.java Wed May 8 08:57:47 2013
@@ -773,8 +773,7 @@ private boolean isNullRejecting (
*
* @exception StandardException Thrown on error
*/
- public void generate(ActivationClassBuilder acb,
- MethodBuilder mb)
+ void generate(ActivationClassBuilder acb, MethodBuilder mb)
throws StandardException
{
/* Verify that a user specifed right outer join is transformed into
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/HashTableNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/HashTableNode.java?rev=1480187&r1=1480186&r2=1480187&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/HashTableNode.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/HashTableNode.java Wed May 8 08:57:47 2013
@@ -146,8 +146,7 @@ public class HashTableNode extends Singl
*
* @exception StandardException Thrown on error
*/
- public void generate(ActivationClassBuilder acb,
- MethodBuilder mb)
+ void generate(ActivationClassBuilder acb, MethodBuilder mb)
throws StandardException
{
if (SanityManager.DEBUG)
@@ -179,8 +178,7 @@ public class HashTableNode extends Singl
* @exception StandardException Thrown on error
*/
- public void generateResultSet(ExpressionClassBuilder acb,
- MethodBuilder mb)
+ void generateResultSet(ExpressionClassBuilder acb, MethodBuilder mb)
throws StandardException
{
generateMinion( acb, mb, true);
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/InListOperatorNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/InListOperatorNode.java?rev=1480187&r1=1480186&r2=1480187&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/InListOperatorNode.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/InListOperatorNode.java Wed May 8 08:57:47 2013
@@ -529,8 +529,7 @@ public final class InListOperatorNode ex
* @exception StandardException Thrown on error
*/
- public void generateExpression(ExpressionClassBuilder acb,
- MethodBuilder mb)
+ void generateExpression(ExpressionClassBuilder acb, MethodBuilder mb)
throws StandardException
{
int listSize = rightOperandList.size();
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=1480187&r1=1480186&r2=1480187&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/IndexToBaseRowNode.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/IndexToBaseRowNode.java Wed May 8 08:57:47 2013
@@ -151,8 +151,7 @@ public class IndexToBaseRowNode extends
*
* @exception StandardException Thrown on error
*/
- public void generate(ActivationClassBuilder acb,
- MethodBuilder mb)
+ void generate(ActivationClassBuilder acb, MethodBuilder mb)
throws StandardException
{
ValueNode restriction = null;
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/InsertNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/InsertNode.java?rev=1480187&r1=1480186&r2=1480187&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/InsertNode.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/InsertNode.java Wed May 8 08:57:47 2013
@@ -901,8 +901,7 @@ public final class InsertNode extends DM
*
* @exception StandardException Thrown on error
*/
- public void generate(ActivationClassBuilder acb,
- MethodBuilder mb)
+ void generate(ActivationClassBuilder acb, MethodBuilder mb)
throws StandardException
{
// If the DML is on the temporary table, generate the code to
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/IntersectOrExceptNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/IntersectOrExceptNode.java?rev=1480187&r1=1480186&r2=1480187&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/IntersectOrExceptNode.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/IntersectOrExceptNode.java Wed May 8 08:57:47 2013
@@ -348,8 +348,7 @@ public class IntersectOrExceptNode exten
*
* @exception StandardException Thrown on error
*/
- public void generate( ActivationClassBuilder acb,
- MethodBuilder mb)
+ void generate( ActivationClassBuilder acb, MethodBuilder mb)
throws StandardException
{
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/IsNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/IsNode.java?rev=1480187&r1=1480186&r2=1480187&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/IsNode.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/IsNode.java Wed May 8 08:57:47 2013
@@ -194,8 +194,7 @@ public class IsNode extends BinaryLogica
* @exception StandardException Thrown on error
*/
- public void generateExpression(ExpressionClassBuilder acb,
- MethodBuilder mb)
+ void generateExpression(ExpressionClassBuilder acb, MethodBuilder mb)
throws StandardException
{
String evaluatorMethodName;
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/JavaToSQLValueNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/JavaToSQLValueNode.java?rev=1480187&r1=1480186&r2=1480187&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/JavaToSQLValueNode.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/JavaToSQLValueNode.java Wed May 8 08:57:47 2013
@@ -99,8 +99,7 @@ public class JavaToSQLValueNode extends
* @exception StandardException Thrown on error
*/
- public void generateExpression(ExpressionClassBuilder acb,
- MethodBuilder mb)
+ void generateExpression(ExpressionClassBuilder acb, MethodBuilder mb)
throws StandardException
{
TypeId resultType;
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/JavaValueNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/JavaValueNode.java?rev=1480187&r1=1480186&r2=1480187&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/JavaValueNode.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/JavaValueNode.java Wed May 8 08:57:47 2013
@@ -248,8 +248,7 @@ abstract class JavaValueNode extends Que
* @exception StandardException Thrown on error
*/
- protected final void generate(ActivationClassBuilder acb,
- MethodBuilder mb)
+ final void generate(ActivationClassBuilder acb, MethodBuilder mb)
throws StandardException
{
generateExpression( acb, mb );
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=1480187&r1=1480186&r2=1480187&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/JoinNode.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/JoinNode.java Wed May 8 08:57:47 2013
@@ -703,11 +703,9 @@ public class JoinNode extends TableOpera
* @exception StandardException Thrown on error
*/
- public void bindResultColumns(TableDescriptor targetTableDescriptor,
- FromVTI targetVTI,
- ResultColumnList targetColumnList,
- DMLStatementNode statement,
- FromList fromListParam)
+ void bindResultColumns(TableDescriptor targetTableDescriptor,
+ FromVTI targetVTI, ResultColumnList targetColumnList,
+ DMLStatementNode statement, FromList fromListParam)
throws StandardException
{
super.bindResultColumns(targetTableDescriptor,
@@ -1545,8 +1543,7 @@ public class JoinNode extends TableOpera
*
* @exception StandardException Thrown on error
*/
- public void generate(ActivationClassBuilder acb,
- MethodBuilder mb)
+ void generate(ActivationClassBuilder acb, MethodBuilder mb)
throws StandardException
{
generateCore(acb, mb, INNERJOIN, null, null);
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/LikeEscapeOperatorNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/LikeEscapeOperatorNode.java?rev=1480187&r1=1480186&r2=1480187&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/LikeEscapeOperatorNode.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/LikeEscapeOperatorNode.java Wed May 8 08:57:47 2013
@@ -802,9 +802,8 @@ public final class LikeEscapeOperatorNod
* @exception StandardException Thrown on error
*/
- public void generateExpression(
- ExpressionClassBuilder acb,
- MethodBuilder mb)
+ void generateExpression(
+ ExpressionClassBuilder acb, MethodBuilder mb)
throws StandardException
{
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/MaterializeResultSetNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/MaterializeResultSetNode.java?rev=1480187&r1=1480186&r2=1480187&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/MaterializeResultSetNode.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/MaterializeResultSetNode.java Wed May 8 08:57:47 2013
@@ -74,8 +74,7 @@ public class MaterializeResultSetNode ex
*
* @exception StandardException Thrown on error
*/
- public void generate(ActivationClassBuilder acb,
- MethodBuilder mb)
+ void generate(ActivationClassBuilder acb, MethodBuilder mb)
throws StandardException
{
if (SanityManager.DEBUG)
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/MaterializeSubqueryNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/MaterializeSubqueryNode.java?rev=1480187&r1=1480186&r2=1480187&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/MaterializeSubqueryNode.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/MaterializeSubqueryNode.java Wed May 8 08:57:47 2013
@@ -44,8 +44,7 @@ class MaterializeSubqueryNode extends Re
this.lf = lf;
}
- public void generate(ActivationClassBuilder acb,
- MethodBuilder mb)
+ void generate(ActivationClassBuilder acb, MethodBuilder mb)
throws StandardException
{
acb.pushThisAsActivation(mb);
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/MiscellaneousStatementNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/MiscellaneousStatementNode.java?rev=1480187&r1=1480186&r2=1480187&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/MiscellaneousStatementNode.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/MiscellaneousStatementNode.java Wed May 8 08:57:47 2013
@@ -63,8 +63,7 @@ abstract class MiscellaneousStatementNod
* @exception StandardException Thrown on error
*/
- public void generate(ActivationClassBuilder acb,
- MethodBuilder mb)
+ void generate(ActivationClassBuilder acb, MethodBuilder mb)
throws StandardException
{
// The generated java is the expression:
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/NextSequenceNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/NextSequenceNode.java?rev=1480187&r1=1480186&r2=1480187&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/NextSequenceNode.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/NextSequenceNode.java Wed May 8 08:57:47 2013
@@ -120,11 +120,9 @@ public class NextSequenceNode extends Va
}
- public void generateExpression
+ void generateExpression
(
- ExpressionClassBuilder acb,
- MethodBuilder mb
- )
+ ExpressionClassBuilder acb, MethodBuilder mb)
throws StandardException
{
String sequenceUUIDstring = sequenceDescriptor.getUUID().toString();
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/NormalizeResultSetNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/NormalizeResultSetNode.java?rev=1480187&r1=1480186&r2=1480187&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/NormalizeResultSetNode.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/NormalizeResultSetNode.java Wed May 8 08:57:47 2013
@@ -618,8 +618,7 @@ public class NormalizeResultSetNode exte
*
* @exception StandardException Thrown on error
*/
- public void generate(ActivationClassBuilder acb,
- MethodBuilder mb)
+ void generate(ActivationClassBuilder acb, MethodBuilder mb)
throws StandardException
{
int erdNumber;
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/NotNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/NotNode.java?rev=1480187&r1=1480186&r2=1480187&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/NotNode.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/NotNode.java Wed May 8 08:57:47 2013
@@ -91,8 +91,7 @@ public final class NotNode extends Unary
* @exception StandardException Thrown on error
*/
- public void generateExpression(ExpressionClassBuilder acb,
- MethodBuilder mb)
+ void generateExpression(ExpressionClassBuilder acb, MethodBuilder mb)
throws StandardException
{
/*
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/OrderByNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/OrderByNode.java?rev=1480187&r1=1480186&r2=1480187&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/OrderByNode.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/OrderByNode.java Wed May 8 08:57:47 2013
@@ -117,8 +117,7 @@ public class OrderByNode extends SingleC
*
* @exception StandardException Thrown on error
*/
- public void generate(ActivationClassBuilder acb,
- MethodBuilder mb)
+ void generate(ActivationClassBuilder acb, MethodBuilder mb)
throws StandardException
{
// Get the cost estimate for the child
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=1480187&r1=1480186&r2=1480187&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 May 8 08:57:47 2013
@@ -322,8 +322,7 @@ public class ParameterNode extends Value
*
* @exception StandardException Thrown on error
*/
- public void generateExpression(ExpressionClassBuilder acb,
- MethodBuilder mb)
+ void generateExpression(ExpressionClassBuilder acb, MethodBuilder mb)
throws StandardException
{
/* If we were given a specific ValueNode to generate then
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ProjectRestrictNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ProjectRestrictNode.java?rev=1480187&r1=1480186&r2=1480187&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ProjectRestrictNode.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ProjectRestrictNode.java Wed May 8 08:57:47 2013
@@ -1316,8 +1316,7 @@ public class ProjectRestrictNode extends
*
* @exception StandardException Thrown on error
*/
- public void generate(ActivationClassBuilder acb,
- MethodBuilder mb)
+ void generate(ActivationClassBuilder acb, MethodBuilder mb)
throws StandardException
{
if (SanityManager.DEBUG)
@@ -1347,8 +1346,7 @@ public class ProjectRestrictNode extends
* @exception StandardException Thrown on error
*/
- public void generateResultSet(ExpressionClassBuilder acb,
- MethodBuilder mb)
+ void generateResultSet(ExpressionClassBuilder acb, MethodBuilder mb)
throws StandardException
{
generateMinion( acb, mb, true);
@@ -1773,7 +1771,7 @@ public class ProjectRestrictNode extends
*
* @exception StandardException Thrown on error
*/
- protected FromTable getFromTableByName(String name, String schemaName, boolean exactMatch)
+ FromTable getFromTableByName(String name, String schemaName, boolean exactMatch)
throws StandardException
{
return childResult.getFromTableByName(name, schemaName, exactMatch);
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/QueryTreeNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/QueryTreeNode.java?rev=1480187&r1=1480186&r2=1480187&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/QueryTreeNode.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/QueryTreeNode.java Wed May 8 08:57:47 2013
@@ -589,9 +589,7 @@ public abstract class QueryTreeNode impl
* @exception StandardException Thrown on error
*/
- protected void generate(
- ActivationClassBuilder acb,
- MethodBuilder mb)
+ void generate(ActivationClassBuilder acb, MethodBuilder mb)
throws StandardException
{
throw StandardException.newException(SQLState.LANG_UNABLE_TO_GENERATE,
@@ -812,7 +810,7 @@ public abstract class QueryTreeNode impl
*
* @exception StandardException Thrown on error
*/
- public ConstantNode getNullNode(DataTypeDescriptor type)
+ ConstantNode getNullNode(DataTypeDescriptor type)
throws StandardException
{
int constantNodeType;
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ResultColumn.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ResultColumn.java?rev=1480187&r1=1480186&r2=1480187&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ResultColumn.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ResultColumn.java Wed May 8 08:57:47 2013
@@ -1050,11 +1050,10 @@ public class ResultColumn extends ValueN
* @exception StandardException Thrown on error
*/
- public void generateExpression(ExpressionClassBuilder ecb,
- MethodBuilder mb)
+ void generateExpression(ExpressionClassBuilder acb, MethodBuilder mb)
throws StandardException
{
- expression.generateExpression(ecb, mb);
+ expression.generateExpression(acb, mb);
}
/**
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ResultColumnList.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ResultColumnList.java?rev=1480187&r1=1480186&r2=1480187&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ResultColumnList.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ResultColumnList.java Wed May 8 08:57:47 2013
@@ -1158,7 +1158,7 @@ public class ResultColumnList extends Qu
*
* @exception StandardException Thrown on error
*/
- public void generate(ActivationClassBuilder acb, MethodBuilder mb)
+ void generate(ActivationClassBuilder acb, MethodBuilder mb)
throws StandardException
{
generateCore(acb, mb, false);
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=1480187&r1=1480186&r2=1480187&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ResultSetNode.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ResultSetNode.java Wed May 8 08:57:47 2013
@@ -508,11 +508,9 @@ public abstract class ResultSetNode exte
* @exception StandardException Thrown on error
*/
- public void bindResultColumns(TableDescriptor targetTableDescriptor,
- FromVTI targetVTI,
- ResultColumnList targetColumnList,
- DMLStatementNode statement,
- FromList fromListParam)
+ void bindResultColumns(TableDescriptor targetTableDescriptor,
+ FromVTI targetVTI, ResultColumnList targetColumnList,
+ DMLStatementNode statement, FromList fromListParam)
throws StandardException
{
/* For insert select, we need to expand any *'s in the
@@ -1408,7 +1406,7 @@ public abstract class ResultSetNode exte
*
* @exception StandardException Thrown on error
*/
- public void generateNormalizationResultSet(
+ void generateNormalizationResultSet(
ActivationClassBuilder acb,
MethodBuilder mb,
int resultSetNumber,
@@ -1628,7 +1626,7 @@ public abstract class ResultSetNode exte
*
* @exception StandardException Thrown on error
*/
- protected FromTable getFromTableByName(String name, String schemaName, boolean exactMatch)
+ FromTable getFromTableByName(String name, String schemaName, boolean exactMatch)
throws StandardException
{
if (SanityManager.DEBUG)
@@ -1696,14 +1694,15 @@ public abstract class ResultSetNode exte
* @exception StandardException Thrown on error
*/
- public void generateResultSet(ExpressionClassBuilder acb,
- MethodBuilder mb)
+ void generateResultSet(ExpressionClassBuilder acb, MethodBuilder mb)
throws StandardException
{
- System.out.println("I am a " + getClass());
if (SanityManager.DEBUG)
- SanityManager.NOTREACHED();
- return;
+ {
+ SanityManager.THROWASSERT(
+ "generateResultSet() not expected to be called for " +
+ getClass().getName());
+ }
}
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=1480187&r1=1480186&r2=1480187&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 May 8 08:57:47 2013
@@ -80,8 +80,7 @@ public final class RowCountNode extends
*
* @exception StandardException Thrown on error
*/
- public void generate(ActivationClassBuilder acb,
- MethodBuilder mb)
+ void generate(ActivationClassBuilder acb, MethodBuilder mb)
throws StandardException {
/* Get the next ResultSet #, so that we can number this ResultSetNode,
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=1480187&r1=1480186&r2=1480187&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/RowResultSetNode.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/RowResultSetNode.java Wed May 8 08:57:47 2013
@@ -869,8 +869,7 @@ public class RowResultSetNode extends Fr
*
* @exception StandardException Thrown on error
*/
- public void generate(ActivationClassBuilder acb,
- MethodBuilder mb)
+ void generate(ActivationClassBuilder acb, MethodBuilder mb)
throws StandardException
{
if (SanityManager.DEBUG)
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ScrollInsensitiveResultSetNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ScrollInsensitiveResultSetNode.java?rev=1480187&r1=1480186&r2=1480187&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ScrollInsensitiveResultSetNode.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ScrollInsensitiveResultSetNode.java Wed May 8 08:57:47 2013
@@ -61,8 +61,7 @@ public class ScrollInsensitiveResultSetN
*
* @exception StandardException Thrown on error
*/
- public void generate(ActivationClassBuilder acb,
- MethodBuilder mb)
+ void generate(ActivationClassBuilder acb, MethodBuilder mb)
throws StandardException
{
if (SanityManager.DEBUG)
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=1480187&r1=1480186&r2=1480187&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SelectNode.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SelectNode.java Wed May 8 08:57:47 2013
@@ -831,11 +831,9 @@ public class SelectNode extends ResultSe
* @exception StandardException Thrown on error
*/
- public void bindResultColumns(TableDescriptor targetTableDescriptor,
- FromVTI targetVTI,
- ResultColumnList targetColumnList,
- DMLStatementNode statement,
- FromList fromListParam)
+ void bindResultColumns(TableDescriptor targetTableDescriptor,
+ FromVTI targetVTI, ResultColumnList targetColumnList,
+ DMLStatementNode statement, FromList fromListParam)
throws StandardException
{
/* We first bind the resultColumns for any FromTable which
@@ -934,7 +932,7 @@ public class SelectNode extends ResultSe
*
* @exception StandardException Thrown on error
*/
- protected FromTable getFromTableByName(String name, String schemaName, boolean exactMatch)
+ FromTable getFromTableByName(String name, String schemaName, boolean exactMatch)
throws StandardException
{
return fromList.getFromTableByName(name, schemaName, exactMatch);
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SetOperatorNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SetOperatorNode.java?rev=1480187&r1=1480186&r2=1480187&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SetOperatorNode.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SetOperatorNode.java Wed May 8 08:57:47 2013
@@ -621,11 +621,9 @@ abstract class SetOperatorNode extends T
* @exception StandardException Thrown on error
*/
- public void bindResultColumns(TableDescriptor targetTableDescriptor,
- FromVTI targetVTI,
- ResultColumnList targetColumnList,
- DMLStatementNode statement,
- FromList fromListParam)
+ void bindResultColumns(TableDescriptor targetTableDescriptor,
+ FromVTI targetVTI, ResultColumnList targetColumnList,
+ DMLStatementNode statement, FromList fromListParam)
throws StandardException
{
super.bindResultColumns(targetTableDescriptor,
@@ -1003,7 +1001,7 @@ abstract class SetOperatorNode extends T
*
* @exception StandardException Thrown on error
*/
- protected FromTable getFromTableByName(String name, String schemaName, boolean exactMatch)
+ FromTable getFromTableByName(String name, String schemaName, boolean exactMatch)
throws StandardException
{
/* We search both sides for a TableOperatorNode (join nodes)
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SetRoleNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SetRoleNode.java?rev=1480187&r1=1480186&r2=1480187&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SetRoleNode.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SetRoleNode.java Wed May 8 08:57:47 2013
@@ -101,8 +101,7 @@ public class SetRoleNode extends Miscell
* @exception StandardException Thrown on error
*/
- public void generate(ActivationClassBuilder acb,
- MethodBuilder mb)
+ void generate(ActivationClassBuilder acb, MethodBuilder mb)
throws StandardException
{
//generate the parameters for the DYNAMIC SET ROLE
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SetSchemaNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SetSchemaNode.java?rev=1480187&r1=1480186&r2=1480187&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 May 8 08:57:47 2013
@@ -107,8 +107,7 @@ public class SetSchemaNode extends Misce
* @exception StandardException Thrown on error
*/
- public void generate(ActivationClassBuilder acb,
- MethodBuilder mb)
+ void generate(ActivationClassBuilder acb, MethodBuilder mb)
throws StandardException
{
//generate the parameters for the DYNAMIC SET SCHEMA
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SetTransactionIsolationNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SetTransactionIsolationNode.java?rev=1480187&r1=1480186&r2=1480187&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SetTransactionIsolationNode.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SetTransactionIsolationNode.java Wed May 8 08:57:47 2013
@@ -90,8 +90,7 @@ public class SetTransactionIsolationNode
* @param mb The method for the method to be built
* @exception StandardException thrown if generation fails
*/
- public void generate(ActivationClassBuilder acb,
- MethodBuilder mb)
+ void generate(ActivationClassBuilder acb, MethodBuilder mb)
throws StandardException
{
acb.pushGetResultSetFactoryExpression(mb);
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=1480187&r1=1480186&r2=1480187&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SingleChildResultSetNode.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SingleChildResultSetNode.java Wed May 8 08:57:47 2013
@@ -454,7 +454,7 @@ abstract class SingleChildResultSetNode
*
* @exception StandardException Thrown on error
*/
- protected FromTable getFromTableByName(String name, String schemaName, boolean exactMatch)
+ FromTable getFromTableByName(String name, String schemaName, boolean exactMatch)
throws StandardException
{
return childResult.getFromTableByName(name, schemaName, exactMatch);
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SpecialFunctionNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SpecialFunctionNode.java?rev=1480187&r1=1480186&r2=1480187&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SpecialFunctionNode.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SpecialFunctionNode.java Wed May 8 08:57:47 2013
@@ -227,8 +227,7 @@ public class SpecialFunctionNode extends
*
* @exception StandardException Thrown on error
*/
- public void generateExpression(ExpressionClassBuilder acb,
- MethodBuilder mb)
+ void generateExpression(ExpressionClassBuilder acb, MethodBuilder mb)
throws StandardException
{
mb.pushThis();
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SubqueryNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SubqueryNode.java?rev=1480187&r1=1480186&r2=1480187&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SubqueryNode.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SubqueryNode.java Wed May 8 08:57:47 2013
@@ -1925,9 +1925,8 @@ public class SubqueryNode extends ValueN
* @exception StandardException Thrown on error
*/
- public void generateExpression(
- ExpressionClassBuilder expressionBuilder,
- MethodBuilder mbex)
+ void generateExpression(
+ ExpressionClassBuilder expressionBuilder, MethodBuilder mbex)
throws StandardException
{
CompilerContext cc = getCompilerContext();
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/TableOperatorNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/TableOperatorNode.java?rev=1480187&r1=1480186&r2=1480187&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 May 8 08:57:47 2013
@@ -535,11 +535,9 @@ abstract class TableOperatorNode extends
* @exception StandardException Thrown on error
*/
- public void bindResultColumns(TableDescriptor targetTableDescriptor,
- FromVTI targetVTI,
- ResultColumnList targetColumnList,
- DMLStatementNode statement,
- FromList fromListParam)
+ void bindResultColumns(TableDescriptor targetTableDescriptor,
+ FromVTI targetVTI, ResultColumnList targetColumnList,
+ DMLStatementNode statement, FromList fromListParam)
throws StandardException
{
leftResultSet.bindResultColumns(targetTableDescriptor,
@@ -565,7 +563,7 @@ abstract class TableOperatorNode extends
*
* @exception StandardException Thrown on error
*/
- protected FromTable getFromTableByName(String name, String schemaName, boolean exactMatch)
+ FromTable getFromTableByName(String name, String schemaName, boolean exactMatch)
throws StandardException
{
FromTable result = leftResultSet.getFromTableByName(name, schemaName, exactMatch);
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/TernaryOperatorNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/TernaryOperatorNode.java?rev=1480187&r1=1480186&r2=1480187&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/TernaryOperatorNode.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/TernaryOperatorNode.java Wed May 8 08:57:47 2013
@@ -267,8 +267,7 @@ public class TernaryOperatorNode extends
* @exception StandardException Thrown on error
*/
- public void generateExpression(ExpressionClassBuilder acb,
- MethodBuilder mb)
+ void generateExpression(ExpressionClassBuilder acb, MethodBuilder mb)
throws StandardException
{
int nargs = 0;
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/TestConstraintNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/TestConstraintNode.java?rev=1480187&r1=1480186&r2=1480187&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/TestConstraintNode.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/TestConstraintNode.java Wed May 8 08:57:47 2013
@@ -119,8 +119,7 @@ public class TestConstraintNode extends
* @exception StandardException Thrown on error
*/
- public void generateExpression(ExpressionClassBuilder acb,
- MethodBuilder mb)
+ void generateExpression(ExpressionClassBuilder acb, MethodBuilder mb)
throws StandardException
{
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/TimestampOperatorNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/TimestampOperatorNode.java?rev=1480187&r1=1480186&r2=1480187&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/TimestampOperatorNode.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/TimestampOperatorNode.java Wed May 8 08:57:47 2013
@@ -114,8 +114,7 @@ public class TimestampOperatorNode exten
* @exception StandardException Thrown on error
*/
- public void generateExpression(ExpressionClassBuilder acb,
- MethodBuilder mb)
+ void generateExpression(ExpressionClassBuilder acb, MethodBuilder mb)
throws StandardException
{
acb.pushDataValueFactory(mb);
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/UnaryArithmeticOperatorNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/UnaryArithmeticOperatorNode.java?rev=1480187&r1=1480186&r2=1480187&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/UnaryArithmeticOperatorNode.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/UnaryArithmeticOperatorNode.java Wed May 8 08:57:47 2013
@@ -198,8 +198,7 @@ public class UnaryArithmeticOperatorNode
* @exception StandardException Thrown on error
*/
- public void generateExpression(ExpressionClassBuilder acb,
- MethodBuilder mb)
+ void generateExpression(ExpressionClassBuilder acb, MethodBuilder mb)
throws StandardException
{
/* Unary + doesn't do anything. Just return the operand */
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/UnaryDateTimestampOperatorNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/UnaryDateTimestampOperatorNode.java?rev=1480187&r1=1480186&r2=1480187&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/UnaryDateTimestampOperatorNode.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/UnaryDateTimestampOperatorNode.java Wed May 8 08:57:47 2013
@@ -183,8 +183,7 @@ public class UnaryDateTimestampOperatorN
* @exception StandardException Thrown on error
*/
- public void generateExpression( ExpressionClassBuilder acb,
- MethodBuilder mb)
+ void generateExpression( ExpressionClassBuilder acb, MethodBuilder mb)
throws StandardException
{
acb.pushDataValueFactory( mb);
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/UnaryOperatorNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/UnaryOperatorNode.java?rev=1480187&r1=1480186&r2=1480187&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/UnaryOperatorNode.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/UnaryOperatorNode.java Wed May 8 08:57:47 2013
@@ -607,8 +607,7 @@ public class UnaryOperatorNode extends O
* @exception StandardException Thrown on error
*/
- public void generateExpression(ExpressionClassBuilder acb,
- MethodBuilder mb)
+ void generateExpression(ExpressionClassBuilder acb, MethodBuilder mb)
throws StandardException
{
String resultTypeName =
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/UnionNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/UnionNode.java?rev=1480187&r1=1480186&r2=1480187&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 May 8 08:57:47 2013
@@ -617,8 +617,7 @@ public class UnionNode extends SetOperat
*
* @exception StandardException Thrown on error
*/
- public void generate(ActivationClassBuilder acb,
- MethodBuilder mb)
+ void generate(ActivationClassBuilder acb, MethodBuilder mb)
throws StandardException
{
/* By the time we get here we should be a union all.
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/UpdateNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/UpdateNode.java?rev=1480187&r1=1480186&r2=1480187&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/UpdateNode.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/UpdateNode.java Wed May 8 08:57:47 2013
@@ -780,8 +780,7 @@ public final class UpdateNode extends DM
*
* @exception StandardException Thrown on error
*/
- public void generate(ActivationClassBuilder acb,
- MethodBuilder mb)
+ void generate(ActivationClassBuilder acb, MethodBuilder mb)
throws StandardException
{
// If the DML is on the temporary table, generate the code to
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/UserTypeConstantNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/UserTypeConstantNode.java?rev=1480187&r1=1480186&r2=1480187&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 May 8 08:57:47 2013
@@ -231,8 +231,7 @@ public class UserTypeConstantNode extend
*
* @exception StandardException Thrown on error
*/
- public void generateExpression(ExpressionClassBuilder acb,
- MethodBuilder mb)
+ void generateExpression(ExpressionClassBuilder acb, MethodBuilder mb)
throws StandardException {
TypeCompiler tc = getTypeCompiler();
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ValueNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ValueNode.java?rev=1480187&r1=1480186&r2=1480187&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ValueNode.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ValueNode.java Wed May 8 08:57:47 2013
@@ -971,32 +971,13 @@ public abstract class ValueNode extends
* @exception StandardException Thrown on error
*/
- protected final void generate(ActivationClassBuilder acb,
- MethodBuilder mb)
+ final void generate(ActivationClassBuilder acb, MethodBuilder mb)
throws StandardException
{
generateExpression( acb, mb );
}
/**
- * The only reason this routine exists is so that I don't have to change
- * the protection on generateExpression() and rototill all of QueryTree.
- *
- * @param ecb The ExpressionClassBuilder for the class being built
- * @param mb The method the expression will go into
- *
- *
- * @exception StandardException Thrown on error
- */
- public void generateFilter(ExpressionClassBuilder ecb,
- MethodBuilder mb)
- throws StandardException
- {
- generateExpression( ecb, mb );
- }
-
-
- /**
* The default selectivity for value nodes is 50%. This is overridden
* in specific cases, such as the RelationalOperators.
*/
@@ -1116,8 +1097,7 @@ public abstract class ValueNode extends
* @exception StandardException Thrown on error
*/
- public void generateExpression(ExpressionClassBuilder acb,
- MethodBuilder mb)
+ void generateExpression(ExpressionClassBuilder acb, MethodBuilder mb)
throws StandardException
{
if (SanityManager.DEBUG)
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/VirtualColumnNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/VirtualColumnNode.java?rev=1480187&r1=1480186&r2=1480187&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/VirtualColumnNode.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/VirtualColumnNode.java Wed May 8 08:57:47 2013
@@ -212,8 +212,7 @@ public class VirtualColumnNode extends V
*
* @exception StandardException Thrown on error
*/
- public void generateExpression(ExpressionClassBuilder acb,
- MethodBuilder mb)
+ void generateExpression(ExpressionClassBuilder acb, MethodBuilder mb)
throws StandardException
{
int sourceResultSetNumber = sourceColumn.getResultSetNumber();
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/WindowResultSetNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/WindowResultSetNode.java?rev=1480187&r1=1480186&r2=1480187&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/WindowResultSetNode.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/WindowResultSetNode.java Wed May 8 08:57:47 2013
@@ -344,8 +344,7 @@ public class WindowResultSetNode extends
* override
* @see QueryTreeNode#generate
*/
- public void generate(ActivationClassBuilder acb,
- MethodBuilder mb)
+ void generate(ActivationClassBuilder acb, MethodBuilder mb)
throws StandardException
{
// Get the next ResultSet#, so we can number this ResultSetNode, its