Fix unit tests

Signed-off-by: Yuanchun Shen <yuanchu@amazon.com>

Author: yuancu

integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalcitePPLCaseFunctionIT.java

@@ -8,6 +8,7 @@
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.opensearch.sql.legacy.TestsConstants.TEST_INDEX_BANK;
 import static org.opensearch.sql.legacy.TestsConstants.TEST_INDEX_WEBLOGS;
+import static org.opensearch.sql.util.MatcherUtils.closeTo;
 import static org.opensearch.sql.util.MatcherUtils.rows;
 import static org.opensearch.sql.util.MatcherUtils.schema;
 import static org.opensearch.sql.util.MatcherUtils.verifyDataRows;
@@ -304,9 +305,9 @@ public void testCaseCanBePushedDownAsRangeQuery() throws IOException {
     verifySchema(actual4, schema("avg(balance)", "double"), schema("age_range", "string"));
     verifyDataRows(
         actual4,
-        rows(32838.0, "u30"),
-        rows(30497.0, "null"),
-        rows(20881.333333333332, "30-40 or >=80"));
+        closeTo(32838.0, "u30"),
+        closeTo(30497.0, "null"),
+        closeTo(20881.333333333332, "30-40 or >=80"));
 
     // 1.5 Should not be pushed because the range is not closed-open
     JSONObject actual5 =

opensearch/src/main/java/org/opensearch/sql/opensearch/response/agg/LeafBucketAggregationParser.java

@@ -64,8 +64,9 @@ private Map<String, Object> parse(MultiBucketsAggregation.Bucket bucket, String
       if (bucket.getDocCount() == 0) {
         return null;
       }
-      result.put(name, bucket.getKey());
     }
+    // TODO: Should we add all bucket key to agg name? It does not always seem necessary.
+    result.put(name, bucket.getKey());
     countAggNameList.forEach(n -> result.put(n, bucket.getDocCount()));
     return result;
   }

opensearch/src/test/java/org/opensearch/sql/opensearch/request/AggregateAnalyzerTest.java

@@ -46,8 +46,9 @@
 import org.opensearch.sql.opensearch.data.type.OpenSearchDataType;
 import org.opensearch.sql.opensearch.data.type.OpenSearchDataType.MappingType;
 import org.opensearch.sql.opensearch.request.AggregateAnalyzer.ExpressionNotAnalyzableException;
-import org.opensearch.sql.opensearch.response.agg.CompositeAggregationParser;
+import org.opensearch.sql.opensearch.response.agg.BucketAggregationParser;
 import org.opensearch.sql.opensearch.response.agg.FilterParser;
+import org.opensearch.sql.opensearch.response.agg.LeafBucketAggregationParser;
 import org.opensearch.sql.opensearch.response.agg.MetricParserHelper;
 import org.opensearch.sql.opensearch.response.agg.NoBucketAggregationParser;
 import org.opensearch.sql.opensearch.response.agg.OpenSearchAggregationResponseParser;
@@ -280,9 +281,14 @@ void analyze_groupBy() throws ExpressionNotAnalyzableException {
             + "{\"a\":{\"terms\":{\"field\":\"a\",\"missing_bucket\":true,\"missing_order\":\"first\",\"order\":\"asc\"}}},"
             + "{\"b\":{\"terms\":{\"field\":\"b.keyword\",\"missing_bucket\":true,\"missing_order\":\"first\",\"order\":\"asc\"}}}]}}}]",
         result.getLeft().toString());
-    assertInstanceOf(CompositeAggregationParser.class, result.getRight());
+    assertInstanceOf(BucketAggregationParser.class, result.getRight());
+    assertInstanceOf(
+        LeafBucketAggregationParser.class,
+        ((BucketAggregationParser) result.getRight()).getSubAggParser());
     MetricParserHelper metricsParser =
-        ((CompositeAggregationParser) result.getRight()).getMetricsParser();
+        ((LeafBucketAggregationParser)
+                ((BucketAggregationParser) result.getRight()).getSubAggParser())
+            .getMetricsParser();
     assertEquals(1, metricsParser.getMetricParserMap().size());
     metricsParser
         .getMetricParserMap()