[OPTIQ-412] RelFieldTrimmer: when trimming SortRel, the collation and…

… trait set don't match
julianhyde · Sep 17, 2014 · 3c32deb · 3c32deb
1 parent f715880
commit 3c32deb
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 3 deletions.
diff --git a/core/src/main/java/org/eigenbase/sql2rel/RelFieldTrimmer.java b/core/src/main/java/org/eigenbase/sql2rel/RelFieldTrimmer.java
@@ -471,9 +471,11 @@ public TrimResult trimFields(
           Mappings.createIdentity(fieldCount));
     }
 
-    final RelNode newSort = sortFactory.createSort(sort.getTraitSet(),
-        newInput, RexUtil.apply(inputMapping, collation),
-        sort.offset, sort.fetch);
+    final RelCollation newCollation =
+        sort.getTraitSet().canonize(RexUtil.apply(inputMapping, collation));
+    final RelTraitSet newTraitSet = sort.getTraitSet().replace(newCollation);
+    final RelNode newSort = sortFactory.createSort(newTraitSet, newInput,
+        newCollation, sort.offset, sort.fetch);
 
     // The result has the same mapping as the input gave us. Sometimes we
     // return fields that the consumer didn't ask for, because the filter

diff --git a/core/src/test/java/org/eigenbase/test/SqlToRelConverterTest.java b/core/src/test/java/org/eigenbase/test/SqlToRelConverterTest.java
@@ -915,6 +915,16 @@ protected final void check(
         Util.toLinux(sw.toString()));
   }
 
+  /** Test case for
+   * <a href="https://issues.apache.org/jira/browse/OPTIQ-412">OPTIQ-412</a>,
+   * "RelFieldTrimmer: when trimming SortRel, the collation and trait set don't
+   * match". */
+  @Test public void testSortWithTrim() {
+    tester.assertConvertsTo(
+        "select ename from (select * from emp order by sal) a", "${plan}",
+        true);
+  }
+
   /**
    * Visitor that checks that every {@link RelNode} in a tree is valid.
    *

diff --git a/core/src/test/resources/org/eigenbase/test/SqlToRelConverterTest.xml b/core/src/test/resources/org/eigenbase/test/SqlToRelConverterTest.xml
@@ -1947,6 +1947,19 @@ ProjectRel(EMPNO=[$0], EXPR$1=[NOT(true)])
       ProjectRel($f0=[$0], $f1=[true])
         ProjectRel(DEPTNO=[$0])
           TableAccessRel(table=[[CATALOG, SALES, DEPT]])
+]]>
+        </Resource>
+    </TestCase>
+    <TestCase name="testSortWithTrim">
+        <Resource name="sql">
+            <![CDATA[select ename from (select * from emp order by sal) a]]>
+        </Resource>
+        <Resource name="plan">
+            <![CDATA[
+ProjectRel(ENAME=[$0])
+  SortRel(sort0=[$1], dir0=[ASC])
+    ProjectRel(ENAME=[$1], SAL=[$5])
+      TableAccessRel(table=[[CATALOG, SALES, EMP]])
 ]]>
         </Resource>
     </TestCase>