test/datacap
1
0
Fork 0
mirror of https://gitee.com/devlive-community/datacap.git synced 2024-12-04 13:09:02 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

[Core] [DataSet] Support ad hoc query custom functions (#686)

Browse Source
This commit is contained in:
qianmoQ 2024-02-23 09:57:24 +08:00 committed by GitHub
commit 15b5bcd679
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/datacap-common/src/main/java/io/edurt/datacap/common/sql/SqlBuilder.java
View File

@ -108,7 +108,7 @@ public class SqlBuilder
private List<String> applyGroupByColumns()
{
return configure.getGroups().stream()
.map(v -> String.join(" ", String.format("`%s`", v.getColumn())))
.map(v -> String.join(" ", String.format("%s", v.getColumn())))
.collect(Collectors.toList());
}

1
core/datacap-service/src/main/java/io/edurt/datacap/service/body/adhoc/AdhocColumn.java
View File

@ -13,6 +13,7 @@ public class AdhocColumn
{
private Long id;
private String expression;
private String function;
private String alias;
private String order;
}

15
core/datacap-service/src/main/java/io/edurt/datacap/service/service/impl/DataSetServiceImpl.java
View File

@ -175,9 +175,12 @@ public class DataSetServiceImpl
configure.getColumns()
.forEach(column -> columnRepository.findById(column.getId())
.ifPresent(entity -> {
String columnName = entity.getName();
AtomicReference<String> columnAlias = new AtomicReference<>(null);
AtomicReference<String> expression = new AtomicReference<>(null);
AtomicReference<String> columnName = new AtomicReference<>(entity.getName());
if (StringUtils.isNotEmpty(column.getFunction())) {
columnName.set(column.getFunction());
}
configure.getColumns().stream()
.filter(it -> it.getId().equals(entity.getId()))
.findFirst()
@ -186,7 +189,7 @@ public class DataSetServiceImpl
columnAlias.set(it.getAlias());
});
SqlColumn sqlColumn = SqlColumn.builder()
.column(columnName)
.column(columnName.get())
.expression(expression.get())
.alias(columnAlias.get())
.build();
@ -194,7 +197,7 @@ public class DataSetServiceImpl
// Only dimensions are added to GROUP BY
if (entity.getMode().equals(ColumnMode.DIMENSION)) {
groupBy.add(SqlColumn.builder()
.column(columnName)
.column(columnName.get())
.build());
}
// Add to Sort Sequence
@ -300,14 +303,14 @@ public class DataSetServiceImpl
{
switch (type) {
case NUMBER:
return "bigint";
return "Bigint";
case NUMBER_SIGNED:
return "UInt64";
case BOOLEAN:
return "boolean";
return "Boolean";
case STRING:
default:
return "varchar";
return "String";
}
}

1
core/datacap-web/src/i18n/langs/en/dataset.ts
View File

@ -75,4 +75,5 @@ export default {
columnExpressionAvg: 'Average',
columnExpressionCount: 'Count',
validatorSamplingTip: 'The order by key must contain a sampling key',
customFunction: 'Custom Function'
}

3
core/datacap-web/src/i18n/langs/zhCn/dataset.ts
View File

@ -74,5 +74,6 @@ export default {
columnExpressionSum: '总和',
columnExpressionAvg: '平均值',
columnExpressionCount: '计数',
validatorSamplingTip: '排序键中必须包含抽样键'
validatorSamplingTip: '排序键中必须包含抽样键',
customFunction: '自定义函数'
}

9
core/datacap-web/src/views/admin/dataset/components/adhoc/DatasetColumnConfigure.vue
View File

@ -7,7 +7,7 @@
@onOk="handlerCommit()"
@cancel="handlerCancel()">
<Form :model="formState"
:label-width="80">
:label-width="90">
<FormItem v-if="columnType === 'METRIC'"
:label="$t('common.expression')">
<Select v-model="formState.expression">
@ -34,6 +34,10 @@
<Radio label="DESC">{{ $t('dataset.columnOrderDesc') }}</Radio>
</RadioGroup>
</FormItem>
<FormItem v-if="columnType === 'DIMENSION'"
:label="$t('dataset.customFunction')">
<Input v-model="formState.function"/>
</FormItem>
</Form>
</Modal>
</div>
@ -91,7 +95,8 @@ export default defineComponent({
type: null,
alias: null,
expression: null,
order: null
order: null,
function: null
}
}
},