Update Changelog for execution_hint for cardinaltiy agg

* Reviving https://github.com/opensearch-project/OpenSearch/pull/15764/commits Signed-off-by: Asim Mahmood <[email protected]>
opensearch-project · Feb 10, 2025 · a9f838f · a9f838f
1 parent 746df72
commit a9f838f
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ## [Unreleased 2.x]
 ### Added
+- Add execution_hint to cardinality aggregator request (#[17301](https://github.com/opensearch-project/OpenSearch/pull/17301))
 - Latency and Memory allocation improvements to Multi Term Aggregation queries ([#14993](https://github.com/opensearch-project/OpenSearch/pull/14993))
 - Add support for restoring from snapshot with search replicas ([#16111](https://github.com/opensearch-project/OpenSearch/pull/16111))
 - Ensure support of the transport-nio by security plugin ([#16474](https://github.com/opensearch-project/OpenSearch/pull/16474))

diff --git a/...c/main/java/org/opensearch/search/aggregations/metrics/CardinalityAggregationBuilder.java b/...c/main/java/org/opensearch/search/aggregations/metrics/CardinalityAggregationBuilder.java
@@ -131,7 +131,9 @@ protected void innerWriteTo(StreamOutput out) throws IOException {
         if (hasPrecisionThreshold) {
             out.writeLong(precisionThreshold);
         }
-        out.writeOptionalString(executionHint);
+        if (out.getVersion().onOrAfter(Version.V_2_19_0)) {
+            out.writeOptionalString(executionHint);
+        }
     }
 
     @Override

diff --git a/server/src/main/java/org/opensearch/search/aggregations/metrics/CardinalityAggregator.java b/server/src/main/java/org/opensearch/search/aggregations/metrics/CardinalityAggregator.java
@@ -486,7 +486,7 @@ public void close() {
      *
      * @opensearch.internal
      */
-    public static class DirectCollector extends Collector {
+    static class DirectCollector extends Collector {
 
         private final MurmurHash3Values hashes;
         private final HyperLogLogPlusPlus counts;
@@ -523,7 +523,7 @@ public void close() {
      *
      * @opensearch.internal
      */
-    public static class OrdinalsCollector extends Collector {
+    static class OrdinalsCollector extends Collector {
 
         private static final long SHALLOW_FIXEDBITSET_SIZE = RamUsageEstimator.shallowSizeOfInstance(FixedBitSet.class);