KE-44971 merge KE4 to KE5 (#366)

* AL-10159 fix function params type match (#361)

Co-authored-by: Xuecheng Shan <xuecheng.shan@kyligence.io>

* AL-10200 fix 'order by xxx limit 0' (#362)

Co-authored-by: Xuecheng Shan <xuecheng.shan@kyligence.io>

---------

Co-authored-by: Xuecheng Shan <xuecheng.shan@kyligence.io>

Author: shanxuecheng

core/src/main/java/org/apache/calcite/sql/type/SqlTypeExplicitPrecedenceList.java

@@ -138,23 +138,31 @@ private static SqlTypeExplicitPrecedenceList numeric(SqlTypeName typeName) {
 
   // implement RelDataTypePrecedenceList
   @Override public int compareTypePrecedence(RelDataType type1, RelDataType type2) {
-    assert containsType(type1) : type1;
-    assert containsType(type2) : type2;
+    if (SqlTypeName.ANY != type1.getSqlTypeName()) {
+      assert containsType(type1) : type1;
+    }
+    if (SqlTypeName.ANY != type2.getSqlTypeName()) {
+      assert containsType(type2) : type2;
+    }
 
     int p1 =
         getListPosition(
             type1.getSqlTypeName(),
             typeNames);
+    p1 = (p1 == -1) ? Integer.MAX_VALUE : p1;
     int p2 =
         getListPosition(
             type2.getSqlTypeName(),
             typeNames);
+    p2 = (p2 == -1) ? Integer.MAX_VALUE : p2;
     return p2 - p1;
   }
 
   private static int getListPosition(SqlTypeName type, List<SqlTypeName> list) {
     int i = list.indexOf(type);
-    assert i != -1;
+    if (SqlTypeName.ANY != type) {
+      assert i != -1;
+    }
     return i;
   }
 

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

@@ -661,7 +661,7 @@ public TrimResult trimFields(
         sort.fetch == null ? -1 : RexLiteral.intValue(sort.fetch);
     final ImmutableList<RexNode> fields =
         relBuilder.fields(RexUtil.apply(inputMapping, collation));
-    relBuilder.sortLimit(offset, fetch, fields);
+    relBuilder.sortLimit(sort.getTraitSet(), offset, fetch, fields);
 
     // 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

core/src/main/java/org/apache/calcite/tools/RelBuilder.java

@@ -26,6 +26,7 @@
 import org.apache.calcite.plan.RelOptSchema;
 import org.apache.calcite.plan.RelOptTable;
 import org.apache.calcite.plan.RelOptUtil;
+import org.apache.calcite.plan.RelTraitSet;
 import org.apache.calcite.plan.ViewExpanders;
 import org.apache.calcite.prepare.RelOptTableImpl;
 import org.apache.calcite.rel.RelCollation;
@@ -3050,15 +3051,25 @@ private static boolean allNull(@Nullable Object[] values, int column, int column
    * create a relation expression that retains the input, just to read its
    * schema.
    */
-  public RelBuilder empty() {
+  public RelBuilder empty(RelTraitSet sortTraits) {
     final Frame frame = stack.pop();
-    final RelNode values =
+    RelNode values =
         struct.valuesFactory.createValues(cluster, frame.rel.getRowType(),
             ImmutableList.of());
+    if (null != sortTraits) {
+      if (values.getConvention() != null) {
+        sortTraits = sortTraits.replace(values.getConvention());
+      }
+      values = values.copy(sortTraits, values.getInputs());
+    }
     stack.push(new Frame(values, frame.fields));
     return this;
   }
 
+  public RelBuilder empty() {
+    return empty(null);
+  }
+
   /** Creates a {@link Values} with a specified row type.
    *
    * <p>This method can handle cases that {@link #values(String[], Object...)}
@@ -3190,11 +3201,12 @@ public RelBuilder sort(RelCollation collation) {
 
   /** Creates a {@link Sort} by a list of expressions, with limit and offset.
    *
+   * @param sortTraits traits of Sort
    * @param offset Number of rows to skip; non-positive means don't skip any
    * @param fetch Maximum number of rows to fetch; negative means no limit
    * @param nodes Sort expressions
    */
-  public RelBuilder sortLimit(int offset, int fetch,
+  public RelBuilder sortLimit(RelTraitSet sortTraits, int offset, int fetch,
       Iterable<? extends RexNode> nodes) {
     final Registrar registrar = new Registrar(fields(), ImmutableList.of());
     final List<RelFieldCollation> fieldCollations =
@@ -3203,7 +3215,7 @@ public RelBuilder sortLimit(int offset, int fetch,
     final RexNode offsetNode = offset <= 0 ? null : literal(offset);
     final RexNode fetchNode = fetch < 0 ? null : literal(fetch);
     if (offsetNode == null && fetch == 0 && config.simplifyLimit()) {
-      return empty();
+      return empty(sortTraits);
     }
     if (offsetNode == null && fetchNode == null && fieldCollations.isEmpty()) {
       return this; // sort is trivial
@@ -3254,6 +3266,11 @@ public RelBuilder sortLimit(int offset, int fetch,
     return this;
   }
 
+  public RelBuilder sortLimit(int offset, int fetch,
+      Iterable<? extends RexNode> nodes) {
+    return sortLimit(null, offset, fetch, nodes);
+  }
+
   private static RelFieldCollation collation(RexNode node,
       RelFieldCollation.Direction direction,
       RelFieldCollation.@Nullable NullDirection nullDirection,

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-5.x-r3
+calcite.version=1.30.0-kylin-5.x-r4
 # This is a version to be used from Maven repository. It can be overridden by localAvatica below
 calcite.avatica.version=1.22.0