Skip to content

Web console: updated the explain dialog to use new explain output #12009

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
abhishekagarwal87 merged 2 commits into from
Dec 1, 2021
Merged

Web console: updated the explain dialog to use new explain output #12009

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
93a1214
explain dialog uses new explain output
vogievetsky Nov 30, 2021
3c8f808
update css
vogievetsky Nov 30, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 1 addition & 11 deletions web-console/src/utils/druid-query.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,7 @@

import { sane } from 'druid-query-toolkit/build/test-utils';

import {
DruidError,
getDruidErrorMessage,
parseHtmlError,
parseQueryPlan,
trimSemicolon,
} from './druid-query';
import { DruidError, getDruidErrorMessage, parseHtmlError, trimSemicolon } from './druid-query';

describe('DruidQuery', () => {
describe('DruidError.parsePosition', () => {
Expand Down Expand Up @@ -227,10 +221,6 @@ describe('DruidQuery', () => {
it('parseHtmlError', () => {
expect(getDruidErrorMessage({})).toMatchInlineSnapshot(`undefined`);
});

it('parseQueryPlan', () => {
expect(parseQueryPlan('start')).toMatchInlineSnapshot(`"start"`);
});
});

describe('.trimSemicolon', () => {
Expand Down
71 changes: 7 additions & 64 deletions web-console/src/utils/druid-query.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
*/

import axios, { AxiosResponse } from 'axios';
import { SqlRef } from 'druid-query-toolkit';

import { Api } from '../singletons';

Expand Down Expand Up @@ -296,73 +297,15 @@ export async function queryDruidSql<T = any>(sqlQueryPayload: Record<string, any
return sqlResultResp.data;
}

export interface BasicQueryExplanation {
export interface QueryExplanation {
query: any;
signature: string | null;
signature: { name: string; type: string }[];
}

export interface SemiJoinQueryExplanation {
mainQuery: BasicQueryExplanation;
subQueryRight: BasicQueryExplanation;
}

function parseQueryPlanResult(queryPlanResult: string): BasicQueryExplanation {
if (!queryPlanResult) {
return {
query: null,
signature: null,
};
}

const queryAndSignature = queryPlanResult.split(', signature=');
const queryValue = new RegExp(/query=(.+)/).exec(queryAndSignature[0]);
const signatureValue = queryAndSignature[1];

let parsedQuery: any;

if (queryValue && queryValue[1]) {
try {
parsedQuery = JSON.parse(queryValue[1]);
} catch (e) {}
}

return {
query: parsedQuery || queryPlanResult,
signature: signatureValue || null,
};
}

export function parseQueryPlan(
raw: string,
): BasicQueryExplanation | SemiJoinQueryExplanation | string {
let plan: string = raw;
plan = plan.replace(/\n/g, '');

if (plan.includes('DruidOuterQueryRel(')) {
return plan; // don't know how to parse this
}

let queryArgs: string;
const queryRelFnStart = 'DruidQueryRel(';
const semiJoinFnStart = 'DruidSemiJoin(';

if (plan.startsWith(queryRelFnStart)) {
queryArgs = plan.substring(queryRelFnStart.length, plan.length - 1);
} else if (plan.startsWith(semiJoinFnStart)) {
queryArgs = plan.substring(semiJoinFnStart.length, plan.length - 1);
const leftExpressionsArgs = ', leftExpressions=';
const keysArgumentIdx = queryArgs.indexOf(leftExpressionsArgs);
if (keysArgumentIdx !== -1) {
return {
mainQuery: parseQueryPlanResult(queryArgs.substring(0, keysArgumentIdx)),
subQueryRight: parseQueryPlan(queryArgs.substring(queryArgs.indexOf(queryRelFnStart))),
} as SemiJoinQueryExplanation;
}
} else {
return plan;
}

return parseQueryPlanResult(queryArgs);
export function formatSignature(queryExplanation: QueryExplanation): string {
return queryExplanation.signature
.map(({ name, type }) => `${SqlRef.column(name)}::${type}`)
.join(', ');
}

export function trimSemicolon(query: string): string {
Expand Down
Loading