[fix][dingo-calcite] Metric mean and median error

Author: guojn1

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

@@ -192,21 +192,22 @@ void TableElement(List<SqlNode> list) :
             [<SCALAR>]
             columnList = ParenthesizedSimpleIdentifierList()
         )
-        [ <WITH> withColumnList = ParenthesizedSimpleIdentifierList() ]
-        [ <ENGINE> <EQ> { engine = getNextToken().image; if (engine.equalsIgnoreCase("innodb")) { engine = "TXN_LSM";} } ]
-        [
+        ( <WITH> withColumnList = ParenthesizedSimpleIdentifierList()
+         |
+          <ENGINE> <EQ> { engine = getNextToken().image; if (engine.equalsIgnoreCase("innodb")) { engine = "TXN_LSM";} }
+         |
            <PARTITION> <BY>
            {
                partitionDefinition = new PartitionDefinition();
                partitionDefinition.setFuncName(getNextToken().image);
                partitionDefinition.setColumns(readNames());
                partitionDefinition.setDetails(readPartitionDetails());
            }
-        ]
-        [
+         |
             <REPLICA> <EQ> {replica = Integer.parseInt(getNextToken().image);}
-        ]
-        [ <PARAMETERS> properties = readProperties() ]
+         |
+           <PARAMETERS> properties = readProperties()
+        )*
         {
             list.add(new SqlIndexDeclaration(s.end(this), index, columnList, withColumnList, properties,
             partitionDefinition, replica, indexType, engine));
@@ -313,9 +314,9 @@ SqlCreate SqlCreateUser(Span s, boolean replace) :
     ( <QUOTED_STRING> | <IDENTIFIER> )
      { user = token.image; }
     [ <AT_SPLIT> (<QUOTED_STRING> | <IDENTIFIER>) { host = token.image; }  ]
-    <IDENTIFIED> 
+    <IDENTIFIED>
     (
-    <WITH> (<QUOTED_STRING> | <IDENTIFIER>) { plugin = token.image; } [<AS> <QUOTED_STRING> { pluginDn = token.image; }] 
+    <WITH> (<QUOTED_STRING> | <IDENTIFIER>) { plugin = token.image; } [<AS> <QUOTED_STRING> { pluginDn = token.image; }]
     |
     <BY>  <QUOTED_STRING> { password = token.image; }
     [ <REQUIRE> (  <SSL> { requireSsl = "SSL"; } | <NONE> { requireSsl  = "NONE"; }) ]

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

@@ -928,12 +928,16 @@ public void execute(@NonNull SqlAlterTableDistribution sqlAlterTableDistribution
             .filter(Column::isPrimary)
             .sorted(Comparator.comparingInt(Column::getPrimaryKeyIndex))
             .collect(Collectors.toList());
-        DefinitionUtils.checkAndConvertRangePartition(
-            keyColumns.stream().map(Column::getName).collect(Collectors.toList()),
-            Collections.emptyList(),
-            keyColumns.stream().map(Column::getType).collect(Collectors.toList()),
-            Collections.singletonList(detail.getOperand())
-        );
+        try {
+            DefinitionUtils.checkAndConvertRangePartition(
+                keyColumns.stream().map(Column::getName).collect(Collectors.toList()),
+                Collections.emptyList(),
+                keyColumns.stream().map(Column::getType).collect(Collectors.toList()),
+                Collections.singletonList(detail.getOperand())
+            );
+        } catch (Exception e) {
+            throw DINGO_RESOURCE.illegalArgumentException().ex();
+        }
         LogUtils.info(log, "DDL execute SqlAlterTableDistribution tableName: {}, partitionDefinition: {}", tableName, detail);
         schema.addDistribution(tableName, sqlAlterTableDistribution.getPartitionDefinition());
         timeCtx.stop();

dingo-calcite/src/main/java/io/dingodb/calcite/runtime/DingoResource.java

@@ -122,4 +122,7 @@ public interface DingoResource {
 
     @BaseMessage("Error 1060 (42S21): Duplicate column names are not allowed in table definition")
     ExInst<DingoSqlException> duplicateColumn();
+
+    @BaseMessage("Error 1105 (HY000): Check illegalArgumentException")
+    ExInst<DingoSqlException> illegalArgumentException();
 }

dingo-common/src/main/java/io/dingodb/common/metrics/DingoMetrics.java

@@ -20,6 +20,7 @@
 import com.codahale.metrics.Meter;
 import com.codahale.metrics.MetricRegistry;
 import com.codahale.metrics.Timer;
+import com.codahale.metrics.UniformReservoir;
 import com.codahale.metrics.jmx.JmxReporter;
 import io.dingodb.common.concurrent.Executors;
 import lombok.extern.slf4j.Slf4j;
@@ -150,7 +151,7 @@ public static Meter meter(final @NonNull String name) {
     }
 
     public static Timer timer(final @NonNull String name) {
-        return metricRegistry.timer(name);
+        return metricRegistry.timer(name, () -> new Timer(new UniformReservoir()));
     }
 
     public static Timer.Context getTimeContext(final @NonNull String name) {

dingo-driver/host/src/main/java/io/dingodb/driver/DingoMeta.java

@@ -319,6 +319,7 @@ public ExecuteResult prepareAndExecute(
             callback.execute();
             if (signature.statementType == StatementType.OTHER_DDL) {
                 addSqlProfile(statement.getSqlProfile(), connection);
+                ((DingoConnection) connection).setCommandStartTime(0);
             }
             final MetaResultSet metaResultSet = MetaResultSet.create(
                 sh.connectionId,

dingo-driver/host/src/main/resources/io/dingodb/calcite/runtime/DingoResource_en.properties

@@ -39,6 +39,7 @@ DuplicateKey=Error 1062(23000): Duplicate entry for key 'PRIMARY'
 fieldSeparatorError=Error 1083(42000): Field separator argument is not what is expected; check the manual
 TableNotExists=Error 1146(42S02): Table ''{0}'' does not exist
 DuplicateColumn=Error 1060 (42S21): Duplicate column names are not allowed in table definition
+IllegalArgumentException=Error 1105 (HY000): Check illegalArgumentException
 
 # Other errors
 PrimaryKeyRequired=Error 1001 (45000): Primary keys are required in table ''{0}''

dingo-store-proxy/src/main/java/io/dingodb/store/proxy/meta/MetaService.java

@@ -45,26 +45,21 @@
 import io.dingodb.sdk.service.entity.coordinator.RegionCmd.RequestNest.SplitRequest;
 import io.dingodb.sdk.service.entity.coordinator.SplitRegionRequest;
 import io.dingodb.sdk.service.entity.meta.AddIndexOnTableRequest;
-import io.dingodb.sdk.service.entity.meta.CreateIndexRequest;
 import io.dingodb.sdk.service.entity.meta.CreateSchemaRequest;
 import io.dingodb.sdk.service.entity.meta.CreateTablesRequest;
 import io.dingodb.sdk.service.entity.meta.DingoCommonId;
 import io.dingodb.sdk.service.entity.meta.DropIndexOnTableRequest;
-import io.dingodb.sdk.service.entity.meta.DropIndexRequest;
 import io.dingodb.sdk.service.entity.meta.DropSchemaRequest;
 import io.dingodb.sdk.service.entity.meta.DropTablesRequest;
 import io.dingodb.sdk.service.entity.meta.EntityType;
 import io.dingodb.sdk.service.entity.meta.GenerateTableIdsRequest;
-import io.dingodb.sdk.service.entity.meta.GetIndexRequest;
-import io.dingodb.sdk.service.entity.meta.GetIndexesRequest;
 import io.dingodb.sdk.service.entity.meta.GetSchemasRequest;
 import io.dingodb.sdk.service.entity.meta.GetSchemasResponse;
 import io.dingodb.sdk.service.entity.meta.GetTableByNameRequest;
 import io.dingodb.sdk.service.entity.meta.GetTableMetricsRequest;
 import io.dingodb.sdk.service.entity.meta.GetTableMetricsResponse;
 import io.dingodb.sdk.service.entity.meta.GetTableRequest;
 import io.dingodb.sdk.service.entity.meta.GetTablesRequest;
-import io.dingodb.sdk.service.entity.meta.IndexDefinition;
 import io.dingodb.sdk.service.entity.meta.Partition;
 import io.dingodb.sdk.service.entity.meta.ReservedSchemaIds;
 import io.dingodb.sdk.service.entity.meta.Schema;
@@ -73,9 +68,7 @@
 import io.dingodb.sdk.service.entity.meta.TableMetrics;
 import io.dingodb.sdk.service.entity.meta.TableMetricsWithId;
 import io.dingodb.sdk.service.entity.meta.TableWithPartCount;
-import io.dingodb.sdk.service.entity.meta.UpdateTablesRequest;
 import io.dingodb.store.proxy.Configuration;
-import io.dingodb.store.proxy.common.Mapping;
 import io.dingodb.store.proxy.service.AutoIncrementService;
 import io.dingodb.store.proxy.service.CodecService;
 import io.dingodb.tso.TsoService;
@@ -100,7 +93,6 @@
 
 import static io.dingodb.common.CommonId.CommonType.TABLE;
 import static io.dingodb.partition.DingoPartitionServiceProvider.HASH_FUNC_NAME;
-import static io.dingodb.store.proxy.common.Mapping.mapping;
 import static io.dingodb.store.proxy.mapper.Mapper.MAPPER;
 
 @Slf4j
@@ -123,8 +115,8 @@ public io.dingodb.meta.MetaService root() {
         }
     }
 
-    private static Pattern pattern = Pattern.compile("^[A-Z_][A-Z\\d_]*$");
-    private static Pattern warnPattern = Pattern.compile(".*[a-z]+.*");
+    private static final Pattern pattern = Pattern.compile("^[A-Z_][A-Z\\d_]*$");
+    private static final Pattern warnPattern = Pattern.compile(".*[a-z]+.*");
 
     public final DingoCommonId id;
     public final String name;