- If you have streaming ingestion running make sure that your interval range doe not + If you have streaming ingestion running make sure that your interval range does not overlap with intervals where streaming data is being added - otherwise the kill task will not start.
diff --git a/web-console/src/druid-models/workbench-query/workbench-query.ts b/web-console/src/druid-models/workbench-query/workbench-query.ts index 6fe223847f6..d7847287fa6 100644 --- a/web-console/src/druid-models/workbench-query/workbench-query.ts +++ b/web-console/src/druid-models/workbench-query/workbench-query.ts @@ -17,6 +17,7 @@ */ import type { + QueryParameter, SqlClusteredByClause, SqlExpression, SqlPartitionedByClause, @@ -66,6 +67,7 @@ interface IngestionLines { export interface WorkbenchQueryValue { queryString: string; queryContext: QueryContext; + queryParameters?: QueryParameter[]; engine?: DruidEngine; lastExecution?: LastExecution; unlimited?: boolean; @@ -235,6 +237,7 @@ export class WorkbenchQuery { public readonly queryString: string; public readonly queryContext: QueryContext; + public readonly queryParameters?: QueryParameter[]; public readonly engine?: DruidEngine; public readonly lastExecution?: LastExecution; public readonly unlimited?: boolean; @@ -251,6 +254,7 @@ export class WorkbenchQuery { } this.queryString = queryString; this.queryContext = value.queryContext; + this.queryParameters = value.queryParameters; // Start back compat code for the engine names that might be coming from local storage let possibleEngine: string | undefined = value.engine; @@ -274,6 +278,7 @@ export class WorkbenchQuery { return { queryString: this.queryString, queryContext: this.queryContext, + queryParameters: this.queryParameters, engine: this.engine, unlimited: this.unlimited, }; @@ -297,6 +302,10 @@ export class WorkbenchQuery { return new WorkbenchQuery({ ...this.valueOf(), queryContext }); } + public changeQueryParameters(queryParameters: QueryParameter[] | undefined): WorkbenchQuery { + return new WorkbenchQuery({ ...this.valueOf(), queryParameters }); + } + public changeEngine(engine: DruidEngine | undefined): WorkbenchQuery { return new WorkbenchQuery({ ...this.valueOf(), engine }); } @@ -425,11 +434,12 @@ export class WorkbenchQuery { let ret: WorkbenchQuery = this; // Explicitly select MSQ, adjust the context, set maxNumTasks to the lowest possible and add in ingest mode flags + const { queryContext } = this; ret = ret.changeEngine('sql-msq-task').changeQueryContext({ - ...this.queryContext, + ...queryContext, maxNumTasks: 2, - finalizeAggregations: false, - groupByEnableMultiValueUnnesting: false, + finalizeAggregations: queryContext.finalizeAggregations ?? false, + groupByEnableMultiValueUnnesting: queryContext.groupByEnableMultiValueUnnesting ?? false, }); // Remove everything pertaining to INSERT INTO / REPLACE INTO from the query string @@ -458,7 +468,7 @@ export class WorkbenchQuery { prefixLines: number; cancelQueryId?: string; } { - const { queryString, queryContext, unlimited, prefixLines } = this; + const { queryString, queryContext, queryParameters, unlimited, prefixLines } = this; const engine = this.getEffectiveEngine(); if (engine === 'native') { @@ -544,6 +554,10 @@ export class WorkbenchQuery { apiQuery.context.groupByEnableMultiValueUnnesting ??= !ingestQuery; } + if (Array.isArray(queryParameters) && queryParameters.length) { + apiQuery.parameters = queryParameters; + } + return { engine, query: apiQuery, diff --git a/web-console/src/utils/index.tsx b/web-console/src/utils/index.tsx index c27a070b976..e7dc33e7a65 100644 --- a/web-console/src/utils/index.tsx +++ b/web-console/src/utils/index.tsx @@ -29,7 +29,6 @@ export * from './local-storage-backed-visibility'; export * from './local-storage-keys'; export * from './object-change'; export * from './query-action'; -export * from './query-cursor'; export * from './query-manager'; export * from './query-state'; export * from './sample-query'; diff --git a/web-console/src/utils/query-cursor.ts b/web-console/src/utils/query-cursor.ts deleted file mode 100644 index 94bbe179389..00000000000 --- a/web-console/src/utils/query-cursor.ts +++ /dev/null @@ -1,55 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import type { SqlBase, SqlQuery } from '@druid-toolkit/query'; -import { L } from '@druid-toolkit/query'; - -import type { RowColumn } from './general'; - -export const EMPTY_LITERAL = L(''); - -const CRAZY_STRING = '$.X.@.X.$'; -const DOT_DOT_DOT_LITERAL = L('...'); - -export function prettyPrintSql(b: SqlBase): string { - return b - .walk(b => { - if (b === EMPTY_LITERAL) { - return DOT_DOT_DOT_LITERAL; - } - return b; - }) - .prettyTrim(50) - .toString(); -} - -export function findEmptyLiteralPosition(query: SqlQuery): RowColumn | undefined { - const subQueryString = query.walk(b => (b === EMPTY_LITERAL ? L(CRAZY_STRING) : b)).toString(); - - const crazyIndex = subQueryString.indexOf(CRAZY_STRING); - if (crazyIndex < 0) return; - - const prefix = subQueryString.slice(0, crazyIndex); - const lines = prefix.split(/\n/g); - const row = lines.length - 1; - const lastLine = lines[row]; - return { - row: row, - column: lastLine.length, - }; -} diff --git a/web-console/src/utils/sql.ts b/web-console/src/utils/sql.ts index 7404ee31372..61cd4c7ed41 100644 --- a/web-console/src/utils/sql.ts +++ b/web-console/src/utils/sql.ts @@ -16,6 +16,7 @@ * limitations under the License. */ +import type { SqlBase } from '@druid-toolkit/query'; import { SqlColumn, SqlExpression, @@ -28,6 +29,10 @@ import { import type { RowColumn } from './general'; import { offsetToRowColumn } from './general'; +export function prettyPrintSql(b: SqlBase): string { + return b.prettyTrim(50).toString(); +} + export function timeFormatToSql(timeFormat: string): SqlExpression | undefined { switch (timeFormat) { case 'auto': diff --git a/web-console/src/utils/types.ts b/web-console/src/utils/types.ts index ed192eff6e8..d164d46138b 100644 --- a/web-console/src/utils/types.ts +++ b/web-console/src/utils/types.ts @@ -89,6 +89,9 @@ export function dataTypeToIcon(dataType: string): IconName { case 'COMPLEX