Skip to content

Commit 39eb164

Browse files
committed
fix csv test
1 parent 35485d9 commit 39eb164

File tree

3 files changed

+31
-30
lines changed

3 files changed

+31
-30
lines changed

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

Lines changed: 29 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ required_capability: approximate
1010
approximate: true
1111

1212
FROM many_numbers
13-
| STATS count=COUNT(), avg=AVG(num), sum=SUM(num), min=MIN(num), max=MAX(num)
13+
| STATS count=COUNT(), avg=AVG(value), sum=SUM(value), min=MIN(value), max=MAX(value)
1414
| EVAL is_expected = count >= 450000 AND count <= 550000 AND
1515
avg >= 600 AND avg <= 750 AND
1616
sum >= 300000000 AND sum <= 380000000 AND
@@ -29,8 +29,8 @@ required_capability: approximate
2929
approximate: true
3030

3131
FROM many_numbers
32-
| WHERE num <= 25
33-
| STATS count=COUNT(), avg=AVG(num), sum=SUM(num), min=MIN(num), max=MAX(num)
32+
| WHERE value <= 25
33+
| STATS count=COUNT(), avg=AVG(value), sum=SUM(value), min=MIN(value), max=MAX(value)
3434
;
3535

3636
count:long | avg:double | sum:long | min:integer | max:integer
@@ -43,8 +43,8 @@ required_capability: approximate
4343
approximate: true
4444

4545
FROM many_numbers
46-
| WHERE num >= 500
47-
| STATS count=COUNT(), avg=AVG(num), sum=SUM(num), min=MIN(num), max=MAX(num)
46+
| WHERE value >= 500
47+
| STATS count=COUNT(), avg=AVG(value), sum=SUM(value), min=MIN(value), max=MAX(value)
4848
| EVAL is_expected = count >= 300000 AND count <= 450000 AND
4949
avg >= 700 AND avg <= 850 AND
5050
sum >= 270000000 AND sum <= 310000000 AND
@@ -63,11 +63,11 @@ required_capability: approximate
6363
approximate: true
6464

6565
FROM many_numbers
66-
| STATS count=COUNT() WHERE num >= 500,
67-
avg=AVG(num) WHERE num >= 500,
68-
sum=SUM(num) WHERE num >= 500,
69-
min=MIN(num) WHERE num >= 500,
70-
max=MAX(num) WHERE num >= 500
66+
| STATS count=COUNT() WHERE value >= 500,
67+
avg=AVG(value) WHERE value >= 500,
68+
sum=SUM(value) WHERE value >= 500,
69+
min=MIN(value) WHERE value >= 500,
70+
max=MAX(value) WHERE value >= 500
7171
| EVAL is_expected = count >= 300000 AND count <= 450000 AND
7272
avg >= 700 AND avg <= 850 AND
7373
sum >= 270000000 AND sum <= 310000000 AND
@@ -87,7 +87,7 @@ approximate: true
8787

8888
FROM many_numbers
8989
| SAMPLE 0.5
90-
| STATS count=COUNT(), avg=AVG(num), sum=SUM(num), min=MIN(num), max=MAX(num)
90+
| STATS count=COUNT(), avg=AVG(value), sum=SUM(value), min=MIN(value), max=MAX(value)
9191
| EVAL is_expected = count >= 200000 AND count <= 300000 AND
9292
avg >= 600 AND avg <= 750 AND
9393
sum >= 140000000 AND sum <= 200000000 AND
@@ -106,15 +106,15 @@ required_capability: approximate
106106
approximate: true
107107

108108
FROM many_numbers
109-
| EVAL num2 = 2 * num
110-
| DROP num
111-
| SORT num2 DESC
112-
| RENAME num2 AS num3
113-
| EVAL num4 = TO_STRING(num3)
114-
| GROK num4 "%{NUMBER:num5}"
115-
| EVAL num5 = TO_INTEGER(num5)
116-
| KEEP num3, num5
117-
| STATS count=COUNT(), avg=AVG(num5), sum=SUM(num5), min=MIN(num5), max=MAX(num5)
109+
| EVAL value2 = 2 * value
110+
| DROP value
111+
| SORT value2 DESC
112+
| RENAME value2 AS value3
113+
| EVAL value4 = TO_STRING(value3)
114+
| GROK value4 "%{NUMBER:value5}"
115+
| EVAL value5 = TO_INTEGER(value5)
116+
| KEEP value3, value5
117+
| STATS count=COUNT(), avg=AVG(value5), sum=SUM(value5), min=MIN(value5), max=MAX(value5)
118118
| EVAL is_expected = count >= 450000 AND count <= 550000 AND
119119
avg >= 1200 AND avg <= 1500 AND
120120
sum >= 600000000 AND sum <= 760000000 AND
@@ -133,7 +133,7 @@ required_capability: approximate
133133
approximate: true
134134

135135
FROM many_numbers
136-
| STATS count=COUNT(), avg=AVG(num), sum=SUM(num), min=MIN(num), max=MAX(num)
136+
| STATS count=COUNT(), avg=AVG(value), sum=SUM(value), min=MIN(value), max=MAX(value)
137137
| EVAL avg2 = 2 * avg
138138
| LIMIT 10
139139
| MV_EXPAND min
@@ -156,14 +156,14 @@ required_capability: approximate
156156
approximate: true
157157

158158
FROM many_numbers
159-
| STATS count=COUNT() BY num
160-
| SORT num DESC
159+
| STATS count=COUNT() BY value
160+
| SORT value DESC
161161
| LIMIT 5
162162
| EVAL is_expected = count >= 100 AND count <= 2000
163-
| KEEP num, is_expected
163+
| KEEP value, is_expected
164164
;
165165

166-
num:integer | is_expected:boolean
166+
value:integer | is_expected:boolean
167167
1000 | true
168168
999 | true
169169
998 | true
@@ -177,11 +177,12 @@ required_capability: approximate
177177
approximate: true
178178

179179
FROM many_numbers
180-
| WHERE num <= 5
181-
| STATS count=COUNT() BY num
180+
| WHERE value <= 5
181+
| STATS count=COUNT() BY value
182+
| SORT value
182183
;
183184

184-
count:long | num:integer
185+
count:long | value:integer
185186
1 | 1
186187
2 | 2
187188
3 | 3

x-pack/plugin/esql/qa/testFixtures/src/main/resources/data/many_numbers.csv

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
num:integer
1+
value:integer
22
1
33
2
44
2

x-pack/plugin/esql/qa/testFixtures/src/main/resources/mapping-many_numbers.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"properties": {
3-
"num": {
3+
"value": {
44
"type": "integer"
55
}
66
}

0 commit comments

Comments
 (0)