[teiid-commits] teiid SVN: r4247 - in branches/7.4.x/engine/src: test/java/org/teiid/query/processor and 1 other directory.
Author: jolee
Date: 2012-07-19 16:28:45 -0400 (Thu, 19 Jul 2012)
New Revision: 4247
Modified:
branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/relational/rules/RuleImplementJoinStrategy.java
branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestTempTables.java
Log:
TEIID-2107 fix for left outer join with index issue
Modified:
branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/relational/rules/RuleImplementJoinStrategy.java
===================================================================
---
branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/relational/rules/RuleImplementJoinStrategy.java 2012-07-19
16:37:08 UTC (rev 4246)
+++
branches/7.4.x/engine/src/main/java/org/teiid/query/optimizer/relational/rules/RuleImplementJoinStrategy.java 2012-07-19
20:28:45 UTC (rev 4247)
@@ -162,7 +162,6 @@
if (joinCriteria == null || joinCriteria.isEmpty()) {
joinCriteria = new ArrayList<Criteria>();
joinCriteria.add(cc);
- joinNode.setProperty(Info.JOIN_TYPE, JoinType.JOIN_INNER);
}
}
joinNode.setProperty(Info.NON_EQUI_JOIN_CRITERIA, joinCriteria);
Modified:
branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestTempTables.java
===================================================================
---
branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestTempTables.java 2012-07-19
16:37:08 UTC (rev 4246)
+++
branches/7.4.x/engine/src/test/java/org/teiid/query/processor/TestTempTables.java 2012-07-19
20:28:45 UTC (rev 4247)
@@ -336,6 +336,7 @@
execute("insert into x (e2, e1) values (2, 'b')", new List[]
{Arrays.asList(1)}); //$NON-NLS-1$
execute("insert into x1 (e2, e1) values (3, 'b')", new List[]
{Arrays.asList(1)}); //$NON-NLS-1$
execute("select x.e1 from x makenotdep, x1 makenotdep where x.e2 = x1.e2 and x.e1
= x1.e1", new List[0]); //$NON-NLS-1$
+ execute("select x.e1 from x left outer join x1 on x.e2 = x1.e2 and x.e1 =
x1.e1", new List[] {Arrays.asList("b")}); //$NON-NLS-1$
}
private void sampleTable() throws Exception {