Adjust main version after backport to 1.x (#2147)

Signed-off-by: Peng Huo <[email protected]>
opensearch-project · Feb 17, 2022 · 9ea25c4 · 9ea25c4
1 parent 9689a27
commit 9ea25c4
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 4 deletions.
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/230_composite.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/search.aggregation/230_composite.yml
@@ -1030,3 +1030,35 @@ setup:
   - length: { aggregations.test.buckets: 1 }
   - match: { aggregations.test.buckets.0.key.keyword: "foo" }
   - match: { aggregations.test.buckets.0.doc_count: 1 }
+---
+"Simple Composite aggregation with missing order":
+  - skip:
+      version: " - 1.2.99"
+      reason:  missing_order is supported in 1.3.0.
+
+  - do:
+      search:
+        rest_total_hits_as_int: true
+        index: test
+        body:
+          aggregations:
+            test:
+              composite:
+                sources: [
+                    "kw": {
+                      "terms": {
+                        "field": "keyword",
+                        "missing_bucket": true,
+                        "missing_order": "last"
+                      }
+                    }
+                ]
+
+  - match: {hits.total: 6}
+  - length: { aggregations.test.buckets: 3 }
+  - match: { aggregations.test.buckets.0.key.kw: "bar" }
+  - match: { aggregations.test.buckets.0.doc_count: 3 }
+  - match: { aggregations.test.buckets.1.key.kw: "foo" }
+  - match: { aggregations.test.buckets.1.doc_count: 2 }
+  - match: { aggregations.test.buckets.2.key.kw: null }
+  - match: { aggregations.test.buckets.2.doc_count: 2 }
diff --git a/...ava/org/opensearch/search/aggregations/bucket/composite/CompositeValuesSourceBuilder.java b/...ava/org/opensearch/search/aggregations/bucket/composite/CompositeValuesSourceBuilder.java
@@ -81,7 +81,7 @@ public abstract class CompositeValuesSourceBuilder<AB extends CompositeValuesSou
             this.userValueTypeHint = ValueType.readFromStream(in);
         }
         this.missingBucket = in.readBoolean();
-        if (in.getVersion().onOrAfter(Version.V_2_0_0)) {
+        if (in.getVersion().onOrAfter(Version.V_1_3_0)) {
             this.missingOrder = MissingOrder.readFromStream(in);
         }
         this.order = SortOrder.readFromStream(in);
@@ -103,7 +103,7 @@ public final void writeTo(StreamOutput out) throws IOException {
             userValueTypeHint.writeTo(out);
         }
         out.writeBoolean(missingBucket);
-        if (out.getVersion().onOrAfter(Version.V_2_0_0)) {
+        if (out.getVersion().onOrAfter(Version.V_1_3_0)) {
             missingOrder.writeTo(out);
         }
         order.writeTo(out);

diff --git a/.../src/main/java/org/opensearch/search/aggregations/bucket/composite/InternalComposite.java b/.../src/main/java/org/opensearch/search/aggregations/bucket/composite/InternalComposite.java
@@ -104,7 +104,7 @@ public InternalComposite(StreamInput in) throws IOException {
             formats.add(in.readNamedWriteable(DocValueFormat.class));
         }
         this.reverseMuls = in.readIntArray();
-        if (in.getVersion().onOrAfter(Version.V_2_0_0)) {
+        if (in.getVersion().onOrAfter(Version.V_1_3_0)) {
             this.missingOrders = in.readArray(MissingOrder::readFromStream, MissingOrder[]::new);
         } else {
             this.missingOrders = new MissingOrder[reverseMuls.length];
@@ -123,7 +123,7 @@ protected void doWriteTo(StreamOutput out) throws IOException {
             out.writeNamedWriteable(format);
         }
         out.writeIntArray(reverseMuls);
-        if (out.getVersion().onOrAfter(Version.V_2_0_0)) {
+        if (out.getVersion().onOrAfter(Version.V_1_3_0)) {
             out.writeArray((output, order) -> order.writeTo(output), missingOrders);
         }
         out.writeList(buckets);