More stuff

Author: astefan

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

@@ -256,7 +256,7 @@ pushDownSort_To_LeftSideOnly
 required_capability: inlinestats_v8
 
 from employees
-| sort emp_no desc
+| sort emp_no
 | inlinestats avg = avg(salary) by languages
 | limit 5
 | keep emp_no, avg, languages, gender
@@ -270,13 +270,6 @@ from employees
 10005          |63528.0        |1                |M
 ;
 
-from employees
-| sort emp_no desc
-| inlinestats avg = avg(salary) by languages
-| limit 5
-| keep emp_no, avg, languages, gender
-;
-
 byMultivaluedSimple
 required_capability: inlinestats_v8
 
@@ -1196,11 +1189,10 @@ FROM employees
 | INLINESTATS salary = min(salary) BY gender
 | WHERE salary > 31000
 | INLINESTATS salary = max(salary) BY gender
-| WHERE salary > 31500
+| WHERE salary < 31500
 | KEEP salary, gender
 | SORT salary DESC, gender 
 ;
-warning:No limit defined, adding default limit of [1000]
 
 salary:integer |gender:keyword
 31120          |null           
@@ -1225,7 +1217,7 @@ FROM employees
 | LIMIT 3
 ;
 
-emp_no:integer |salary:integer |languages:integer|avg(salary):double|gender:keyword     
+emp_no:integer |salary:integer |languages:integer|avg(salary):double|gender:long     
 10001          |57305          |2                |48248.55          |2              
 10002          |56371          |5                |48248.55          |2              
 10003          |61805          |4                |48248.55          |2              

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

@@ -29,7 +29,6 @@
 import org.elasticsearch.xpack.esql.rule.Rule;
 
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 
 /**
@@ -105,15 +104,16 @@ public LogicalPlan apply(LogicalPlan plan) {
                             p = aggregate.with(aggregate.groupings(), remaining);
                         }
                     }
-                } else if (p instanceof InlineJoin ij) {// TODO: InlineStats - add tests for this IJ removal
-                    var remaining = removeUnused(ij.right().output(), used, Collections.emptyList());
+                } else if (p instanceof InlineJoin ij) {// TODO: InlineStats - add unit tests for this IJ removal
+                    var remaining = removeUnused(ij.right().output(), used, inlineJoinRightOutput);
                     if (remaining != null) {
                         if (remaining.isEmpty()) {
                             // remove the InlineJoin altogether
                             p = ij.left();
                             recheck = true;
                         }
-                        // TODO: InlineStats - prune only the unused columns from it?
+                        // TODO: InlineStats - prune ONLY the unused output columns from it? In other words, don't perform more aggs
+                        // if they will not be used anyway
                     }
                 } else if (p instanceof Eval eval) {
                     var remaining = removeUnused(eval.fields(), used, inlineJoinRightOutput);