Merge branch 'main' into fix-indentation

kosabogi · web-flow · commit 670fb1503684 · 2025-08-19T14:09:54.000+02:00
diff --git a/docs/changelog/133064.yaml b/docs/changelog/133064.yaml
@@ -0,0 +1,5 @@
+pr: 133064
+summary: Mark LOOKUP JOIN as `ExecutesOn.Any` by default
+area: ES|QL
+type: bug
+issues: []
diff --git a/docs/reference/elasticsearch/index.md b/docs/reference/elasticsearch/index.md
@@ -1,14 +1,65 @@
 # Elasticsearch
 
-This section contains reference information for {{es}} and index management features.
+{{es}} is a distributed search and analytics engine, scalable data store, and vector database built on Apache Lucene. It’s optimized for speed and relevance on production-scale workloads. Use Elasticsearch to search, index, store, and analyze data of all shapes and sizes in near real time.
 
-To learn more about {{es}} features and how to get started, refer to the [{{es}}](docs-content://solutions/search.md) documentation.
+## Quick links
 
-For more details about query and scripting languages, check these sections:
-* [Query languages](../query-languages/index.md)
-* [Scripting languages](../scripting-languages/index.md)
+:::{dropdown} Useful links
 
-{{es}} also provides the following REST APIs:
+- [REST API Reference](./rest-apis/index.md)
+- [API Conventions](./rest-apis/api-conventions.md)
+- [Settings Reference](https://www.elastic.co/guide/en/elasticsearch/reference/current/settings.html)
+- [Breaking Changes](https://www.elastic.co/guide/en/elasticsearch/reference/current/breaking-changes.html)
+- [Compatibility](./rest-apis/compatibility.md)
+- [Glossary](https://www.elastic.co/guide/en/elasticsearch/reference/current/glossary.html)
+- [Plugin Development](https://www.elastic.co/guide/en/elasticsearch/plugins/current/index.html)
+- [Supported Platforms](https://www.elastic.co/support/matrix#matrix_jvm)
+:::
 
-* [{{es}} API](https://www.elastic.co/docs/api/doc/elasticsearch)
-* [{{es}} Serverless API](https://www.elastic.co/docs/api/doc/elasticsearch-serverless)
+## Setup and architecture
+
+- [Set up Elasticsearch](docs-content://deploy-manage/deploy/self-managed/installing-elasticsearch.md)
+- [Secure the Elastic Stack](docs-content://deploy-manage/security.md)
+- [Upgrade Elasticsearch](docs-content://deploy-manage/upgrade/deployment-or-cluster.md)
+- [Set up a cluster for high availability](docs-content://deploy-manage/tools.md)
+- [Stack monitoring](docs-content://deploy-manage/monitor/stack-monitoring.md)
+- [Troubleshooting](docs-content://troubleshoot/elasticsearch.md)
+- [Optimizations](docs-content://deploy-manage/production-guidance/optimize-performance.md)
+
+## Working with data
+
+- [Adding data to Elasticsearch](docs-content://manage-data/ingest.md)
+- [Connectors](https://www.elastic.co/docs/reference/search-connectors)
+- [Web crawler](https://www.elastic.co/search-labs/blog/elastic-open-crawler-release)
+- [Data streams](docs-content://manage-data/data-store/data-streams.md)
+- [Ingest pipelines](docs-content://manage-data/ingest/transform-enrich/ingest-pipelines.md)
+- [Mapping](docs-content://manage-data/data-store/mapping.md)
+- [Data management](docs-content://manage-data/lifecycle.md)
+- [Downsampling](docs-content://manage-data/lifecycle.md)
+- [Snapshot and restore](docs-content://deploy-manage/tools/snapshot-and-restore.md)
+
+## Search and analytics
+
+{{es}} is the search and analytics engine that powers the {{stack}}.
+
+- [Get started](docs-content://get-started/index.md)
+- [Learn how to search your data](docs-content://solutions/search/querying-for-search.md)
+- Query data programmatically: use query languages to run advanced search, filtering, or analytics
+  - [Query DSL](docs-content://explore-analyze/query-filter/languages/querydsl.md): full JSON-based query language
+  - [ES|QL](docs-content://explore-analyze/query-filter/languages/esql.md): fast, SQL-like language with piped syntax
+  - [EQL](docs-content://explore-analyze/query-filter/languages/eql.md): for event-based time series data, such as logs, metrics, and traces
+  - [SQL](docs-content://explore-analyze/query-filter/languages/sql.md): SQL-style queries on Elasticsearch data
+- [Search applications](docs-content://solutions/search/search-applications.md)
+- [Aggregations](docs-content://explore-analyze/query-filter/aggregations.md)
+- [Geospatial analysis](docs-content://explore-analyze/geospatial-analysis.md)
+- [Machine Learning](docs-content://explore-analyze/machine-learning.md)
+- [Alerting](docs-content://explore-analyze/alerts-cases.md)
+
+## APIs and developer docs
+
+- [REST APIs](https://www.elastic.co/docs/reference/elasticsearch/rest-apis)
+- [{{es}} Clients](https://www.elastic.co/docs/reference/elasticsearch-clients)
+- [Painless](https://www.elastic.co/docs/reference/scripting-languages/painless/painless)
+- [Plugins and integrations](https://www.elastic.co/docs/reference/elasticsearch/plugins)
+- [Search Labs](https://www.elastic.co/search-labs)
+- [Notebook examples](https://www.elastic.co/search-labs/tutorials/examples)
diff --git a/libs/core/src/test/java/org/elasticsearch/core/GlobTests.java b/libs/core/src/test/java/org/elasticsearch/core/GlobTests.java
@@ -30,7 +30,7 @@ public void testMatchLiteral() {
         str = randomAlphanumericOfLength(randomIntBetween(1, 12));
         assertMatch(str, str);
 
-        str = randomAsciiString(randomIntBetween(1, 24), ch -> ch >= ' ' && ch <= '~' && ch != '*');
+        str = randomAsciiStringNoAsterisks(randomIntBetween(1, 24));
         assertMatch(str, str);
     }
 
@@ -67,7 +67,7 @@ public void testPrefixMatch() {
         assertNonMatch("123*", "abc123");
         assertNonMatch("123*", "abc123def");
 
-        var prefix = randomAsciiString(randomIntBetween(2, 12));
+        var prefix = randomAsciiStringNoAsterisks(randomIntBetween(2, 12));
         var pattern = prefix + "*";
         assertMatch(pattern, prefix);
         assertMatch(pattern, prefix + randomAsciiString(randomIntBetween(1, 30)));
@@ -92,7 +92,7 @@ public void testSuffixMatch() {
         assertNonMatch("*123", "123abc");
         assertNonMatch("*123", "abc123def");
 
-        var suffix = randomAsciiString(randomIntBetween(2, 12));
+        var suffix = randomAsciiStringNoAsterisks(randomIntBetween(2, 12));
         var pattern = "*" + suffix;
         assertMatch(pattern, suffix);
         assertMatch(pattern, randomAsciiString(randomIntBetween(1, 30)) + suffix);
@@ -114,7 +114,7 @@ public void testInfixStringMatch() {
         assertNonMatch("*123*", "12*");
         assertNonMatch("*123*", "1.2.3");
 
-        var infix = randomAsciiString(randomIntBetween(2, 12));
+        var infix = randomAsciiStringNoAsterisks(randomIntBetween(2, 12));
         var pattern = "*" + infix + "*";
         assertMatch(pattern, infix);
         assertMatch(pattern, randomAsciiString(randomIntBetween(1, 30)) + infix + randomAsciiString(randomIntBetween(1, 30)));
@@ -138,8 +138,8 @@ public void testInfixAsteriskMatch() {
         assertMatch("123*321", "12345678987654321");
         assertNonMatch("123*321", "12321");
 
-        var prefix = randomAsciiString(randomIntBetween(2, 12));
-        var suffix = randomAsciiString(randomIntBetween(2, 12));
+        var prefix = randomAsciiStringNoAsterisks(randomIntBetween(2, 12));
+        var suffix = randomAsciiStringNoAsterisks(randomIntBetween(2, 12));
         var pattern = prefix + "*" + suffix;
         assertMatch(pattern, prefix + suffix);
         assertMatch(pattern, prefix + randomAsciiString(randomIntBetween(1, 30)) + suffix);
@@ -180,6 +180,10 @@ private String randomAsciiString(int length) {
         return randomAsciiString(length, ch -> ch >= ' ' && ch <= '~');
     }
 
+    private String randomAsciiStringNoAsterisks(final int length) {
+        return randomAsciiString(length, ch -> ch >= ' ' && ch <= '~' && ch != '*');
+    }
+
     private String randomAsciiString(int length, CharPredicate validCharacters) {
         StringBuilder str = new StringBuilder(length);
         nextChar: for (int i = 0; i < length; i++) {
diff --git a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/plan/logical/join/Join.java b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/plan/logical/join/Join.java
@@ -318,7 +318,7 @@ public boolean isRemote() {
 
     @Override
     public ExecuteLocation executesOn() {
-        return isRemote ? ExecuteLocation.REMOTE : ExecuteLocation.COORDINATOR;
+        return isRemote ? ExecuteLocation.REMOTE : ExecuteLocation.ANY;
     }
 
     private void checkRemoteJoin(Failures failures) {
diff --git a/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/optimizer/OptimizerVerificationTests.java b/x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/optimizer/OptimizerVerificationTests.java
@@ -95,16 +95,40 @@ public void testRemoteEnrichAfterCoordinatorOnlyPlans() {
 
         String err;
 
+        // Remote enrich is ok after limit
         plan("""
             FROM test
+            | LIMIT 10
             | EVAL language_code = languages
             | ENRICH _remote:languages ON language_code
             | STATS count(*) BY language_name
             """, analyzer);
 
+        // Remote enrich is ok after topn
+        plan("""
+            FROM test
+            | EVAL language_code = languages
+            | SORT languages
+            | ENRICH _remote:languages ON language_code
+            """, analyzer);
+        plan("""
+            FROM test
+            | EVAL language_code = languages
+            | SORT languages
+            | LIMIT 2
+            | ENRICH _remote:languages ON language_code
+            """, analyzer);
+
+        // Remote enrich is ok before pipeline breakers
         plan("""
             FROM test
+            | EVAL language_code = languages
+            | ENRICH _remote:languages ON language_code
             | LIMIT 10
+            """, analyzer);
+
+        plan("""
+            FROM test
             | EVAL language_code = languages
             | ENRICH _remote:languages ON language_code
             | STATS count(*) BY language_name
@@ -118,6 +142,13 @@ public void testRemoteEnrichAfterCoordinatorOnlyPlans() {
             | LIMIT 10
             """, analyzer);
 
+        plan("""
+            FROM test
+            | EVAL language_code = languages
+            | ENRICH _remote:languages ON language_code
+            | SORT language_name
+            """, analyzer);
+
         err = error("""
             FROM test
             | EVAL language_code = languages
@@ -230,6 +261,9 @@ public void testRemoteEnrichAfterCoordinatorOnlyPlans() {
         assertThat(err, containsString("4:3: ENRICH with remote policy can't be executed after [CHANGE_POINT salary ON languages]@2:3"));
     }
 
+    /**
+     * The validation should not trigger for remote enrich after a lookup join. Lookup joins can be executed anywhere.
+     */
     public void testRemoteEnrichAfterLookupJoin() {
         EnrichResolution enrichResolution = new EnrichResolution();
         loadEnrichPolicyResolution(
@@ -257,32 +291,29 @@ public void testRemoteEnrichAfterLookupJoin() {
             | %s
             """, lookupCommand), analyzer);
 
-        String err = error(Strings.format("""
+        plan(Strings.format("""
             FROM test
             | EVAL language_code = languages
             | %s
             | ENRICH _remote:languages ON language_code
             """, lookupCommand), analyzer);
-        assertThat(err, containsString("4:3: ENRICH with remote policy can't be executed after [" + lookupCommand + "]@3:3"));
 
-        err = error(Strings.format("""
+        plan(Strings.format("""
             FROM test
             | EVAL language_code = languages
             | %s
             | ENRICH _remote:languages ON language_code
             | %s
             """, lookupCommand, lookupCommand), analyzer);
-        assertThat(err, containsString("4:3: ENRICH with remote policy can't be executed after [" + lookupCommand + "]@3:3"));
 
-        err = error(Strings.format("""
+        plan(Strings.format("""
             FROM test
             | EVAL language_code = languages
             | %s
             | EVAL x = 1
             | MV_EXPAND language_code
             | ENRICH _remote:languages ON language_code
             """, lookupCommand), analyzer);
-        assertThat(err, containsString("6:3: ENRICH with remote policy can't be executed after [" + lookupCommand + "]@3:3"));
     }
 
     public void testRemoteLookupJoinWithPipelineBreaker() {

Original file line number	Diff line number	Diff line change
`@@ -318,7 +318,7 @@ public boolean isRemote() {`
`318`	`318`
`319`	`319`	`@Override`
`320`	`320`	`public ExecuteLocation executesOn() {`
`321`		`- return isRemote ? ExecuteLocation.REMOTE : ExecuteLocation.COORDINATOR;`
	`321`	`+ return isRemote ? ExecuteLocation.REMOTE : ExecuteLocation.ANY;`
`322`	`322`	`}`
`323`	`323`
`324`	`324`	`private void checkRemoteJoin(Failures failures) {`