Skip to content

Fix failing release tests (Require capability for DECAY function and SET and INLINESTATS commands) #134358

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
merged 7 commits into from
Sep 9, 2025
Merged

Fix failing release tests (Require capability for DECAY function and SET and INLINESTATS commands) #134358

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
8b49b94
Require capability for DECAY function
craigtaverner Sep 9, 2025
c61b9e0
Fix railroad diagrams with correct commas for optional params
craigtaverner Sep 9, 2025
a9c37ee
Add capability to gate SET command in release tests
craigtaverner Sep 9, 2025
dc6ca56
Merge branch 'main' into fix_decay_test-release
craigtaverner Sep 9, 2025
f6b2b74
Gate new INLINESTATS test with capability
craigtaverner Sep 9, 2025
7498d8c
Merge remote-tracking branch 'origin/main' into fix_decay_test-release
craigtaverner Sep 9, 2025
bdd96ec
Change function count after moving from SNAPSHOT
craigtaverner Sep 9, 2025
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
2 changes: 1 addition & 1 deletion docs/reference/query-languages/esql/images/functions/decay.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion docs/reference/query-languages/esql/images/functions/knn.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/action/EsqlCapabilities.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1329,6 +1329,11 @@ public enum Cap {
*/
FIX_MV_EXPAND_INCONSISTENT_COLUMN_ORDER,

/**
* Support for the SET command.
*/
SET_COMMAND(Build.current().isSnapshot()),

/**
* (Re)Added EXPLAIN command
*/
Expand Down
6 changes: 6 additions & 0 deletions x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/analysis/ParsingTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,6 +213,7 @@ public void testInvalidSample() {
}

public void testSet() {
assumeTrue("SET command available in snapshot only", EsqlCapabilities.Cap.SET_COMMAND.isEnabled());
EsqlStatement query = parse("SET foo = \"bar\"; row a = 1", new QueryParams());
assertThat(query.plan(), is(instanceOf(Row.class)));
assertThat(query.settings().size(), is(1));
Expand All @@ -232,6 +233,7 @@ public void testSet() {
}

public void testSetWithTripleQuotes() {
assumeTrue("SET command available in snapshot only", EsqlCapabilities.Cap.SET_COMMAND.isEnabled());
EsqlStatement query = parse("SET foo = \"\"\"bar\"baz\"\"\"; row a = 1", new QueryParams());
assertThat(query.plan(), is(instanceOf(Row.class)));
assertThat(query.settings().size(), is(1));
Expand All @@ -249,6 +251,7 @@ public void testSetWithTripleQuotes() {
}

public void testMultipleSet() {
assumeTrue("SET command available in snapshot only", EsqlCapabilities.Cap.SET_COMMAND.isEnabled());
EsqlStatement query = parse(
"SET foo = \"bar\"; SET bar = 2; SET foo = \"baz\"; SET x = 3.5; SET y = false; SET z = null; row a = 1",
new QueryParams()
Expand All @@ -265,6 +268,7 @@ public void testMultipleSet() {
}

public void testSetArrays() {
assumeTrue("SET command available in snapshot only", EsqlCapabilities.Cap.SET_COMMAND.isEnabled());
EsqlStatement query = parse("SET foo = [\"bar\", \"baz\"]; SET bar = [1, 2, 3]; row a = 1", new QueryParams());
assertThat(query.plan(), is(instanceOf(Row.class)));
assertThat(query.settings().size(), is(2));
Expand All @@ -274,6 +278,7 @@ public void testSetArrays() {
}

public void testSetWithNamedParams() {
assumeTrue("SET command available in snapshot only", EsqlCapabilities.Cap.SET_COMMAND.isEnabled());
EsqlStatement query = parse(
"SET foo = \"bar\"; SET bar = ?a; SET foo = \"baz\"; SET x = ?x; row a = 1",
new QueryParams(
Expand All @@ -293,6 +298,7 @@ public void testSetWithNamedParams() {
}

public void testSetWithPositionalParams() {
assumeTrue("SET command available in snapshot only", EsqlCapabilities.Cap.SET_COMMAND.isEnabled());
EsqlStatement query = parse(
"SET foo = \"bar\"; SET bar = ?; SET foo = \"baz\"; SET x = ?; row a = ?",
new QueryParams(
Expand Down
7 changes: 7 additions & 0 deletions ...c/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/score/DecayTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,15 @@
import org.elasticsearch.common.geo.GeoPoint;
import org.elasticsearch.common.unit.DistanceUnit;
import org.elasticsearch.script.ScoreScriptUtils;
import org.elasticsearch.xpack.esql.action.EsqlCapabilities;
import org.elasticsearch.xpack.esql.core.expression.Expression;
import org.elasticsearch.xpack.esql.core.expression.Literal;
import org.elasticsearch.xpack.esql.core.expression.MapExpression;
import org.elasticsearch.xpack.esql.core.tree.Source;
import org.elasticsearch.xpack.esql.core.type.DataType;
import org.elasticsearch.xpack.esql.expression.function.AbstractScalarFunctionTestCase;
import org.elasticsearch.xpack.esql.expression.function.TestCaseSupplier;
import org.junit.BeforeClass;

import java.time.Duration;
import java.time.Instant;
Expand All @@ -44,6 +46,11 @@ public DecayTests(@Name("TestCase") Supplier<TestCaseSupplier.TestCase> testCase
this.testCase = testCaseSupplier.get();
}

@BeforeClass
public static void checkCapability() {
assumeTrue("Decay function tests require the DECAY_FUNCTION capability", EsqlCapabilities.Cap.DECAY_FUNCTION.isEnabled());
}

@ParametersFactory
public static Iterable<Object[]> parameters() {
List<TestCaseSupplier> testCaseSuppliers = new ArrayList<>();
Expand Down