questdb
diff --git a/‎core/src/main/java/io/questdb/griffin/SqlOptimiser.java‎
Lines changed: 25 additions & 9 deletions b/‎core/src/main/java/io/questdb/griffin/SqlOptimiser.java‎
Lines changed: 25 additions & 9 deletions
@@ -1217,19 +1217,35 @@ private boolean canPushToSampleBy(final QueryModel model, ObjList<CharSequence>
     private boolean checkForChildAggregates(ExpressionNode node) {
         sqlNodeStack.clear();
         while (node != null) {
-            if (node.rhs != null) {
-                if (node.rhs.type == FUNCTION && functionParser.getFunctionFactoryCache().isGroupBy(node.rhs.token)) {
-                    return true;
+            if (node.paramCount < 3) {
+                if (node.rhs != null) {
+                    if (node.rhs.type == FUNCTION && functionParser.getFunctionFactoryCache().isGroupBy(node.rhs.token)) {
+                        return true;
+                    }
+                    sqlNodeStack.push(node.rhs);
                 }
-                sqlNodeStack.push(node.rhs);
-            }
 
-            if (node.lhs != null) {
-                if (node.lhs.type == FUNCTION && functionParser.getFunctionFactoryCache().isGroupBy(node.lhs.token)) {
-                    return true;
+                if (node.lhs != null) {
+                    if (node.lhs.type == FUNCTION && functionParser.getFunctionFactoryCache().isGroupBy(node.lhs.token)) {
+                        return true;
+                    }
+                    node = node.lhs;
+                } else if (!sqlNodeStack.isEmpty()) {
+                    node = sqlNodeStack.poll();
+                } else {
+                    node = null;
                 }
-                node = node.lhs;
             } else {
+                // for nodes with paramCount >= 3, arguments are stored in args list (e.g., CASE expressions)
+                for (int i = 0, k = node.paramCount; i < k; i++) {
+                    ExpressionNode arg = node.args.getQuick(i);
+                    if (arg != null) {
+                        if (arg.type == FUNCTION && functionParser.getFunctionFactoryCache().isGroupBy(arg.token)) {
+                            return true;
+                        }
+                        sqlNodeStack.push(arg);
+                    }
+                }
                 if (!sqlNodeStack.isEmpty()) {
                     node = sqlNodeStack.poll();
                 } else {