Skip to content

Changed DistanceFeatureQuery and RangeQuery from allOf + oneOf to oneOf + allOf #865

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Apr 11, 2025
Merged

Changed DistanceFeatureQuery and RangeQuery from allOf + oneOf to oneOf + allOf #865

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cb0ac81
Changed DistanceFeatureQuery and RangeQuery from allOf + oneOf to one…
lucy66hw Apr 10, 2025
39474cf
fix lint
lucy66hw Apr 10, 2025
f8edc1c
Merge branch 'main' into rangequery
lucy66hw Apr 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,7 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
- Changed `ml.get_memory` and `ml.get_message` to split out `get_all` variants ([#796](https://github.com/opensearch-project/opensearch-api-specification/pull/796))
- Changed `ml.get_tools` to have two different operation groups `ml.get_all_tools` and `ml.get_tool` ([#799](https://github.com/opensearch-project/opensearch-api-specification/pull/799))
- Changed `FlowFrameworkDeleteResponse` to utilize `WriteResponseBase` ([#814](https://github.com/opensearch-project/opensearch-api-specification/pull/814))
- Changed `DistanceFeatureQuery` and `RangeQuery` from (allOf + oneOf) to (oneOf + allOf) ([#865](https://github.com/opensearch-project/opensearch-api-specification/pull/865))
- Changed `ClusterJvm.versions`, `ClusterOperatingSystemName.name` and `ClusterOperatingSystemPrettyName.pretty_name` to not be required as AOS does not return them ([#866](https://github.com/opensearch-project/opensearch-api-specification/pull/866))

## [0.1.0] - 2024-10-25
Expand Down
16 changes: 10 additions & 6 deletions spec/schemas/_common.query_dsl.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -422,9 +422,9 @@ components:
required:
- queries
DistanceFeatureQuery:
allOf:
- $ref: '#/components/schemas/QueryBase'
- oneOf:
oneOf:
- allOf:
- $ref: '#/components/schemas/QueryBase'
- type: object
properties:
origin:
Expand All @@ -437,6 +437,8 @@ components:
- field
- origin
- pivot
- allOf:
- $ref: '#/components/schemas/QueryBase'
- type: object
properties:
origin:
Expand Down Expand Up @@ -1664,10 +1666,12 @@ components:
required:
- query
RangeQuery:
allOf:
- $ref: '#/components/schemas/RangeQueryBase'
- oneOf:
oneOf:
- allOf:
- $ref: '#/components/schemas/RangeQueryBase'
- $ref: '#/components/schemas/NumberRangeQueryParameters'
- allOf:
- $ref: '#/components/schemas/RangeQueryBase'
- $ref: '#/components/schemas/DateRangeQueryParameters'
DateRangeQueryParameters:
type: object
Expand Down