Skip to content

Add multi_match function #121525 #125062

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Merged
Changes from 1 commit
Commits
Show all changes
96 commits
Select commit Hold shift + click to select a range
d392b17
Initial
svilen-mihaylov-elastic Mar 17, 2025
18559d0
Apply Ioana's changes
svilen-mihaylov-elastic Mar 19, 2025
dd28440
incremental work
svilen-mihaylov-elastic Mar 19, 2025
4e67cb2
Fix tests
svilen-mihaylov-elastic Mar 20, 2025
e871d38
Merge branch 'main' into svilen/121525
svilen-mihaylov-elastic Mar 20, 2025
6ab6baa
Fix
svilen-mihaylov-elastic Mar 20, 2025
a2a5fde
Fix field names
svilen-mihaylov-elastic Mar 20, 2025
bb57f52
Merge branch 'main' into svilen/121525
svilen-mihaylov-elastic Mar 20, 2025
257caf9
One more function
svilen-mihaylov-elastic Mar 20, 2025
28ca7e7
Update x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/…
svilen-mihaylov-elastic Mar 21, 2025
78f6c52
cr feedback
svilen-mihaylov-elastic Mar 21, 2025
07d6230
Merge branch 'svilen/121525' of https://github.com/svilen-mihaylov-el…
svilen-mihaylov-elastic Mar 21, 2025
d280906
Fix serialization/deserialization
svilen-mihaylov-elastic Mar 21, 2025
9a72c76
Remove TODO
svilen-mihaylov-elastic Mar 21, 2025
27d4138
Add analyzer test
svilen-mihaylov-elastic Mar 21, 2025
099a555
Add verifier test
svilen-mihaylov-elastic Mar 21, 2025
9d48454
More tests
svilen-mihaylov-elastic Mar 21, 2025
651c28f
Add test
svilen-mihaylov-elastic Mar 25, 2025
7e06f77
Merge branch 'main' into svilen/121525
svilen-mihaylov-elastic Mar 26, 2025
fb53d2b
lint
svilen-mihaylov-elastic Mar 26, 2025
422e4dd
Add test and updates
svilen-mihaylov-elastic Mar 26, 2025
c56cab6
Merge branch 'main' into svilen/121525
svilen-mihaylov-elastic Mar 27, 2025
b0cac5c
Fix test
svilen-mihaylov-elastic Mar 27, 2025
cfb2f23
Fix test
svilen-mihaylov-elastic Mar 27, 2025
eeed847
Fix .toString()
svilen-mihaylov-elastic Mar 27, 2025
e3d4f60
optional arg
svilen-mihaylov-elastic Mar 28, 2025
3a10b44
Add initial csv test
svilen-mihaylov-elastic Mar 28, 2025
f9649da
Fix CsvTests
carlosdelest Mar 28, 2025
322e5ae
Merge branch 'main' into svilen/121525
svilen-mihaylov-elastic Mar 28, 2025
3884437
Add generated files
svilen-mihaylov-elastic Mar 28, 2025
ae8c7cd
Add initial version of scoring test
svilen-mihaylov-elastic Mar 28, 2025
c308b1c
Merge branch 'main' into svilen/121525
svilen-mihaylov-elastic Mar 31, 2025
fbbb7eb
Fix type of fields
svilen-mihaylov-elastic Mar 31, 2025
6f75f30
Tweak test
svilen-mihaylov-elastic Mar 31, 2025
8d72e21
Merge branch 'main' into svilen/121525
svilen-mihaylov-elastic Apr 1, 2025
463938d
Documentation annotations
svilen-mihaylov-elastic Apr 1, 2025
83cb95d
Updates
svilen-mihaylov-elastic Apr 1, 2025
4c83974
Fix test and add assert
svilen-mihaylov-elastic Apr 1, 2025
a3aa40f
Change type of "type"
svilen-mihaylov-elastic Apr 3, 2025
89ae411
[CI] Auto commit changes from spotless
elasticsearchmachine Apr 3, 2025
d0138d9
Make MultiMatchQuery scorable, fixes ScoringIt test
svilen-mihaylov-elastic Apr 3, 2025
a9bca4c
Merge branch 'svilen/121525' of https://github.com/svilen-mihaylov-el…
svilen-mihaylov-elastic Apr 3, 2025
0979299
Merge branch 'main' into svilen/121525
svilen-mihaylov-elastic Apr 3, 2025
2a673b3
Fix merge
svilen-mihaylov-elastic Apr 3, 2025
b0bfecc
Fix test
svilen-mihaylov-elastic Apr 3, 2025
d06f161
Fix score
svilen-mihaylov-elastic Apr 3, 2025
dc04490
Merge branch 'main' into svilen/121525
svilen-mihaylov-elastic Apr 3, 2025
c3a091c
Update docs/changelog/125062.yaml
svilen-mihaylov-elastic Apr 3, 2025
38029fb
Update docs/changelog/125062.yaml
svilen-mihaylov-elastic Apr 4, 2025
20ad6c8
Update x-pack/plugin/esql/qa/testFixtures/src/main/resources/multi-ma…
svilen-mihaylov-elastic Apr 4, 2025
c8f4bfb
remove description
svilen-mihaylov-elastic Apr 4, 2025
a35b390
Exercise 'type'
svilen-mihaylov-elastic Apr 4, 2025
44912dc
Update x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/…
svilen-mihaylov-elastic Apr 4, 2025
282f8a2
Update x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/…
svilen-mihaylov-elastic Apr 4, 2025
0c7d352
Update x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/…
svilen-mihaylov-elastic Apr 4, 2025
262db09
Update x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/…
svilen-mihaylov-elastic Apr 4, 2025
f420b52
Update x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/…
svilen-mihaylov-elastic Apr 4, 2025
b8f5c21
[CI] Auto commit changes from spotless
elasticsearchmachine Apr 4, 2025
b08c8ea
Update descriptions
svilen-mihaylov-elastic Apr 4, 2025
e603145
Descriptions
svilen-mihaylov-elastic Apr 4, 2025
70ffeac
Merge branch 'svilen/121525' of https://github.com/svilen-mihaylov-el…
svilen-mihaylov-elastic Apr 4, 2025
c1d4157
Add fuzzy_rewrite field
svilen-mihaylov-elastic Apr 4, 2025
bfb5fa9
Add lenient as default
svilen-mihaylov-elastic Apr 4, 2025
bfbaa13
Breakup long line
svilen-mihaylov-elastic Apr 4, 2025
876c1ce
Extend test
svilen-mihaylov-elastic Apr 4, 2025
890c3a9
Apply fix from Carlos
svilen-mihaylov-elastic Apr 7, 2025
8cf0343
Merge branch 'main' into svilen/121525
svilen-mihaylov-elastic Apr 7, 2025
33fba44
Update scores
svilen-mihaylov-elastic Apr 7, 2025
f67c607
Implement postAnalysisPlanVerification
svilen-mihaylov-elastic Apr 7, 2025
101c4b2
More fixes
svilen-mihaylov-elastic Apr 7, 2025
98ad8b0
Fix
svilen-mihaylov-elastic Apr 8, 2025
ff95fe7
More verifier tests
svilen-mihaylov-elastic Apr 8, 2025
c574a1b
Merge branch 'main' into svilen/121525
svilen-mihaylov-elastic Apr 8, 2025
6713caf
[CI] Auto commit changes from spotless
elasticsearchmachine Apr 8, 2025
4c2eaa2
Enabled only in snapshot
svilen-mihaylov-elastic Apr 8, 2025
51a7e6b
Merge branch 'svilen/121525' of https://github.com/svilen-mihaylov-el…
svilen-mihaylov-elastic Apr 8, 2025
fa3d50a
Share options code between match and multi_match
svilen-mihaylov-elastic Apr 9, 2025
050f086
Update x-pack/plugin/esql/qa/testFixtures/src/main/resources/multi-ma…
svilen-mihaylov-elastic Apr 9, 2025
665c32e
Update x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/…
svilen-mihaylov-elastic Apr 9, 2025
56888af
Add boost field
svilen-mihaylov-elastic Apr 9, 2025
02e2b75
Move static function
svilen-mihaylov-elastic Apr 9, 2025
4774dbe
Update test
svilen-mihaylov-elastic Apr 9, 2025
999b820
Uses populateOptionsMap from QueryString
svilen-mihaylov-elastic Apr 9, 2025
8a74c79
Merge branch 'main' into svilen/121525
svilen-mihaylov-elastic Apr 9, 2025
937963b
Extend test
svilen-mihaylov-elastic Apr 10, 2025
6703882
add test
svilen-mihaylov-elastic Apr 10, 2025
44d6721
Merge branch 'main' into svilen/121525
svilen-mihaylov-elastic Apr 10, 2025
1cdf7ed
+1
svilen-mihaylov-elastic Apr 10, 2025
58d37f8
Merge branch 'main' into svilen/121525
svilen-mihaylov-elastic Apr 10, 2025
9b90726
Add required capability
svilen-mihaylov-elastic Apr 11, 2025
9c6b73d
Merge branch 'main' into svilen/121525
svilen-mihaylov-elastic Apr 11, 2025
b5d6edb
Indicate multimatch is behind a snapshot
svilen-mihaylov-elastic Apr 14, 2025
0b928d1
Merge branch 'main' into svilen/121525
svilen-mihaylov-elastic Apr 14, 2025
3ea5092
Update count
svilen-mihaylov-elastic Apr 14, 2025
b526b81
revert
svilen-mihaylov-elastic Apr 14, 2025
9c37690
Merge branch 'main' into svilen/121525
svilen-mihaylov-elastic Apr 14, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Extend test
  • Loading branch information
svilen-mihaylov-elastic committed Apr 10, 2025
commit 937963b8afa187d93688ac47dac10c42f58100e6
Original file line number Diff line number Diff line change
Expand Up @@ -95,3 +95,35 @@ book_no:keyword
8678
8875
;

testMultiMatchPhraseQuery
from books
| where multi_match("Lord of the rings", title, description, { "type": "phrase" } )
| keep title
;
ignoreOrder: true

title:text
A Tolkien Compass: Including J. R. R. Tolkien's Guide to the Names in The Lord of the Rings
Return of the Shadow
The Lord of the Rings Poster Collection: Six Paintings by Alan Lee (No. 1)
Letters of J R R Tolkien
The Lord of the Rings - Boxed Set
The Two Towers
Realms of Tolkien: Images of Middle-earth
Return of the King Being the Third Part of The Lord of the Rings
;

testMultiMatchPhrasePrefixQuery
from books
| where multi_match("Lord of the ri", title, { "type": "phrase_prefix" } )
| keep title
;
ignoreOrder: true

title:text
The Lord of the Rings - Boxed Set
Return of the King Being the Third Part of The Lord of the Rings
A Tolkien Compass: Including J. R. R. Tolkien's Guide to the Names in The Lord of the Rings
The Lord of the Rings Poster Collection: Six Paintings by Alan Lee (No. 1)
;
Loading