Skip to content

Commit 40f3a1c

Browse files
limotovalimotova
authored
[ES|QL] Round stddev tests more aggressively (#135217)
Adjust the rounding for std_dev CSV tests so they are less sensitive to the whims of fate Hopefully: Closes #135100 Closes #135101 Closes #135102 Closes #135103
1 parent 32ff026 commit 40f3a1c

File tree

4 files changed

+46
-55
lines changed

4 files changed

+46
-55
lines changed

‎docs/reference/query-languages/esql/_snippets/functions/examples/std_dev.md‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎muted-tests.yml‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -567,18 +567,6 @@ tests:
567567
- class: org.elasticsearch.xpack.esql.qa.single_node.GenerativeMetricsIT
568568
method: test
569569
issue: https://github.com/elastic/elasticsearch/issues/135055
570-
- class: org.elasticsearch.xpack.esql.qa.single_node.EsqlSpecIT
571-
method: test {csv-spec:stats.StdDevFilter}
572-
issue: https://github.com/elastic/elasticsearch/issues/135100
573-
- class: org.elasticsearch.xpack.esql.qa.single_node.EsqlSpecIT
574-
method: test {csv-spec:inlinestats.StdDevFilter}
575-
issue: https://github.com/elastic/elasticsearch/issues/135101
576-
- class: org.elasticsearch.xpack.esql.qa.single_node.EsqlSpecIT
577-
method: test {csv-spec:stats.StdDeviationWithLongs}
578-
issue: https://github.com/elastic/elasticsearch/issues/135102
579-
- class: org.elasticsearch.xpack.esql.qa.single_node.EsqlSpecIT
580-
method: test {csv-spec:stats.StdDeviationGroupedAllTypes}
581-
issue: https://github.com/elastic/elasticsearch/issues/135103
582570
- class: org.elasticsearch.xpack.esql.ccq.MultiClusterSpecIT
583571
method: test {csv-spec:fork.ForkWithStats}
584572
issue: https://github.com/elastic/elasticsearch/issues/135116

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

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2546,22 +2546,25 @@ FROM employees
25462546
, less_than = STD_DEV(salary_change) WHERE languages <= 3
25472547
, salary = STD_DEV(salary * 2)
25482548
, count = COUNT(*) BY gender
2549+
| EVAL greater_than = ROUND(greater_than, 5)
2550+
, less_than = ROUND(less_than, 5)
2551+
, salary = ROUND(salary, 5)
25492552
| keep emp_no, gender, languages, *than, salary, count
25502553
| SORT emp_no asc
25512554
| limit 10
25522555
;
25532556

2554-
emp_no:integer|gender:keyword |languages:integer|greater_than:double|less_than:double | salary:double | count:long
2555-
10001 |M |2 |6.975232333891946 |6.604807075547775|26171.331109641273|57
2556-
10002 |F |5 |6.4543266953142835 |7.57786788789264 |29045.770666969744|33
2557-
10003 |M |4 |6.975232333891946 |6.604807075547775|26171.331109641273|57
2558-
10004 |M |5 |6.975232333891946 |6.604807075547775|26171.331109641273|57
2559-
10005 |M |1 |6.975232333891946 |6.604807075547775|26171.331109641273|57
2560-
10006 |F |3 |6.4543266953142835 |7.57786788789264 |29045.770666969744|33
2561-
10007 |F |4 |6.4543266953142835 |7.57786788789264 |29045.770666969744|33
2562-
10008 |M |2 |6.975232333891946 |6.604807075547775|26171.331109641273|57
2563-
10009 |F |1 |6.4543266953142835 |7.57786788789264 |29045.770666969744|33
2564-
10010 |null |4 |6.949207097931448 |7.127229475750027|27921.220736207077|10
2557+
emp_no:integer | gender:keyword | languages:integer | greater_than:double | less_than:double | salary:double | count:long
2558+
10001 | M | 2 | 6.97523 | 6.60481 | 26171.33111 | 57
2559+
10002 | F | 5 | 6.45433 | 7.57787 | 29045.77067 | 33
2560+
10003 | M | 4 | 6.97523 | 6.60481 | 26171.33111 | 57
2561+
10004 | M | 5 | 6.97523 | 6.60481 | 26171.33111 | 57
2562+
10005 | M | 1 | 6.97523 | 6.60481 | 26171.33111 | 57
2563+
10006 | F | 3 | 6.45433 | 7.57787 | 29045.77067 | 33
2564+
10007 | F | 4 | 6.45433 | 7.57787 | 29045.77067 | 33
2565+
10008 | M | 2 | 6.97523 | 6.60481 | 26171.33111 | 57
2566+
10009 | F | 1 | 6.45433 | 7.57787 | 29045.77067 | 33
2567+
10010 | null | 4 | 6.94921 | 7.12723 | 27921.22074 | 10
25652568
;
25662569

25672570
twoConsecutiveInlinestatsWithFalseFilters

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

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -2988,12 +2988,12 @@ required_capability: std_dev
29882988
FROM employees
29892989
| STATS std_dev_height = STD_DEV(height)
29902990
// end::stdev[]
2991-
| EVAL std_dev_height = ROUND(std_dev_height, 10)
2991+
| EVAL std_dev_height = ROUND(std_dev_height, 7)
29922992
;
29932993

29942994
// tag::stdev-result[]
29952995
std_dev_height:double
2996-
0.2063704436
2996+
0.2063704
29972997
// end::stdev-result[]
29982998
;
29992999

@@ -3003,12 +3003,12 @@ required_capability: std_dev
30033003
FROM employees
30043004
| STATS stddev_salary_change = STD_DEV(MV_MAX(salary_change))
30053005
// end::docsStatsStdDevNestedExpression[]
3006-
| EVAL stddev_salary_change = ROUND(stddev_salary_change, 10)
3006+
| EVAL stddev_salary_change = ROUND(stddev_salary_change, 5)
30073007
;
30083008

30093009
// tag::docsStatsStdDevNestedExpression-result[]
30103010
stddev_salary_change:double
3011-
6.8758295929
3011+
6.87583
30123012
// end::docsStatsStdDevNestedExpression-result[]
30133013
;
30143014

@@ -3017,22 +3017,22 @@ stdDeviationWithLongs
30173017
required_capability: std_dev
30183018
FROM employees
30193019
| STATS std_dev = STD_DEV(avg_worked_seconds)
3020-
| EVAL std_dev = ROUND(std_dev, 10)
3020+
| EVAL std_dev = ROUND(std_dev, 0)
30213021
;
30223022

30233023
std_dev:double
3024-
5.76010425971634E7
3024+
5.7601043E7
30253025
;
30263026

30273027
stdDeviationWithInts
30283028
required_capability: std_dev
30293029
FROM employees
30303030
| STATS std_dev = STD_DEV(salary)
3031-
| EVAL std_dev = ROUND(std_dev, 9)
3031+
| EVAL std_dev = ROUND(std_dev, 5)
30323032
;
30333033

30343034
std_dev:double
3035-
13765.125502788
3035+
13765.1255
30363036
;
30373037

30383038
stdDeviationConstantValue
@@ -3050,18 +3050,18 @@ stdDeviationGroupedDoublesOnly
30503050
required_capability: std_dev
30513051
FROM employees
30523052
| STATS std_dev = STD_DEV(height) BY languages
3053-
| EVAL std_dev = ROUND(std_dev, 10)
3053+
| EVAL std_dev = ROUND(std_dev, 5)
30543054
| SORT languages asc
30553055
| KEEP std_dev, languages
30563056
;
30573057

30583058
std_dev:double | languages:integer
3059-
0.2210640933 | 1
3060-
0.2279719087 | 2
3061-
0.1889307008 | 3
3062-
0.14656141 | 4
3063-
0.1773386015 | 5
3064-
0.2486543786 | null
3059+
0.22106 | 1
3060+
0.22797 | 2
3061+
0.18893 | 3
3062+
0.14656 | 4
3063+
0.17734 | 5
3064+
0.24865 | null
30653065
;
30663066

30673067
stdDeviationGroupedAllTypes
@@ -3073,14 +3073,14 @@ FROM employees
30733073
int_std_dev = STD_DEV(salary),
30743074
long_std_dev = STD_DEV(avg_worked_seconds)
30753075
BY languages
3076-
| EVAL double_std_dev = ROUND(double_std_dev, 10), int_std_dev = ROUND(int_std_dev, 10), long_std_dev = ROUND(long_std_dev, 10)
3076+
| EVAL double_std_dev = ROUND(double_std_dev, 5), int_std_dev = ROUND(int_std_dev, 5), long_std_dev = ROUND(long_std_dev, 5)
30773077
| SORT languages asc
30783078
| KEEP double_std_dev, int_std_dev, long_std_dev, languages
30793079
;
30803080

3081-
double_std_dev:double | int_std_dev:double | long_std_dev:double | languages:integer
3082-
0.2210640933 | 15166.2441787309 | 5.1998715922156096E7 | 1
3083-
0.2279719087 | 12139.6109937812 | 5.309085506583288E7 | 2
3081+
double_std_dev:double | int_std_dev:double | long_std_dev:double | languages:integer
3082+
0.22106 | 15166.24418 | 5.199871592216E7 | 1
3083+
0.22797 | 12139.61099 | 5.309085506583E7 | 2
30843084
;
30853085

30863086
stdDeviationNoRows
@@ -3098,11 +3098,11 @@ stdDevMultiValue
30983098
required_capability: std_dev
30993099
FROM employees
31003100
| STATS std_dev = STD_DEV(salary_change)
3101-
| EVAL std_dev = ROUND(std_dev, 10)
3101+
| EVAL std_dev = ROUND(std_dev, 5)
31023102
;
31033103

31043104
std_dev:double
3105-
7.0622267887
3105+
7.06223
31063106
;
31073107

31083108
stdDevFilter
@@ -3112,28 +3112,28 @@ FROM employees
31123112
, less_than = STD_DEV(salary_change) WHERE languages <= 3
31133113
, salary = STD_DEV(salary * 2)
31143114
, count = COUNT(*) BY gender
3115-
| EVAL greater_than = ROUND(greater_than, 10)
3116-
, less_than = ROUND(less_than, 10)
3117-
, salary = ROUND(salary, 10)
3115+
| EVAL greater_than = ROUND(greater_than, 5)
3116+
, less_than = ROUND(less_than, 5)
3117+
, salary = ROUND(salary, 5)
31183118
| SORT gender asc
31193119
| KEEP greater_than, less_than, salary, count, gender
31203120
;
31213121

3122-
greater_than:double | less_than:double | salary:double | count:long | gender:keyword
3123-
6.4543266953 | 7.5778678879 | 29045.7706669697 | 33 | F
3124-
6.9752323339 | 6.6048070755 | 26171.3311096413 | 57 | M
3125-
6.9492070979 | 7.1272294758 | 27921.2207362071 | 10 | null
3122+
greater_than:double | less_than:double | salary:double | count:long | gender:keyword
3123+
6.45433 | 7.57787 | 29045.77067 | 33 | F
3124+
6.97523 | 6.60481 | 26171.33111 | 57 | M
3125+
6.94921 | 7.12723 | 27921.22074 | 10 | null
31263126
;
31273127

31283128
stdDevRow
31293129
required_capability: std_dev
31303130
ROW a = [1,2,3], b = 5
31313131
| STATS std_dev_a = STD_DEV(a), std_dev_b = STD_DEV(b)
3132-
| EVAL std_dev_a = ROUND(std_dev_a, 10), std_dev_b = ROUND(std_dev_b, 10)
3132+
| EVAL std_dev_a = ROUND(std_dev_a, 5), std_dev_b = ROUND(std_dev_b, 5)
31333133
;
31343134

31353135
std_dev_a:double | std_dev_b:double
3136-
0.8164965809 | 0.0
3136+
0.8165 | 0.0
31373137
;
31383138

31393139
resolveGroupingsBeforeResolvingImplicitReferencesToGroupings

0 commit comments

Comments
 (0)