Author: shawkins
Date: 2011-07-27 13:49:14 -0400 (Wed, 27 Jul 2011)
New Revision: 3342
Modified:
branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/xml/SourceNodePlannerVisitor.java
Log:
TEIID-1683 completing the merge of old case changes
Modified:
branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/xml/SourceNodePlannerVisitor.java
===================================================================
---
branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/xml/SourceNodePlannerVisitor.java 2011-07-27
17:32:38 UTC (rev 3341)
+++
branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/xml/SourceNodePlannerVisitor.java 2011-07-27
17:49:14 UTC (rev 3342)
@@ -127,7 +127,7 @@
// going through the raising the criteria.
// if the original query is not a select.. we are out of luck. we can expand
on this later
// versions. make sure bindings are only to parent.
- if (parent == null || !canRaiseInputset(command, bindings) ||
!areBindingsOnlyToNode(modifiedNode, parent)) {
+ if (!rsInfo.hasInputSet() || !canRaiseInputset(command, bindings) ||
!areBindingsOnlyToNode(modifiedNode, parent)) {
return;
}
@@ -153,6 +153,10 @@
}
}
+ if (inputSetCriteria == null) {
+ return;
+ }
+
// Keep the criteria which is not reference based.
transformationQuery.setCriteria(nonInputsetCriteria);
Show replies by date