[teiid-commits] teiid SVN: r3500 - in branches/7.1.1.CP3_SOA-3362/engine/src: test/java/org/teiid/query/processor and 1 other directory.

Author: loleary Date: 2011-09-19 20:14:47 -0400 (Mon, 19 Sep 2011) New Revision: 3500 Modified: branches/7.1.1.CP3_SOA-3362/engine/src/main/java/org/teiid/query/optimizer/relational/rules/RulePlanJoins.java branches/7.1.1.CP3_SOA-3362/engine/src/test/java/org/teiid/query/processor/TestTextTable.java Log: TEIID-1706 fix to join planning with nested tables Modified: branches/7.1.1.CP3_SOA-3362/engine/src/main/java/org/teiid/query/optimizer/relational/rules/RulePlanJoins.java =================================================================== --- branches/7.1.1.CP3_SOA-3362/engine/src/main/java/org/teiid/query/optimizer/relational/rules/RulePlanJoins.java 2011-09-19 23:45:18 UTC (rev 3499) +++ branches/7.1.1.CP3_SOA-3362/engine/src/main/java/org/teiid/query/optimizer/relational/rules/RulePlanJoins.java 2011-09-20 00:14:47 UTC (rev 3500) @@ -470,7 +470,8 @@ } JoinType jt = (JoinType)root.getProperty(NodeConstants.Info.JOIN_TYPE); - boolean treatJoinAsSource = jt.isOuter() || root.getProperty(NodeConstants.Info.ACCESS_PATTERNS) != null || root.hasProperty(NodeConstants.Info.MAKE_DEP); + boolean treatJoinAsSource = jt.isOuter() || root.getProperty(NodeConstants.Info.ACCESS_PATTERNS) != null + || root.hasProperty(NodeConstants.Info.MAKE_DEP) || !root.getExportedCorrelatedReferences().isEmpty(); if (treatJoinAsSource) { currentRegion.addJoinSourceNode(root); Modified: branches/7.1.1.CP3_SOA-3362/engine/src/test/java/org/teiid/query/processor/TestTextTable.java =================================================================== --- branches/7.1.1.CP3_SOA-3362/engine/src/test/java/org/teiid/query/processor/TestTextTable.java 2011-09-19 23:45:18 UTC (rev 3499) +++ branches/7.1.1.CP3_SOA-3362/engine/src/test/java/org/teiid/query/processor/TestTextTable.java 2011-09-20 00:14:47 UTC (rev 3500) @@ -22,6 +22,8 @@ package org.teiid.query.processor; +import static org.junit.Assert.*; +import static org.teiid.query.optimizer.TestOptimizer.*; import static org.teiid.query.processor.TestProcessor.*; import java.util.Arrays; @@ -34,7 +36,13 @@ import org.teiid.core.types.InputStreamFactory; import org.teiid.core.util.UnitTestUtil; import org.teiid.query.optimizer.capabilities.DefaultCapabilitiesFinder; +import org.teiid.query.optimizer.capabilities.FakeCapabilitiesFinder; +import org.teiid.query.optimizer.capabilities.SourceCapabilities.Capability; +import org.teiid.query.processor.relational.JoinNode; +import org.teiid.query.processor.relational.NestedTableJoinStrategy; +import org.teiid.query.processor.relational.RelationalPlan; import org.teiid.query.unittest.FakeMetadataFactory; +import org.teiid.query.unittest.RealMetadataFactory; @SuppressWarnings({"unchecked", "nls"}) public class TestTextTable { @@ -208,8 +216,27 @@ }; process(sql, expected); - } + } + @Test public void testTextTableJoin() throws Exception { + String sql = "select z.* from (select x.* from (select * from pm1.g1 where e1 = 'c') y, texttable(e1 || '\n' || e2 || '\n' || e3 COLUMNS x string) x) as z, " + + "(select x.* from (select * from pm1.g1 where e1 = 'c') y, texttable(e1 || '\n' || e2 || '\n' || e3 COLUMNS x string) x) as z1 where z.x = z1.x order by z.x"; + + List[] expected = new List[] { + Arrays.asList("1"), + Arrays.asList("c"), + Arrays.asList("true"), + }; + + FakeDataManager dataManager = new FakeDataManager(); + sampleData1(dataManager); + RelationalPlan plan = (RelationalPlan)helpGetPlan(helpParse(sql), FakeMetadataFactory.example1Cached()); + // The root node's child is a sortNode so we want the sortNode's first child + JoinNode join = (JoinNode) plan.getRootNode().getChildren()[0].getChildren()[0]; + assertTrue(!(join.getJoinStrategy() instanceof NestedTableJoinStrategy)); + helpProcess(plan, createCommandContext(), dataManager, expected); + } + public static void process(String sql, List[] expectedResults) throws Exception { FakeDataManager dataManager = new FakeDataManager(); sampleData1(dataManager);