Skip to content

Backport moving scoring in ES|QL out of snapshot into 8.x #120905

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

Backport moving scoring in ES|QL out of snapshot into 8.x #120905

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
902fbea
Move scoring in ES|QL out of snapshot (#120354)
tteofili Jan 21, 2025
b2e3b23
Revert unwanted ES|QL lexer changes from PR #120354 (#120538)
tteofili Jan 21, 2025
5f82c00
Update docs/changelog/120905.yaml
tteofili Jan 27, 2025
9c30c31
Merge branch '8.x' of github.com:elastic/elasticsearch into esql_scor…
tteofili Jan 27, 2025
08304dd
Merge branch '8.x' of github.com:elastic/elasticsearch into esql_scor…
tteofili Jan 27, 2025
6be54ef
Merge branch 'esql_scoring_nosnap_8x' of github.com:tteofili/elastics…
tteofili Jan 27, 2025
71ff5c6
remove unneeded changelog entries
tteofili Jan 27, 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
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think any of these changelog should be added? We already should have the changelog for the scoring change, the others should not be needed (this should be a >non-issue IMO)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thanks @carlosdelest , very good points !

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

added #120940 to remove the mentioned assertions in tests

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: []
5 changes: 5 additions & 0 deletions docs/changelog/120538.yaml
View file
Open in desktop
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/120905.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
pr: 120905
summary: Backport moving scoring in ES|QL out of snapshot into 8.x
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. Scoring will be updated when using <<esql-search-functions,full text search functions>>.

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

Expand Down
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 @@ -599,7 +599,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 @@ -18,7 +18,6 @@
import org.elasticsearch.index.IndexMode;
import org.elasticsearch.transport.RemoteClusterAware;
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 @@ -280,8 +279,7 @@ public LogicalPlan visitFromCommand(EsqlBaseParser.FromCommandContext ctx) {
for (var c : metadataOptionContext.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