Skip to content

[9.4] [ES|QL] FORK now can be run on only one branch (#267712) #267890

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
kibanamachine merged 1 commit into from
May 6, 2026
Merged

[9.4] [ES|QL] FORK now can be run on only one branch (#267712) #267890

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 0 additions & 4 deletions src/platform/packages/shared/kbn-esql-language/src/commands/definitions/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -452,10 +452,6 @@ export interface ValidationErrors {
message: string;
type: {};
};
forkTooFewBranches: {
message: string;
type: {};
};
forkNotAllowedWithSubqueries: {
message: string;
type: {};
Expand Down
10 changes: 0 additions & 10 deletions src/platform/packages/shared/kbn-esql-language/src/commands/definitions/utils/errors.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -429,13 +429,6 @@ Expected one of:
}),
type: 'error',
};
case 'forkTooFewBranches':
return {
message: i18n.translate('kbn-esql-language.esql.validation.forkTooFewBranches', {
defaultMessage: '[FORK] Must include at least two branches.',
}),
type: 'error',
};
case 'forkNotAllowedWithSubqueries':
return {
message: i18n.translate('kbn-esql-language.esql.validation.forkNotAllowedWithSubqueries', {
Expand Down Expand Up @@ -750,9 +743,6 @@ export const errors = {
forkTooManyBranches: (command: ESQLAstAllCommands): ESQLMessage =>
errors.byId('forkTooManyBranches', command.location, {}),

forkTooFewBranches: (command: ESQLAstAllCommands): ESQLMessage =>
errors.byId('forkTooFewBranches', command.location, {}),

forkNotAllowedWithSubqueries: (command: ESQLAstAllCommands): ESQLMessage =>
errors.byId('forkNotAllowedWithSubqueries', command.location, {}),

Expand Down
2 changes: 1 addition & 1 deletion ...latform/packages/shared/kbn-esql-language/src/commands/registry/fork/autocomplete.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ describe('FORK Autocomplete', () => {
});

test('suggests pipe and new branch after complete branch', async () => {
await forkExpectSuggestions('FROM a | FORK (LIMIT 100) ', ['($0)']);
await forkExpectSuggestions('FROM a | FORK (LIMIT 100) ', ['($0)', '| ']);
await forkExpectSuggestions('FROM a | FORK (LIMIT 100) (SORT keywordField ASC) ', [
'($0)',
'| ',
Expand Down
2 changes: 1 addition & 1 deletion src/platform/packages/shared/kbn-esql-language/src/commands/registry/fork/autocomplete.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ export async function autocomplete(

if (!withinActiveBranch && /\)\s+$/i.test(innerText)) {
const suggestions = [newBranchSuggestion];
if (forkCommand.args.length > 1) {
if (forkCommand.args.length > 0) {
suggestions.push(pipeCompleteItem);
}
return suggestions;
Expand Down
4 changes: 2 additions & 2 deletions src/platform/packages/shared/kbn-esql-language/src/commands/registry/fork/validate.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,12 @@ describe('FORK Validation', () => {
);
});

test('requires at least two branches', () => {
test('Allows FORK with one branch', () => {
forkExpectErrors(
`FROM index
| FORK
(WHERE keywordField != "")`,
[`[FORK] Must include at least two branches.`]
[]
);
});

Expand Down
5 changes: 0 additions & 5 deletions src/platform/packages/shared/kbn-esql-language/src/commands/registry/fork/validate.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ import type { ICommandContext, ICommandCallbacks } from '../types';
import { validateCommandArguments } from '../../definitions/utils/validation';
import { errors } from '../../definitions/utils';

const MIN_BRANCHES = 2;
const MAX_BRANCHES = 8;

export const validate = (
Expand All @@ -29,10 +28,6 @@ export const validate = (
const forkCommand = command as ESQLAstForkCommand;
const messages: ESQLMessage[] = [];

if (forkCommand.args.length < MIN_BRANCHES) {
messages.push(errors.forkTooFewBranches(forkCommand));
}

if (forkCommand.args.length > MAX_BRANCHES) {
messages.push(errors.forkTooManyBranches(forkCommand));
}
Expand Down
5 changes: 0 additions & 5 deletions src/platform/plugins/shared/esql/ADD_COMMAND_GUIDE.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,11 +161,6 @@ export const validate = (
): ESQLMessage[] => {
const messages: ESQLMessage[] = [];

// custom check specific to FORK
if (command.args.length < MIN_BRANCHES) {
messages.push(errors.forkTooFewBranches(command));
}

// custom check specific to FORK
if (command.args.length > MAX_BRANCHES) {
messages.push(errors.forkTooManyBranches(command));
Expand Down
Loading