Skip to content

Commit 75bbfe2

Browse files
author
afoucret
committed
Remove useless conditional.
1 parent 7a43b63 commit 75bbfe2

File tree

2 files changed

+5
-21
lines changed

2 files changed

+5
-21
lines changed

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/action/EsqlCapabilities.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1734,11 +1734,6 @@ public enum Cap {
17341734
*/
17351735
TOP_SNIPPETS_FUNCTION(Build.current().isSnapshot()),
17361736

1737-
/**
1738-
* Support for inference in cross-cluster search (CCS)
1739-
*/
1740-
INFERENCE_COMMANDS_CCS_SUPPORT,
1741-
17421737
// Last capability should still have a comma for fewer merge conflicts when adding new ones :)
17431738
// This comment prevents the semicolon from being on the previous capability when Spotless formats the file.
17441739
;

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/parser/LogicalPlanBuilder.java

Lines changed: 5 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1125,16 +1125,10 @@ public PlanFactory visitRerankCommand(EsqlBaseParser.RerankCommandContext ctx) {
11251125
}
11261126
Literal rowLimit = Literal.integer(source, context.inferenceSettings().rerankRowLimit());
11271127

1128-
return p -> {
1129-
if (EsqlCapabilities.Cap.INFERENCE_COMMANDS_CCS_SUPPORT.isEnabled() == false) {
1130-
checkForRemoteClusters(p, source, "RERANK");
1131-
}
1132-
1133-
return applyRerankOptions(
1134-
new Rerank(source, p, rowLimit, queryText, rerankFields, scoreAttribute),
1135-
ctx.commandNamedParameters()
1136-
);
1137-
};
1128+
return p -> applyRerankOptions(
1129+
new Rerank(source, p, rowLimit, queryText, rerankFields, scoreAttribute),
1130+
ctx.commandNamedParameters()
1131+
);
11381132
}
11391133

11401134
private Rerank applyRerankOptions(Rerank rerank, EsqlBaseParser.CommandNamedParametersContext ctx) {
@@ -1179,12 +1173,7 @@ public PlanFactory visitCompletionCommand(EsqlBaseParser.CompletionCommandContex
11791173

11801174
Literal rowLimit = Literal.integer(source, context.inferenceSettings().completionRowLimit());
11811175

1182-
return p -> {
1183-
if (EsqlCapabilities.Cap.INFERENCE_COMMANDS_CCS_SUPPORT.isEnabled() == false) {
1184-
checkForRemoteClusters(p, source, "COMPLETION");
1185-
}
1186-
return applyCompletionOptions(new Completion(source, p, rowLimit, prompt, targetField), ctx.commandNamedParameters());
1187-
};
1176+
return p -> applyCompletionOptions(new Completion(source, p, rowLimit, prompt, targetField), ctx.commandNamedParameters());
11881177
}
11891178

11901179
private Completion applyCompletionOptions(Completion completion, EsqlBaseParser.CommandNamedParametersContext ctx) {

0 commit comments

Comments
 (0)