Skip to content

Commit 3696c5c

Browse files
authored
Enable remote lookup join in release (#134400)
* Enable remote lookup join in release
1 parent 355920e commit 3696c5c

File tree

7 files changed

+1
-32
lines changed

7 files changed

+1
-32
lines changed

x-pack/plugin/esql/qa/server/multi-clusters/src/javaRestTest/java/org/elasticsearch/xpack/esql/ccq/RequestIndexFilteringIT.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,6 @@ private static boolean checkVersion(org.elasticsearch.Version version) {
157157
}
158158

159159
public void testIndicesDontExistWithRemoteLookupJoin() throws IOException {
160-
assumeTrue("Only works with remote LOOKUP JOIN support", EsqlCapabilities.Cap.ENABLE_LOOKUP_JOIN_ON_REMOTE.isEnabled());
161160
// This check is for "local" cluster - which is different from test runner actually, so it could be old
162161
assumeTrue(
163162
"Only works with remote LOOKUP JOIN support",

x-pack/plugin/esql/src/internalClusterTest/java/org/elasticsearch/xpack/esql/action/CrossClusterLookupJoinFailuresIT.java

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
import org.elasticsearch.transport.TransportResponse;
1515
import org.elasticsearch.transport.TransportService;
1616
import org.elasticsearch.xpack.esql.VerificationException;
17-
import org.junit.Before;
1817

1918
import java.io.IOException;
2019
import java.util.List;
@@ -32,11 +31,6 @@ protected boolean reuseClusters() {
3231
return false;
3332
}
3433

35-
@Before
36-
public void checkEnabled() {
37-
assumeTrue("Remote LOOKUP JOIN not enabled", EsqlCapabilities.Cap.ENABLE_LOOKUP_JOIN_ON_REMOTE.isEnabled());
38-
}
39-
4034
public void testLookupFail() throws IOException {
4135
setupClusters(3);
4236
populateLookupIndex(LOCAL_CLUSTER, "values_lookup", 10);

x-pack/plugin/esql/src/internalClusterTest/java/org/elasticsearch/xpack/esql/action/CrossClusterLookupJoinIT.java

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
import org.elasticsearch.xpack.core.enrich.action.PutEnrichPolicyAction;
1717
import org.elasticsearch.xpack.esql.VerificationException;
1818
import org.elasticsearch.xpack.esql.core.type.DataType;
19-
import org.junit.Before;
2019

2120
import java.io.IOException;
2221
import java.time.Duration;
@@ -40,11 +39,6 @@
4039
// @TestLogging(value = "org.elasticsearch.xpack.esql.session:DEBUG", reason = "to better understand planning")
4140
public class CrossClusterLookupJoinIT extends AbstractCrossClusterTestCase {
4241

43-
@Before
44-
public void checkEnabled() {
45-
assumeTrue("Remote LOOKUP JOIN not enabled", EsqlCapabilities.Cap.ENABLE_LOOKUP_JOIN_ON_REMOTE.isEnabled());
46-
}
47-
4842
public void testLookupJoinAcrossClusters() throws IOException {
4943
setupClustersAndLookups();
5044

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1285,7 +1285,7 @@ public enum Cap {
12851285
/**
12861286
* Enable support for cross-cluster lookup joins.
12871287
*/
1288-
ENABLE_LOOKUP_JOIN_ON_REMOTE(Build.current().isSnapshot()),
1288+
ENABLE_LOOKUP_JOIN_ON_REMOTE,
12891289

12901290
/**
12911291
* Fix the planning of {@code | ENRICH _remote:policy} when there's a preceding {@code | LOOKUP JOIN},

x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/analysis/VerifierTests.java

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2354,22 +2354,6 @@ public void testFullTextFunctionsInStats() {
23542354
}
23552355
}
23562356

2357-
public void testRemoteLookupJoinIsSnapshot() {
2358-
// TODO: remove when we allow remote joins in release builds
2359-
assumeTrue("Remote LOOKUP JOIN not enabled", EsqlCapabilities.Cap.ENABLE_LOOKUP_JOIN_ON_REMOTE.isEnabled());
2360-
assertTrue(Build.current().isSnapshot());
2361-
}
2362-
2363-
public void testRemoteLookupJoinIsDisabled() {
2364-
// TODO: remove when we allow remote joins in release builds
2365-
assumeFalse("Remote LOOKUP JOIN enabled", EsqlCapabilities.Cap.ENABLE_LOOKUP_JOIN_ON_REMOTE.isEnabled());
2366-
ParsingException e = expectThrows(
2367-
ParsingException.class,
2368-
() -> query("FROM test,remote:test | EVAL language_code = languages | LOOKUP JOIN languages_lookup ON language_code")
2369-
);
2370-
assertThat(e.getMessage(), containsString("remote clusters are not supported with LOOKUP JOIN"));
2371-
}
2372-
23732357
public void testDecayFunctionNullArgs() {
23742358
assumeTrue("Decay function not enabled", EsqlCapabilities.Cap.DECAY_FUNCTION.isEnabled());
23752359

x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/optimizer/OptimizerVerificationTests.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -318,7 +318,6 @@ public void testRemoteEnrichAfterLookupJoin() {
318318
}
319319

320320
public void testRemoteLookupJoinWithPipelineBreaker() {
321-
assumeTrue("Remote LOOKUP JOIN not enabled", EsqlCapabilities.Cap.ENABLE_LOOKUP_JOIN_ON_REMOTE.isEnabled());
322321
var analyzer = AnalyzerTestUtils.analyzer(loadMapping("mapping-default.json", "test,remote:test"));
323322
assertEquals(
324323
"1:92: LOOKUP JOIN with remote indices can't be executed after [STATS c = COUNT(*) by languages]@1:25",

x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/parser/StatementParserTests.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3271,7 +3271,6 @@ public void testInvalidPatternsWithIntermittentQuotes() {
32713271
}
32723272

32733273
public void testValidJoinPatternWithRemote() {
3274-
assumeTrue("LOOKUP JOIN requires corresponding capability", EsqlCapabilities.Cap.ENABLE_LOOKUP_JOIN_ON_REMOTE.isEnabled());
32753274
var fromPatterns = randomIndexPatterns(CROSS_CLUSTER);
32763275
var joinPattern = randomIndexPattern(without(CROSS_CLUSTER), without(WILDCARD_PATTERN), without(INDEX_SELECTOR));
32773276
var plan = statement("FROM " + fromPatterns + " | LOOKUP JOIN " + joinPattern + " ON " + randomIdentifier());

0 commit comments

Comments
 (0)