Skip to content

Commit 0c8f5f8

Browse files
tteofilielasticsearchmachine
andauthored
Remove scoring enabled assumptions in ES|QL match test (#121393)
* Remove scoring enabled assumptions in ES|QL match test --------- Co-authored-by: elasticsearchmachine <[email protected]>
1 parent f2b0905 commit 0c8f5f8

File tree

4 files changed

+1
-16
lines changed

4 files changed

+1
-16
lines changed

x-pack/plugin/esql/src/internalClusterTest/java/org/elasticsearch/xpack/esql/plugin/MatchFunctionIT.java

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
import org.elasticsearch.common.settings.Settings;
1414
import org.elasticsearch.xpack.esql.VerificationException;
1515
import org.elasticsearch.xpack.esql.action.AbstractEsqlIntegTestCase;
16-
import org.elasticsearch.xpack.esql.action.EsqlCapabilities;
1716
import org.junit.Before;
1817

1918
import java.util.List;
@@ -105,7 +104,6 @@ public void testNotWhereMatch() {
105104
}
106105

107106
public void testWhereMatchWithScoring() {
108-
assumeTrue("'METADATA _score' is disabled", EsqlCapabilities.Cap.METADATA_SCORE.isEnabled());
109107
var query = """
110108
FROM test
111109
METADATA _score
@@ -122,7 +120,7 @@ public void testWhereMatchWithScoring() {
122120
}
123121

124122
public void testWhereMatchWithScoringDifferentSort() {
125-
assumeTrue("'METADATA _score' is disabled", EsqlCapabilities.Cap.METADATA_SCORE.isEnabled());
123+
126124
var query = """
127125
FROM test
128126
METADATA _score
@@ -139,7 +137,6 @@ public void testWhereMatchWithScoringDifferentSort() {
139137
}
140138

141139
public void testWhereMatchWithScoringSortScore() {
142-
assumeTrue("'METADATA _score' is disabled", EsqlCapabilities.Cap.METADATA_SCORE.isEnabled());
143140
var query = """
144141
FROM test
145142
METADATA _score
@@ -156,7 +153,6 @@ public void testWhereMatchWithScoringSortScore() {
156153
}
157154

158155
public void testWhereMatchWithScoringNoSort() {
159-
assumeTrue("'METADATA _score' is disabled", EsqlCapabilities.Cap.METADATA_SCORE.isEnabled());
160156
var query = """
161157
FROM test
162158
METADATA _score

x-pack/plugin/esql/src/internalClusterTest/java/org/elasticsearch/xpack/esql/plugin/MatchOperatorIT.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
import org.elasticsearch.common.settings.Settings;
1414
import org.elasticsearch.xpack.esql.VerificationException;
1515
import org.elasticsearch.xpack.esql.action.AbstractEsqlIntegTestCase;
16-
import org.elasticsearch.xpack.esql.action.EsqlCapabilities;
1716
import org.junit.Before;
1817

1918
import java.util.List;
@@ -106,7 +105,6 @@ public void testNotWhereMatch() {
106105
}
107106

108107
public void testWhereMatchWithScoring() {
109-
assumeTrue("'METADATA _score' is disabled", EsqlCapabilities.Cap.METADATA_SCORE.isEnabled());
110108
var query = """
111109
FROM test
112110
METADATA _score
@@ -123,7 +121,6 @@ public void testWhereMatchWithScoring() {
123121
}
124122

125123
public void testWhereMatchWithScoringDifferentSort() {
126-
assumeTrue("'METADATA _score' is disabled", EsqlCapabilities.Cap.METADATA_SCORE.isEnabled());
127124
var query = """
128125
FROM test
129126
METADATA _score
@@ -140,7 +137,6 @@ public void testWhereMatchWithScoringDifferentSort() {
140137
}
141138

142139
public void testWhereMatchWithScoringNoSort() {
143-
assumeTrue("'METADATA _score' is disabled", EsqlCapabilities.Cap.METADATA_SCORE.isEnabled());
144140
var query = """
145141
FROM test
146142
METADATA _score

x-pack/plugin/esql/src/internalClusterTest/java/org/elasticsearch/xpack/esql/plugin/QueryStringIT.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
import org.elasticsearch.index.query.QueryShardException;
1414
import org.elasticsearch.xpack.esql.VerificationException;
1515
import org.elasticsearch.xpack.esql.action.AbstractEsqlIntegTestCase;
16-
import org.elasticsearch.xpack.esql.action.EsqlCapabilities;
1716
import org.junit.Before;
1817

1918
import java.util.List;
@@ -140,7 +139,6 @@ private void createAndPopulateIndex() {
140139
}
141140

142141
public void testWhereQstrWithScoring() {
143-
assumeTrue("'METADATA _score' is disabled", EsqlCapabilities.Cap.METADATA_SCORE.isEnabled());
144142
var query = """
145143
FROM test
146144
METADATA _score
@@ -165,7 +163,6 @@ public void testWhereQstrWithScoring() {
165163
}
166164

167165
public void testWhereQstrWithScoringSorted() {
168-
assumeTrue("'METADATA _score' is disabled", EsqlCapabilities.Cap.METADATA_SCORE.isEnabled());
169166
var query = """
170167
FROM test
171168
METADATA _score
@@ -191,7 +188,6 @@ public void testWhereQstrWithScoringSorted() {
191188
}
192189

193190
public void testWhereQstrWithScoringNoSort() {
194-
assumeTrue("'METADATA _score' is disabled", EsqlCapabilities.Cap.METADATA_SCORE.isEnabled());
195191
var query = """
196192
FROM test
197193
METADATA _score
@@ -215,7 +211,6 @@ public void testWhereQstrWithScoringNoSort() {
215211
}
216212

217213
public void testWhereQstrWithNonPushableAndScoring() {
218-
assumeTrue("'METADATA _score' is disabled", EsqlCapabilities.Cap.METADATA_SCORE.isEnabled());
219214
var query = """
220215
FROM test
221216
METADATA _score

x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/optimizer/PhysicalPlanOptimizerTests.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7631,7 +7631,6 @@ private List<Set<String>> findFieldNamesInLookupJoinDescription(LocalExecutionPl
76317631
}
76327632

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

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

0 commit comments

Comments
 (0)