[fix][dingo-calcite] Adjusted the return type of avg

Author: guojn1

dingo-calcite/src/main/codegen/includes/AlterTable.ftl

@@ -293,7 +293,8 @@ SqlAlterTable addIndex(Span s, String scope, SqlIdentifier id): {
 }
 
 SqlAlterTable addUniqueIndex(Span s, String scope, SqlIdentifier id): {
-    final String index;
+    String index = null;
+    SqlIdentifier tmpIndex = null;
     Boolean autoIncrement = false;
     Properties properties = null;
     PartitionDefinition partitionDefinition = null;
@@ -306,8 +307,13 @@ SqlAlterTable addUniqueIndex(Span s, String scope, SqlIdentifier id): {
     String indexAlg = null;
     String indexLockOpt = null;
 } {
- <UNIQUE> [<INDEX>][<KEY>] { s.add(this); }
-    { SqlIdentifier tmpIndex = SimpleIdentifier(); index = tmpIndex.getSimple();  }
+ <UNIQUE> { s.add(this); }
+    (
+          <KEY>
+          |
+          <INDEX>
+    )?
+    ( tmpIndex = SimpleIdentifier() { index = tmpIndex.getSimple(); } | { boolean hasName = false; })
     [<SCALAR>] columnList = indexColumns()
     (
        LOOKAHEAD(2)

dingo-calcite/src/main/java/io/dingodb/calcite/DingoDdlExecutor.java

@@ -2361,9 +2361,11 @@ private static IndexDefinition fromSqlUniqueDeclaration(
         if (sqlKeyConstraint1.getReplica() >= 0) {
             indexDefinition.setReplica(sqlKeyConstraint1.getReplica());
         }
+        String engine = "TXN_LSM";
         if (sqlKeyConstraint1.getEngine() != null) {
-            indexDefinition.setEngine(sqlKeyConstraint1.getEngine().toUpperCase());
+            engine = sqlKeyConstraint1.getEngine().toUpperCase();
         }
+        indexDefinition.setEngine(engine);
         indexDefinition.setPartDefinition(sqlKeyConstraint1.getPartDefinition());
         validatePartitionBy(
             indexDefinition.getKeyColumns().stream().map(ColumnDefinition::getName).collect(Collectors.toList()),

dingo-calcite/src/main/java/io/dingodb/calcite/executor/ShowCreateTableExecutor.java

@@ -289,6 +289,9 @@ private String getCreateTable() {
                 if (!"TXN_LSM".equalsIgnoreCase(indexTable.getEngine())) {
                     createTableSqlStr.append(" engine=").append(indexTable.getEngine());
                 }
+                if (StringUtils.isNotBlank(indexTable.getComment())) {
+                    createTableSqlStr.append(" comment ").append(indexTable.getComment());
+                }
                 appendPart(indexTable, createTableSqlStr);
             }
         }

dingo-calcite/src/main/java/io/dingodb/calcite/grammar/ddl/SqlIndexDeclaration.java

@@ -90,6 +90,9 @@ public SqlIndexDeclaration(
                 .map(SqlIdentifier.class::cast)
                 .map(SqlIdentifier::getSimple)
                 .collect(Collectors.toCollection(ArrayList::new));
+            if (this.index == null && !this.columnList.isEmpty()) {
+                this.index = this.columnList.get(0);
+            }
         }
         if (withColumnList != null) {
             this.withColumnList = withColumnList.getList().stream()

dingo-common/src/main/java/io/dingodb/common/ddl/DdlJob.java

@@ -353,7 +353,7 @@ public String toString() {
             + ", dependencyId=" + dependencyId
             + ", query='" + query + '\''
             + ", version=" + version
-            + ", args=" + args
+            //+ ", args=" + args
             + ", multiSchemaInfo=" + multiSchemaInfo
             + ", priority=" + priority
             + ", seqNu=" + seqNu

dingo-common/src/main/java/io/dingodb/common/util/Utils.java

@@ -241,7 +241,7 @@ public static void checkAndUpdateTuples(DingoType schema, Object[] tuple) {
             Type[] dingoTypes = ((TupleType)schemaType).getTypes();
             for (int i = 0; i < dingoTypes.length; i++) {
                 if (dingoTypes[i] instanceof io.dingodb.expr.common.type.DecimalType) {
-                    if (((io.dingodb.expr.common.type.DecimalType)dingoTypes[i]).getScale() == 0) {
+                    if (((io.dingodb.expr.common.type.DecimalType)dingoTypes[i]).getScale() == 0 && tuple[i] instanceof BigDecimal) {
                         tuple[i] = ((BigDecimal)tuple[i]).setScale(0, RoundingMode.HALF_UP);
                     }
                 }

dingo-exec/src/main/java/io/dingodb/exec/fun/mysql/HexFun.java

@@ -42,7 +42,8 @@ protected Object evalNonNullValue(@NonNull Object value, ExprConfig config) {
             BigDecimal valueDecimal = (BigDecimal) value;
             return valueDecimal.toBigInteger().toString(16).toUpperCase();
         } else if (value instanceof Integer) {
-            return Integer.toHexString((Integer) value).toUpperCase();
+            Integer valInt = (Integer) value;
+            return Long.toHexString(valInt.longValue()).toUpperCase();
         } else if (value instanceof Long) {
             return Long.toHexString((Long) value).toUpperCase();
         } else {

dingo-exec/src/main/java/io/dingodb/exec/operator/TxnPartInsertOperator.java

@@ -123,8 +123,8 @@ protected boolean pushTuple(Context context, Object[] tuple, Vertex vertex) {
                             throw new DingoTypeRangeException(0, "Out of range value for column '" + originColumns.get(i).getName() + "'");
                         }
                     }
-                } else if(originColumns.get(i).getSqlTypeName().equalsIgnoreCase("TINYINT")) {
-                    if(tuple[i] instanceof Integer) {
+                } else if (originColumns.get(i).getSqlTypeName().equalsIgnoreCase("TINYINT")) {
+                    if (tuple[i] instanceof Integer) {
                         if (!Utils.tinyintInRange((Integer)tuple[i])) {
                             throw new DingoTypeRangeException(0, "Out of range value for column '" + originColumns.get(i).getName() + "'");
                         }

dingo-executor/src/main/java/io/dingodb/server/executor/ddl/DdlWorker.java

@@ -2645,6 +2645,7 @@ public Pair<Long, String> onCreateTableAsQuery(DdlContext dc, DdlJob job) {
                         job.setActionType(originType);
                         job.setDingoErr(DingoErrUtil.newInternalErr(e.getMessage()));
                         DdlContext.INSTANCE.getSchemaSyncer().ownerUpdateExpVersion(res.getKey());
+                        job.setState(JobState.jobStateCancelled);
                         return Pair.of(0L, job.getDingoErr().errorMsg);
                     }
                 }

dingo-test/src/test/java/io/dingodb/test/dsl/BasicQueryCases.java

@@ -822,8 +822,8 @@ public void build() {
             .step(
                 "select avg(age) aag,avg(gmt) agm,avg(price) apr,round(avg(amount),2) aam from {table}",
                 csv("aag, agm, apr, aam",
-                    "DECIMAL, DECIMAL, FLOAT, DOUBLE",
-                    "107.6000, -17057004875.5000, 9.341029E8, 1.305008494926E10")
+                    "DECIMAL, DECIMAL, DOUBLE, DOUBLE",
+                    "107.6000, -17057004875.5000, 9.341029376E8, 1.305008494926E10")
             );
     }
 }