Skip to content

Commit 93271ff

Browse files
lucy66hwgithub-actions[bot]
authored andcommitted
Protobuf schema change detected
Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
1 parent a240c4d commit 93271ff

2 files changed

Lines changed: 64 additions & 144 deletions

File tree

protos/generated/models/aggregated_models.proto

Lines changed: 33 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -1324,7 +1324,7 @@ message DateDecayPlacement {
13241324
optional string origin = 3;
13251325

13261326
// A duration. Units can be `nanos`, `micros`, `ms` (milliseconds), `s` (seconds), `m` (minutes), `h` (hours) and `d` (days). Also accepts `0` without a unit and `-1` to indicate an unspecified value.
1327-
optional string scale = 4;
1327+
string scale = 4;
13281328
}
13291329
message DateHistogramAggregate {
13301330
// The custom metadata attached to a resource.
@@ -1459,7 +1459,13 @@ message DateRangeQuery {
14591459
// The time zone identifier.
14601460
optional string time_zone = 11;
14611461

1462-
string field = 12;
1462+
// Include the lower bound
1463+
optional bool include_lower = 12;
1464+
1465+
// Include the upper bound
1466+
optional bool include_upper = 13;
1467+
1468+
string field = 14;
14631469
}
14641470
message DateRangeQueryAllOfFrom {
14651471
oneof date_range_query_all_of_from {
@@ -1497,11 +1503,13 @@ message DecayFunctionBase {
14971503
optional MultiValueMode multi_value_mode = 1;
14981504
}
14991505
message DecayPlacement {
1500-
optional DateDecayPlacement date_decay_placement = 1;
1506+
oneof decay_placement {
1507+
DateDecayPlacement date_decay_placement = 1;
15011508

1502-
optional GeoDecayPlacement geo_decay_placement = 2;
1509+
GeoDecayPlacement geo_decay_placement = 2;
15031510

1504-
optional NumericDecayPlacement numeric_decay_placement = 3;
1511+
NumericDecayPlacement numeric_decay_placement = 3;
1512+
}
15051513
}
15061514
message DeleteOperation {
15071515
// The routing value for the document.
@@ -2489,9 +2497,9 @@ message GeoDecayPlacement {
24892497

24902498
optional string offset = 2;
24912499

2492-
optional GeoLocation origin = 3;
2500+
GeoLocation origin = 3;
24932501

2494-
optional string scale = 4;
2502+
string scale = 4;
24952503
}
24962504
message GeoDistanceAggregate {
24972505
// The custom metadata attached to a resource.
@@ -2538,7 +2546,10 @@ message GeoDistanceQuery {
25382546
// Set to `true` to ignore an unmapped field and not match any documents for this query. Set to `false` to throw an exception if the field is not mapped.
25392547
optional bool ignore_unmapped = 6;
25402548

2541-
map<string, GeoLocation> location = 7;
2549+
// The unit of distance measurement.
2550+
optional DistanceUnit unit = 7;
2551+
2552+
map<string, GeoLocation> location = 8;
25422553
}
25432554
message GeoDistanceSort {
25442555
// The mode for sorting on array or multi-valued fields.
@@ -4787,7 +4798,13 @@ message NumberRangeQuery {
47874798

47884799
optional NumberRangeQueryAllOfTo to = 9;
47894800

4790-
string field = 10;
4801+
// Include the lower bound
4802+
optional bool include_lower = 10;
4803+
4804+
// Include the upper bound
4805+
optional bool include_upper = 11;
4806+
4807+
string field = 12;
47914808
}
47924809
message NumberRangeQueryAllOfFrom {
47934810
oneof number_range_query_all_of_from {
@@ -4812,9 +4829,9 @@ message NumericDecayPlacement {
48124829

48134830
optional double offset = 2;
48144831

4815-
optional double origin = 3;
4832+
double origin = 3;
48164833

4817-
optional double scale = 4;
4834+
double scale = 4;
48184835
}
48194836
enum OpType {
48204837
OP_TYPE_UNSPECIFIED = 0;
@@ -5475,7 +5492,9 @@ message RandomScoreFunctionSeed {
54755492
oneof random_score_function_seed {
54765493
int32 int32 = 1;
54775494

5478-
string string = 2;
5495+
int64 int64 = 2;
5496+
5497+
string string = 3;
54795498
}
54805499
}
54815500
message RangeAggregate {
@@ -5990,7 +6009,7 @@ message SearchResponse {
59906009

59916010
optional PhaseTook phase_took = 3;
59926011

5993-
SearchResultHits hits = 4;
6012+
HitsMetadata hits = 4;
59946013

59956014
repeated ProcessorExecutionDetail processor_results = 5;
59966015

@@ -6022,7 +6041,7 @@ message SearchResult {
60226041

60236042
optional PhaseTook phase_took = 3;
60246043

6025-
SearchResultHits hits = 4;
6044+
HitsMetadata hits = 4;
60266045

60276046
repeated ProcessorExecutionDetail processor_results = 5;
60286047

@@ -6047,57 +6066,6 @@ message SearchResult {
60476066

60486067
optional string x_scroll_id = 15;
60496068
}
6050-
message SearchResultHits {
6051-
optional HitsMetadataTotal total = 1;
6052-
6053-
repeated SearchResultHitsAllOfHitsInner hits = 2;
6054-
6055-
optional HitsMetadataMaxScore max_score = 3;
6056-
}
6057-
message SearchResultHitsAllOfHitsInner {
6058-
optional ObjectMap fields = 1;
6059-
6060-
map<string, StringArray> highlight = 2;
6061-
6062-
map<string, InnerHitsResult> inner_hits = 3;
6063-
6064-
repeated string matched_queries = 4;
6065-
6066-
map<string, StringArray> ignored_field_values = 5;
6067-
6068-
repeated FieldValue sort = 6;
6069-
6070-
// The type of document or resource.
6071-
optional string x_type = 7;
6072-
6073-
optional string x_index = 8;
6074-
6075-
// The unique identifier for a resource.
6076-
optional string x_id = 9;
6077-
6078-
optional HitXScore x_score = 10;
6079-
6080-
optional Explanation x_explanation = 11;
6081-
6082-
optional NestedIdentity x_nested = 12;
6083-
6084-
repeated string x_ignored = 13;
6085-
6086-
optional string x_shard = 14;
6087-
6088-
optional string x_node = 15;
6089-
6090-
optional string x_routing = 16;
6091-
6092-
optional ObjectMap x_source = 17;
6093-
6094-
// The sequence number of the document.
6095-
optional int64 x_seq_no = 18;
6096-
6097-
optional int64 x_primary_term = 19;
6098-
6099-
optional int64 x_version = 20;
6100-
}
61016069
enum SearchType {
61026070
SEARCH_TYPE_UNSPECIFIED = 0;
61036071
SEARCH_TYPE_DFS_QUERY_THEN_FETCH = 1;

protos/generated/services/default_service.proto

Lines changed: 31 additions & 79 deletions
Original file line numberDiff line numberDiff line change
@@ -87,145 +87,97 @@ message SearchRequest {
8787
// If `true`, wildcard and prefix queries are analyzed. This parameter can only be used when the q query string parameter is specified.
8888
optional bool analyze_wildcard = 7;
8989

90-
// Analyzer to use for the query string. This parameter can only be used when the q query string parameter is specified.
91-
optional string analyzer = 8;
92-
9390
// The number of shard results that should be reduced at once on the coordinating node. This value should be used as a protection mechanism to reduce the memory overhead per search request if the potential number of shards in the request can be large.
94-
optional int32 batched_reduce_size = 9;
91+
optional int32 batched_reduce_size = 8;
9592

9693
// The time after which the search request will be canceled. Request-level parameter takes precedence over `cancel_after_time_interval` cluster setting.
97-
optional string cancel_after_time_interval = 10;
94+
optional string cancel_after_time_interval = 9;
9895

9996
// If `true`, network round-trips between the coordinating node and the remote clusters are minimized when executing cross-cluster search (CCS) requests.
100-
optional bool ccs_minimize_roundtrips = 11;
97+
optional bool ccs_minimize_roundtrips = 10;
10198

10299
// The default operator for query string query: AND or OR. This parameter can only be used when the `q` query string parameter is specified.
103-
optional Operator default_operator = 12;
100+
optional Operator default_operator = 11;
104101

105102
// Field to use as default where no field prefix is given in the query string. This parameter can only be used when the q query string parameter is specified.
106-
optional string df = 13;
103+
optional string df = 12;
107104

108105
// A comma-separated list of fields to return as the docvalue representation for each hit.
109-
repeated string docvalue_fields = 14;
106+
repeated string docvalue_fields = 13;
110107

111108
// Type of index that wildcard patterns can match. If the request can target data streams, this argument determines whether wildcard expressions match hidden data streams. Supports comma-separated values, such as `open,hidden`.
112-
repeated ExpandWildcard expand_wildcards = 15;
113-
114-
// If `true`, returns detailed information about score computation as part of a hit.
115-
optional bool explain = 16;
116-
117-
// Starting document offset. Needs to be non-negative. By default, you cannot page through more than 10,000 hits using the `from` and `size` parameters. To page through more hits, use the `search_after` parameter.
118-
optional int32 from = 17;
109+
repeated ExpandWildcard expand_wildcards = 14;
119110

120111
// If `true`, concrete, expanded or aliased indexes will be ignored when frozen.
121-
optional bool ignore_throttled = 18;
112+
optional bool ignore_throttled = 15;
122113

123114
// If `false`, the request returns an error if it targets a missing or closed index.
124-
optional bool ignore_unavailable = 19;
125-
126-
// Indicates whether `hit.matched_queries` should be rendered as a map that includes the name of the matched query associated with its score (true) or as an array containing the name of the matched queries (false)
127-
optional bool include_named_queries_score = 20;
128-
129-
// If `true`, format-based query failures (such as providing text to a numeric field) in the query string will be ignored. This parameter can only be used when the `q` query string parameter is specified.
130-
optional bool lenient = 21;
115+
optional bool ignore_unavailable = 16;
131116

132117
// Defines the number of concurrent shard requests per node this search executes concurrently. This value should be used to limit the impact of the search on the cluster in order to limit the number of concurrent shard requests.
133-
optional int32 max_concurrent_shard_requests = 22;
118+
optional int32 max_concurrent_shard_requests = 17;
134119

135120
// Indicates whether to return phase-level `took` time values in the response.
136-
optional bool phase_took = 23;
121+
optional bool phase_took = 18;
137122

138123
// Defines a threshold that enforces a pre-filter roundtrip to prefilter search shards based on query rewriting if the number of shards the search request expands to exceeds the threshold. This filter roundtrip can limit the number of shards significantly if for instance a shard can not match any documents based on its rewrite method (if date filters are mandatory to match but the shard bounds and the query are disjoint). When unspecified, the pre-filter phase is executed if any of these conditions is met: the request targets more than 128 shards; the request targets one or more read-only index; the primary sort of the query targets an indexed field.
139-
optional int32 pre_filter_shard_size = 24;
124+
optional int32 pre_filter_shard_size = 19;
140125

141126
// Nodes and shards used for the search. By default, OpenSearch selects from eligible nodes and shards using adaptive replica selection, accounting for allocation awareness. Valid values are: `_only_local` to run the search only on shards on the local node; `_local` to, if possible, run the search on shards on the local node, or if not, select shards using the default method; `_only_nodes:<node-id>,<node-id>` to run the search on only the specified nodes IDs, where, if suitable shards exist on more than one selected node, use shards on those nodes using the default method, or if none of the specified nodes are available, select shards from any available node using the default method; `_prefer_nodes:<node-id>,<node-id>` to if possible, run the search on the specified nodes IDs, or if not, select shards using the default method; `_shards:<shard>,<shard>` to run the search only on the specified shards; `<custom-string>` (any string that does not start with `_`) to route searches with the same `<custom-string>` to the same shards in the same order.
142-
optional string preference = 25;
127+
optional string preference = 20;
143128

144129
// Query in the Lucene query string syntax using query parameter search. Query parameter searches do not support the full OpenSearch Query DSL but are handy for testing.
145-
optional string q = 26;
130+
optional string q = 21;
146131

147132
// If `true`, the caching of search results is enabled for requests where `size` is `0`. Defaults to index level settings.
148-
optional bool request_cache = 27;
133+
optional bool request_cache = 22;
149134

150135
// Indicates whether `hits.total` should be rendered as an integer or an object in the rest search response.
151-
optional bool rest_total_hits_as_int = 28;
136+
optional bool rest_total_hits_as_int = 23;
152137

153138
// A custom value used to route operations to a specific shard.
154-
repeated string routing = 29;
139+
repeated string routing = 24;
155140

156141
// Period to retain the search context for scrolling. See Scroll search results. By default, this value cannot exceed `1d` (24 hours). You can change this limit using the `search.max_keep_alive` cluster-level setting.
157-
optional string scroll = 30;
142+
optional string scroll = 25;
158143

159144
// Customizable sequence of processing stages applied to search queries.
160-
optional string search_pipeline = 31;
145+
optional string search_pipeline = 26;
161146

162147
// How distributed term frequencies are calculated for relevance scoring.
163-
optional SearchType search_type = 32;
164-
165-
// If `true`, returns sequence number and primary term of the last modification of each hit.
166-
optional bool seq_no_primary_term = 33;
167-
168-
// Defines the number of hits to return. By default, you cannot page through more than 10,000 hits using the `from` and `size` parameters. To page through more hits, use the `search_after` parameter.
169-
optional int32 size = 34;
170-
171-
// A comma-separated list of <field>:<direction> pairs.
172-
repeated string sort = 35;
173-
174-
// Specific `tag` of the request for logging and statistical purposes.
175-
repeated string stats = 36;
176-
177-
// A comma-separated list of stored fields to return as part of a hit. If no fields are specified, no stored fields are included in the response. If this field is specified, the `_source` parameter defaults to `false`. You can pass `_source: true` to return both source fields and stored fields in the search response.
178-
repeated string stored_fields = 37;
148+
optional SearchType search_type = 27;
179149

180150
// Specifies which field to use for suggestions.
181-
optional string suggest_field = 38;
151+
optional string suggest_field = 28;
182152

183153
// Specifies the suggest mode. This parameter can only be used when the `suggest_field` and `suggest_text` query string parameters are specified.
184-
optional SuggestMode suggest_mode = 39;
154+
optional SuggestMode suggest_mode = 29;
185155

186156
// Number of suggestions to return. This parameter can only be used when the `suggest_field` and `suggest_text` query string parameters are specified.
187-
optional int32 suggest_size = 40;
157+
optional int32 suggest_size = 30;
188158

189159
// The source text for which the suggestions should be returned. This parameter can only be used when the `suggest_field` and `suggest_text` query string parameters are specified.
190-
optional string suggest_text = 41;
191-
192-
// Maximum number of documents to collect for each shard. If a query reaches this limit, OpenSearch terminates the query early. OpenSearch collects documents before sorting. Use with caution. OpenSearch applies this parameter to each shard handling the request. When possible, let OpenSearch perform early termination automatically. Avoid specifying this parameter for requests that target data streams with backing indexes across multiple data tiers. If set to `0` (default), the query does not terminate early.
193-
optional int32 terminate_after = 42;
194-
195-
// Specifies the period of time to wait for a response from each shard. If no response is received before the timeout expires, the request fails and returns an error.
196-
optional string timeout = 43;
197-
198-
// If `true`, calculate and return document scores, even if the scores are not used for sorting.
199-
optional bool track_scores = 44;
200-
201-
// Number of hits matching the query to count accurately. If `true`, the exact number of hits is returned at the cost of some performance. If `false`, the response does not include the total number of hits matching the query.
202-
optional TrackHits track_total_hits = 45;
160+
optional string suggest_text = 31;
203161

204162
// If `true`, aggregation and suggester names are be prefixed by their respective types in the response.
205-
optional bool typed_keys = 46;
206-
207-
// Enables or disables verbose mode for the search pipeline. When verbose mode is enabled, detailed information about each processor in the search pipeline is included in the search response. This includes the processor name, execution status, input, output, and time taken for processing. This parameter is primarily intended for debugging purposes, allowing users to track how data flows and transforms through the search pipeline.
208-
optional bool verbose_pipeline = 47;
209-
210-
// If `true`, returns document version as part of a hit.
211-
optional bool version = 48;
163+
optional bool typed_keys = 32;
212164

213165
// Whether to pretty-format the returned JSON response.
214-
optional bool pretty = 49;
166+
optional bool pretty = 33;
215167

216168
// Whether to return human-readable values for statistics.
217-
optional bool human = 50;
169+
optional bool human = 34;
218170

219171
// Whether to include the stack trace of returned errors.
220-
optional bool error_trace = 51;
172+
optional bool error_trace = 35;
221173

222174
// The URL-encoded request definition. Useful for libraries that do not accept a request body for non-POST requests.
223-
optional string source = 52;
175+
optional string source = 36;
224176

225177
// A comma-separated list of filters used to filter the response. Use wildcards to match any field or part of a field's name. To exclude fields, use `-`.
226-
repeated string filter_path = 53;
178+
repeated string filter_path = 37;
227179

228-
optional SearchRequest search_request = 54;
180+
optional SearchRequest search_request = 38;
229181
}
230182

231183
message SearchResponse {

0 commit comments

Comments
 (0)