Skip to content

Remove scoring enabled assumptions in ES|QL match test #121393

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 10 commits into from
Feb 6, 2025
Merged

Remove scoring enabled assumptions in ES|QL match test #121393

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
ca6c401
Remove scoring enabled assumptions in ES|QL match test
tteofili Jan 31, 2025
b755484
reverted undesired changes
tteofili Jan 31, 2025
bc63ab3
Merge branch 'main' of github.com:elastic/elasticsearch into esql_tes…
tteofili Jan 31, 2025
f193161
Merge branch 'main' into esql_test_no_scoring_assumption
tteofili Feb 3, 2025
4f425bf
dropped remaining test checks
tteofili Feb 3, 2025
8e5c524
Merge branch 'esql_test_no_scoring_assumption' of github.com:tteofili…
tteofili Feb 3, 2025
bd84047
[CI] Auto commit changes from spotless
Feb 3, 2025
7723443
Merge branch 'main' of github.com:elastic/elasticsearch into esql_tes…
tteofili Feb 3, 2025
df1d9db
Merge branch 'esql_test_no_scoring_assumption' of github.com:tteofili…
tteofili Feb 3, 2025
b3efcf4
Merge branch 'main' into esql_test_no_scoring_assumption
tteofili Feb 6, 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
6 changes: 1 addition & 5 deletions ...sql/src/internalClusterTest/java/org/elasticsearch/xpack/esql/plugin/MatchFunctionIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.xpack.esql.VerificationException;
import org.elasticsearch.xpack.esql.action.AbstractEsqlIntegTestCase;
import org.elasticsearch.xpack.esql.action.EsqlCapabilities;
import org.junit.Before;

import java.util.List;
Expand Down Expand Up @@ -105,7 +104,6 @@ public void testNotWhereMatch() {
}

public void testWhereMatchWithScoring() {
assumeTrue("'METADATA _score' is disabled", EsqlCapabilities.Cap.METADATA_SCORE.isEnabled());
var query = """
FROM test
METADATA _score
Expand All @@ -122,7 +120,7 @@ public void testWhereMatchWithScoring() {
}

public void testWhereMatchWithScoringDifferentSort() {
assumeTrue("'METADATA _score' is disabled", EsqlCapabilities.Cap.METADATA_SCORE.isEnabled());

var query = """
FROM test
METADATA _score
Expand All @@ -139,7 +137,6 @@ public void testWhereMatchWithScoringDifferentSort() {
}

public void testWhereMatchWithScoringSortScore() {
assumeTrue("'METADATA _score' is disabled", EsqlCapabilities.Cap.METADATA_SCORE.isEnabled());
var query = """
FROM test
METADATA _score
Expand All @@ -156,7 +153,6 @@ public void testWhereMatchWithScoringSortScore() {
}

public void testWhereMatchWithScoringNoSort() {
assumeTrue("'METADATA _score' is disabled", EsqlCapabilities.Cap.METADATA_SCORE.isEnabled());
var query = """
FROM test
METADATA _score
Expand Down
4 changes: 0 additions & 4 deletions ...sql/src/internalClusterTest/java/org/elasticsearch/xpack/esql/plugin/MatchOperatorIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.xpack.esql.VerificationException;
import org.elasticsearch.xpack.esql.action.AbstractEsqlIntegTestCase;
import org.elasticsearch.xpack.esql.action.EsqlCapabilities;
import org.junit.Before;

import java.util.List;
Expand Down Expand Up @@ -106,7 +105,6 @@ public void testNotWhereMatch() {
}

public void testWhereMatchWithScoring() {
assumeTrue("'METADATA _score' is disabled", EsqlCapabilities.Cap.METADATA_SCORE.isEnabled());
var query = """
FROM test
METADATA _score
Expand All @@ -123,7 +121,6 @@ public void testWhereMatchWithScoring() {
}

public void testWhereMatchWithScoringDifferentSort() {
assumeTrue("'METADATA _score' is disabled", EsqlCapabilities.Cap.METADATA_SCORE.isEnabled());
var query = """
FROM test
METADATA _score
Expand All @@ -140,7 +137,6 @@ public void testWhereMatchWithScoringDifferentSort() {
}

public void testWhereMatchWithScoringNoSort() {
assumeTrue("'METADATA _score' is disabled", EsqlCapabilities.Cap.METADATA_SCORE.isEnabled());
var query = """
FROM test
METADATA _score
Expand Down
5 changes: 0 additions & 5 deletions .../esql/src/internalClusterTest/java/org/elasticsearch/xpack/esql/plugin/QueryStringIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
import org.elasticsearch.index.query.QueryShardException;
import org.elasticsearch.xpack.esql.VerificationException;
import org.elasticsearch.xpack.esql.action.AbstractEsqlIntegTestCase;
import org.elasticsearch.xpack.esql.action.EsqlCapabilities;
import org.junit.Before;

import java.util.List;
Expand Down Expand Up @@ -140,7 +139,6 @@ private void createAndPopulateIndex() {
}

public void testWhereQstrWithScoring() {
assumeTrue("'METADATA _score' is disabled", EsqlCapabilities.Cap.METADATA_SCORE.isEnabled());
var query = """
FROM test
METADATA _score
Expand All @@ -165,7 +163,6 @@ public void testWhereQstrWithScoring() {
}

public void testWhereQstrWithScoringSorted() {
assumeTrue("'METADATA _score' is disabled", EsqlCapabilities.Cap.METADATA_SCORE.isEnabled());
var query = """
FROM test
METADATA _score
Expand All @@ -191,7 +188,6 @@ public void testWhereQstrWithScoringSorted() {
}

public void testWhereQstrWithScoringNoSort() {
assumeTrue("'METADATA _score' is disabled", EsqlCapabilities.Cap.METADATA_SCORE.isEnabled());
var query = """
FROM test
METADATA _score
Expand All @@ -215,7 +211,6 @@ public void testWhereQstrWithScoringNoSort() {
}

public void testWhereQstrWithNonPushableAndScoring() {
assumeTrue("'METADATA _score' is disabled", EsqlCapabilities.Cap.METADATA_SCORE.isEnabled());
var query = """
FROM test
METADATA _score
Expand Down
2 changes: 0 additions & 2 deletions ...esql/src/test/java/org/elasticsearch/xpack/esql/optimizer/PhysicalPlanOptimizerTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7631,7 +7631,6 @@ private List<Set<String>> findFieldNamesInLookupJoinDescription(LocalExecutionPl
}

public void testScore() {
assumeTrue("'METADATA _score' is disabled", EsqlCapabilities.Cap.METADATA_SCORE.isEnabled());
var plan = physicalPlan("""
from test metadata _score
| where match(first_name, "john")
Expand All @@ -7658,7 +7657,6 @@ public void testScore() {
}

public void testScoreTopN() {
assumeTrue("'METADATA _score' is disabled", EsqlCapabilities.Cap.METADATA_SCORE.isEnabled());
var plan = physicalPlan("""
from test metadata _score
| where match(first_name, "john")
Expand Down