Skip to content

Commit 88b7244

Browse files
committed
Remove boosting and fuzziness
1 parent e84fcd5 commit 88b7244

File tree

21 files changed

+1866
-2751
lines changed

21 files changed

+1866
-2751
lines changed

server/src/main/java/org/elasticsearch/TransportVersions.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ static TransportVersion def(int id) {
185185
public static final TransportVersion INDEX_REQUEST_REMOVE_METERING = def(8_780_00_0);
186186
public static final TransportVersion CPU_STAT_STRING_PARSING = def(8_781_00_0);
187187
public static final TransportVersion QUERY_RULES_RETRIEVER = def(8_782_00_0);
188-
public static final TransportVersion MATCH_OPERATOR_FUZZINESS_BOOSTING = def(8_783_00_0);
188+
public static final TransportVersion MATCH_OPERATOR_COLON = def(8_783_00_0);
189189

190190
/*
191191
* STOP! READ THIS FIRST! No, really,

x-pack/plugin/esql/qa/testFixtures/src/main/resources/match-operator.csv-spec

Lines changed: 0 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -217,44 +217,3 @@ count(*): long | author.keyword:keyword
217217
1 | Paul Faulkner
218218
8 | William Faulkner
219219
;
220-
221-
fuzzinessMatch
222-
required_capability: match_operator_colon
223-
224-
from books
225-
| where title : "Felowhip"~2
226-
| keep book_no, title;
227-
ignoreOrder:true
228-
229-
book_no:keyword | title:text
230-
2936 | Fellowship of the Ring 2ND Edition
231-
;
232-
233-
fuzzinessMatchUsingExpression
234-
required_capability: match_operator_colon
235-
236-
from books
237-
| eval fuzzy = 1 + 1
238-
| where title : "Felowhip"~fuzzy
239-
| keep book_no, title;
240-
ignoreOrder:true
241-
242-
book_no:keyword | title:text
243-
2936 | Fellowship of the Ring 2ND Edition
244-
;
245-
246-
fuzzinessMatchAuto
247-
required_capability: match_operator_colon
248-
249-
from books
250-
| where title : "Ring"~AUTO:2,5
251-
| keep book_no, title;
252-
ignoreOrder:true
253-
254-
book_no:keyword | title:text
255-
4023 | A Tolkien Compass: Including J. R. R. Tolkien's Guide to the Names in The Lord of the Rings
256-
2936 | Fellowship of the Ring 2ND Edition
257-
2714 | Return of the King Being the Third Part of The Lord of the Rings
258-
2675 | The Lord of the Rings - Boxed Set
259-
7140 | The Lord of the Rings Poster Collection: Six Paintings by Alan Lee (No. 1)
260-
;

x-pack/plugin/esql/src/main/antlr/EsqlBaseLexer.g4

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -208,9 +208,7 @@ MINUS : '-';
208208
ASTERISK : '*';
209209
SLASH : '/';
210210
PERCENT : '%';
211-
DEV_CARET : {this.isDevVersion()}? '^';
212211
COLON : {this.isDevVersion()}? ':';
213-
DEV_TILDE : {this.isDevVersion()}? '~';
214212

215213
NESTED_WHERE : WHERE -> type(WHERE);
216214

x-pack/plugin/esql/src/main/antlr/EsqlBaseParser.g4

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -77,21 +77,9 @@ regexBooleanExpression
7777
;
7878

7979
matchBooleanExpression
80-
: fieldExp=valueExpression (boostExpression)? COLON queryString=valueExpression (fuzzinessExpression)?
80+
: fieldExp=qualifiedName COLON queryString=primaryExpression
8181
;
8282

83-
fuzzinessExpression
84-
: DEV_TILDE fuzzinessValue?
85-
;
86-
87-
fuzzinessValue
88-
: distance=operatorExpression
89-
| AUTO(COLON INTEGER_LITERAL (COMMA INTEGER_LITERAL)?)?
90-
;
91-
92-
boostExpression
93-
: DEV_CARET operatorExpression;
94-
9583
valueExpression
9684
: operatorExpression #valueExpressionDefault
9785
| left=operatorExpression comparisonOperator right=operatorExpression #comparison

x-pack/plugin/esql/src/main/antlr/EsqlBaseParser.tokens

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

0 commit comments

Comments
 (0)