Merge branch 'main' into revert-128293

Author: iverase

docs/reference/query-languages/esql/_snippets/commands/layout/rename.md

@@ -8,6 +8,16 @@ The `RENAME` processing command renames one or more columns.
 RENAME old_name1 AS new_name1[, ..., old_nameN AS new_nameN]
 ```
 
+The following syntax is also supported {applies_to}`stack: ga 9.1`:
+
+```esql
+RENAME new_name1 = old_name1[, ..., new_nameN = old_nameN]
+```
+
+::::{tip}
+Both syntax options can be used interchangeably but we recommend sticking to one for consistency and readability.
+::::
+
 **Parameters**
 
 `old_nameX`

muted-tests.yml

@@ -517,6 +517,9 @@ tests:
 - class: org.elasticsearch.xpack.esql.qa.single_node.GenerativeForkIT
   method: test {lookup-join.EnrichLookupStatsBug SYNC}
   issue: https://github.com/elastic/elasticsearch/issues/129229
+- class: org.elasticsearch.xpack.esql.qa.single_node.GenerativeForkIT
+  method: test {lookup-join.MultipleBatches*
+  issue: https://github.com/elastic/elasticsearch/issues/129210
 
 # Examples:
 #

x-pack/plugin/esql/qa/server/src/main/java/org/elasticsearch/xpack/esql/qa/rest/RestSampleTestCase.java

@@ -33,7 +33,7 @@ public class RestSampleTestCase extends ESRestTestCase {
     public void skipWhenSampleDisabled() throws IOException {
         assumeTrue(
             "Requires SAMPLE capability",
-            EsqlSpecTestCase.hasCapabilities(adminClient(), List.of(EsqlCapabilities.Cap.SAMPLE.capabilityName()))
+            EsqlSpecTestCase.hasCapabilities(adminClient(), List.of(EsqlCapabilities.Cap.SAMPLE_V2.capabilityName()))
         );
     }
 

x-pack/plugin/esql/qa/testFixtures/src/main/resources/rename.csv-spec

@@ -296,3 +296,50 @@ ROW a="keyword", b=5, c=null
 a:integer
 5
 ;
+
+useAssignmentOnly
+required_capability: rename_allow_assignment
+
+ROW a = 1, b = "two"
+| RENAME aa = a, bb = b
+;
+
+aa:integer | bb:keyword
+1          | two
+;
+
+useAssignmentAndASKeyword
+required_capability: rename_allow_assignment
+
+ROW a = 1, b = "two", c = null
+| RENAME aa = a, b AS bb, cc = c
+;
+
+aa:integer | bb:keyword | cc:null
+1          | two        | null
+;
+
+shadowWithAssignment
+required_capability: rename_allow_assignment
+
+ROW a = 1, b = "two"
+| RENAME a = b
+;
+
+a:keyword
+two
+;
+
+multipleRenamesWithAssignment
+required_capability: rename_sequential_processing
+required_capability: rename_allow_assignment
+
+ROW a="keyword", b=5, c=null
+| RENAME c = a, a = b
+| RENAME b = c
+| RENAME b = a, a = b
+;
+
+a:integer
+5
+;

x-pack/plugin/esql/qa/testFixtures/src/main/resources/sample.csv-spec

@@ -9,7 +9,7 @@
 // because the CSV tests don't support such assertions.
 
 row
-required_capability: sample
+required_capability: sample_v2
 
 ROW x = 1 | SAMPLE .999999999
 ;
@@ -20,7 +20,7 @@ x:integer
 
 
 row and mv_expand
-required_capability: sample
+required_capability: sample_v2
 
 ROW x = [1,2,3,4,5] | MV_EXPAND x | SAMPLE .999999999
 ;
@@ -35,7 +35,7 @@ x:integer
 
 
 adjust stats for sampling
-required_capability: sample
+required_capability: sample_v2
 
 FROM employees
   | SAMPLE 0.5
@@ -53,7 +53,7 @@ true
 
 
 before where
-required_capability: sample
+required_capability: sample_v2
 
 FROM employees
   | SAMPLE 0.5
@@ -71,7 +71,7 @@ true
 
 
 after where
-required_capability: sample
+required_capability: sample_v2
 
 FROM employees
   | WHERE emp_no <= 10050 
@@ -89,7 +89,7 @@ true
 
 
 before sort
-required_capability: sample
+required_capability: sample_v2
 
 FROM employees
   | SAMPLE 0.5
@@ -107,7 +107,7 @@ true
 
 
 after sort
-required_capability: sample
+required_capability: sample_v2
 
 FROM employees
   | SORT emp_no
@@ -125,7 +125,7 @@ true
 
 
 before limit
-required_capability: sample
+required_capability: sample_v2
 
 FROM employees
   | SAMPLE 0.5
@@ -141,7 +141,7 @@ true
 
 
 after limit
-required_capability: sample
+required_capability: sample_v2
 
 FROM employees
   | LIMIT 50
@@ -158,7 +158,7 @@ true
 
 
 before mv_expand
-required_capability: sample
+required_capability: sample_v2
 
 ROW x = [1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50], y = [1,2]
   | MV_EXPAND x
@@ -176,7 +176,7 @@ true
 
 
 after mv_expand
-required_capability: sample
+required_capability: sample_v2
 
 ROW x = [1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50], y = [1,2]
   | MV_EXPAND x
@@ -194,7 +194,7 @@ true
 
 
 multiple samples
-required_capability: sample
+required_capability: sample_v2
 
 FROM employees
   | SAMPLE 0.7
@@ -213,7 +213,7 @@ true
 
 
 after stats
-required_capability: sample
+required_capability: sample_v2
 
 FROM employees
   | SAMPLE 0.5

x-pack/plugin/esql/src/main/antlr/EsqlBaseParser.g4

@@ -212,6 +212,7 @@ renameCommand
 
 renameClause:
     oldName=qualifiedNamePattern AS newName=qualifiedNamePattern
+    | newName=qualifiedNamePattern ASSIGN oldName=qualifiedNamePattern
     ;
 
 dissectCommand

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

@@ -439,6 +439,11 @@ public enum Cap {
          */
         RENAME_SEQUENTIAL_PROCESSING,
 
+        /**
+         * Support for assignment in RENAME, besides the use of `AS` keyword.
+         */
+        RENAME_ALLOW_ASSIGNMENT,
+
         /**
          * Support for removing empty attribute in merging output.
          * See <a href="https://github.com/elastic/elasticsearch/issues/126392"> ESQL: EVAL after STATS produces an empty column #126392 </a>
@@ -1077,7 +1082,7 @@ public enum Cap {
         /**
          * Support for the SAMPLE command
          */
-        SAMPLE(Build.current().isSnapshot()),
+        SAMPLE_V2(Build.current().isSnapshot()),
 
         /**
          * The {@code _query} API now gives a cast recommendation if multiple types are found in certain instances.