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 2009/10/30 10:50:06 UTC
svn commit: r831244 -
/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/
Author: kahatlen
Date: Fri Oct 30 09:50:05 2009
New Revision: 831244
URL: http://svn.apache.org/viewvc?rev=831244&view=rev
Log:
DERBY-4421: Allow Visitors to process the nodes bottom-up
Removed redundant calls to stopTraversal() in the acceptChildren()
methods, since stopTraversal() will always be checked in
QueryTreeNode.accept() before visit() is called.
Modified:
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/BinaryListOperatorNode.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/ConditionalNode.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CreateViewNode.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DMLStatementNode.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/FromBaseTable.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/FromVTI.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/HashTableNode.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/IndexToBaseRowNode.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/JavaToSQLValueNode.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/NonStaticMethodCallNode.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/OrderByColumn.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/Predicate.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/ResultColumn.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/SQLToJavaValueNode.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SelectNode.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SingleChildResultSetNode.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/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/UnaryOperatorNode.java
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/BinaryListOperatorNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/BinaryListOperatorNode.java?rev=831244&r1=831243&r2=831244&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/BinaryListOperatorNode.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/BinaryListOperatorNode.java Fri Oct 30 09:50:05 2009
@@ -386,12 +386,12 @@
{
super.acceptChildren(v);
- if (leftOperand != null && !v.stopTraversal())
+ if (leftOperand != null)
{
leftOperand = (ValueNode)leftOperand.accept(v);
}
- if (rightOperandList != null && !v.stopTraversal())
+ if (rightOperandList != null)
{
rightOperandList = (ValueNodeList)rightOperandList.accept(v);
}
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=831244&r1=831243&r2=831244&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 Fri Oct 30 09:50:05 2009
@@ -864,12 +864,12 @@
{
super.acceptChildren(v);
- if (leftOperand != null && !v.stopTraversal())
+ if (leftOperand != null)
{
leftOperand = (ValueNode)leftOperand.accept(v);
}
- if (rightOperand != null && !v.stopTraversal())
+ if (rightOperand != null)
{
rightOperand = (ValueNode)rightOperand.accept(v);
}
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=831244&r1=831243&r2=831244&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 Fri Oct 30 09:50:05 2009
@@ -250,7 +250,7 @@
{
super.acceptChildren(v);
- if (!v.stopTraversal())
+ if (methodCall != null)
{
methodCall = (JavaToSQLValueNode) methodCall.accept(v);
}
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=831244&r1=831243&r2=831244&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 Fri Oct 30 09:50:05 2009
@@ -986,7 +986,7 @@
{
super.acceptChildren(v);
- if (castOperand != null && !v.stopTraversal())
+ if (castOperand != null)
{
castOperand = (ValueNode)castOperand.accept(v);
}
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=831244&r1=831243&r2=831244&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 Fri Oct 30 09:50:05 2009
@@ -729,12 +729,12 @@
{
super.acceptChildren(v);
- if (testCondition != null && !v.stopTraversal())
+ if (testCondition != null)
{
testCondition = (ValueNode)testCondition.accept(v);
}
- if (thenElseList != null && !v.stopTraversal())
+ if (thenElseList != null)
{
thenElseList = (ValueNodeList)thenElseList.accept(v);
}
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CreateViewNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CreateViewNode.java?rev=831244&r1=831243&r2=831244&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CreateViewNode.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CreateViewNode.java Fri Oct 30 09:50:05 2009
@@ -402,7 +402,7 @@
{
super.acceptChildren(v);
- if (queryExpression != null && !v.stopTraversal())
+ if (queryExpression != null)
{
queryExpression = (ResultSetNode)queryExpression.accept(v);
}
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DMLStatementNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DMLStatementNode.java?rev=831244&r1=831243&r2=831244&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DMLStatementNode.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DMLStatementNode.java Fri Oct 30 09:50:05 2009
@@ -495,7 +495,7 @@
{
super.acceptChildren(v);
- if (resultSet != null && !v.stopTraversal())
+ if (resultSet != null)
{
resultSet = (ResultSetNode)resultSet.accept(v);
}
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=831244&r1=831243&r2=831244&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 Fri Oct 30 09:50:05 2009
@@ -4599,19 +4599,19 @@
{
super.acceptChildren(v);
- if (nonStoreRestrictionList != null && !v.stopTraversal()) {
+ if (nonStoreRestrictionList != null) {
nonStoreRestrictionList.accept(v);
}
- if (restrictionList != null & !v.stopTraversal()) {
+ if (restrictionList != null) {
restrictionList.accept(v);
}
- if (nonBaseTableRestrictionList != null && !v.stopTraversal()) {
+ if (nonBaseTableRestrictionList != null) {
nonBaseTableRestrictionList.accept(v);
}
- if (requalificationRestrictionList != null && !v.stopTraversal()) {
+ if (requalificationRestrictionList != null) {
requalificationRestrictionList.accept(v);
}
}
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=831244&r1=831243&r2=831244&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 Fri Oct 30 09:50:05 2009
@@ -1744,7 +1744,7 @@
{
super.acceptChildren(v);
- if (!v.stopTraversal())
+ if (methodCall != null)
{
methodCall = (MethodCallNode) methodCall.accept(v);
}
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=831244&r1=831243&r2=831244&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 Fri Oct 30 09:50:05 2009
@@ -420,12 +420,12 @@
{
super.acceptChildren(v);
- if (searchPredicateList != null && !v.stopTraversal())
+ if (searchPredicateList != null)
{
searchPredicateList = (PredicateList)searchPredicateList.accept(v);
}
- if (joinPredicateList != null && !v.stopTraversal())
+ if (joinPredicateList != null)
{
joinPredicateList = (PredicateList)joinPredicateList.accept(v);
}
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=831244&r1=831243&r2=831244&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 Fri Oct 30 09:50:05 2009
@@ -423,7 +423,7 @@
{
super.acceptChildren(v);
- if (source != null && !v.stopTraversal())
+ if (source != null)
{
source = (FromBaseTable)source.accept(v);
}
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=831244&r1=831243&r2=831244&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 Fri Oct 30 09:50:05 2009
@@ -349,7 +349,7 @@
{
super.acceptChildren(v);
- if (javaNode != null && !v.stopTraversal())
+ if (javaNode != null)
{
javaNode = (JavaValueNode)javaNode.accept(v);
}
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=831244&r1=831243&r2=831244&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 Fri Oct 30 09:50:05 2009
@@ -1943,17 +1943,17 @@
{
super.acceptChildren(v);
- if (resultColumns != null && !v.stopTraversal())
+ if (resultColumns != null)
{
resultColumns = (ResultColumnList)resultColumns.accept(v);
}
- if (joinClause != null && !v.stopTraversal())
+ if (joinClause != null)
{
joinClause = (ValueNode)joinClause.accept(v);
}
- if (usingClause != null && !v.stopTraversal())
+ if (usingClause != null)
{
usingClause = (ResultColumnList)usingClause.accept(v);
}
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/NonStaticMethodCallNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/NonStaticMethodCallNode.java?rev=831244&r1=831243&r2=831244&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/NonStaticMethodCallNode.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/NonStaticMethodCallNode.java Fri Oct 30 09:50:05 2009
@@ -477,7 +477,7 @@
{
super.acceptChildren(v);
- if (receiver != null && !v.stopTraversal())
+ if (receiver != null)
{
receiver = (JavaValueNode)receiver.accept(v);
}
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/OrderByColumn.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/OrderByColumn.java?rev=831244&r1=831243&r2=831244&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/OrderByColumn.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/OrderByColumn.java Fri Oct 30 09:50:05 2009
@@ -512,7 +512,7 @@
{
super.acceptChildren(v);
- if (expression != null && !v.stopTraversal())
+ if (expression != null)
{
expression = (ValueNode)expression.accept(v);
}
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/Predicate.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/Predicate.java?rev=831244&r1=831243&r2=831244&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 Fri Oct 30 09:50:05 2009
@@ -821,7 +821,7 @@
{
super.acceptChildren(v);
- if (andNode != null && !v.stopTraversal())
+ if (andNode != null)
{
andNode = (AndNode)andNode.accept(v);
}
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=831244&r1=831243&r2=831244&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 Fri Oct 30 09:50:05 2009
@@ -1833,12 +1833,12 @@
{
super.acceptChildren(v);
- if (restriction != null && !v.stopTraversal())
+ if (restriction != null)
{
restriction = (ValueNode)restriction.accept(v);
}
- if (restrictionList != null && !v.stopTraversal())
+ if (restrictionList != null)
{
restrictionList = (PredicateList)restrictionList.accept(v);
}
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=831244&r1=831243&r2=831244&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 Fri Oct 30 09:50:05 2009
@@ -1545,7 +1545,7 @@
{
super.acceptChildren(v);
- if (expression != null && !v.stopTraversal())
+ if (expression != null)
{
setExpression( (ValueNode)expression.accept(v) );
}
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=831244&r1=831243&r2=831244&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 Fri Oct 30 09:50:05 2009
@@ -1612,7 +1612,7 @@
{
super.acceptChildren(v);
- if (resultColumns != null && !v.stopTraversal())
+ if (resultColumns != null)
{
resultColumns = (ResultColumnList)resultColumns.accept(v);
}
Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SQLToJavaValueNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SQLToJavaValueNode.java?rev=831244&r1=831243&r2=831244&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 Fri Oct 30 09:50:05 2009
@@ -507,7 +507,7 @@
{
super.acceptChildren(v);
- if (value != null && !v.stopTraversal())
+ if (value != null)
{
value = (ValueNode)value.accept(v);
}
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=831244&r1=831243&r2=831244&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 Fri Oct 30 09:50:05 2009
@@ -2355,22 +2355,22 @@
{
super.acceptChildren(v);
- if (fromList != null && !v.stopTraversal())
+ if (fromList != null)
{
fromList = (FromList)fromList.accept(v);
}
- if (whereClause != null && !v.stopTraversal())
+ if (whereClause != null)
{
whereClause = (ValueNode)whereClause.accept(v);
}
- if (wherePredicates != null && !v.stopTraversal())
+ if (wherePredicates != null)
{
wherePredicates = (PredicateList)wherePredicates.accept(v);
}
- if (havingClause != null && !v.stopTraversal()) {
+ if (havingClause != null) {
havingClause = (ValueNode)havingClause.accept(v);
}
}
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=831244&r1=831243&r2=831244&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 Fri Oct 30 09:50:05 2009
@@ -620,7 +620,7 @@
{
super.acceptChildren(v);
- if (childResult != null && !v.stopTraversal())
+ if (childResult != null)
{
childResult = (ResultSetNode)childResult.accept(v);
}
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=831244&r1=831243&r2=831244&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 Fri Oct 30 09:50:05 2009
@@ -2213,12 +2213,12 @@
return;
}
- if (resultSet != null && !v.stopTraversal())
+ if (resultSet != null)
{
resultSet = (ResultSetNode)resultSet.accept(v);
}
- if (leftOperand != null && !v.stopTraversal())
+ if (leftOperand != null)
{
leftOperand = (ValueNode)leftOperand.accept(v);
}
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=831244&r1=831243&r2=831244&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 Fri Oct 30 09:50:05 2009
@@ -957,11 +957,11 @@
{
super.acceptChildren(v);
- if (leftResultSet != null && !v.stopTraversal())
+ if (leftResultSet != null)
{
leftResultSet = (ResultSetNode)leftResultSet.accept(v);
}
- if (rightResultSet != null && !v.stopTraversal())
+ if (rightResultSet != null)
{
rightResultSet = (ResultSetNode)rightResultSet.accept(v);
}
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=831244&r1=831243&r2=831244&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 Fri Oct 30 09:50:05 2009
@@ -475,17 +475,17 @@
{
super.acceptChildren(v);
- if (receiver != null && !v.stopTraversal())
+ if (receiver != null)
{
receiver = (ValueNode)receiver.accept(v);
}
- if (leftOperand != null && !v.stopTraversal())
+ if (leftOperand != null)
{
leftOperand = (ValueNode)leftOperand.accept(v);
}
- if (rightOperand != null && !v.stopTraversal())
+ if (rightOperand != null)
{
rightOperand = (ValueNode)rightOperand.accept(v);
}
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=831244&r1=831243&r2=831244&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 Fri Oct 30 09:50:05 2009
@@ -754,7 +754,7 @@
{
super.acceptChildren(v);
- if (operand != null && !v.stopTraversal())
+ if (operand != null)
{
operand = (ValueNode)operand.accept(v);
}