topdog/supersonic
1
0
Fork 0
mirror of https://github.com/tencentmusic/supersonic.git synced 2026-06-25 22:29:22 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

feat(data): 添加时间戳数据类型支持并优化维度转换逻辑

Browse Source 
- 新增 TIMESTAMP 数据类型枚举值
- 为整型数据类型匹配添加 INT 关键字识别
- 移除维度转换中的冗余数据类型设置逻辑
- 修复数据类型转换过程中的潜在问题
This commit is contained in:
jerryjzhang
2026-06-04 21:02:41 +08:00
parent c0af25fe2e
commit c3cf8b1889
5 changed files with 26 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
common/src/main/java/com/tencent/supersonic/common/calcite/SqlDialectFactory.java
View File

@@ -26,12 +26,10 @@ public class SqlDialectFactory {
.withLiteralQuoteString("'").withIdentifierQuoteString("\"")
.withLiteralEscapedQuoteString("''").withUnquotedCasing(Casing.UNCHANGED)
.withQuotedCasing(Casing.UNCHANGED).withCaseSensitive(true);
public static final Context PRESTO_CONTEXT =
SqlDialect.EMPTY_CONTEXT.withDatabaseProduct(DatabaseProduct.PRESTO)
.withLiteralQuoteString("'")
.withLiteralEscapedQuoteString("''")
.withUnquotedCasing(Casing.UNCHANGED)
.withQuotedCasing(Casing.UNCHANGED).withCaseSensitive(true);
public static final Context PRESTO_CONTEXT = SqlDialect.EMPTY_CONTEXT
.withDatabaseProduct(DatabaseProduct.PRESTO).withLiteralQuoteString("'")
.withLiteralEscapedQuoteString("''").withUnquotedCasing(Casing.UNCHANGED)
.withQuotedCasing(Casing.UNCHANGED).withCaseSensitive(true);
public static final Context KYUUBI_CONTEXT =
SqlDialect.EMPTY_CONTEXT.withDatabaseProduct(DatabaseProduct.BIG_QUERY)
.withLiteralQuoteString("'").withIdentifierQuoteString("`")

5
common/src/main/java/com/tencent/supersonic/common/pojo/enums/DataTypeEnums.java
View File

@@ -11,6 +11,8 @@ public enum DataTypeEnums {
DATE("DATE"),
TIMESTAMP("TIMESTAMP"),
BIGINT("BIGINT"),
INT("INT"),
@@ -39,6 +41,9 @@ public enum DataTypeEnums {
return typeEnum;
}
}
if (type != null && type.toUpperCase().contains("INT")) {
return DataTypeEnums.INT;
}
return DataTypeEnums.UNKNOWN;
}
}

3
headless/chat/src/main/java/com/tencent/supersonic/headless/chat/ChatQueryContext.java
View File

@@ -56,7 +56,8 @@ public class ChatQueryContext implements Serializable {
candidateQueries = candidateQueries.stream()
.sorted(Comparator.comparing(
semanticQuery -> semanticQuery.getParseInfo().getScore(),
Comparator.reverseOrder())).collect(Collectors.toList());
Comparator.reverseOrder()))
.collect(Collectors.toList());
return candidateQueries;
}

34
headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/DataSetServiceImpl.java
View File

@@ -79,11 +79,11 @@ public class DataSetServiceImpl extends ServiceImpl<DataSetDOMapper, DataSetDO>
public DataSetResp getDataSet(Long id) {
DataSetDO dataSetDO = getById(id);
DataSetResp dataSetResp = convert(dataSetDO);
if (dataSetResp.getDataSetDetail() != null) {
expandIncludesAllModels(dataSetResp);
}
return dataSetResp;
}
@@ -286,10 +286,8 @@ public class DataSetServiceImpl extends ServiceImpl<DataSetDOMapper, DataSetDO>
return;
}
Set<Long> includeAllModelIds = configs.stream()
.filter(DataSetModelConfig::getIncludesAll)
.map(DataSetModelConfig::getId)
.collect(Collectors.toSet());
Set<Long> includeAllModelIds = configs.stream().filter(DataSetModelConfig::getIncludesAll)
.map(DataSetModelConfig::getId).collect(Collectors.toSet());
if (CollectionUtils.isEmpty(includeAllModelIds)) {
return;
@@ -302,28 +300,26 @@ public class DataSetServiceImpl extends ServiceImpl<DataSetDOMapper, DataSetDO>
List<DimensionResp> allDimensions = dimensionService.getDimensions(metaFilter);
List<MetricResp> allMetrics = metricService.getMetrics(metaFilter);
Map<Long, List<Long>> modelDimensionMap = allDimensions.stream()
.collect(Collectors.groupingBy(
DimensionResp::getModelId,
Collectors.mapping(DimensionResp::getId, Collectors.toList())
));
Map<Long, List<Long>> modelDimensionMap =
allDimensions.stream().collect(Collectors.groupingBy(DimensionResp::getModelId,
Collectors.mapping(DimensionResp::getId, Collectors.toList())));
Map<Long, List<Long>> modelMetricMap = allMetrics.stream()
.collect(Collectors.groupingBy(
MetricResp::getModelId,
Collectors.mapping(MetricResp::getId, Collectors.toList())
));
Map<Long, List<Long>> modelMetricMap =
allMetrics.stream().collect(Collectors.groupingBy(MetricResp::getModelId,
Collectors.mapping(MetricResp::getId, Collectors.toList())));
for (DataSetModelConfig config : configs) {
if (Boolean.TRUE.equals(config.getIncludesAll())) {
Long modelId = config.getId();
List<Long> modelDimensions = modelDimensionMap.getOrDefault(modelId, Lists.newArrayList());
List<Long> modelDimensions =
modelDimensionMap.getOrDefault(modelId, Lists.newArrayList());
Set<Long> existingDimensions = new HashSet<>(config.getDimensions());
existingDimensions.addAll(modelDimensions);
config.setDimensions(new ArrayList<>(existingDimensions));
List<Long> modelMetrics = modelMetricMap.getOrDefault(modelId, Lists.newArrayList());
List<Long> modelMetrics =
modelMetricMap.getOrDefault(modelId, Lists.newArrayList());
Set<Long> existingMetrics = new HashSet<>(config.getMetrics());
existingMetrics.addAll(modelMetrics);
config.setMetrics(new ArrayList<>(existingMetrics));

3
headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/DimensionConverter.java
View File

@@ -73,9 +73,6 @@ public class DimensionConverter {
if (dimensionReq.getTypeParams() != null) {
dimensionDO.setTypeParams(JSONObject.toJSONString(dimensionReq.getTypeParams()));
}
if (dimensionReq.getDataType() != null) {
dimensionDO.setDataType(dimensionReq.getDataType().getType());
}
dimensionDO.setStatus(StatusEnum.ONLINE.getCode());
return dimensionDO;
}