Skip to content

Commit 954a901

Browse files
jan-elasticjan-elastic
committed
rename ES|QL sample capability (elastic#129193)
1 parent 7460226 commit 954a901

File tree

7 files changed

+25
-25
lines changed

7 files changed

+25
-25
lines changed

‎x-pack/plugin/esql/qa/server/src/main/java/org/elasticsearch/xpack/esql/qa/rest/RestSampleTestCase.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public class RestSampleTestCase extends ESRestTestCase {
3333
public void skipWhenSampleDisabled() throws IOException {
3434
assumeTrue(
3535
"Requires SAMPLE capability",
36-
EsqlSpecTestCase.hasCapabilities(adminClient(), List.of(EsqlCapabilities.Cap.SAMPLE.capabilityName()))
36+
EsqlSpecTestCase.hasCapabilities(adminClient(), List.of(EsqlCapabilities.Cap.SAMPLE_V2.capabilityName()))
3737
);
3838
}
3939

‎x-pack/plugin/esql/qa/testFixtures/src/main/resources/sample.csv-spec‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
// because the CSV tests don't support such assertions.
1010

1111
row
12-
required_capability: sample
12+
required_capability: sample_v2
1313

1414
ROW x = 1 | SAMPLE .999999999
1515
;
@@ -20,7 +20,7 @@ x:integer
2020

2121

2222
row and mv_expand
23-
required_capability: sample
23+
required_capability: sample_v2
2424

2525
ROW x = [1,2,3,4,5] | MV_EXPAND x | SAMPLE .999999999
2626
;
@@ -35,7 +35,7 @@ x:integer
3535

3636

3737
adjust stats for sampling
38-
required_capability: sample
38+
required_capability: sample_v2
3939

4040
FROM employees
4141
| SAMPLE 0.5
@@ -53,7 +53,7 @@ true
5353

5454

5555
before where
56-
required_capability: sample
56+
required_capability: sample_v2
5757

5858
FROM employees
5959
| SAMPLE 0.5
@@ -71,7 +71,7 @@ true
7171

7272

7373
after where
74-
required_capability: sample
74+
required_capability: sample_v2
7575

7676
FROM employees
7777
| WHERE emp_no <= 10050
@@ -89,7 +89,7 @@ true
8989

9090

9191
before sort
92-
required_capability: sample
92+
required_capability: sample_v2
9393

9494
FROM employees
9595
| SAMPLE 0.5
@@ -107,7 +107,7 @@ true
107107

108108

109109
after sort
110-
required_capability: sample
110+
required_capability: sample_v2
111111

112112
FROM employees
113113
| SORT emp_no
@@ -125,7 +125,7 @@ true
125125

126126

127127
before limit
128-
required_capability: sample
128+
required_capability: sample_v2
129129

130130
FROM employees
131131
| SAMPLE 0.5
@@ -141,7 +141,7 @@ true
141141

142142

143143
after limit
144-
required_capability: sample
144+
required_capability: sample_v2
145145

146146
FROM employees
147147
| LIMIT 50
@@ -158,7 +158,7 @@ true
158158

159159

160160
before mv_expand
161-
required_capability: sample
161+
required_capability: sample_v2
162162

163163
ROW x = [1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50], y = [1,2]
164164
| MV_EXPAND x
@@ -176,7 +176,7 @@ true
176176

177177

178178
after mv_expand
179-
required_capability: sample
179+
required_capability: sample_v2
180180

181181
ROW x = [1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50], y = [1,2]
182182
| MV_EXPAND x
@@ -194,7 +194,7 @@ true
194194

195195

196196
multiple samples
197-
required_capability: sample
197+
required_capability: sample_v2
198198

199199
FROM employees
200200
| SAMPLE 0.7
@@ -213,7 +213,7 @@ true
213213

214214

215215
after stats
216-
required_capability: sample
216+
required_capability: sample_v2
217217

218218
FROM employees
219219
| SAMPLE 0.5

‎x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/action/EsqlCapabilities.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -965,7 +965,7 @@ public enum Cap {
965965
/**
966966
* Support for the SAMPLE command
967967
*/
968-
SAMPLE(Build.current().isSnapshot());
968+
SAMPLE_V2(Build.current().isSnapshot());
969969

970970
private final boolean enabled;
971971

‎x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/analysis/AnalyzerTests.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3167,7 +3167,7 @@ private boolean isMultiTypeEsField(Expression e) {
31673167
}
31683168

31693169
public void testRandomSampleProbability() {
3170-
assumeTrue("requires SAMPLE capability", EsqlCapabilities.Cap.SAMPLE.isEnabled());
3170+
assumeTrue("requires SAMPLE capability", EsqlCapabilities.Cap.SAMPLE_V2.isEnabled());
31713171

31723172
var e = expectThrows(VerificationException.class, () -> analyze("FROM test | SAMPLE 1."));
31733173
assertThat(e.getMessage(), containsString("RandomSampling probability must be strictly between 0.0 and 1.0, was [1.0]"));

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7719,7 +7719,7 @@ public void testPruneRedundantOrderBy() {
77197719
* \_EsRelation[test][_meta_field{f}#12, emp_no{f}#6, first_name{f}#7, ge..]
77207720
*/
77217721
public void testSampleMerged() {
7722-
assumeTrue("sample must be enabled", EsqlCapabilities.Cap.SAMPLE.isEnabled());
7722+
assumeTrue("sample must be enabled", EsqlCapabilities.Cap.SAMPLE_V2.isEnabled());
77237723

77247724
var query = """
77257725
FROM TEST
@@ -7740,7 +7740,7 @@ public void testSampleMerged() {
77407740
}
77417741

77427742
public void testSamplePushDown() {
7743-
assumeTrue("sample must be enabled", EsqlCapabilities.Cap.SAMPLE.isEnabled());
7743+
assumeTrue("sample must be enabled", EsqlCapabilities.Cap.SAMPLE_V2.isEnabled());
77447744

77457745
for (var command : List.of(
77467746
"ENRICH languages_idx on first_name",
@@ -7765,7 +7765,7 @@ public void testSamplePushDown() {
77657765
}
77667766

77677767
public void testSamplePushDown_sort() {
7768-
assumeTrue("sample must be enabled", EsqlCapabilities.Cap.SAMPLE.isEnabled());
7768+
assumeTrue("sample must be enabled", EsqlCapabilities.Cap.SAMPLE_V2.isEnabled());
77697769

77707770
var query = "FROM TEST | WHERE emp_no > 0 | SAMPLE 0.5 | LIMIT 100";
77717771
var optimized = optimizedPlan(query);
@@ -7779,7 +7779,7 @@ public void testSamplePushDown_sort() {
77797779
}
77807780

77817781
public void testSamplePushDown_where() {
7782-
assumeTrue("sample must be enabled", EsqlCapabilities.Cap.SAMPLE.isEnabled());
7782+
assumeTrue("sample must be enabled", EsqlCapabilities.Cap.SAMPLE_V2.isEnabled());
77837783

77847784
var query = "FROM TEST | SORT emp_no | SAMPLE 0.5 | LIMIT 100";
77857785
var optimized = optimizedPlan(query);
@@ -7792,7 +7792,7 @@ public void testSamplePushDown_where() {
77927792
}
77937793

77947794
public void testSampleNoPushDown() {
7795-
assumeTrue("sample must be enabled", EsqlCapabilities.Cap.SAMPLE.isEnabled());
7795+
assumeTrue("sample must be enabled", EsqlCapabilities.Cap.SAMPLE_V2.isEnabled());
77967796

77977797
for (var command : List.of("LIMIT 100", "MV_EXPAND languages", "STATS COUNT()")) {
77987798
var query = "FROM TEST | " + command + " | SAMPLE .5";
@@ -7814,7 +7814,7 @@ public void testSampleNoPushDown() {
78147814
* \_EsRelation[languages_lookup][LOOKUP][language_code{f}#17, language_name{f}#18]
78157815
*/
78167816
public void testSampleNoPushDownLookupJoin() {
7817-
assumeTrue("sample must be enabled", EsqlCapabilities.Cap.SAMPLE.isEnabled());
7817+
assumeTrue("sample must be enabled", EsqlCapabilities.Cap.SAMPLE_V2.isEnabled());
78187818

78197819
var query = """
78207820
FROM TEST
@@ -7840,7 +7840,7 @@ public void testSampleNoPushDownLookupJoin() {
78407840
* \_EsRelation[test][_meta_field{f}#12, emp_no{f}#6, first_name{f}#7, ge..]
78417841
*/
78427842
public void testSampleNoPushDownChangePoint() {
7843-
assumeTrue("sample must be enabled", EsqlCapabilities.Cap.SAMPLE.isEnabled());
7843+
assumeTrue("sample must be enabled", EsqlCapabilities.Cap.SAMPLE_V2.isEnabled());
78447844

78457845
var query = """
78467846
FROM TEST

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8034,7 +8034,7 @@ public void testNotEqualsPushdownToDelegate() {
80348034
* [_doc{f}#24], limit[1000], sort[] estimatedRowSize[332]
80358035
*/
80368036
public void testSamplePushDown() {
8037-
assumeTrue("sample must be enabled", EsqlCapabilities.Cap.SAMPLE.isEnabled());
8037+
assumeTrue("sample must be enabled", EsqlCapabilities.Cap.SAMPLE_V2.isEnabled());
80388038

80398039
var plan = physicalPlan("""
80408040
FROM test

‎x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/parser/StatementParserTests.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3454,7 +3454,7 @@ public void testInvalidCompletion() {
34543454
}
34553455

34563456
public void testSample() {
3457-
assumeTrue("SAMPLE requires corresponding capability", EsqlCapabilities.Cap.SAMPLE.isEnabled());
3457+
assumeTrue("SAMPLE requires corresponding capability", EsqlCapabilities.Cap.SAMPLE_V2.isEnabled());
34583458
expectError("FROM test | SAMPLE .1 2", "line 1:23: extraneous input '2' expecting <EOF>");
34593459
expectError("FROM test | SAMPLE .1 \"2\"", "line 1:23: extraneous input '\"2\"' expecting <EOF>");
34603460
expectError("FROM test | SAMPLE 1", "line 1:20: mismatched input '1' expecting {DECIMAL_LITERAL, '+', '-'}");

0 commit comments

Comments
 (0)