test

Author: Xuecheng Shan

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

@@ -662,13 +662,24 @@ public TrimResult trimFields(
     final ImmutableList<RexNode> fields =
         relBuilder.fields(RexUtil.apply(inputMapping, collation));
     relBuilder.sortLimit(offset, fetch, fields);
+    handleEmpty(sort, relBuilder);
 
     // 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
     // needs them for its condition.
     return result(relBuilder.build(), inputMapping);
   }
 
+  private void handleEmpty(Sort sort, RelBuilder relBuilder) {
+    RelNode relNode = relBuilder.peek();
+    if ((relNode instanceof LogicalValues) && !(relNode.getTraitSet().equals(sort.getTraitSet()))) {
+      relNode = new LogicalValues(relNode.getCluster(), sort.getTraitSet(), relNode.getRowType(),
+          ((LogicalValues) relNode).getTuples());
+    }
+    relBuilder.clear();
+    relBuilder.push(relNode);
+  }
+
   public TrimResult trimFields(
       Exchange exchange,
       ImmutableBitSet fieldsUsed,

gradle.properties

@@ -27,7 +27,7 @@ systemProp.org.gradle.internal.publish.checksums.insecure=true
 # This is version for Calcite itself
 # Note: it should not include "-SNAPSHOT" as it is automatically added by build.gradle.kts
 # Release version can be generated by using -Prelease or -Prc=<int> arguments
-calcite.version=1.30.0-kylin-4.x-r13
+calcite.version=1.30.0-kylin-4.x-r14-SNAPSHOT
 # This is a version to be used from Maven repository. It can be overridden by localAvatica below
 calcite.avatica.version=1.22.0