Tests update

Author: astefan

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

@@ -918,6 +918,7 @@ FROM employees
 | INLINESTATS max_salary = MAX(salary), min_salary = MIN(salary) by languages
 | KEEP emp_no, languages, *salary
 | WHERE salary > 65000 and languages > 2
+| SORT emp_no
 ;
 
 emp_no:integer |languages:integer|salary:integer |max_salary:integer|min_salary:integer   
@@ -938,16 +939,16 @@ FROM employees
 | INLINESTATS max_salary = MAX(salary), min_salary = MIN(salary) by languages
 | KEEP emp_no, languages, *salary
 | WHERE min_salary > 27000 or max_salary < 70000
+| sort salary desc
 | limit 5
-| sort salary
 ;
 
 emp_no:integer |languages:integer|salary:integer |max_salary:integer|min_salary:integer
-10004          |5                |36174          |66817             |25324          
-10002          |5                |56371          |66817             |25324          
-10001          |2                |57305          |73578             |29175          
-10003          |4                |61805          |74572             |27215          
+10029          |null             |74999          |74999             |28336          
 10007          |4                |74572          |74572             |27215          
+10027          |null             |73851          |74999             |28336          
+10099          |2                |73578          |73578             |29175          
+10078          |2                |69904          |73578             |29175          
 ;
 
 filterOnInlineStatsAggsValues_And_Groupings
@@ -957,14 +958,14 @@ FROM employees
 | INLINESTATS max_salary = MAX(salary), min_salary = MIN(salary) by languages
 | KEEP emp_no, languages, *salary
 | WHERE (min_salary > 27000 or max_salary < 70000) and languages > 3
-| limit 5
 | sort salary
+| limit 5
 ;
 
 emp_no:integer |languages:integer|salary:integer |max_salary:integer|min_salary:integer
-10004          |5                |36174          |66817             |25324          
-10010          |4                |45797          |74572             |27215          
-10002          |5                |56371          |66817             |25324          
-10003          |4                |61805          |74572             |27215          
-10007          |4                |74572          |74572             |27215
+10015          |5                |25324          |66817             |25324          
+10035          |5                |25945          |66817             |25324          
+10057          |4                |27215          |74572             |27215          
+10011          |5                |31120          |66817             |25324          
+10066          |5                |31897          |66817             |25324          
 ;

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/optimizer/rules/logical/PushDownAndCombineFilters.java

@@ -87,6 +87,8 @@ protected LogicalPlan rule(Filter filter) {
             plan = orderBy.replaceChild(filter.with(orderBy.child(), condition));
         } else if (child instanceof Join join && child instanceof InlineJoin == false) {
             // TODO: could we do better here about pushing down filters for inlinestats?
+            // See also https://github.com/elastic/elasticsearch/issues/127497
+            // Push down past INLINESTATS if the condition is on the groupings
             return pushDownPastJoin(filter, join);
         }
         // cannot push past a Limit, this could change the tailing result set returned