Skip to content

Commit c3e31cc

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 c504320 commit c3e31cc

2 files changed

Lines changed: 49 additions & 54 deletions

File tree

protos/generated/models/aggregated_models.proto

Lines changed: 23 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,15 @@ message ObjectMap {
1111

1212
message Value {
1313
oneof value {
14-
int32 int32 = 1;
15-
int64 int64 = 2;
16-
float float = 3;
17-
double double = 4;
18-
string string = 5;
19-
bool bool = 6;
20-
ObjectMap object_map = 7;
21-
ListValue list_value = 8;
14+
NullValue null_value = 1;
15+
int32 int32 = 2;
16+
int64 int64 = 3;
17+
float float = 4;
18+
double double = 5;
19+
string string = 6;
20+
bool bool = 7;
21+
ObjectMap object_map = 8;
22+
ListValue list_value = 9;
2223
}
2324
}
2425

@@ -775,7 +776,7 @@ message BulkRequestBody {
775776
message BulkResponse {
776777
bool errors = 1;
777778

778-
repeated Items items = 2;
779+
repeated Item items = 2;
779780

780781
int64 took = 3;
781782

@@ -1074,7 +1075,7 @@ message CompositeAggregation {
10741075
optional int32 size = 6;
10751076

10761077
// The value sources used to build composite buckets. Keys are returned in the order of the `sources` definition.
1077-
repeated CompositeAggregationSourceMap sources = 7;
1078+
map<string, CompositeAggregationSource> sources = 7;
10781079
}
10791080
message CompositeAggregationSource {
10801081
optional CompositeTermsAggregationSource terms = 1;
@@ -1085,9 +1086,6 @@ message CompositeAggregationSource {
10851086

10861087
optional CompositeGeoTileGridAggregationSource geotile_grid = 4;
10871088
}
1088-
message CompositeAggregationSourceMap {
1089-
map<string, CompositeAggregationSource> composite_aggregation_source_map = 1;
1090-
}
10911089
message CompositeBucket {
10921090
int64 doc_count = 1;
10931091

@@ -2199,9 +2197,6 @@ message FiltersAggregation {
21992197
message FiltersBucket {
22002198
int64 doc_count = 1;
22012199
}
2202-
message FloatMap {
2203-
map<string, float> float_map = 1;
2204-
}
22052200
message FormatMetricAggregationBase {
22062201
// The custom metadata attached to a resource.
22072202
optional ObjectMap meta = 1;
@@ -3502,7 +3497,7 @@ message IpRangeBucket {
35023497

35033498
optional string to = 4;
35043499
}
3505-
message Items {
3500+
message Item {
35063501
optional ResponseItem index = 1;
35073502

35083503
optional ResponseItem create = 2;
@@ -5706,7 +5701,7 @@ message SearchRequestBody {
57065701
optional TrackHits track_total_hits = 8;
57075702

57085703
// Boosts the `_score` of documents from specified indexes.
5709-
repeated FloatMap indices_boost = 9;
5704+
map<string, float> indices_boost = 9;
57105705

57115706
// Array of wildcard (`*`) patterns. The request returns doc values for field names matching these patterns in the `hits.fields` property of the response.
57125707
repeated FieldAndFormat docvalue_fields = 10;
@@ -5878,7 +5873,7 @@ message ShardFailure {
58785873

58795874
optional string status = 5;
58805875

5881-
optional bool primary = 6;
5876+
bool primary = 6;
58825877
}
58835878
message ShardInfo {
58845879
int32 failed = 1;
@@ -6265,7 +6260,7 @@ message SortCombinations {
62656260
// The path to a field or an array of paths. Some APIs support wildcards in the path, which allows you to select multiple fields.
62666261
string field = 1;
62676262

6268-
StringMap field_with_direction = 2;
6263+
SortOrderMap field_with_direction = 2;
62696264

62706265
FieldSortMap field_with_order = 3;
62716266

@@ -6292,6 +6287,9 @@ enum SortOrder {
62926287
SORT_ORDER_ASC = 1;
62936288
SORT_ORDER_DESC = 2;
62946289
}
6290+
message SortOrderMap {
6291+
map<string, SortOrder> sort_order_map = 1;
6292+
}
62956293
message SourceConfig {
62966294
oneof source_config {
62976295
bool fetch = 1;
@@ -7011,7 +7009,7 @@ message TermsAggregation {
70117009
// Coerced unmapped fields into the specified type.
70127010
optional string value_type = 14;
70137011

7014-
repeated StringMap order = 15;
7012+
map<string, SortOrder> order = 15;
70157013

70167014
optional Script script = 16;
70177015

@@ -7252,18 +7250,15 @@ message UpdateAction {
72527250
// When `true`, uses the contents of `doc` as the value of `upsert`.
72537251
optional bool doc_as_upsert = 3;
72547252

7255-
// The sequence number of the document.
7256-
optional int64 if_seq_no = 4;
7257-
7258-
optional Script script = 5;
7253+
optional Script script = 4;
72597254

72607255
// When `true`, executes the script whether or not the document exists.
7261-
optional bool scripted_upsert = 6;
7256+
optional bool scripted_upsert = 5;
72627257

72637258
// If the document does not already exist, the contents of `upsert` are inserted as a new document. If the document exists, the `script` is executed.
7264-
optional bytes upsert = 7;
7259+
optional bytes upsert = 6;
72657260

7266-
optional SourceConfig x_source = 8;
7261+
optional SourceConfig x_source = 7;
72677262
}
72687263
message UpdateOperation {
72697264
// The routing value for the document.

protos/generated/services/default_service.proto

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -9,19 +9,19 @@ package org.opensearch.protobufs.services;
99
import "models/aggregated_models.proto";
1010

1111
message BulkRequest {
12-
// Name of the data stream, index, or index alias to perform bulk actions on.
13-
string index = 1;
14-
15-
repeated BulkRequestBody bulk_request_body = 2;
12+
repeated BulkRequestBody bulk_request_body = 1;
1613

1714
// `true` or `false` to return the `_source` field or not, or a list of fields to return.
18-
optional SourceConfigParam x_source = 3;
15+
optional SourceConfigParam x_source = 2;
1916

2017
// A comma-separated list of source fields to exclude from the response.
21-
repeated string x_source_excludes = 4;
18+
repeated string x_source_excludes = 3;
2219

2320
// A comma-separated list of source fields to include in the response.
24-
repeated string x_source_includes = 5;
21+
repeated string x_source_includes = 4;
22+
23+
// Name of the data stream, index, or index alias to perform bulk actions on.
24+
optional string index = 5;
2525

2626
// ID of the pipeline to use to preprocess incoming documents. If the index has a default ingest pipeline specified, then setting the value to `_none` disables the default ingest pipeline for this request. If a final pipeline is configured it will always run, regardless of the value of this parameter.
2727
optional string pipeline = 6;
@@ -49,53 +49,53 @@ message BulkRequest {
4949
}
5050

5151
message SearchRequest {
52-
// A comma-separated list of data streams, indexes, and aliases to search. Supports wildcards (`*`). To search all data streams and indexes, omit this parameter or use `*` or `_all`.
53-
repeated string index = 1;
54-
5552
// Indicates which source fields are returned for matching documents. These fields are returned in the `hits._source` property of the search response. Valid values are: `true` to return the entire document source; `false` to not return the document source; `<string>` to return the source fields that are specified as a comma-separated list (supports wildcard (`*`) patterns).
56-
optional SourceConfigParam x_source = 2;
53+
optional SourceConfigParam x_source = 1;
5754

5855
// A comma-separated list of source fields to exclude from the response. You can also use this parameter to exclude fields from the subset specified in `_source_includes` query parameter. If the `_source` parameter is `false`, this parameter is ignored.
59-
repeated string x_source_excludes = 3;
56+
repeated string x_source_excludes = 2;
6057

6158
// A comma-separated list of source fields to include in the response. If this parameter is specified, only these source fields are returned. You can exclude fields from this subset using the `_source_excludes` query parameter. If the `_source` parameter is `false`, this parameter is ignored.
62-
repeated string x_source_includes = 4;
59+
repeated string x_source_includes = 3;
6360

6461
// If `false`, the request returns an error if any wildcard expression, index alias, or `_all` value targets only missing or closed indexes. This behavior applies even if the request targets other open indexes. For example, a request targeting `foo*,bar*` returns an error if an index starts with `foo` but no index starts with `bar`.
65-
optional bool allow_no_indices = 5;
62+
optional bool allow_no_indices = 4;
6663

6764
// If `true`, returns partial results if there are shard request timeouts or shard failures. If `false`, returns an error with no partial results.
68-
optional bool allow_partial_search_results = 6;
65+
optional bool allow_partial_search_results = 5;
6966

7067
// If `true`, wildcard and prefix queries are analyzed. This parameter can only be used when the q query string parameter is specified.
71-
optional bool analyze_wildcard = 7;
68+
optional bool analyze_wildcard = 6;
7269

7370
// 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.
74-
optional int32 batched_reduce_size = 8;
71+
optional int32 batched_reduce_size = 7;
7572

7673
// The time after which the search request will be canceled. Request-level parameter takes precedence over `cancel_after_time_interval` cluster setting.
77-
optional string cancel_after_time_interval = 9;
74+
optional string cancel_after_time_interval = 8;
7875

7976
// If `true`, network round-trips between the coordinating node and the remote clusters are minimized when executing cross-cluster search (CCS) requests.
80-
optional bool ccs_minimize_roundtrips = 10;
77+
optional bool ccs_minimize_roundtrips = 9;
8178

8279
// The default operator for query string query: AND or OR. This parameter can only be used when the `q` query string parameter is specified.
83-
optional Operator default_operator = 11;
80+
optional Operator default_operator = 10;
8481

8582
// 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.
86-
optional string df = 12;
83+
optional string df = 11;
8784

8885
// A comma-separated list of fields to return as the docvalue representation for each hit.
89-
repeated string docvalue_fields = 13;
86+
repeated string docvalue_fields = 12;
9087

9188
// 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`.
92-
repeated ExpandWildcard expand_wildcards = 14;
89+
repeated ExpandWildcard expand_wildcards = 13;
9390

9491
// If `true`, concrete, expanded or aliased indexes will be ignored when frozen.
95-
optional bool ignore_throttled = 15;
92+
optional bool ignore_throttled = 14;
9693

9794
// If `false`, the request returns an error if it targets a missing or closed index.
98-
optional bool ignore_unavailable = 16;
95+
optional bool ignore_unavailable = 15;
96+
97+
// A comma-separated list of data streams, indexes, and aliases to search. Supports wildcards (`*`). To search all data streams and indexes, omit this parameter or use `*` or `_all`.
98+
repeated string index = 16;
9999

100100
// 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.
101101
optional int32 max_concurrent_shard_requests = 17;
@@ -116,7 +116,7 @@ message SearchRequest {
116116
optional bool request_cache = 22;
117117

118118
// Indicates whether `hits.total` should be rendered as an integer or an object in the rest search response.
119-
optional bool rest_total_hits_as_int = 23;
119+
optional bool total_hits_as_int = 23;
120120

121121
// A custom value used to route operations to a specific shard.
122122
repeated string routing = 24;

0 commit comments

Comments
 (0)