TEIID-2733 retaining optional join predicates in dependent join

scenarios
teiid · Nov 12, 2013 · 6b430de · 6b430de
1 parent 904137e
commit 6b430de
Show file tree

Hide file tree

Showing 2 changed files with 53 additions and 0 deletions.
diff --git a/engine/src/main/java/org/teiid/query/optimizer/relational/rules/RulePushSelectCriteria.java b/engine/src/main/java/org/teiid/query/optimizer/relational/rules/RulePushSelectCriteria.java
@@ -48,6 +48,7 @@
 import org.teiid.query.optimizer.relational.plantree.NodeFactory;
 import org.teiid.query.optimizer.relational.plantree.PlanNode;
 import org.teiid.query.resolver.util.AccessPattern;
+import org.teiid.query.sql.LanguageObject;
 import org.teiid.query.sql.lang.CompareCriteria;
 import org.teiid.query.sql.lang.CompoundCriteria;
 import org.teiid.query.sql.lang.Criteria;
@@ -523,6 +524,29 @@ private void markDependent(PlanNode critNode, PlanNode accessNode, QueryMetadata
 			List<DependentSetCriteria> crits = splitDependentSetCriteria((DependentSetCriteria) crit);
 			critNode.setProperty(NodeConstants.Info.SELECT_CRITERIA, new CompoundCriteria(crits));
 		}
+
+        Collection<ElementSymbol> elements = null;
+        for (PlanNode joinNode : NodeEditor.findAllNodes(accessNode, NodeConstants.Types.JOIN, NodeConstants.Types.SOURCE)) {
+        	List<Criteria> joinCriteria = (List<Criteria>) joinNode.getProperty(Info.JOIN_CRITERIA);
+            if (joinCriteria == null) {
+            	continue;
+            }
+            for (Criteria joinPredicate : joinCriteria) {
+            	if (!(joinPredicate instanceof CompareCriteria)) {
+            		continue;
+            	}
+        		CompareCriteria cc = (CompareCriteria)joinPredicate;
+        		if (!cc.isOptional()) {
+        			continue;
+        		}
+        		if (elements == null) {
+        			elements = ElementCollectorVisitor.getElements((LanguageObject)critNode.getProperty(Info.SELECT_CRITERIA), true);
+        		}
+        		if (!Collections.disjoint(elements, ElementCollectorVisitor.getElements(cc, false))) {
+        			cc.setOptional(false);
+        		}
+            }
+        }
 	}
 
 	private List<DependentSetCriteria> splitDependentSetCriteria(DependentSetCriteria dsc) {

diff --git a/engine/src/test/java/org/teiid/query/optimizer/TestDependentJoins.java b/engine/src/test/java/org/teiid/query/optimizer/TestDependentJoins.java
@@ -932,4 +932,33 @@ null, new DefaultCapabilitiesFinder(TestOptimizer.getTypicalCapabilities()),
         });         
     }
 
+    @Test public void testKeepTransitiveWithDependentJoin() throws Exception {
+
+        FakeCapabilitiesFinder capFinder = new FakeCapabilitiesFinder();
+        BasicSourceCapabilities caps = TestOptimizer.getTypicalCapabilities();
+        caps.setCapabilitySupport(Capability.QUERY_ORDERBY, false);
+        capFinder.addCapabilities("pm1", caps); //$NON-NLS-1$
+        capFinder.addCapabilities("pm2", caps); //$NON-NLS-1$
+
+        ProcessorPlan plan = TestOptimizer.helpPlan("select pm1.g1.e1 from pm1.g1, pm2.g1, pm2.g2 where pm1.g1.e1 = pm2.g1.e1 and pm1.g1.e1 = pm2.g2.e1 and pm2.g1.e2 = pm2.g2.e2 option makedep pm2.g1", RealMetadataFactory.example1Cached(), null, capFinder, //$NON-NLS-1$
+            new String[] { "SELECT g_1.e1, g_0.e1 FROM pm2.g1 AS g_0, pm2.g2 AS g_1 WHERE (g_0.e2 = g_1.e2) AND (g_1.e1 = g_0.e1) AND (g_1.e1 IN (<dependent values>)) AND (g_0.e1 IN (<dependent values>))", "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[] {
+            1,      // Access
+            1,      // 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
+        });
+    }
+
 }