Skip to content

Commit e0763c2

Browse files
authored
Mark the lookup join tests in IndexResolverFieldNamesTests as snapshot-only (#118815)
1 parent 312c21a commit e0763c2

File tree

3 files changed

+14
-3
lines changed

3 files changed

+14
-3
lines changed

muted-tests.yml

-2
Original file line numberDiff line numberDiff line change
@@ -302,8 +302,6 @@ tests:
302302
- class: org.elasticsearch.xpack.security.QueryableReservedRolesIT
303303
method: testDeletingAndCreatingSecurityIndexTriggersSynchronization
304304
issue: https://github.com/elastic/elasticsearch/issues/118806
305-
- class: org.elasticsearch.xpack.esql.session.IndexResolverFieldNamesTests
306-
issue: https://github.com/elastic/elasticsearch/issues/118814
307305
- class: org.elasticsearch.index.engine.RecoverySourcePruneMergePolicyTests
308306
method: testPruneSome
309307
issue: https://github.com/elastic/elasticsearch/issues/118728

x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/session/IndexResolverFieldNamesTests.java

+13
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99

1010
import org.elasticsearch.Build;
1111
import org.elasticsearch.test.ESTestCase;
12+
import org.elasticsearch.xpack.esql.action.EsqlCapabilities;
1213
import org.elasticsearch.xpack.esql.parser.EsqlParser;
1314
import org.elasticsearch.xpack.esql.parser.ParsingException;
1415

@@ -1364,6 +1365,7 @@ public void testMetrics() {
13641365
}
13651366

13661367
public void testLookupJoin() {
1368+
assumeTrue("LOOKUP JOIN available as snapshot only", EsqlCapabilities.Cap.JOIN_LOOKUP_V7.isEnabled());
13671369
assertFieldNames(
13681370
"FROM employees | KEEP languages | RENAME languages AS language_code | LOOKUP JOIN languages_lookup ON language_code",
13691371
Set.of("languages", "languages.*", "language_code", "language_code.*"),
@@ -1372,6 +1374,7 @@ public void testLookupJoin() {
13721374
}
13731375

13741376
public void testLookupJoinKeep() {
1377+
assumeTrue("LOOKUP JOIN available as snapshot only", EsqlCapabilities.Cap.JOIN_LOOKUP_V7.isEnabled());
13751378
assertFieldNames(
13761379
"""
13771380
FROM employees
@@ -1385,6 +1388,7 @@ public void testLookupJoinKeep() {
13851388
}
13861389

13871390
public void testLookupJoinKeepWildcard() {
1391+
assumeTrue("LOOKUP JOIN available as snapshot only", EsqlCapabilities.Cap.JOIN_LOOKUP_V7.isEnabled());
13881392
assertFieldNames(
13891393
"""
13901394
FROM employees
@@ -1398,6 +1402,7 @@ public void testLookupJoinKeepWildcard() {
13981402
}
13991403

14001404
public void testMultiLookupJoin() {
1405+
assumeTrue("LOOKUP JOIN available as snapshot only", EsqlCapabilities.Cap.JOIN_LOOKUP_V7.isEnabled());
14011406
assertFieldNames(
14021407
"""
14031408
FROM sample_data
@@ -1410,6 +1415,7 @@ public void testMultiLookupJoin() {
14101415
}
14111416

14121417
public void testMultiLookupJoinKeepBefore() {
1418+
assumeTrue("LOOKUP JOIN available as snapshot only", EsqlCapabilities.Cap.JOIN_LOOKUP_V7.isEnabled());
14131419
assertFieldNames(
14141420
"""
14151421
FROM sample_data
@@ -1423,6 +1429,7 @@ public void testMultiLookupJoinKeepBefore() {
14231429
}
14241430

14251431
public void testMultiLookupJoinKeepBetween() {
1432+
assumeTrue("LOOKUP JOIN available as snapshot only", EsqlCapabilities.Cap.JOIN_LOOKUP_V7.isEnabled());
14261433
assertFieldNames(
14271434
"""
14281435
FROM sample_data
@@ -1447,6 +1454,7 @@ public void testMultiLookupJoinKeepBetween() {
14471454
}
14481455

14491456
public void testMultiLookupJoinKeepAfter() {
1457+
assumeTrue("LOOKUP JOIN available as snapshot only", EsqlCapabilities.Cap.JOIN_LOOKUP_V7.isEnabled());
14501458
assertFieldNames(
14511459
"""
14521460
FROM sample_data
@@ -1473,6 +1481,7 @@ public void testMultiLookupJoinKeepAfter() {
14731481
}
14741482

14751483
public void testMultiLookupJoinKeepAfterWildcard() {
1484+
assumeTrue("LOOKUP JOIN available as snapshot only", EsqlCapabilities.Cap.JOIN_LOOKUP_V7.isEnabled());
14761485
assertFieldNames(
14771486
"""
14781487
FROM sample_data
@@ -1486,6 +1495,7 @@ public void testMultiLookupJoinKeepAfterWildcard() {
14861495
}
14871496

14881497
public void testMultiLookupJoinSameIndex() {
1498+
assumeTrue("LOOKUP JOIN available as snapshot only", EsqlCapabilities.Cap.JOIN_LOOKUP_V7.isEnabled());
14891499
assertFieldNames(
14901500
"""
14911501
FROM sample_data
@@ -1499,6 +1509,7 @@ public void testMultiLookupJoinSameIndex() {
14991509
}
15001510

15011511
public void testMultiLookupJoinSameIndexKeepBefore() {
1512+
assumeTrue("LOOKUP JOIN available as snapshot only", EsqlCapabilities.Cap.JOIN_LOOKUP_V7.isEnabled());
15021513
assertFieldNames(
15031514
"""
15041515
FROM sample_data
@@ -1513,6 +1524,7 @@ public void testMultiLookupJoinSameIndexKeepBefore() {
15131524
}
15141525

15151526
public void testMultiLookupJoinSameIndexKeepBetween() {
1527+
assumeTrue("LOOKUP JOIN available as snapshot only", EsqlCapabilities.Cap.JOIN_LOOKUP_V7.isEnabled());
15161528
assertFieldNames(
15171529
"""
15181530
FROM sample_data
@@ -1538,6 +1550,7 @@ public void testMultiLookupJoinSameIndexKeepBetween() {
15381550
}
15391551

15401552
public void testMultiLookupJoinSameIndexKeepAfter() {
1553+
assumeTrue("LOOKUP JOIN available as snapshot only", EsqlCapabilities.Cap.JOIN_LOOKUP_V7.isEnabled());
15411554
assertFieldNames(
15421555
"""
15431556
FROM sample_data

x-pack/plugin/sql/qa/server/src/main/resources/docs/docs.csv-spec

+1-1
Original file line numberDiff line numberDiff line change
@@ -3353,7 +3353,7 @@ Alejandro
33533353
Amabile
33543354
Anoosh
33553355
Basil
3356-
Bojan
3356+
Brendon
33573357
// end::filterToday
33583358
;
33593359

0 commit comments

Comments
 (0)