[teiid-commits] teiid SVN: r4600 - in branches/7.7.x/engine/src: test/java/org/teiid/query/optimizer and 1 other directory.

[teiid-commits at lists.jboss.org]

Author: jolee
Date: 2013-10-04 16:57:36 -0400 (Fri, 04 Oct 2013)
New Revision: 4600

Modified:
   branches/7.7.x/engine/src/main/java/org/teiid/query/optimizer/relational/rules/NewCalculateCostUtil.java
   branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestDependentJoins.java
Log:
TEIID-2688: NPE determining dependent join cost

Modified: branches/7.7.x/engine/src/main/java/org/teiid/query/optimizer/relational/rules/NewCalculateCostUtil.java
===================================================================
--- branches/7.7.x/engine/src/main/java/org/teiid/query/optimizer/relational/rules/NewCalculateCostUtil.java	2013-10-02 15:37:12 UTC (rev 4599)
+++ branches/7.7.x/engine/src/main/java/org/teiid/query/optimizer/relational/rules/NewCalculateCostUtil.java	2013-10-04 20:57:36 UTC (rev 4600)
@@ -1289,10 +1289,21 @@
 				continue;
 			}
 			PlanNode sourceNode = FrameUtil.findOriginatingNode(initial, critNode.getGroups());
-			PlanNode target = sourceNode;
-			if (initial != sourceNode) {
-				target = rpsc.examinePath(initial, sourceNode, metadata, capFinder);					
-			}
+ 			if (sourceNode == null) {
+ 				continue;
+ 			}
+ 			PlanNode target = sourceNode;
+ 			if (initial != sourceNode) {
+ 				//pretend the criteria starts at the initial location
+ 				//either above or below depending upon the node type
+ 				if (initial.getChildCount() > 1) {
+ 					initial.addAsParent(critNode);
+ 				} else {
+ 					initial.getFirstChild().addAsParent(critNode);
+ 				}
+ 				target = rpsc.examinePath(critNode, sourceNode, metadata, capFinder);
+ 				critNode.getParent().replaceChild(critNode, critNode.getFirstChild());
+ 			}
 			if (target != sourceNode || (sourceNode.getType() == NodeConstants.Types.SOURCE && sourceNode.getChildCount() == 0)) {
 				targets.add(target);
 				DependentSetCriteria dsc = (DependentSetCriteria)critNode.getProperty(Info.SELECT_CRITERIA);

Modified: branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestDependentJoins.java
===================================================================
--- branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestDependentJoins.java	2013-10-02 15:37:12 UTC (rev 4599)
+++ branches/7.7.x/engine/src/test/java/org/teiid/query/optimizer/TestDependentJoins.java	2013-10-04 20:57:36 UTC (rev 4600)
@@ -824,4 +824,40 @@
 
     } 
     
+     @Test public void testPlanningOverJoin() throws Exception {
+         // Create query
+         String sql = "SELECT pm1.g1.e1 FROM pm1.g1, (select pm2.g2.e1, pm2.g3.e2 from pm2.g2 left outer join pm2.g3 on pm2.g2.e1 = pm2.g3.e1) as x where pm1.g1.e1 = x.e1";//$NON-NLS-1$
+ 
+         FakeCapabilitiesFinder capFinder = new FakeCapabilitiesFinder();
+         BasicSourceCapabilities caps = new BasicSourceCapabilities();
+         caps.setCapabilitySupport(Capability.CRITERIA_COMPARE_EQ, true);
+         caps.setCapabilitySupport(Capability.QUERY_FROM_GROUP_ALIAS, true);
+         capFinder.addCapabilities("pm1", caps); //$NON-NLS-1$
+         capFinder.addCapabilities("pm2", TestOptimizer.getTypicalCapabilities()); //$NON-NLS-1$
+ 
+         QueryMetadataInterface metadata = RealMetadataFactory.example1();
+         RealMetadataFactory.setCardinality("pm1.g1", RuleChooseDependent.DEFAULT_INDEPENDENT_CARDINALITY, metadata);
+         RealMetadataFactory.setCardinality("pm2.g2", RuleChooseDependent.DEFAULT_INDEPENDENT_CARDINALITY + 1, metadata);
+         RealMetadataFactory.setCardinality("pm2.g3", RuleChooseDependent.DEFAULT_INDEPENDENT_CARDINALITY + 1, metadata);
+     
+         ProcessorPlan plan = TestOptimizer.helpPlan(sql, metadata,  
+             null, capFinder,
+             new String[] { "SELECT g_0.e1 AS c_0 FROM pm2.g2 AS g_0 LEFT OUTER JOIN pm2.g3 AS g_1 ON g_0.e1 = g_1.e1 ORDER BY c_0", "SELECT g_0.e1 FROM pm1.g1 AS g_0" }, TestOptimizer.ComparisonMode.EXACT_COMMAND_STRING); //$NON-NLS-1$ //$NON-NLS-2$
+         TestOptimizer.checkNodeTypes(plan, new int[] {
+             2,      // Access
+             0,      // DependentAccess
+             0,      // DependentSelect
+             0,      // DependentProject
+             0,      // DupRemove
+             0,      // Grouping
+             0,      // NestedLoopJoinStrategy
+             1,      // MergeJoinStrategy
+             0,      // Null
+             0,      // PlanExecution
+             1,      // Project
+             0,      // Select
+             0,      // Sort
+             0       // UnionAll
+         });         
+     }       
 }