Skip to content

Commit 7b92c87

Browse files
authored
Merge branch 'main' into knn-query-similarity
2 parents 9a4d5f2 + 02f092b commit 7b92c87

File tree

15 files changed

+926
-111
lines changed

15 files changed

+926
-111
lines changed

output/schema/schema.json

Lines changed: 360 additions & 88 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: 12 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

specification/_doc_ids/table.csv

Lines changed: 27 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -349,6 +349,7 @@ modules-node,https://www.elastic.co/guide/en/elasticsearch/reference/{branch}/mo
349349
search-aggregations-bucket-count-ks-test-aggregation,https://www.elastic.co/guide/en/elasticsearch/reference/{branch}/search-aggregations-bucket-count-ks-test-aggregation.html
350350
search-aggregations-bucket-correlation-aggregation,https://www.elastic.co/guide/en/elasticsearch/reference/{branch}/search-aggregations-bucket-correlation-aggregation.html
351351
search-aggregations-bucket-categorize-text-aggregation,https://www.elastic.co/guide/en/elasticsearch/reference/{branch}/search-aggregations-bucket-categorize-text-aggregation.html
352+
search-aggregations-bucket-significantterms-aggregation,https://www.elastic.co/guide/en/elasticsearch/reference/{branch}/search-aggregations-bucket-significantterms-aggregation.html
352353
search-aggregations-pipeline-bucket-path,https://www.elastic.co/guide/en/elasticsearch/reference/{branch}/search-aggregations-pipeline.html#buckets-path-syntax
353354
ml-feature-importance,https://www.elastic.co/guide/en/machine-learning/{branch}/ml-feature-importance.html
354355
analysis-normalizers,https://www.elastic.co/guide/en/elasticsearch/reference/{branch}/analysis-normalizers.html
@@ -431,12 +432,35 @@ query-dsl-match-all-query,https://www.elastic.co/guide/en/elasticsearch/referenc
431432
query-dsl-match-bool-prefix-query,https://www.elastic.co/guide/en/elasticsearch/reference/{branch}/query-dsl-match-bool-prefix-query.html
432433
query-dsl-match-none-query,https://www.elastic.co/guide/en/elasticsearch/reference/{branch}/query-dsl-match-all-query.html#query-dsl-match-none-query
433434
query-dsl-match-query-phrase,https://www.elastic.co/guide/en/elasticsearch/reference/{branch}/query-dsl-match-query-phrase.html
434-
query-dsl-match-query-phrase-prefix,https://www.elastic.co/guide/en/elasticsearch/reference/query-dsl-mlt-query,{branch}/query-dsl-match-query-phrase-prefix.html
435-
https://www.elastic.co/guide/en/elasticsearch/reference/{branch}/query-dsl-mlt-query.html
435+
query-dsl-match-query-phrase-prefix,https://www.elastic.co/guide/en/elasticsearch/reference/{branch}/query-dsl-match-query-phrase-prefix.html
436+
query-dsl-mlt-query,https://www.elastic.co/guide/en/elasticsearch/reference/{branch}/query-dsl-mlt-query.html
436437
query-dsl-multi-match-query,https://www.elastic.co/guide/en/elasticsearch/reference/{branch}/query-dsl-multi-match-query.html
437438
query-dsl-nested-query,https://www.elastic.co/guide/en/elasticsearch/reference/{branch}/query-dsl-nested-query.html
438439
query-dsl-parent-id-query,https://www.elastic.co/guide/en/elasticsearch/reference/{branch}/query-dsl-parent-id-query.html
439440
query-dsl-percolate-query,https://www.elastic.co/guide/en/elasticsearch/reference/{branch}/query-dsl-percolate-query.html
440441
query-dsl-pinned-query,https://www.elastic.co/guide/en/elasticsearch/reference/{branch}/query-dsl-pinned-query.html
441442
query-dsl-prefix-query,https://www.elastic.co/guide/en/elasticsearch/reference/{branch}/query-dsl-prefix-query.html
442-
query-dsl-query-string-query,https://www.elastic.co/guide/en/elasticsearch/reference/{branch}/query-dsl-query-string-query.html
443+
query-dsl-query-string-query,https://www.elastic.co/guide/en/elasticsearch/reference/{branch}/query-dsl-query-string-query.html
444+
query-dsl-range-query,https://www.elastic.co/guide/en/elasticsearch/reference/{branch}/query-dsl-range-query.html
445+
query-dsl-rank-feature-query,https://www.elastic.co/guide/en/elasticsearch/reference/{branch}/query-dsl-rank-feature-query.html
446+
query-dsl-regexp-query,https://www.elastic.co/guide/en/elasticsearch/reference/{branch}/query-dsl-regexp-query.html
447+
regexp-syntax,https://www.elastic.co/guide/en/elasticsearch/reference/{branch}/regexp-syntax.html
448+
query-dsl-script-query,https://www.elastic.co/guide/en/elasticsearch/reference/{branch}/query-dsl-script-query.html
449+
query-dsl-script-score-query,https://www.elastic.co/guide/en/elasticsearch/reference/{branch}/query-dsl-script-score-query.html
450+
query-dsl-shape-query,https://www.elastic.co/guide/en/elasticsearch/reference/{branch}/query-dsl-shape-query.html
451+
query-dsl-simple-query-string-query,https://www.elastic.co/guide/en/elasticsearch/reference/{branch}/query-dsl-simple-query-string-query.html
452+
query-dsl-span-containing-query,https://www.elastic.co/guide/en/elasticsearch/reference/{branch}/query-dsl-span-containing-query.html
453+
query-dsl-span-field-masking-query,https://www.elastic.co/guide/en/elasticsearch/reference/{branch}/query-dsl-span-field-masking-query.html
454+
query-dsl-span-first-query,https://www.elastic.co/guide/en/elasticsearch/reference/{branch}/query-dsl-span-first-query.html
455+
query-dsl-span-multi-term-query,https://www.elastic.co/guide/en/elasticsearch/reference/{branch}/query-dsl-span-multi-term-query.html
456+
query-dsl-span-near-query,https://www.elastic.co/guide/en/elasticsearch/reference/{branch}/query-dsl-span-near-query.html
457+
query-dsl-span-not-query,https://www.elastic.co/guide/en/elasticsearch/reference/{branch}/query-dsl-span-not-query.html
458+
query-dsl-span-or-query,https://www.elastic.co/guide/en/elasticsearch/reference/{branch}/query-dsl-span-or-query.html
459+
query-dsl-span-term-query,https://www.elastic.co/guide/en/elasticsearch/reference/{branch}/query-dsl-span-term-query.html
460+
query-dsl-span-within-query,https://www.elastic.co/guide/en/elasticsearch/reference/{branch}/query-dsl-span-within-query.html
461+
query-dsl-term-query,https://www.elastic.co/guide/en/elasticsearch/reference/{branch}/query-dsl-term-query.html
462+
query-dsl-terms-query,https://www.elastic.co/guide/en/elasticsearch/reference/{branch}/query-dsl-terms-query.html
463+
query-dsl-terms-set-query,https://www.elastic.co/guide/en/elasticsearch/reference/{branch}/query-dsl-terms-set-query.html
464+
query-dsl-text-expansion-query,https://www.elastic.co/guide/en/elasticsearch/reference/{branch}/query-dsl-text-expansion-query.html
465+
query-dsl-wildcard-query,https://www.elastic.co/guide/en/elasticsearch/reference/{branch}/query-dsl-wildcard-query.html
466+
query-dsl-wrapper-query,https://www.elastic.co/guide/en/elasticsearch/reference/{branch}/query-dsl-wrapper-query.html

specification/_types/Scripting.ts

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,30 +26,62 @@ import { Id } from './common'
2626
* @non_exhaustive
2727
*/
2828
export enum ScriptLanguage {
29+
/**
30+
* Painless scripting language, purpose-built for Elasticsearch.
31+
*/
2932
painless = 0,
33+
/**
34+
* Lucene’s expressions language, compiles a JavaScript expression to bytecode.
35+
*/
3036
expression = 1,
37+
/**
38+
* Mustache templated, used for templates.
39+
*/
3140
mustache = 2,
41+
/**
42+
* Expert Java API
43+
*/
3244
java = 3
3345
}
3446

3547
export class StoredScript {
48+
/**
49+
* Specifies the language the script is written in.
50+
*/
3651
lang: ScriptLanguage
3752
options?: Dictionary<string, string>
53+
/**
54+
* The script source.
55+
*/
3856
source: string
3957
}
4058

4159
export class ScriptBase {
60+
/**
61+
* Specifies any named parameters that are passed into the script as variables.
62+
* Use parameters instead of hard-coded values to decrease compile time.
63+
*/
4264
params?: Dictionary<string, UserDefinedValue>
4365
}
4466

4567
/** @shortcut_property source */
4668
export class InlineScript extends ScriptBase {
69+
/**
70+
* Specifies the language the script is written in.
71+
* @server_default painless
72+
*/
4773
lang?: ScriptLanguage
4874
options?: Dictionary<string, string>
75+
/**
76+
* The script source.
77+
*/
4978
source: string
5079
}
5180

5281
export class StoredScriptId extends ScriptBase {
82+
/**
83+
* The `id` for a stored script.
84+
*/
5385
id: Id
5486
}
5587

specification/_types/query_dsl/TextExpansionQuery.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919

2020
import { QueryBase } from './abstractions'
2121

22-
/** @shortcut_property value */
2322
export class TextExpansionQuery extends QueryBase {
2423
/** The text expansion NLP model to use */
2524
model_id: string

specification/_types/query_dsl/abstractions.ts

Lines changed: 95 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -265,32 +265,123 @@ export class QueryContainer {
265265
* @doc_id query-dsl-query-string-query
266266
*/
267267
query_string?: QueryStringQuery
268+
/**
269+
* Returns documents that contain terms within a provided range.
270+
* @doc_id query-dsl-range-query
271+
*/
268272
range?: SingleKeyDictionary<Field, RangeQuery>
273+
/**
274+
* Boosts the relevance score of documents based on the numeric value of a `rank_feature` or `rank_features` field.
275+
* @doc_id query-dsl-rank-feature-query
276+
*/
269277
rank_feature?: RankFeatureQuery
278+
/**
279+
* Returns documents that contain terms matching a regular expression.
280+
* @doc_id query-dsl-regexp-query
281+
*/
270282
regexp?: SingleKeyDictionary<Field, RegexpQuery>
271283
rule_query?: RuleQuery
284+
/**
285+
* Filters documents based on a provided script.
286+
* The script query is typically used in a filter context.
287+
* @doc_id query-dsl-script-query
288+
*/
272289
script?: ScriptQuery
290+
/**
291+
* Uses a script to provide a custom score for returned documents.
292+
* @doc_id query-dsl-script-score-query
293+
*/
273294
script_score?: ScriptScoreQuery
295+
/**
296+
* Queries documents that contain fields indexed using the `shape` type.
297+
* @doc_id query-dsl-shape-query
298+
*/
274299
shape?: ShapeQuery
300+
/**
301+
* Returns documents based on a provided query string, using a parser with a limited but fault-tolerant syntax.
302+
* @doc_id query-dsl-simple-query-string-query
303+
*/
275304
simple_query_string?: SimpleQueryStringQuery
305+
/**
306+
* Returns matches which enclose another span query.
307+
* @doc_id query-dsl-span-containing-query
308+
*/
276309
span_containing?: SpanContainingQuery
310+
/**
311+
* Wrapper to allow span queries to participate in composite single-field span queries by _lying_ about their search field.
312+
* @doc_id query-dsl-span-field-masking-query
313+
*/
277314
field_masking_span?: SpanFieldMaskingQuery
315+
/**
316+
* Matches spans near the beginning of a field.
317+
* @doc_id query-dsl-span-first-query
318+
*/
278319
span_first?: SpanFirstQuery
320+
/**
321+
* Allows you to wrap a multi term query (one of `wildcard`, `fuzzy`, `prefix`, `range`, or `regexp` query) as a `span` query, so it can be nested.
322+
* @doc_id query-dsl-span-multi-term-query
323+
*/
279324
span_multi?: SpanMultiTermQuery
325+
/**
326+
* Matches spans which are near one another.
327+
* You can specify `slop`, the maximum number of intervening unmatched positions, as well as whether matches are required to be in-order.
328+
* @doc_id query-dsl-span-near-query
329+
*/
280330
span_near?: SpanNearQuery
331+
/**
332+
* Removes matches which overlap with another span query or which are within x tokens before (controlled by the parameter `pre`) or y tokens after (controlled by the parameter `post`) another span query.
333+
* @doc_id query-dsl-span-not-query
334+
*/
281335
span_not?: SpanNotQuery
336+
/**
337+
* Matches the union of its span clauses.
338+
* @doc_id query-dsl-span-or-query
339+
*/
282340
span_or?: SpanOrQuery
341+
/**
342+
* Matches spans containing a term.
343+
* @doc_id query-dsl-span-term-query
344+
*/
283345
span_term?: SingleKeyDictionary<Field, SpanTermQuery>
346+
/**
347+
* Returns matches which are enclosed inside another span query.
348+
* @doc_id query-dsl-span-within-query
349+
*/
284350
span_within?: SpanWithinQuery
351+
/**
352+
* Returns documents that contain an exact term in a provided field.
353+
* To return a document, the query term must exactly match the queried field's value, including whitespace and capitalization.
354+
* @doc_id query-dsl-term-query
355+
*/
285356
term?: SingleKeyDictionary<Field, TermQuery>
357+
/**
358+
* Returns documents that contain one or more exact terms in a provided field.
359+
* To return a document, one or more terms must exactly match a field value, including whitespace and capitalization.
360+
* @doc_id query-dsl-terms-query
361+
*/
286362
terms?: TermsQuery
363+
/**
364+
* Returns documents that contain a minimum number of exact terms in a provided field.
365+
* To return a document, a required number of terms must exactly match the field values, including whitespace and capitalization.
366+
* @doc_id query-dsl-terms-set-query
367+
*/
287368
terms_set?: SingleKeyDictionary<Field, TermsSetQuery>
288369
/**
370+
* Uses a natural language processing model to convert the query text into a list of token-weight pairs which are then used in a query against a rank features field.
289371
* @availability stack since=8.8.0
290372
* @availability serverless
373+
* @doc_id query-dsl-text-expansion-query
291374
*/
292375
text_expansion?: SingleKeyDictionary<Field, TextExpansionQuery>
376+
/**
377+
* Returns documents that contain terms matching a wildcard pattern.
378+
* @doc_id query-dsl-wildcard-query
379+
*/
293380
wildcard?: SingleKeyDictionary<Field, WildcardQuery>
381+
/**
382+
* A query that accepts any other query as base64 encoded string.
383+
* @doc_id query-dsl-wrapper-query
384+
*/
294385
wrapper?: WrapperQuery
295386

296387
/**
@@ -372,7 +463,10 @@ export class CombinedFieldsQuery extends QueryBase {
372463
}
373464

374465
export class WrapperQuery extends QueryBase {
375-
/** A base64 encoded query. The binary data format can be any of JSON, YAML, CBOR or SMILE encodings */
466+
/**
467+
* A base64 encoded query.
468+
* The binary data format can be any of JSON, YAML, CBOR or SMILE encodings
469+
*/
376470
query: string
377471
}
378472

0 commit comments

Comments
 (0)