Skip to content

Commit 7b334ef

Browse files
authored
Revert "[7.17] Allow single fields in fields and _source parameters (#2332)" (#2340)
This reverts commit dc674ea.
1 parent dc674ea commit 7b334ef

File tree

5 files changed

+38
-99
lines changed

5 files changed

+38
-99
lines changed

output/schema/schema.json

Lines changed: 27 additions & 84 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

output/typescript/types.ts

Lines changed: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

specification/_global/msearch/types.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ import { Dictionary } from '@spec_utils/Dictionary'
2323
import { AggregationContainer } from '@_types/aggregations/AggregationContainer'
2424
import {
2525
ExpandWildcards,
26-
Field,
2726
Fields,
2827
IndexName,
2928
Indices,
@@ -96,7 +95,7 @@ export class MultisearchBody {
9695
* Array of wildcard (*) patterns. The request returns doc values for field
9796
* names matching these patterns in the hits.fields property of the response.
9897
*/
99-
docvalue_fields?: Array<Field | FieldAndFormat>
98+
docvalue_fields?: FieldAndFormat[]
10099
/**
101100
* Starting document offset. By default, you cannot page through more than 10,000
102101
* hits using the from and size parameters. To page through more hits, use the
@@ -140,7 +139,7 @@ export class MultisearchBody {
140139
* Array of wildcard (*) patterns. The request returns values for field names
141140
* matching these patterns in the hits.fields property of the response.
142141
*/
143-
fields?: Array<Field | FieldAndFormat>
142+
fields?: Array<FieldAndFormat>
144143
/**
145144
* Maximum number of documents to collect for each shard. If a query reaches this
146145
* limit, Elasticsearch terminates the query early. Elasticsearch collects documents

specification/_global/search/SearchRequest.ts

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ export interface Request extends RequestBase {
146146
* Array of wildcard (*) patterns. The request returns doc values for field
147147
* names matching these patterns in the hits.fields property of the response.
148148
*/
149-
docvalue_fields?: Array<Field | FieldAndFormat>
149+
docvalue_fields?: FieldAndFormat[]
150150
/**
151151
* Minimum _score for matching documents. Documents with a lower _score are
152152
* not included in the search results.
@@ -183,10 +183,7 @@ export interface Request extends RequestBase {
183183
* Array of wildcard (*) patterns. The request returns values for field names
184184
* matching these patterns in the hits.fields property of the response.
185185
*/
186-
fields?: Array<FieldAndFormat | Field>
187-
/**
188-
* Defines a suggester that provides similar looking terms based on a provided text.
189-
*/
186+
fields?: Array<FieldAndFormat>
190187
suggest?: Suggester
191188
/**
192189
* Maximum number of documents to collect for each shard. If a query reaches this

specification/_global/search/_types/SourceFilter.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@ export class SourceFilter {
3232

3333
/**
3434
* Defines how to fetch a source. Fetching can be disabled entirely, or the source can be filtered.
35-
* @codegen_names fetch, fields, filter
35+
* @codegen_names fetch, filter
3636
*/
37-
export type SourceConfig = boolean | Fields | SourceFilter
37+
export type SourceConfig = boolean | SourceFilter
3838

3939
/**
4040
* Defines how to fetch a source. Fetching can be disabled entirely, or the source can be filtered.

0 commit comments

Comments
 (0)