Skip to content

Commit

Permalink
ESQL: Reenable some tests (elastic#100339)
Browse files Browse the repository at this point in the history
We have fixed them!
  • Loading branch information
nik9000 committed Oct 5, 2023
1 parent cb57d48 commit 55434c2
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 18 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -205,8 +205,7 @@ emp_no:integer | languages:integer | gender:keyword | first_name:keyword | abc:i
10100 | 4 | F | Hironobu | 3
;

# awaitsfix https://github.com/elastic/elasticsearch/issues/99826
projectFromWithStatsAfterLimit-Ignore
projectFromWithStatsAfterLimit
from employees | sort emp_no | keep gender, avg_worked_seconds, first_name, last_name | limit 10 | stats m = max(avg_worked_seconds) by gender;

m:long | gender:keyword
Expand Down
15 changes: 5 additions & 10 deletions x-pack/plugin/esql/qa/testFixtures/src/main/resources/row.csv-spec
Original file line number Diff line number Diff line change
Expand Up @@ -170,24 +170,21 @@ a:integer | b:integer | y:integer
1 | 2 | null
;

// AwaitsFix https://github.com/elastic/elasticsearch/issues/99826
rowWithNullsInCount-Ignore
rowWithNullsInCount
row a = 1.5, b = 2.6, c = null | eval s = null + a + b | stats c = count(s);

c:long
0
;

# AwaitsFix https://github.com/elastic/elasticsearch/issues/99826
rowWithNullsInAvg-Ignore
rowWithNullsInAvg
row a = 1.5, b = 2.6, c = null | eval s = null + a + b | stats c = avg(s);

c:double
null
;

// AwaitsFix https://github.com/elastic/elasticsearch/issues/99826
rowWithNullsInAvg2-Ignore
rowWithNullsInAvg2
row a = 1.5, b = 2.6, c = null | eval s = a - b * c | stats avg(s);

avg(s):double
Expand Down Expand Up @@ -228,16 +225,14 @@ row a = 1 | limit 0;
a:integer
;

// AwaitsFix https://github.com/elastic/elasticsearch/issues/99826
rowWithMultipleStats-Ignore
rowWithMultipleStats
row a = 1+3, b = 2, ab = 5 | eval x = 1 + b + 5 | stats avg = avg(x), min(x), max(x), count(x), avg(x), avg(ab), avg(a);

avg:double | min(x):integer | max(x):integer | count(x):long | avg(x):double | avg(ab):double | avg(a):double
8.0 | 8 | 8 | 1 | 8.0 | 5.0 | 4.0
;

# AwaitsFix https://github.com/elastic/elasticsearch/issues/99826
rowWithMultipleStatsOverNull-Ignore
rowWithMultipleStatsOverNull
row x=1, y=2 | eval tot = null + y + x | stats c=count(tot), a=avg(tot), mi=min(tot), ma=max(tot), s=sum(tot);

c:long | a:double | mi:integer | ma:integer | s:long
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
# AwaitsFix https://github.com/elastic/elasticsearch/issues/99826
showInfo-Ignore
showInfo
show info | stats v = count(version);

v:long
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -525,8 +525,7 @@ min(salary):i | max(salary):i | c:l
25324 | 74999 | 100
;

# AwaitsFix https://github.com/elastic/elasticsearch/issues/99826
statsWithLiterals-Ignore
statsWithLiterals
from employees | limit 10 | eval x = 1 | stats c = count(x);

c:l
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -203,8 +203,7 @@ bad
5.2.9-SNAPSHOT
;

# AwaitsFix https://github.com/elastic/elasticsearch/issues/99826
groupByVersionCast-Ignore
groupByVersionCast
FROM apps | EVAL g = TO_VER(CONCAT("1.", TO_STR(version))) | STATS id = MAX(id) BY g | SORT id | DROP g;

id:i
Expand Down

0 comments on commit 55434c2

Please sign in to comment.