Skip to content

ES|QL: Remove redundant capability checks in tests #135695

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 2 commits into from
Oct 1, 2025
Merged

ES|QL: Remove redundant capability checks in tests #135695

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
c757c7f
Remove capability checks
ioanatia Sep 30, 2025
1224a13
Remove JOIN_LOOKUP_V12 checks too
ioanatia Sep 30, 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
1 change: 0 additions & 1 deletion .../plugin/esql/src/internalClusterTest/java/org/elasticsearch/xpack/esql/action/ForkIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ public class ForkIT extends AbstractEsqlIntegTestCase {

@Before
public void setupIndex() {
assumeTrue("requires FORK capability", EsqlCapabilities.Cap.FORK_V9.isEnabled());
createAndPopulateIndices();
}

Expand Down
1 change: 0 additions & 1 deletion .../plugin/esql/src/internalClusterTest/java/org/elasticsearch/xpack/esql/action/FuseIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ protected Collection<Class<? extends Plugin>> nodePlugins() {

@Before
public void setupIndex() {
assumeTrue("requires FUSE capability", EsqlCapabilities.Cap.FUSE_V6.isEnabled());
createAndPopulateIndex();
}

Expand Down
1 change: 0 additions & 1 deletion ...nternalClusterTest/java/org/elasticsearch/xpack/esql/action/FuseWithInvalidLicenseIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ protected Collection<Class<? extends Plugin>> nodePlugins() {

@Before
public void setupIndex() {
assumeTrue("requires FUSE capability", EsqlCapabilities.Cap.FUSE_V6.isEnabled());
var indexName = "test";
var client = client().admin().indices();
var CreateRequest = client.prepareCreate(indexName)
Expand Down
10 changes: 0 additions & 10 deletions x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/analysis/AnalyzerTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2222,8 +2222,6 @@ public void testLookupMatchTypeWrong() {
}

public void testLookupJoinUnknownIndex() {
assumeTrue("requires LOOKUP JOIN capability", EsqlCapabilities.Cap.JOIN_LOOKUP_V12.isEnabled());

String errorMessage = "Unknown index [foobar]";
IndexResolution missingLookupIndex = IndexResolution.invalid(errorMessage);

Expand Down Expand Up @@ -2252,8 +2250,6 @@ public void testLookupJoinUnknownIndex() {
}

public void testLookupJoinUnknownField() {
assumeTrue("requires LOOKUP JOIN capability", EsqlCapabilities.Cap.JOIN_LOOKUP_V12.isEnabled());

String query = "FROM test | LOOKUP JOIN languages_lookup ON last_name";
String errorMessage = "1:45: Unknown column [last_name] in right side of join";

Expand All @@ -2275,8 +2271,6 @@ public void testLookupJoinUnknownField() {
}

public void testMultipleLookupJoinsGiveDifferentAttributes() {
assumeTrue("requires LOOKUP JOIN capability", EsqlCapabilities.Cap.JOIN_LOOKUP_V12.isEnabled());

// The field attributes that get contributed by different LOOKUP JOIN commands must have different name ids,
// even if they have the same names. Otherwise, things like dependency analysis - like in PruneColumns - cannot work based on
// name ids and shadowing semantics proliferate into all kinds of optimizer code.
Expand Down Expand Up @@ -3700,8 +3694,6 @@ public void testForkError() {
}

public void testValidFuse() {
assumeTrue("requires FUSE capability", EsqlCapabilities.Cap.FUSE_V6.isEnabled());

LogicalPlan plan = analyze("""
from test metadata _id, _index, _score
| fork ( where first_name:"foo" )
Expand All @@ -3724,8 +3716,6 @@ public void testValidFuse() {
}

public void testFuseError() {
assumeTrue("requires FUSE capability", EsqlCapabilities.Cap.FUSE_V6.isEnabled());

var e = expectThrows(VerificationException.class, () -> analyze("""
from test
| fuse
Expand Down
3 changes: 0 additions & 3 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 @@ -131,7 +131,6 @@ public void testTooBigQuery() {
}

public void testJoinOnConstant() {
assumeTrue("LOOKUP JOIN available as snapshot only", EsqlCapabilities.Cap.JOIN_LOOKUP_V12.isEnabled());
assumeTrue(
"requires LOOKUP JOIN ON boolean expression capability",
EsqlCapabilities.Cap.LOOKUP_JOIN_ON_BOOLEAN_EXPRESSION.isEnabled()
Expand All @@ -151,15 +150,13 @@ public void testJoinOnConstant() {
}

public void testJoinTwiceOnTheSameField() {
assumeTrue("LOOKUP JOIN available as snapshot only", EsqlCapabilities.Cap.JOIN_LOOKUP_V12.isEnabled());
assertEquals(
"1:66: JOIN ON clause does not support multiple fields with the same name, found multiple instances of [languages]",
error("row languages = 1, gender = \"f\" | lookup join test on languages, languages")
);
}

public void testJoinTwiceOnTheSameField_TwoLookups() {
assumeTrue("LOOKUP JOIN available as snapshot only", EsqlCapabilities.Cap.JOIN_LOOKUP_V12.isEnabled());
assertEquals(
"1:108: JOIN ON clause does not support multiple fields with the same name, found multiple instances of [gender]",
error("row languages = 1, gender = \"f\" | lookup join test on languages | eval x = 1 | lookup join test on gender, gender")
Expand Down
17 changes: 4 additions & 13 deletions x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/analysis/VerifierTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,12 +304,10 @@ public void testUnsupportedAndMultiTypedFields() {
);
}

if (EsqlCapabilities.Cap.FUSE_V6.isEnabled()) {
assertEquals(
"1:76: cannot use [double] as an input of FUSE. Consider using [DROP double] before FUSE.",
error("from test* METADATA _id, _index, _score | FORK (where true) (where true) | FUSE", analyzer)
);
}
assertEquals(
"1:76: cannot use [double] as an input of FUSE. Consider using [DROP double] before FUSE.",
error("from test* METADATA _id, _index, _score | FORK (where true) (where true) | FUSE", analyzer)
);
}

public void testRoundFunctionInvalidInputs() {
Expand Down Expand Up @@ -2241,8 +2239,6 @@ public void testAggregateInRow() {
}

public void testLookupJoinDataTypeMismatch() {
assumeTrue("requires LOOKUP JOIN capability", EsqlCapabilities.Cap.JOIN_LOOKUP_V12.isEnabled());

query("FROM test | EVAL language_code = languages | LOOKUP JOIN languages_lookup ON language_code");

assertEquals(
Expand All @@ -2252,7 +2248,6 @@ public void testLookupJoinDataTypeMismatch() {
}

public void testLookupJoinExpressionAmbiguousRight() {
assumeTrue("requires LOOKUP JOIN capability", EsqlCapabilities.Cap.JOIN_LOOKUP_V12.isEnabled());
assumeTrue(
"requires LOOKUP JOIN ON boolean expression capability",
EsqlCapabilities.Cap.LOOKUP_JOIN_ON_BOOLEAN_EXPRESSION.isEnabled()
Expand All @@ -2270,7 +2265,6 @@ public void testLookupJoinExpressionAmbiguousRight() {
}

public void testLookupJoinExpressionAmbiguousLeft() {
assumeTrue("requires LOOKUP JOIN capability", EsqlCapabilities.Cap.JOIN_LOOKUP_V12.isEnabled());
assumeTrue(
"requires LOOKUP JOIN ON boolean expression capability",
EsqlCapabilities.Cap.LOOKUP_JOIN_ON_BOOLEAN_EXPRESSION.isEnabled()
Expand All @@ -2288,7 +2282,6 @@ public void testLookupJoinExpressionAmbiguousLeft() {
}

public void testLookupJoinExpressionAmbiguousBoth() {
assumeTrue("requires LOOKUP JOIN capability", EsqlCapabilities.Cap.JOIN_LOOKUP_V12.isEnabled());
assumeTrue(
"requires LOOKUP JOIN ON boolean expression capability",
EsqlCapabilities.Cap.LOOKUP_JOIN_ON_BOOLEAN_EXPRESSION.isEnabled()
Expand Down Expand Up @@ -2576,8 +2569,6 @@ public void testInvalidTBucketCalls() {
}

public void testFuse() {
assumeTrue("FUSE requires corresponding capability", EsqlCapabilities.Cap.FUSE_V6.isEnabled());

String queryPrefix = "from test metadata _score, _index, _id | fork (where true) (where true)";

query(queryPrefix + " | fuse");
Expand Down
19 changes: 0 additions & 19 deletions .../esql/src/test/java/org/elasticsearch/xpack/esql/optimizer/LogicalPlanOptimizerTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5349,8 +5349,6 @@ public void testPlanSanityCheck() throws Exception {
* }</pre>
*/
public void testPlanSanityCheckWithBinaryPlans() {
assumeTrue("Requires LOOKUP JOIN", EsqlCapabilities.Cap.JOIN_LOOKUP_V12.isEnabled());

var plan = optimizedPlan("""
FROM test
| RENAME languages AS language_code
Expand Down Expand Up @@ -6265,7 +6263,6 @@ public void testInlineStatsWithLookupJoin() {
| KEEP abbrev, *scalerank
| LIMIT 5
""";
assumeTrue("Requires LOOKUP JOIN", EsqlCapabilities.Cap.JOIN_LOOKUP_V12.isEnabled());
if (releaseBuildForInlineStats(query)) {
return;
}
Expand Down Expand Up @@ -7053,8 +7050,6 @@ public void testLookupStats() {
* }</pre>
*/
public void testLookupJoinPushDownFilterOnJoinKeyWithRename() {
assumeTrue("Requires LOOKUP JOIN", EsqlCapabilities.Cap.JOIN_LOOKUP_V12.isEnabled());

String query = """
FROM test
| RENAME languages AS language_code
Expand Down Expand Up @@ -7098,8 +7093,6 @@ public void testLookupJoinPushDownFilterOnJoinKeyWithRename() {
* }</pre>
*/
public void testLookupJoinPushDownFilterOnLeftSideField() {
assumeTrue("Requires LOOKUP JOIN", EsqlCapabilities.Cap.JOIN_LOOKUP_V12.isEnabled());

String query = """
FROM test
| RENAME languages AS language_code
Expand Down Expand Up @@ -7144,8 +7137,6 @@ public void testLookupJoinPushDownFilterOnLeftSideField() {
* }</pre>
*/
public void testLookupJoinPushDownDisabledForLookupField() {
assumeTrue("Requires LOOKUP JOIN", EsqlCapabilities.Cap.JOIN_LOOKUP_V12.isEnabled());

String query = """
FROM test
| RENAME languages AS language_code
Expand Down Expand Up @@ -7193,8 +7184,6 @@ public void testLookupJoinPushDownDisabledForLookupField() {
* }</pre>
*/
public void testLookupJoinPushDownSeparatedForConjunctionBetweenLeftAndRightField() {
assumeTrue("Requires LOOKUP JOIN", EsqlCapabilities.Cap.JOIN_LOOKUP_V12.isEnabled());

String query = """
FROM test
| RENAME languages AS language_code
Expand Down Expand Up @@ -7247,8 +7236,6 @@ public void testLookupJoinPushDownSeparatedForConjunctionBetweenLeftAndRightFiel
* }</pre>
*/
public void testLookupJoinPushDownDisabledForDisjunctionBetweenLeftAndRightField() {
assumeTrue("Requires LOOKUP JOIN", EsqlCapabilities.Cap.JOIN_LOOKUP_V12.isEnabled());

String query = """
FROM test
| RENAME languages AS language_code
Expand Down Expand Up @@ -7301,8 +7288,6 @@ public void testLookupJoinPushDownDisabledForDisjunctionBetweenLeftAndRightField
* }</pre>
*/
public void testLookupJoinKeepNoLookupFields() {
assumeTrue("Requires LOOKUP JOIN", EsqlCapabilities.Cap.JOIN_LOOKUP_V12.isEnabled());

String commandDiscardingFields = randomBoolean() ? "| KEEP languages" : """
| DROP _meta_field, emp_no, first_name, gender, language_code,
language_name, last_name, salary, hire_date, job, job.raw, long_noidx
Expand Down Expand Up @@ -7346,8 +7331,6 @@ public void testLookupJoinKeepNoLookupFields() {
* }</pre>
*/
public void testMultipleLookupShadowing() {
assumeTrue("Requires LOOKUP JOIN", EsqlCapabilities.Cap.JOIN_LOOKUP_V12.isEnabled());

String query = """
FROM test
| EVAL language_code = languages
Expand Down Expand Up @@ -8112,8 +8095,6 @@ public void testFunctionNamedParamsAsFunctionArgument1() {
* }</pre>
*/
public void testRedundantSortOnJoin() {
assumeTrue("Requires LOOKUP JOIN", EsqlCapabilities.Cap.JOIN_LOOKUP_V12.isEnabled());

var plan = optimizedPlan("""
FROM test
| SORT languages
Expand Down
10 changes: 0 additions & 10 deletions ...esql/src/test/java/org/elasticsearch/xpack/esql/optimizer/PhysicalPlanOptimizerTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2915,8 +2915,6 @@ public void testVerifierOnMissingReferences() {
}

public void testVerifierOnMissingReferencesWithBinaryPlans() throws Exception {
assumeTrue("Requires LOOKUP JOIN", EsqlCapabilities.Cap.JOIN_LOOKUP_V12.isEnabled());

// Do not assert serialization:
// This will have a LookupJoinExec, which is not serializable because it doesn't leave the coordinator.
var plan = physicalPlan("""
Expand Down Expand Up @@ -7626,8 +7624,6 @@ public void testLookupThenTopN() {
}

public void testLookupJoinFieldLoading() throws Exception {
assumeTrue("Requires LOOKUP JOIN", EsqlCapabilities.Cap.JOIN_LOOKUP_V12.isEnabled());

TestDataSource data = dataSetWithLookupIndices(Map.of("lookup_index", List.of("first_name", "foo", "bar", "baz")));

String query = """
Expand Down Expand Up @@ -7703,8 +7699,6 @@ public void testLookupJoinFieldLoading() throws Exception {
}

public void testLookupJoinFieldLoadingTwoLookups() throws Exception {
assumeTrue("Requires LOOKUP JOIN", EsqlCapabilities.Cap.JOIN_LOOKUP_V12.isEnabled());

TestDataSource data = dataSetWithLookupIndices(
Map.of(
"lookup_index1",
Expand Down Expand Up @@ -7756,8 +7750,6 @@ public void testLookupJoinFieldLoadingTwoLookups() throws Exception {
}

public void testLookupJoinFieldLoadingTwoLookupsProjectInBetween() throws Exception {
assumeTrue("Requires LOOKUP JOIN", EsqlCapabilities.Cap.JOIN_LOOKUP_V12.isEnabled());

TestDataSource data = dataSetWithLookupIndices(
Map.of(
"lookup_index1",
Expand Down Expand Up @@ -7796,8 +7788,6 @@ public void testLookupJoinFieldLoadingTwoLookupsProjectInBetween() throws Except
}

public void testLookupJoinFieldLoadingDropAllFields() throws Exception {
assumeTrue("Requires LOOKUP JOIN", EsqlCapabilities.Cap.JOIN_LOOKUP_V12.isEnabled());

TestDataSource data = dataSetWithLookupIndices(Map.of("lookup_index", List.of("first_name", "foo", "bar", "baz")));

String query = """
Expand Down
12 changes: 0 additions & 12 deletions ...va/org/elasticsearch/xpack/esql/optimizer/rules/logical/PushDownJoinPastProjectTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,6 @@ public class PushDownJoinPastProjectTests extends AbstractLogicalPlanOptimizerTe
// | \_EsRelation[languages_lookup][LOOKUP][language_code{f}#24]
// \_EsRelation[languages_lookup][LOOKUP][language_code{f}#26, language_name{f}#27]
public void testMultipleLookups() {
assumeTrue("Requires LOOKUP JOIN", EsqlCapabilities.Cap.JOIN_LOOKUP_V12.isEnabled());

String query = """
FROM test
| KEEP languages, emp_no
Expand Down Expand Up @@ -86,8 +84,6 @@ public void testMultipleLookups() {
// | \_EsRelation[test][_meta_field{f}#17, emp_no{f}#11, first_name{f}#12, ..]
// \_EsRelation[languages_lookup][LOOKUP][language_code{f}#22, language_name{f}#23]
public void testShadowingBeforePushdown() {
assumeTrue("Requires LOOKUP JOIN", EsqlCapabilities.Cap.JOIN_LOOKUP_V12.isEnabled());

String query = """
FROM test
| RENAME languages AS language_code, last_name AS language_name
Expand Down Expand Up @@ -118,8 +114,6 @@ public void testShadowingBeforePushdown() {
// | \_EsRelation[test][_meta_field{f}#20, emp_no{f}#14, first_name{f}#15, ..]
// \_EsRelation[languages_lookup][LOOKUP][language_code{f}#25, language_name{f}#26]
public void testShadowingAfterPushdown() {
assumeTrue("Requires LOOKUP JOIN", EsqlCapabilities.Cap.JOIN_LOOKUP_V12.isEnabled());

String query = """
FROM test
| EVAL language_name = 2*salary
Expand Down Expand Up @@ -179,8 +173,6 @@ public void testShadowingAfterPushdown() {
// | \_EsRelation[test][_meta_field{f}#32, emp_no{f}#26, first_name{f}#27, ..]
// \_EsRelation[test_lookup][LOOKUP][emp_no{f}#37, languages{f}#40, salary{f}#42]
public void testShadowingAfterPushdown2() {
assumeTrue("Requires LOOKUP JOIN", EsqlCapabilities.Cap.JOIN_LOOKUP_V12.isEnabled());

String query = """
FROM test_lookup
| RENAME emp_no AS x, salary AS salary2
Expand Down Expand Up @@ -249,7 +241,6 @@ public void testShadowingAfterPushdown2() {
* \_EsRelation[test_lookup][LOOKUP][emp_no{f}#27, languages{f}#30, salary{f}#32]
*/
public void testShadowingAfterPushdownExpressionJoin() {
assumeTrue("Requires LOOKUP JOIN", EsqlCapabilities.Cap.JOIN_LOOKUP_V12.isEnabled());
assumeTrue(
"requires LOOKUP JOIN ON boolean expression capability",
EsqlCapabilities.Cap.LOOKUP_JOIN_ON_BOOLEAN_EXPRESSION.isEnabled()
Expand Down Expand Up @@ -298,7 +289,6 @@ public void testShadowingAfterPushdownExpressionJoin() {
* \_EsRelation[test_lookup][LOOKUP][emp_no{f}#28, languages{f}#31, salary{f}#33]
*/
public void testShadowingAfterPushdownExpressionJoinKeepOrig() {
assumeTrue("Requires LOOKUP JOIN", EsqlCapabilities.Cap.JOIN_LOOKUP_V12.isEnabled());
assumeTrue(
"requires LOOKUP JOIN ON boolean expression capability",
EsqlCapabilities.Cap.LOOKUP_JOIN_ON_BOOLEAN_EXPRESSION.isEnabled()
Expand Down Expand Up @@ -351,7 +341,6 @@ public void testShadowingAfterPushdownExpressionJoinKeepOrig() {
* \_EsRelation[test_lookup][LOOKUP][emp_no{f}#21, languages{f}#24, salary{f}#26]
*/
public void testShadowingAfterPushdownRenameExpressionJoin() {
assumeTrue("Requires LOOKUP JOIN", EsqlCapabilities.Cap.JOIN_LOOKUP_V12.isEnabled());
assumeTrue(
"requires LOOKUP JOIN ON boolean expression capability",
EsqlCapabilities.Cap.LOOKUP_JOIN_ON_BOOLEAN_EXPRESSION.isEnabled()
Expand Down Expand Up @@ -398,7 +387,6 @@ public void testShadowingAfterPushdownRenameExpressionJoin() {
* \_EsRelation[test_lookup][LOOKUP][emp_no{f}#22, languages{f}#25, salary{f}#27]
*/
public void testShadowingAfterPushdownEvalExpressionJoin() {
assumeTrue("Requires LOOKUP JOIN", EsqlCapabilities.Cap.JOIN_LOOKUP_V12.isEnabled());
assumeTrue(
"requires LOOKUP JOIN ON boolean expression capability",
EsqlCapabilities.Cap.LOOKUP_JOIN_ON_BOOLEAN_EXPRESSION.isEnabled()
Expand Down
8 changes: 0 additions & 8 deletions ...k/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/parser/StatementParserTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3214,8 +3214,6 @@ public void testValidFromPattern() {
}

public void testValidJoinPatternFieldJoin() {
assumeTrue("LOOKUP JOIN requires corresponding capability", EsqlCapabilities.Cap.JOIN_LOOKUP_V12.isEnabled());

var basePattern = randomIndexPatterns(without(CROSS_CLUSTER));
var joinPattern = randomIndexPattern(without(WILDCARD_PATTERN), without(CROSS_CLUSTER), without(INDEX_SELECTOR));
var numberOfOnFields = randomIntBetween(1, 5);
Expand Down Expand Up @@ -3532,8 +3530,6 @@ private String singleExpressionJoinClause() {
}

private void testInvalidJoinPatterns(String onClause) {
assumeTrue("LOOKUP JOIN requires corresponding capability", EsqlCapabilities.Cap.JOIN_LOOKUP_V12.isEnabled());

{
// wildcard
var joinPattern = randomIndexPattern(WILDCARD_PATTERN, without(CROSS_CLUSTER), without(INDEX_SELECTOR));
Expand Down Expand Up @@ -4218,8 +4214,6 @@ static Alias alias(String name, Expression value) {
}

public void testValidFuse() {
assumeTrue("FUSE requires corresponding capability", EsqlCapabilities.Cap.FUSE_V6.isEnabled());

LogicalPlan plan = statement("""
FROM foo* METADATA _id, _index, _score
| FORK ( WHERE a:"baz" )
Expand Down Expand Up @@ -4318,8 +4312,6 @@ public void testValidFuse() {
}

public void testInvalidFuse() {
assumeTrue("FUSE requires corresponding capability", EsqlCapabilities.Cap.FUSE_V6.isEnabled());

String queryPrefix = "from test metadata _score, _index, _id | fork (where true) (where true)";

expectError(queryPrefix + " | FUSE BLA", "line 1:75: Fuse type BLA is not supported");
Expand Down
Loading