Apache
/
druid
mirror of https://github.com/apache/druid.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Web console: Fix spec conversion, expose failOnEmptyInsert (#15627) 

* Spec converter should dedupe the columns

* Add "Fail on empty insert" setting to QueryContext toggles
This commit is contained in:
Vadim Ogievetsky 2024-01-08 12:05:12 -08:00 committed by GitHub
parent 5d1e66b8f9
commit 84adb9255e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 39 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
web-console/src/druid-models/query-context/query-context.tsx
View File

@ -146,6 +146,22 @@ export function changeTaskAssigment(
: deepDelete(context, 'taskAssignment');
}
// failOnEmptyInsert
export function getFailOnEmptyInsert(context: QueryContext): boolean | undefined {
const { failOnEmptyInsert } = context;
return typeof failOnEmptyInsert === 'boolean' ? failOnEmptyInsert : undefined;
}
export function changeFailOnEmptyInsert(
context: QueryContext,
failOnEmptyInsert: boolean | undefined,
): QueryContext {
return typeof failOnEmptyInsert === 'boolean'
? deepSet(context, 'failOnEmptyInsert', failOnEmptyInsert)
: deepDelete(context, 'failOnEmptyInsert');
}
// finalizeAggregations
export function getFinalizeAggregations(context: QueryContext): boolean | undefined {

1
web-console/src/helpers/__snapshots__/spec-conversion.spec.ts.snap
View File

@ -58,6 +58,7 @@ SELECT
COUNT(*) AS "count",
SUM("added") AS "sum_added",
SUM("commentLength") AS "sum_commentLength",
MAX("commentLength") AS "max_commentLength",
SUM("delta") AS "sum_delta",
SUM("deltaBucket") AS "sum_deltaBucket",
SUM("deleted") AS "sum_deleted",

5
web-console/src/helpers/spec-conversion.spec.ts
View File

@ -192,6 +192,11 @@ describe('spec conversion', () => {
type: 'longSum',
fieldName: 'commentLength',
},
{
name: 'max_commentLength',
type: 'longMax',
fieldName: 'commentLength',
},
{
name: 'sum_delta',
type: 'longSum',

7
web-console/src/helpers/spec-conversion.ts
View File

@ -18,6 +18,7 @@
import {
C,
dedupe,
L,
RefName,
SqlColumnDeclaration,
@ -120,6 +121,8 @@ export function convertSpecToSql(spec: any): QueryWithContext {
);
}
columnDeclarations = dedupe(columnDeclarations, d => d.getColumnName());
const transforms: Transform[] = deepGet(spec, 'spec.dataSchema.transformSpec.transforms') || [];
if (!Array.isArray(transforms)) {
throw new Error(`spec.dataSchema.transformSpec.transforms is not an array`);
@ -346,14 +349,14 @@ export function convertSpecToSql(spec: any): QueryWithContext {
function convertQueryGranularity(
timeExpression: string,
queryGranularity: { type: string } | string | undefined,
queryGranularity: { type: unknown } | string | undefined,
) {
if (!queryGranularity) return timeExpression;
const effectiveQueryGranularity =
typeof queryGranularity === 'string'
? queryGranularity
: typeof queryGranularity.type === 'string'
: typeof queryGranularity?.type === 'string'
? queryGranularity.type
: undefined;

12
web-console/src/views/workbench-view/run-panel/run-panel.tsx
View File

@ -38,6 +38,7 @@ import { IndexSpecDialog } from '../../../dialogs/index-spec-dialog/index-spec-d
import type { DruidEngine, IndexSpec, QueryContext, WorkbenchQuery } from '../../../druid-models';
import {
changeDurableShuffleStorage,
changeFailOnEmptyInsert,
changeFinalizeAggregations,
changeGroupByEnableMultiValueUnnesting,
changeMaxParseExceptions,
@ -47,6 +48,7 @@ import {
changeUseCache,
changeWaitUntilSegmentsLoad,
getDurableShuffleStorage,
getFailOnEmptyInsert,
getFinalizeAggregations,
getGroupByEnableMultiValueUnnesting,
getMaxParseExceptions,
@ -111,6 +113,7 @@ export const RunPanel = React.memo(function RunPanel(props: RunPanelProps) {
const queryParameters = query.queryParameters;
const maxParseExceptions = getMaxParseExceptions(queryContext);
const failOnEmptyInsert = getFailOnEmptyInsert(queryContext);
const finalizeAggregations = getFinalizeAggregations(queryContext);
const waitUntilSegmentsLoad = getWaitUntilSegmentsLoad(queryContext);
const groupByEnableMultiValueUnnesting = getGroupByEnableMultiValueUnnesting(queryContext);
@ -305,6 +308,15 @@ export const RunPanel = React.memo(function RunPanel(props: RunPanelProps) {
/>
))}
</MenuItem>
<MenuTristate
icon={IconNames.DISABLE}
text="Fail on empty insert"
value={failOnEmptyInsert}
undefinedEffectiveValue={false}
onValueChange={v =>
changeQueryContext(changeFailOnEmptyInsert(queryContext, v))
}
/>
<MenuTristate
icon={IconNames.TRANSLATE}
text="Finalize aggregations"