diff --git a/common/src/main/java/com/tencent/supersonic/common/pojo/enums/AggOperatorEnum.java b/common/src/main/java/com/tencent/supersonic/common/pojo/enums/AggOperatorEnum.java index 1a5d46c79..e3eb7875d 100644 --- a/common/src/main/java/com/tencent/supersonic/common/pojo/enums/AggOperatorEnum.java +++ b/common/src/main/java/com/tencent/supersonic/common/pojo/enums/AggOperatorEnum.java @@ -1,6 +1,8 @@ package com.tencent.supersonic.common.pojo.enums; public enum AggOperatorEnum { + ANY("ANY"), + MAX("MAX"), MIN("MIN"), diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/ColumnSchema.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/ColumnSchema.java index 51f6112c5..c84745aaf 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/ColumnSchema.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/ColumnSchema.java @@ -15,7 +15,7 @@ public class ColumnSchema { private FieldType filedType; - private AggOperatorEnum agg = AggOperatorEnum.SUM; + private AggOperatorEnum agg = AggOperatorEnum.ANY; private String name; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/ModelConverter.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/ModelConverter.java index c9f65ab1c..91ab94d0f 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/ModelConverter.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/ModelConverter.java @@ -163,13 +163,11 @@ public class ModelConverter { getIdentifyType(fieldType).name(), columnSchema.getColumnName(), 1); modelDetail.getIdentifiers().add(identify); } else if (FieldType.measure.equals(fieldType)) { - Measure measure = new Measure(columnSchema.getName(), - modelReq.getBizName() + "_" + columnSchema.getColumnName(), + Measure measure = new Measure(columnSchema.getName(), columnSchema.getColumnName(), columnSchema.getColumnName(), columnSchema.getAgg().getOperator(), 1); modelDetail.getMeasures().add(measure); } else { - Dimension dim = new Dimension(columnSchema.getName(), - modelReq.getBizName() + "_" + columnSchema.getColumnName(), + Dimension dim = new Dimension(columnSchema.getName(), columnSchema.getColumnName(), columnSchema.getColumnName(), DimensionType.valueOf(columnSchema.getFiledType().name()), 1); modelDetail.getDimensions().add(dim);