ESQL: Unmute and fix Max/Min CSV tests with unsorted IPs (elastic#111149

) Fixes elastic#111107 Fixes elastic#111125 Fixes elastic#111136 Fixes elastic#111137 Fixes elastic#111138
salvatore-campagna · Jul 23, 2024 · 6cb3788 · 6cb3788
1 parent 27b0ddf
commit 6cb3788
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 19 deletions.
diff --git a/muted-tests.yml b/muted-tests.yml
@@ -103,9 +103,6 @@ tests:
 - class: org.elasticsearch.xpack.esql.spatial.SpatialPushDownGeoPointIT
   method: testPushedDownQueriesSingleValue
   issue: https://github.com/elastic/elasticsearch/issues/111084
-- class: org.elasticsearch.xpack.esql.ccq.MultiClusterSpecIT
-  method: test {stats.MaxOfIpGrouping}
-  issue: https://github.com/elastic/elasticsearch/issues/111107
 - class: org.elasticsearch.ingest.geoip.EnterpriseGeoIpDownloaderIT
   method: testEnterpriseDownloaderTask
   issue: https://github.com/elastic/elasticsearch/issues/111002
@@ -114,9 +111,6 @@ tests:
   issue: https://github.com/elastic/elasticsearch/issues/110982
 - class: org.elasticsearch.multi_node.GlobalCheckpointSyncActionIT
   issue: https://github.com/elastic/elasticsearch/issues/111124
-- class: org.elasticsearch.xpack.esql.ccq.MultiClusterSpecIT
-  method: test {stats.MinOfIpGrouping}
-  issue: https://github.com/elastic/elasticsearch/issues/111125
 - class: org.elasticsearch.xpack.security.authz.store.NativePrivilegeStoreCacheTests
   method: testGetPrivilegesUsesCache
   issue: https://github.com/elastic/elasticsearch/issues/110788
@@ -126,15 +120,6 @@ tests:
 - class: org.elasticsearch.cluster.PrevalidateShardPathIT
   method: testCheckShards
   issue: https://github.com/elastic/elasticsearch/issues/111134
-- class: org.elasticsearch.xpack.esql.qa.multi_node.EsqlSpecIT
-  method: test {stats.MaxOfIpGrouping SYNC}
-  issue: https://github.com/elastic/elasticsearch/issues/111136
-- class: org.elasticsearch.xpack.esql.qa.multi_node.EsqlSpecIT
-  method: test {stats.MinOfIpGrouping SYNC}
-  issue: https://github.com/elastic/elasticsearch/issues/111137
-- class: org.elasticsearch.xpack.esql.qa.multi_node.EsqlSpecIT
-  method: test {stats.MinOfIpGrouping ASYNC}
-  issue: https://github.com/elastic/elasticsearch/issues/111138
 - class: org.elasticsearch.packaging.test.DockerTests
   method: test021InstallPlugin
   issue: https://github.com/elastic/elasticsearch/issues/110343

diff --git a/x-pack/plugin/esql/qa/testFixtures/src/main/resources/stats.csv-spec b/x-pack/plugin/esql/qa/testFixtures/src/main/resources/stats.csv-spec
@@ -67,12 +67,13 @@ required_capability: agg_max_min_ip_support
 from hosts
 | eval x = ip0
 | where host > "alpha"
-| stats max(ip0), a = max(ip0), b = max(x), c = max(case(host == "beta", ip0, ip1)) by host;
+| stats max(ip0), a = max(ip0), b = max(x), c = max(case(host == "beta", ip0, ip1)) by host
+| sort host asc;
 
 max(ip0):ip | a:ip | b:ip | c:ip | host:keyword
 127.0.0.1 | 127.0.0.1 | 127.0.0.1 | 127.0.0.1 | beta
-fe80::cae2:65ff:fece:feb9 | fe80::cae2:65ff:fece:feb9 | fe80::cae2:65ff:fece:feb9 | fe81::cae2:65ff:fece:feb9 | gamma
 fe82::cae2:65ff:fece:fec0 | fe82::cae2:65ff:fece:fec0 | fe82::cae2:65ff:fece:fec0 | fe82::cae2:65ff:fece:fec0 | epsilon
+fe80::cae2:65ff:fece:feb9 | fe80::cae2:65ff:fece:feb9 | fe80::cae2:65ff:fece:feb9 | fe81::cae2:65ff:fece:feb9 | gamma
 ;
 
 minOfBooleanExpression
@@ -111,12 +112,13 @@ required_capability: agg_max_min_ip_support
 from hosts
 | eval x = ip0
 | where host > "alpha"
-| stats min(ip0), a = min(ip0), b = min(x), c = min(case(host == "beta", ip0, ip1)) by host;
+| stats min(ip0), a = min(ip0), b = min(x), c = min(case(host == "beta", ip0, ip1)) by host
+| sort host asc;
 
 min(ip0):ip | a:ip | b:ip | c:ip | host:keyword
 127.0.0.1 | 127.0.0.1 | 127.0.0.1 | 127.0.0.1 | beta
-fe80::cae2:65ff:fece:feb9 | fe80::cae2:65ff:fece:feb9 | fe80::cae2:65ff:fece:feb9 | 127.0.0.3 | gamma
 fe80::cae2:65ff:fece:feb9 | fe80::cae2:65ff:fece:feb9 | fe80::cae2:65ff:fece:feb9 | 127.0.0.1 | epsilon
+fe80::cae2:65ff:fece:feb9 | fe80::cae2:65ff:fece:feb9 | fe80::cae2:65ff:fece:feb9 | 127.0.0.3 | gamma
 ;
 
 maxOfShort