Commit b763bcc
committed
Merge branch 'non-issue/esql-dense-vector-support-normalization' into non-issue/esql-dense-vector-byte-element-support
# Conflicts:
# server/src/main/java/org/elasticsearch/index/mapper/BlockDocValuesReader.java
# x-pack/plugin/esql/src/internalClusterTest/java/org/elasticsearch/xpack/esql/DenseVectorFieldTypeIT.java
# x-pack/plugin/esql/src/internalClusterTest/java/org/elasticsearch/xpack/esql/plugin/KnnFunctionIT.javaFile tree
2 files changed
+13
-12
lines changed- server/src/main/java/org/elasticsearch/index/mapper
- x-pack/plugin/esql/src/internalClusterTest/java/org/elasticsearch/xpack/esql
2 files changed
+13
-12
lines changedLines changed: 11 additions & 7 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
536 | 536 | | |
537 | 537 | | |
538 | 538 | | |
539 | | - | |
540 | | - | |
541 | | - | |
542 | | - | |
543 | | - | |
| 539 | + | |
| 540 | + | |
| 541 | + | |
| 542 | + | |
544 | 543 | | |
545 | 544 | | |
546 | 545 | | |
| |||
644 | 643 | | |
645 | 644 | | |
646 | 645 | | |
647 | | - | |
648 | | - | |
| 646 | + | |
| 647 | + | |
| 648 | + | |
| 649 | + | |
| 650 | + | |
| 651 | + | |
649 | 652 | | |
650 | 653 | | |
651 | 654 | | |
| |||
654 | 657 | | |
655 | 658 | | |
656 | 659 | | |
| 660 | + | |
657 | 661 | | |
658 | 662 | | |
659 | 663 | | |
| |||
Lines changed: 2 additions & 5 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
219 | 219 | | |
220 | 220 | | |
221 | 221 | | |
222 | | - | |
| 222 | + | |
223 | 223 | | |
224 | 224 | | |
225 | 225 | | |
| |||
248 | 248 | | |
249 | 249 | | |
250 | 250 | | |
251 | | - | |
252 | | - | |
253 | | - | |
254 | | - | |
| 251 | + | |
255 | 252 | | |
256 | 253 | | |
257 | 254 | | |
| |||
0 commit comments