Skip to content

Commit

Permalink
Merge branch 'main' into 2025/01/21/update-tests-with-mark-as-read-on…
Browse files Browse the repository at this point in the history
…ly-api
  • Loading branch information
tlrx committed Jan 22, 2025
2 parents 6c39d3f + dd2fb5b commit a303d16
Show file tree
Hide file tree
Showing 98 changed files with 1,216 additions and 543 deletions.
2 changes: 1 addition & 1 deletion .buildkite/pipelines/intake.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ steps:
timeout_in_minutes: 300
matrix:
setup:
BWC_VERSION: ["8.16.3", "8.17.1", "8.18.0", "9.0.0"]
BWC_VERSION: ["8.16.4", "8.17.2", "8.18.0", "9.0.0"]
agents:
provider: gcp
image: family/elasticsearch-ubuntu-2004
Expand Down
12 changes: 6 additions & 6 deletions .buildkite/pipelines/periodic-packaging.yml
Original file line number Diff line number Diff line change
Expand Up @@ -287,8 +287,8 @@ steps:
env:
BWC_VERSION: 8.15.5

- label: "{{matrix.image}} / 8.16.3 / packaging-tests-upgrade"
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.16.3
- label: "{{matrix.image}} / 8.16.4 / packaging-tests-upgrade"
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.16.4
timeout_in_minutes: 300
matrix:
setup:
Expand All @@ -301,10 +301,10 @@ steps:
machineType: custom-16-32768
buildDirectory: /dev/shm/bk
env:
BWC_VERSION: 8.16.3
BWC_VERSION: 8.16.4

- label: "{{matrix.image}} / 8.17.1 / packaging-tests-upgrade"
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.17.1
- label: "{{matrix.image}} / 8.17.2 / packaging-tests-upgrade"
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.17.2
timeout_in_minutes: 300
matrix:
setup:
Expand All @@ -317,7 +317,7 @@ steps:
machineType: custom-16-32768
buildDirectory: /dev/shm/bk
env:
BWC_VERSION: 8.17.1
BWC_VERSION: 8.17.2

- label: "{{matrix.image}} / 8.18.0 / packaging-tests-upgrade"
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.18.0
Expand Down
16 changes: 8 additions & 8 deletions .buildkite/pipelines/periodic.yml
Original file line number Diff line number Diff line change
Expand Up @@ -306,8 +306,8 @@ steps:
- signal_reason: agent_stop
limit: 3

- label: 8.16.3 / bwc
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v8.16.3#bwcTest
- label: 8.16.4 / bwc
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v8.16.4#bwcTest
timeout_in_minutes: 300
agents:
provider: gcp
Expand All @@ -316,7 +316,7 @@ steps:
buildDirectory: /dev/shm/bk
preemptible: true
env:
BWC_VERSION: 8.16.3
BWC_VERSION: 8.16.4
retry:
automatic:
- exit_status: "-1"
Expand All @@ -325,8 +325,8 @@ steps:
- signal_reason: agent_stop
limit: 3

- label: 8.17.1 / bwc
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v8.17.1#bwcTest
- label: 8.17.2 / bwc
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v8.17.2#bwcTest
timeout_in_minutes: 300
agents:
provider: gcp
Expand All @@ -335,7 +335,7 @@ steps:
buildDirectory: /dev/shm/bk
preemptible: true
env:
BWC_VERSION: 8.17.1
BWC_VERSION: 8.17.2
retry:
automatic:
- exit_status: "-1"
Expand Down Expand Up @@ -448,7 +448,7 @@ steps:
setup:
ES_RUNTIME_JAVA:
- openjdk21
BWC_VERSION: ["8.16.3", "8.17.1", "8.18.0", "9.0.0"]
BWC_VERSION: ["8.16.4", "8.17.2", "8.18.0", "9.0.0"]
agents:
provider: gcp
image: family/elasticsearch-ubuntu-2004
Expand Down Expand Up @@ -490,7 +490,7 @@ steps:
ES_RUNTIME_JAVA:
- openjdk21
- openjdk23
BWC_VERSION: ["8.16.3", "8.17.1", "8.18.0", "9.0.0"]
BWC_VERSION: ["8.16.4", "8.17.2", "8.18.0", "9.0.0"]
agents:
provider: gcp
image: family/elasticsearch-ubuntu-2004
Expand Down
4 changes: 2 additions & 2 deletions .ci/bwcVersions
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ BWC_VERSION:
- "8.13.4"
- "8.14.3"
- "8.15.5"
- "8.16.3"
- "8.17.1"
- "8.16.4"
- "8.17.2"
- "8.18.0"
- "9.0.0"
4 changes: 2 additions & 2 deletions .ci/snapshotBwcVersions
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
BWC_VERSION:
- "8.16.3"
- "8.17.1"
- "8.16.4"
- "8.17.2"
- "8.18.0"
- "9.0.0"
6 changes: 0 additions & 6 deletions docs/changelog/117469.yaml

This file was deleted.

5 changes: 0 additions & 5 deletions docs/changelog/117840.yaml

This file was deleted.

5 changes: 0 additions & 5 deletions docs/changelog/117851.yaml

This file was deleted.

5 changes: 0 additions & 5 deletions docs/changelog/118454.yaml

This file was deleted.

6 changes: 0 additions & 6 deletions docs/changelog/118516.yaml

This file was deleted.

6 changes: 0 additions & 6 deletions docs/changelog/118603.yaml

This file was deleted.

5 changes: 0 additions & 5 deletions docs/changelog/118757.yaml

This file was deleted.

6 changes: 0 additions & 6 deletions docs/changelog/118816.yaml

This file was deleted.

5 changes: 0 additions & 5 deletions docs/changelog/118837.yaml

This file was deleted.

5 changes: 0 additions & 5 deletions docs/changelog/118844.yaml

This file was deleted.

5 changes: 0 additions & 5 deletions docs/changelog/118919.yaml

This file was deleted.

5 changes: 0 additions & 5 deletions docs/changelog/118921.yaml

This file was deleted.

5 changes: 0 additions & 5 deletions docs/changelog/118954.yaml

This file was deleted.

5 changes: 0 additions & 5 deletions docs/changelog/118958.yaml

This file was deleted.

6 changes: 0 additions & 6 deletions docs/changelog/118999.yaml

This file was deleted.

5 changes: 0 additions & 5 deletions docs/changelog/119131.yaml

This file was deleted.

6 changes: 0 additions & 6 deletions docs/changelog/119134.yaml

This file was deleted.

5 changes: 0 additions & 5 deletions docs/changelog/119233.yaml

This file was deleted.

5 changes: 0 additions & 5 deletions docs/changelog/119449.yaml

This file was deleted.

5 changes: 0 additions & 5 deletions docs/changelog/119495.yaml

This file was deleted.

5 changes: 0 additions & 5 deletions docs/changelog/119516.yaml

This file was deleted.

5 changes: 0 additions & 5 deletions docs/changelog/119637.yaml

This file was deleted.

6 changes: 0 additions & 6 deletions docs/changelog/119750.yaml

This file was deleted.

6 changes: 0 additions & 6 deletions docs/changelog/119793.yaml

This file was deleted.

5 changes: 0 additions & 5 deletions docs/changelog/119797.yaml

This file was deleted.

5 changes: 0 additions & 5 deletions docs/changelog/119897.yaml

This file was deleted.

5 changes: 5 additions & 0 deletions docs/changelog/120128.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
pr: 120128
summary: Add Multi-Field Support for Semantic Text Fields
area: Relevance
type: feature
issues: []
5 changes: 5 additions & 0 deletions docs/changelog/120445.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
pr: 120445
summary: Run `GetPipelineTransportAction` on local node
area: Ingest Node
type: enhancement
issues: []
5 changes: 5 additions & 0 deletions docs/changelog/120538.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
pr: 120538
summary: "Revert unwanted ES|QL lexer changes from PR #120354"
area: ES|QL
type: bug
issues: []
5 changes: 5 additions & 0 deletions docs/changelog/120548.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
pr: 120548
summary: Add `remove_index_block` arg to `_create_from` api
area: Indices APIs
type: enhancement
issues: []
48 changes: 26 additions & 22 deletions docs/reference/mapping/types/semantic-text.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -182,16 +182,11 @@ Even if the script targets non-`semantic_text` fields, the update will fail when

[discrete]
[[copy-to-support]]
==== `copy_to` support
==== `copy_to` and multi-fields support

The `semantic_text` field type can be the target of
<<copy-to,`copy_to` fields>>. This means you can use a single `semantic_text`
field to collect the values of other fields for semantic search. Each value has
its embeddings calculated separately; each field value is a separate set of chunk(s) in
the resulting embeddings.

This imposes a restriction on bulk requests and ingestion pipelines that update documents with `semantic_text` fields.
In these cases, all fields that are copied to a `semantic_text` field, including the `semantic_text` field value, must have a value to ensure every embedding is calculated correctly.
The semantic_text field type can serve as the target of <<copy-to,copy_to fields>>,
be part of a <<multi-fields,multi-field>> structure, or contain <<multi-fields,multi-fields>> internally.
This means you can use a single field to collect the values of other fields for semantic search.

For example, the following mapping:

Expand All @@ -201,39 +196,48 @@ PUT test-index
{
"mappings": {
"properties": {
"infer_field": {
"type": "semantic_text",
"inference_id": ".elser-2-elasticsearch"
},
"source_field": {
"type": "text",
"copy_to": "infer_field"
},
"infer_field": {
"type": "semantic_text",
"inference_id": ".elser-2-elasticsearch"
}
}
}
}
------------------------------------------------------------
// TEST[skip:TBD]

Will need the following bulk update request to ensure that `infer_field` is updated correctly:
can also be declared as multi-fields:

[source,console]
------------------------------------------------------------
PUT test-index/_bulk
{"update": {"_id": "1"}}
{"doc": {"infer_field": "updated inference field", "source_field": "updated source field"}}
PUT test-index
{
"mappings": {
"properties": {
"source_field": {
"type": "text",
"fields": {
"infer_field": {
"type": "semantic_text",
"inference_id": ".elser-2-elasticsearch"
}
}
}
}
}
}
------------------------------------------------------------
// TEST[skip:TBD]

Notice that both the `semantic_text` field and the source field are updated in the bulk request.


[discrete]
[[limitations]]
==== Limitations

`semantic_text` field types have the following limitations:

* `semantic_text` fields are not currently supported as elements of <<nested,nested fields>>.
* `semantic_text` fields can't currently be set as part of <<dynamic-templates>>.
* `semantic_text` fields can't be defined as <<multi-fields,multi-fields>> of another field, nor can they contain other fields as multi-fields.
* `semantic_text` fields can't currently be set as part of <<dynamic-templates>>.
Loading

0 comments on commit a303d16

Please sign in to comment.