Merge remote-tracking branch 'origin/main' into lucene_snapshot

Author: elasticsearchmachine

docs/changelog/135744.yaml

@@ -0,0 +1,5 @@
+pr: 135744
+summary: Non-Correlated Subquery in FROM command
+area: ES|QL
+type: enhancement
+issues: []

docs/changelog/137024.yaml

@@ -0,0 +1,5 @@
+pr: 137024
+summary: Catch-and-rethrow `TooComplexToDeterminizeException` within ESQL
+area: ES|QL
+type: bug
+issues: []

docs/reference/query-languages/query-dsl/full-text-filter-tutorial.md

@@ -497,7 +497,7 @@ GET /cooking_blog/_search
       "should": [
         {
           "term": {
-            "category": "Main Course"
+            "category.keyword": "Main Course"
           }
         },
         {

muted-tests.yml

@@ -534,6 +534,9 @@ tests:
 - class: org.elasticsearch.cluster.routing.allocation.decider.WriteLoadConstraintDeciderIT
   method: testCanRemainNotPreferredIsIgnoredWhenAllOtherNodesReturnNotPreferred
   issue: https://github.com/elastic/elasticsearch/issues/137162
+- class: org.elasticsearch.xpack.esql.plan.logical.CommandLicenseTests
+  method: testLicenseCheck
+  issue: https://github.com/elastic/elasticsearch/issues/137168
 
 # Examples:
 #

x-pack/plugin/esql-core/src/main/java/org/elasticsearch/xpack/esql/core/expression/Attribute.java

@@ -74,7 +74,9 @@ public IdIgnoringWrapper ignoreId() {
     /**
      * Changing this will break bwc with 8.15, see {@link FieldAttribute#fieldName()}.
      */
-    protected static final String SYNTHETIC_ATTRIBUTE_NAME_PREFIX = "$$";
+    public static final String SYNTHETIC_ATTRIBUTE_NAME_PREFIX = "$$";
+
+    public static final String SYNTHETIC_ATTRIBUTE_NAME_SEPARATOR = "$";
 
     private static final TransportVersion ESQL_QUALIFIERS_IN_ATTRIBUTES = TransportVersion.fromName("esql_qualifiers_in_attributes");
 
@@ -116,7 +118,7 @@ public Attribute(
     }
 
     public static String rawTemporaryName(String... parts) {
-        var name = String.join("$", parts);
+        var name = String.join(SYNTHETIC_ATTRIBUTE_NAME_SEPARATOR, parts);
         return name.isEmpty() || name.startsWith(SYNTHETIC_ATTRIBUTE_NAME_PREFIX) ? name : SYNTHETIC_ATTRIBUTE_NAME_PREFIX + name;
     }
 

x-pack/plugin/esql-core/src/main/java/org/elasticsearch/xpack/esql/core/expression/predicate/regex/AbstractStringPattern.java

@@ -11,12 +11,21 @@
 import org.apache.lucene.util.UnicodeUtil;
 import org.apache.lucene.util.automaton.Automaton;
 import org.apache.lucene.util.automaton.Operations;
+import org.apache.lucene.util.automaton.TooComplexToDeterminizeException;
 
 public abstract class AbstractStringPattern implements StringPattern {
 
     private Automaton automaton;
 
-    public abstract Automaton createAutomaton(boolean ignoreCase);
+    public final Automaton createAutomaton(boolean ignoreCase) {
+        try {
+            return doCreateAutomaton(ignoreCase);
+        } catch (TooComplexToDeterminizeException e) {
+            throw new IllegalArgumentException("Pattern was too complex to determinize", e);
+        }
+    }
+
+    protected abstract Automaton doCreateAutomaton(boolean ignoreCase);
 
     private Automaton automaton() {
         if (automaton == null) {

x-pack/plugin/esql-core/src/main/java/org/elasticsearch/xpack/esql/core/expression/predicate/regex/RLikePattern.java

@@ -34,7 +34,7 @@ public void writeTo(StreamOutput out) throws IOException {
     }
 
     @Override
-    public Automaton createAutomaton(boolean ignoreCase) {
+    protected Automaton doCreateAutomaton(boolean ignoreCase) {
         int matchFlags = ignoreCase ? RegExp.CASE_INSENSITIVE : 0;
         return Operations.determinize(
             new RegExp(regexpPattern, RegExp.ALL | RegExp.DEPRECATED_COMPLEMENT, matchFlags).toAutomaton(),

x-pack/plugin/esql-core/src/main/java/org/elasticsearch/xpack/esql/core/expression/predicate/regex/RLikePatternList.java

@@ -43,7 +43,7 @@ public List<RLikePattern> patternList() {
      * We create a single automaton that is the union of all individual automatons to improve performance
      */
     @Override
-    public Automaton createAutomaton(boolean ignoreCase) {
+    protected Automaton doCreateAutomaton(boolean ignoreCase) {
         List<Automaton> automatonList = patternList.stream().map(x -> x.createAutomaton(ignoreCase)).toList();
         Automaton result = Operations.union(automatonList);
         return Operations.determinize(result, Operations.DEFAULT_DETERMINIZE_WORK_LIMIT);

x-pack/plugin/esql-core/src/main/java/org/elasticsearch/xpack/esql/core/expression/predicate/regex/WildcardPattern.java

@@ -53,7 +53,7 @@ public String pattern() {
     }
 
     @Override
-    public Automaton createAutomaton(boolean ignoreCase) {
+    protected Automaton doCreateAutomaton(boolean ignoreCase) {
         return ignoreCase
             ? Operations.determinize(
                 new RegExp(luceneWildcardToRegExp(wildcard), RegExp.ALL | RegExp.DEPRECATED_COMPLEMENT, RegExp.CASE_INSENSITIVE)

x-pack/plugin/esql-core/src/main/java/org/elasticsearch/xpack/esql/core/expression/predicate/regex/WildcardPatternList.java

@@ -51,7 +51,7 @@ public List<WildcardPattern> patternList() {
      * We create a single automaton that is the union of all individual automata to improve performance
      */
     @Override
-    public Automaton createAutomaton(boolean ignoreCase) {
+    protected Automaton doCreateAutomaton(boolean ignoreCase) {
         List<Automaton> automatonList = patternList.stream().map(x -> x.createAutomaton(ignoreCase)).toList();
         Automaton result = Operations.union(automatonList);
         return Operations.determinize(result, Operations.DEFAULT_DETERMINIZE_WORK_LIMIT);