FunctionScore Schema Update (#963)

* Change DecayFunction anyOf to oneOf

Signed-off-by: xil <[email protected]>

* Add NumberRangeQuery & DateRangeQuery missing field include_lower & include_upper

Signed-off-by: xil <[email protected]>

* Add missing unit to GeoDistanceQuery

Signed-off-by: xil <[email protected]>

* update seed

Signed-off-by: xil <[email protected]>

---------

Signed-off-by: xil <[email protected]>
Signed-off-by: lucy66hw <[email protected]>

Author: lucy66hw

CHANGELOG.md

@@ -330,6 +330,7 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 - Changed `indices.stats`'s `metric` path param to use an enum of metrics ([#586](https://github.com/opensearch-project/opensearch-api-specification/pull/586))
 - Changed `CleanupRepositoryResults`' properties to be `int64`s ([#587](https://github.com/opensearch-project/opensearch-api-specification/pull/587))
 - Changed `RangeQuery` to unified type with oneOf ([#958](https://github.com/opensearch-project/opensearch-api-specification/pull/958))
+- Changed `FunctionScore` related Schema ([#963](https://github.com/opensearch-project/opensearch-api-specification/pull/963))
 - Changed `sort` from `SortOptions` to `SortCombinations` ([#961](https://github.com/opensearch-project/opensearch-api-specification/pull/961))
 
 ### Deprecated

spec/schemas/_common.query_dsl.yaml

@@ -546,7 +546,7 @@ components:
         - min
         - sum
     DecayPlacement:
-      anyOf:
+      oneOf:
         - $ref: '#/components/schemas/DateDecayPlacement'
         - $ref: '#/components/schemas/GeoDecayPlacement'
         - $ref: '#/components/schemas/NumericDecayPlacement'
@@ -562,6 +562,8 @@ components:
           $ref: '_common.yaml#/components/schemas/DateTime'
         scale:
           $ref: '_common.yaml#/components/schemas/Duration'
+      required:
+        - scale
     GeoDecayPlacement:
       type: object
       properties:
@@ -574,6 +576,9 @@ components:
           $ref: '_common.yaml#/components/schemas/GeoLocation'
         scale:
           $ref: '_common.yaml#/components/schemas/Distance'
+      required:
+        - origin
+        - scale
     NumericDecayPlacement:
       type: object
       properties:
@@ -589,6 +594,9 @@ components:
         scale:
           type: number
           format: double
+      required:
+        - origin
+        - scale
     FieldValueFactorScoreFunction:
       type: object
       properties:
@@ -630,6 +638,8 @@ components:
           oneOf:
             - type: integer
               format: int32
+            - type: integer
+              format: int64
             - type: string
     ScriptScoreFunction:
       type: object
@@ -723,6 +733,9 @@ components:
               $ref: '#/components/schemas/GeoValidationMethod'
             ignore_unmapped:
               $ref: '#/components/schemas/IgnoreUnmapped'
+            unit:
+              description: The unit of distance measurement.
+              $ref: '_common.yaml#/components/schemas/DistanceUnit'
           propertyNames:
             title: field
             type: string
@@ -1698,6 +1711,12 @@ components:
               $ref: '_common.yaml#/components/schemas/DateFormat'
             time_zone:
               $ref: '_common.yaml#/components/schemas/TimeZone'
+            include_lower:
+              description: Include the lower bound
+              type: boolean
+            include_upper:
+              description: Include the upper bound
+              type: boolean
     NumberRangeQuery:
       allOf:
         - $ref: '#/components/schemas/RangeQueryBase'
@@ -1731,6 +1750,12 @@ components:
                   format: double
                 - type: string
                 - type: 'null'
+            include_lower:
+              description: Include the lower bound
+              type: boolean
+            include_upper:
+              description: Include the upper bound
+              type: boolean
     RangeQueryBase:
       allOf:
         - $ref: '#/components/schemas/QueryBase'