Improve

Author: xiedeyantu

core/src/main/java/org/apache/calcite/sql2rel/RelFieldTrimmer.java

@@ -836,6 +836,11 @@ public TrimResult trimFields(
       Join join,
       ImmutableBitSet fieldsUsed,
       Set<RelDataTypeField> extraFields) {
+    // If the column "mark" is included, it needs to be excluded first.
+    if (join.getJoinType() == JoinRelType.LEFT_MARK) {
+      int markIndex = join.getRowType().getFieldCount() - 1;
+      fieldsUsed = fieldsUsed.except(ImmutableBitSet.of(markIndex));
+    }
     final int fieldCount = join.getSystemFieldList().size()
         + join.getLeft().getRowType().getFieldCount()
         + join.getRight().getRowType().getFieldCount();

core/src/test/resources/sql/new-decorr.iq

@@ -65,34 +65,36 @@ INSERT INTO emps (empid, deptno, name, salary, commission) VALUES
 
 !update
 
-SELECT *, EXISTS(select * from (
+SELECT empid, EXISTS(select * from (
   SELECT e2.deptno FROM emps e2 where e1.commission = e2.commission) as table3
   where table3.deptno <> e1.deptno)
 from emps e1 order by empid;
-+-------+--------+-----------+----------+------------+--------+
-| EMPID | DEPTNO | NAME      | SALARY   | COMMISSION | EXPR$5 |
-+-------+--------+-----------+----------+------------+--------+
-|   100 |     10 | Bill      | 10000.00 |       1000 | false  |
-|   110 |     10 | Theodore  | 11500.00 |        250 | true   |
-|   140 |     10 | Sebastian |  7000.00 |            | false  |
-|   150 |     10 | Sebastian |  7000.00 |            | false  |
-|   170 |     30 | Theodore  | 11500.00 |        250 | true   |
-|   200 |     20 | Eric      |  8000.00 |        500 | false  |
-+-------+--------+-----------+----------+------------+--------+
++-------+--------+
+| EMPID | EXPR$1 |
++-------+--------+
+|   100 | false  |
+|   110 | true   |
+|   140 | false  |
+|   150 | false  |
+|   170 | true   |
+|   200 | false  |
++-------+--------+
 (6 rows)
 
 !ok
 
 !if (use_new_decorr) {
 EnumerableSort(sort0=[$0], dir0=[ASC])
-  EnumerableHashJoin(condition=[AND(IS NOT DISTINCT FROM($1, $6), IS NOT DISTINCT FROM($4, $7))], joinType=[left_mark])
-    EnumerableTableScan(table=[[BLANK, EMPS]])
-    EnumerableCalc(expr#0..3=[{inputs}], DEPTNO=[$t2], DEPTNO0=[$t0], COMMISSION0=[$t1])
-      EnumerableHashJoin(condition=[AND(=($1, $3), <>($2, $0))], joinType=[inner])
-        EnumerableAggregate(group=[{1, 4}])
-          EnumerableTableScan(table=[[BLANK, EMPS]])
-        EnumerableCalc(expr#0..4=[{inputs}], DEPTNO=[$t1], COMMISSION=[$t4])
-          EnumerableTableScan(table=[[BLANK, EMPS]])
+  EnumerableCalc(expr#0..3=[{inputs}], EMPID=[$t0], EXPR$1=[$t3])
+    EnumerableHashJoin(condition=[AND(IS NOT DISTINCT FROM($1, $3), IS NOT DISTINCT FROM($2, $4))], joinType=[left_mark])
+      EnumerableCalc(expr#0..4=[{inputs}], proj#0..1=[{exprs}], COMMISSION=[$t4])
+        EnumerableTableScan(table=[[BLANK, EMPS]])
+      EnumerableCalc(expr#0..3=[{inputs}], proj#0..1=[{exprs}])
+        EnumerableHashJoin(condition=[AND(=($1, $3), <>($2, $0))], joinType=[inner])
+          EnumerableAggregate(group=[{1, 4}])
+            EnumerableTableScan(table=[[BLANK, EMPS]])
+          EnumerableCalc(expr#0..4=[{inputs}], DEPTNO=[$t1], COMMISSION=[$t4])
+            EnumerableTableScan(table=[[BLANK, EMPS]])
 !plan
 !}