Even better

luigidellaquila · Nov 22, 2024 · 3268f1b · 3268f1b
1 parent c2ef14d
commit 3268f1b
Showing 1 changed file with 13 additions and 9 deletions.
diff --git a/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/analysis/Verifier.java b/x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/analysis/Verifier.java
@@ -117,15 +117,6 @@ Collection<Failure> verify(LogicalPlan plan, BitSet partialMetrics) {
             }
             // p is resolved, skip
             else if (p.resolved()) {
-                if (p instanceof OrderBy ob) {
-                    ob.order().forEach(o -> {
-                        o.forEachDown(Function.class, f -> {
-                            if (f instanceof AggregateFunction) {
-                                failures.add(fail(f, "Aggregate functions are not allowed in SORT [{}]", f.functionName()));
-                            }
-                        });
-                    });
-                }
                 p.forEachExpressionUp(Alias.class, a -> aliases.put(a.toAttribute(), a.child()));
                 return;
             }
@@ -224,6 +215,7 @@ else if (p instanceof Lookup lookup) {
             checkOperationsOnUnsignedLong(p, failures);
             checkBinaryComparison(p, failures);
             checkForSortableDataTypes(p, failures);
+            checkSort(p, failures);
 
             checkFullTextQueryFunctions(p, failures);
         });
@@ -241,6 +233,18 @@ else if (p instanceof Lookup lookup) {
         return failures;
     }
 
+    private void checkSort(LogicalPlan p, Set<Failure> failures) {
+        if (p instanceof OrderBy ob) {
+            ob.order().forEach(o -> {
+                o.forEachDown(Function.class, f -> {
+                    if (f instanceof AggregateFunction) {
+                        failures.add(fail(f, "Aggregate functions are not allowed in SORT [{}]", f.functionName()));
+                    }
+                });
+            });
+        }
+    }
+
     private static void checkFilterConditionType(LogicalPlan p, Set<Failure> localFailures) {
         if (p instanceof Filter f) {
             Expression condition = f.condition();