[teiid-commits] teiid SVN: r4207 - trunk/engine/src/test/java/org/teiid/query/optimizer.
Author: shawkins
Date: 2012-06-27 12:54:17 -0400 (Wed, 27 Jun 2012)
New Revision: 4207
Modified:
trunk/engine/src/test/java/org/teiid/query/optimizer/TestRuleMergeVirtual.java
Log:
TEIID-2087 fix for union planning
Modified: trunk/engine/src/test/java/org/teiid/query/optimizer/TestRuleMergeVirtual.java
===================================================================
---
trunk/engine/src/test/java/org/teiid/query/optimizer/TestRuleMergeVirtual.java 2012-06-27
16:34:53 UTC (rev 4206)
+++
trunk/engine/src/test/java/org/teiid/query/optimizer/TestRuleMergeVirtual.java 2012-06-27
16:54:17 UTC (rev 4207)
@@ -410,12 +410,12 @@
}
@Test public void testSortOverUnion() throws Exception {
- ProcessorPlan plan = TestOptimizer.helpPlan("select e1 from (select max(e1)
as e1 from pm1.g1 having 1 = 0) as y union all select e2 from pm1.g1 order by e1",
//$NON-NLS-1$
+ ProcessorPlan plan = TestOptimizer.helpPlan("select e1 from (select max(e1)
as e1 from pm1.g1 having 1 = 0) as y union all select e2 from pm1.g1 union all select e1
from pm1.g1 order by e1", //$NON-NLS-1$
RealMetadataFactory.example1Cached(), null, new
DefaultCapabilitiesFinder(),
new String[] {
- "SELECT pm1.g1.e2 FROM pm1.g1"},
ComparisonMode.EXACT_COMMAND_STRING); //$NON-NLS-1$
+ "SELECT pm1.g1.e2 FROM pm1.g1",
"SELECT pm1.g1.e1 FROM pm1.g1"}, ComparisonMode.EXACT_COMMAND_STRING);
//$NON-NLS-1$
TestOptimizer.checkNodeTypes(plan, new int[] {
- 1, // Access
+ 2, // Access
0, // DependentAccess
0, // DependentSelect
0, // DependentProject
@@ -428,7 +428,7 @@
1, // Project
0, // Select
1, // Sort
- 0 // UnionAll
+ 1 // UnionAll
});
}