Return null for aggregations factory even if empty aggs is present in…

… search source (#8206) (#8222) * Return null for aggregations factory even if empty aggs is present in search source * Update rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/60_empty.yml --------- (cherry picked from commit 049129c) Signed-off-by: Jay Deng <[email protected]> Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: Andriy Redko <[email protected]>
opensearch-project · Jun 22, 2023 · e3d8f7d · e3d8f7d
1 parent de9e8dd
commit e3d8f7d
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 1 deletion.
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/60_empty.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/60_empty.yml
@@ -0,0 +1,29 @@
+---
+"Empty aggs Body":
+  - do:
+      index:
+        index: test
+        id: 1
+        body: { "double" : 42 }
+
+  - do:
+      index:
+        index: test
+        id: 2
+        body: { "double" : 100 }
+
+  - do:
+      index:
+        index: test
+        id: 3
+        body: { "double" : 50 }
+
+  - do:
+      indices.refresh: {}
+
+  - do:
+      search:
+        rest_total_hits_as_int: true
+        body: { "size" : 0, "aggs" : { } }
+
+  - match: { hits.total: 3 }
diff --git a/server/src/main/java/org/opensearch/search/aggregations/AggregatorFactories.java b/server/src/main/java/org/opensearch/search/aggregations/AggregatorFactories.java
@@ -235,7 +235,7 @@ private static AggregatorFactories.Builder parseAggregators(XContentParser parse
             }
         }
 
-        return factories;
+        return factories.count() > 0 ? factories : null;
     }
 
     public static final AggregatorFactories EMPTY = new AggregatorFactories(new AggregatorFactory[0]);
-Original file line number
+Diff line change
@@ Expand Up @@
                 }
             }
-            return factories;
+            return factories.count() > 0 ? factories : null;
         }
         public static final AggregatorFactories EMPTY = new AggregatorFactories(new AggregatorFactory[0]);
@@ Expand Down @@