Skip to content

Move scoring in ES|QL out of snapshot #120354

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.

Sign up for GitHub

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 8 commits into from
Jan 21, 2025
Merged

Move scoring in ES|QL out of snapshot #120354

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
dc493f0
Move scoring in ES|QL out of snapshot
tteofili Jan 17, 2025
9df0d7b
Merge branch 'main' of github.com:elastic/elasticsearch into scoring_…
tteofili Jan 17, 2025
31aecbd
Update docs/changelog/120354.yaml
tteofili Jan 17, 2025
ee48d8e
[CI] Auto commit changes from spotless
Jan 17, 2025
0a7e7b5
Update docs/reference/esql/metadata-fields.asciidoc
tteofili Jan 20, 2025
689d989
Merge branch 'main' into scoring_no_snapshot
tteofili Jan 21, 2025
fcad09a
minor doc fix
tteofili Jan 21, 2025
241dbc0
Merge branch 'main' of github.com:elastic/elasticsearch into scoring_…
tteofili Jan 21, 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
5 changes: 5 additions & 0 deletions docs/changelog/120354.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
pr: 120354
summary: Move scoring in ES|QL out of snapshot
area: ES|QL
type: enhancement
issues: []
2 changes: 2 additions & 0 deletions docs/reference/esql/metadata-fields.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ supported ones are:
* <<mapping-ignored-field,`_ignored`>>: the ignored source document fields. The field is of the type
<<keyword,keyword>>.

* `_score`: when enabled, the final score assigned to each row matching an ES|QL query.

To enable the access to these fields, the <<esql-from,`FROM`>> source command needs
to be provided with a dedicated directive:

Expand Down
136 changes: 67 additions & 69 deletions x-pack/plugin/esql/src/main/antlr/EsqlBaseLexer.tokens
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/action/EsqlCapabilities.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -703,7 +703,7 @@ public enum Cap {
/**
* Support the "METADATA _score" directive to enable _score column.
*/
METADATA_SCORE(Build.current().isSnapshot()),
METADATA_SCORE,

/**
* Term function
Expand Down
4 changes: 1 addition & 3 deletions x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/parser/LogicalPlanBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
import org.elasticsearch.dissect.DissectParser;
import org.elasticsearch.index.IndexMode;
import org.elasticsearch.xpack.esql.VerificationException;
import org.elasticsearch.xpack.esql.action.EsqlCapabilities;
import org.elasticsearch.xpack.esql.common.Failure;
import org.elasticsearch.xpack.esql.core.expression.Alias;
import org.elasticsearch.xpack.esql.core.expression.Attribute;
Expand Down Expand Up @@ -262,8 +261,7 @@ public LogicalPlan visitFromCommand(EsqlBaseParser.FromCommandContext ctx) {
for (var c : ctx.metadata().UNQUOTED_SOURCE()) {
String id = c.getText();
Source src = source(c);
if (MetadataAttribute.isSupported(id) == false // TODO: drop check below once METADATA_SCORE is no longer snapshot-only
|| (EsqlCapabilities.Cap.METADATA_SCORE.isEnabled() == false && MetadataAttribute.SCORE.equals(id))) {
if (MetadataAttribute.isSupported(id) == false) {
throw new ParsingException(src, "unsupported metadata field [" + id + "]");
}
Attribute a = metadataMap.put(id, MetadataAttribute.create(src, id));
Expand Down