fixes

Signed-off-by: Kai Huang <[email protected]>

Author: ahkcs

core/src/main/java/org/opensearch/sql/calcite/CalcitePlanContext.java

@@ -48,6 +48,9 @@ public class CalcitePlanContext {
   @Getter @Setter private boolean isResolvingSubquery = false;
   @Getter @Setter private boolean inCoalesceFunction = false;
 
+  /** Tracks whether bin operations are being used in the query (for AVG rounding) */
+  @Getter @Setter private boolean hasBinOperations = false;
+
   /** Fields that are being grouped by in aggregation (for bin operations to preserve originals) */
   @Getter @Setter
   private java.util.Set<String> aggregationGroupByFields = new java.util.HashSet<>();

core/src/main/java/org/opensearch/sql/calcite/CalciteRelNodeVisitor.java

@@ -679,6 +679,9 @@ public RelNode visitReverse(
 
   @Override
   public RelNode visitBin(Bin node, CalcitePlanContext context) {
+    // Mark that this query uses bin operations (for AVG rounding in aggregations)
+    context.setHasBinOperations(true);
+
     visitChildren(node, context);
 
     RexNode fieldExpr = rexVisitor.analyze(node.getField(), context);
@@ -1264,9 +1267,17 @@ public RelNode visitAggregation(Aggregation node, CalcitePlanContext context) {
             numOfOutputFields - aggregationAttributes.getRight().size(),
             numOfOutputFields - aggregationAttributes.getRight().size() + numOfUserAggregations);
 
-    // Check if we have any bin columns (for AVG rounding)
+    // Check if we have any bin operations (for AVG rounding)
+    // First check the flag set by visitBin
+    boolean hasBinColumns = context.isHasBinOperations();
+
+    // Get all field names (needed later for schema reordering)
     List<String> allFieldNames = context.relBuilder.peek().getRowType().getFieldNames();
-    boolean hasBinColumns = allFieldNames.stream().anyMatch(name -> name.endsWith("_bin"));
+
+    // Also check if we have columns ending with _bin suffix (multi-field bin aggregations)
+    if (!hasBinColumns) {
+      hasBinColumns = allFieldNames.stream().anyMatch(name -> name.endsWith("_bin"));
+    }
 
     // Wrap AVG aggregations with ROUND to fix floating point precision (only when bins are present)
     for (int i = 0; i < userAggRexList.size(); i++) {