Skip to content

Commit f93d28b

Browse files
JeremyDahlgrenJeremyDahlgren
authored
Merge branch 'main' into tasks/es-12267-skip-unavailable-for-cps
2 parents b552484 + 2ba21a4 commit f93d28b

File tree

37 files changed

+642
-196
lines changed

37 files changed

+642
-196
lines changed

‎docs/changelog/136017.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 136017
2+
summary: Cohere service Model Id field is required
3+
area: Machine Learning
4+
type: bug
5+
issues: []

‎docs/reference/query-languages/esql/_snippets/functions/layout/knn.md‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎docs/reference/query-languages/esql/_snippets/functions/parameters/knn.md‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎docs/reference/query-languages/esql/_snippets/lists/dense-vector-functions.md‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
* {applies_to}`stack: preview 9.2` {applies_to}`serverless: preview` [`KNN`](../../functions-operators/dense-vector-functions.md#esql-knn)
2+
3+
% * {applies_to}`stack: preview 9.3` {applies_to}`serverless: preview` [`V_COSINE`](../../functions-operators/dense-vector-functions.md#esql-v_cosine)
4+
% * {applies_to}`stack: preview 9.3` {applies_to}`serverless: preview` [`V_DOT_PRODUCT`](../../functions-operators/dense-vector-functions.md#esql-v_dot_product)
5+
% * {applies_to}`stack: preview 9.3` {applies_to}`serverless: preview`[`V_HAMMING`](../../functions-operators/dense-vector-functions.md#esql-v_hamming)
6+
% * {applies_to}`stack: preview 9.3` {applies_to}`serverless: preview` [`V_L1_NORM`](../../functions-operators/dense-vector-functions.md#esql-v_l1_norm)
7+
% * {applies_to}`stack: preview 9.3` {applies_to}`serverless: preview` [`V_L2_NORM`](../../functions-operators/dense-vector-functions.md#esql-v_l2_norm)
8+
% * {applies_to}`stack: preview 9.3` {applies_to}`serverless: preview` [`V_MAGNITUDE`](../../functions-operators/dense-vector-functions.md#esql-v_magnitude)

‎docs/reference/query-languages/esql/esql-functions-operators.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,12 @@ mapped_pages:
8080
:::
8181
::::
8282

83+
::::{dropdown} Dense vector functions
84+
:open:
85+
:::{include} _snippets/lists/dense-vector-functions.md
86+
:::
87+
::::
88+
8389
::::{dropdown} Multi value functions
8490
:open:
8591
:::{include} _snippets/lists/mv-functions.md

‎docs/reference/query-languages/esql/functions-operators/dense-vector-functions.md‎

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
---
2+
applies_to:
3+
stack: preview
4+
serverless: preview
5+
navigation_title: "Dense vector functions"
6+
mapped_pages:
7+
- https://www.elastic.co/guide/en/elasticsearch/reference/current/esql-functions-operators.html#esql-dense-vector-functions
8+
---
9+
10+
# {{esql}} dense vector functions [esql-dense-vector-functions]
11+
12+
{{esql}} supports dense vector functions for vector similarity calculations and
13+
k-nearest neighbor search.
14+
Dsense vector functions work with [
15+
`dense_vector` fields](/reference/elasticsearch/mapping-reference/dense-vector.md)
16+
and require appropriate field mappings.
17+
18+
{{esql}} supports these vector functions:
19+
20+
:::{include} ../_snippets/lists/dense-vector-functions.md
21+
:::
22+
23+
:::{include} ../_snippets/functions/layout/knn.md
24+
:::
25+
26+
% V_COSINE is currently a hidden feature
27+
% To make it visible again, uncomment this and the line in
28+
% lists/dense-vector-functions.md
29+
% :::{include} ../_snippets/functions/layout/v_cosine.md
30+
% :::
31+
32+
% V_DOT_PRODUCT is currently a hidden feature
33+
% To make it visible again, uncomment this and the line in
34+
% lists/dense-vector-functions.md
35+
% :::{include} ../_snippets/functions/layout/v_dot_product.md
36+
% :::
37+
38+
% V_HAMMING is currently a hidden feature
39+
% To make it visible again, uncomment this and the line in
40+
% lists/dense-vector-functions.md
41+
% :::{include} ../_snippets/functions/layout/v_hamming.md
42+
% :::
43+
44+
% V_L1_NORM is currently a hidden feature
45+
% To make it visible again, uncomment this and the line in
46+
% lists/dense-vector-functions.md
47+
% :::{include} ../_snippets/functions/layout/v_l1_norm.md
48+
% :::
49+
50+
% V_L2_NORM is currently a hidden feature
51+
% To make it visible again, uncomment this and the line in
52+
% lists/dense-vector-functions.md
53+
% :::{include} ../_snippets/functions/layout/v_l2_norm.md
54+
% :::
55+
56+
% V_MAGNITUDE is currently a hidden feature
57+
% To make it visible again, uncomment this and the line in
58+
% lists/dense-vector-functions.md
59+
% :::{include} ../_snippets/functions/layout/v_magnitude.md
60+
% :::

‎docs/reference/query-languages/esql/functions-operators/search-functions.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@ Get started with {{esql}} for search use cases with
1414
our [hands-on tutorial](/reference/query-languages/esql/esql-search-tutorial.md).
1515

1616
For a high-level overview of search functionalities in {{esql}}, and to learn about relevance scoring, refer to [{{esql}} for search](docs-content://solutions/search/esql-for-search.md#esql-for-search-scoring).
17-
:::
1817

19-
{{esql}} provides a set of functions for performing searching on text fields.
18+
For information regarding dense vector search functions,
19+
including [KNN](dense-vector-functions.md#esql-knn), please refer to
20+
the [Dense vector functions](dense-vector-functions.md) documentation.
21+
:::
2022

21-
Use these functions
22-
for [full-text search](docs-content://solutions/search/full-text.md)
2323
and [semantic search](docs-content://solutions/search/semantic-search/semantic-search-semantic-text.md).
2424

2525
Full text functions can be used to

‎docs/reference/query-languages/esql/kibana/definition/functions/knn.json‎

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

‎docs/reference/query-languages/toc.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,7 @@ toc:
133133
- file: esql/functions-operators/search-functions.md
134134
- file: esql/functions-operators/spatial-functions.md
135135
- file: esql/functions-operators/string-functions.md
136+
- file: esql/functions-operators/dense-vector-functions.md
136137
- file: esql/functions-operators/type-conversion-functions.md
137138
- file: esql/functions-operators/mv-functions.md
138139
- file: esql/functions-operators/operators.md

‎muted-tests.yml‎

Lines changed: 15 additions & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -615,84 +615,9 @@ tests:
615615
- class: org.elasticsearch.datastreams.DataStreamIndexSettingsProviderTests
616616
method: testGetAdditionalIndexSettingsMappingsMerging
617617
issue: https://github.com/elastic/elasticsearch/issues/135884
618-
- class: org.elasticsearch.upgrades.FullClusterRestartDownsampleIT
619-
method: testRollupIndex {cluster=UPGRADED}
620-
issue: https://github.com/elastic/elasticsearch/issues/135906
621-
- class: org.elasticsearch.upgrades.FullClusterRestartIT
622-
method: testNewReplicasTimeSeriesMode {cluster=UPGRADED}
623-
issue: https://github.com/elastic/elasticsearch/issues/135907
624-
- class: org.elasticsearch.upgrades.FullClusterRestartIT
625-
method: testSingleDoc {cluster=UPGRADED}
626-
issue: https://github.com/elastic/elasticsearch/issues/135908
627-
- class: org.elasticsearch.upgrades.FullClusterRestartIT
628-
method: testResize {cluster=UPGRADED}
629-
issue: https://github.com/elastic/elasticsearch/issues/135909
630-
- class: org.elasticsearch.upgrades.FullClusterRestartIT
631-
method: testSystemIndexMetadataIsUpgraded {cluster=UPGRADED}
632-
issue: https://github.com/elastic/elasticsearch/issues/135923
633-
- class: org.elasticsearch.upgrades.FullClusterRestartIT
634-
method: testSearch {cluster=UPGRADED}
635-
issue: https://github.com/elastic/elasticsearch/issues/135927
636-
- class: org.elasticsearch.xpack.inference.chunking.ChunkingSettingsBuilderTests
637-
method: testBuildChunkingSettingsForElasticReranker_QueryTokenCountLessThanHalfOfTokenLimit
638-
issue: https://github.com/elastic/elasticsearch/issues/135928
639-
- class: org.elasticsearch.upgrades.FullClusterRestartIT
640-
method: testPeerRecoveryRetentionLeases {cluster=UPGRADED}
641-
issue: https://github.com/elastic/elasticsearch/issues/135929
642-
- class: org.elasticsearch.upgrades.FullClusterRestartIT
643-
method: testPersianAnalyzerBWC {cluster=UPGRADED}
644-
issue: https://github.com/elastic/elasticsearch/issues/135930
645-
- class: org.elasticsearch.upgrades.FullClusterRestartIT
646-
method: testSnapshotRestore {cluster=UPGRADED}
647-
issue: https://github.com/elastic/elasticsearch/issues/135933
648-
- class: org.elasticsearch.upgrades.FullClusterRestartIT
649-
method: testForbidDisableSoftDeletesOnRestore {cluster=UPGRADED}
650-
issue: https://github.com/elastic/elasticsearch/issues/135937
651-
- class: org.elasticsearch.upgrades.FullClusterRestartIT
652-
method: testShrinkAfterUpgrade {cluster=UPGRADED}
653-
issue: https://github.com/elastic/elasticsearch/issues/135938
654618
- class: org.elasticsearch.xpack.esql.action.EsqlActionBreakerIT
655619
method: testTopNPushedToLuceneOnSortedIndex
656620
issue: https://github.com/elastic/elasticsearch/issues/135939
657-
- class: org.elasticsearch.upgrades.FullClusterRestartIT
658-
method: testClosedIndices {cluster=UPGRADED}
659-
issue: https://github.com/elastic/elasticsearch/issues/135941
660-
- class: org.elasticsearch.upgrades.FullClusterRestartIT
661-
method: testOperationBasedRecovery {cluster=UPGRADED}
662-
issue: https://github.com/elastic/elasticsearch/issues/135944
663-
- class: org.elasticsearch.upgrades.FullClusterRestartIT
664-
method: testRomanianAnalyzerBWC {cluster=UPGRADED}
665-
issue: https://github.com/elastic/elasticsearch/issues/135948
666-
- class: org.elasticsearch.upgrades.FullClusterRestartIT
667-
method: testEmptyShard {cluster=UPGRADED}
668-
issue: https://github.com/elastic/elasticsearch/issues/135951
669-
- class: org.elasticsearch.upgrades.FullClusterRestartIT
670-
method: testRollover {cluster=UPGRADED}
671-
issue: https://github.com/elastic/elasticsearch/issues/135952
672-
- class: org.elasticsearch.upgrades.FullClusterRestartIT
673-
method: testRecovery {cluster=UPGRADED}
674-
issue: https://github.com/elastic/elasticsearch/issues/135953
675-
- class: org.elasticsearch.upgrades.FullClusterRestartIT
676-
method: testNewReplicas {cluster=UPGRADED}
677-
issue: https://github.com/elastic/elasticsearch/issues/135956
678-
- class: org.elasticsearch.upgrades.FullClusterRestartIT
679-
method: testHistoryUUIDIsAdded {cluster=UPGRADED}
680-
issue: https://github.com/elastic/elasticsearch/issues/135957
681-
- class: org.elasticsearch.upgrades.FullClusterRestartIT
682-
method: testTurnOffTranslogRetentionAfterUpgraded {cluster=UPGRADED}
683-
issue: https://github.com/elastic/elasticsearch/issues/135958
684-
- class: org.elasticsearch.upgrades.FullClusterRestartIT
685-
method: testSoftDeletes {cluster=UPGRADED}
686-
issue: https://github.com/elastic/elasticsearch/issues/135959
687-
- class: org.elasticsearch.upgrades.FullClusterRestartIT
688-
method: testClusterState {cluster=UPGRADED}
689-
issue: https://github.com/elastic/elasticsearch/issues/135960
690-
- class: org.elasticsearch.upgrades.FullClusterRestartIT
691-
method: testShrink {cluster=UPGRADED}
692-
issue: https://github.com/elastic/elasticsearch/issues/135962
693-
- class: org.elasticsearch.upgrades.FullClusterRestartIT
694-
method: testSearchTimeSeriesMode {cluster=UPGRADED}
695-
issue: https://github.com/elastic/elasticsearch/issues/135963
696621
- class: org.elasticsearch.datastreams.DataStreamIndexSettingsProviderTests
697622
method: testGetAdditionalIndexSettings
698623
issue: https://github.com/elastic/elasticsearch/issues/135972
@@ -738,6 +663,21 @@ tests:
738663
- class: org.elasticsearch.xpack.esql.ccq.MultiClusterSpecIT
739664
method: test {csv-spec:fork.ForkBranchWithInlineStats}
740665
issue: https://github.com/elastic/elasticsearch/issues/136091
666+
- class: org.elasticsearch.xpack.esql.qa.multi_node.EsqlSpecIT
667+
method: test {csv-spec:date.EvalDateTruncQuarterlyIntervalWithGTInRange}
668+
issue: https://github.com/elastic/elasticsearch/issues/136102
669+
- class: org.elasticsearch.xpack.esql.qa.single_node.GenerativeForkIT
670+
method: test {csv-spec:math.PowIntInt}
671+
issue: https://github.com/elastic/elasticsearch/issues/136106
672+
- class: org.elasticsearch.xpack.esql.qa.single_node.GenerativeForkIT
673+
method: test {csv-spec:text-embedding.Text_embedding with knn on semantic_text_dense_field}
674+
issue: https://github.com/elastic/elasticsearch/issues/136108
675+
- class: org.elasticsearch.xpack.esql.qa.single_node.GenerativeForkIT
676+
method: test {csv-spec:string.ContainsFail}
677+
issue: https://github.com/elastic/elasticsearch/issues/136112
678+
- class: org.elasticsearch.xpack.esql.qa.single_node.GenerativeForkIT
679+
method: test {csv-spec:union_types.MultiIndexTsLongStatsDrop}
680+
issue: https://github.com/elastic/elasticsearch/issues/136113
741681

742682
# Examples:
743683
#

0 commit comments

Comments
 (0)