Skip to content

Commit 4b90f01

Browse files
authored
Esql - fix some test failures due to results ordering (#118692)
fix some failing multi-shard tests. The backport for the PR that added these tests hasn't landed yet, so I'm going to just cherry pick this into there rather than do two back ports with conflict resolution.
1 parent bde485a commit 4b90f01

File tree

1 file changed

+13
-6
lines changed

1 file changed

+13
-6
lines changed

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

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -555,7 +555,8 @@ required_capability: date_nanos_bucket
555555

556556
FROM date_nanos
557557
| WHERE millis > "2020-01-01"
558-
| STATS ct = count(*) BY yr = BUCKET(nanos, 1 year);
558+
| STATS ct = count(*) BY yr = BUCKET(nanos, 1 year)
559+
| SORT yr DESC;
559560

560561
ct:long | yr:date_nanos
561562
8 | 2023-01-01T00:00:00.000000000Z
@@ -567,7 +568,8 @@ required_capability: date_nanos_bucket
567568

568569
FROM date_nanos
569570
| WHERE millis > "2020-01-01"
570-
| STATS ct = count(*) BY yr = BUCKET(nanos, 5, "1999-01-01", NOW());
571+
| STATS ct = count(*) BY yr = BUCKET(nanos, 5, "1999-01-01", NOW())
572+
| SORT yr DESC;
571573

572574
ct:long | yr:date_nanos
573575
8 | 2023-01-01T00:00:00.000000000Z
@@ -579,7 +581,8 @@ required_capability: date_nanos_bucket
579581

580582
FROM date_nanos
581583
| WHERE millis > "2020-01-01"
582-
| STATS ct = count(*) BY mo = BUCKET(nanos, 1 month);
584+
| STATS ct = count(*) BY mo = BUCKET(nanos, 1 month)
585+
| SORT mo DESC;
583586

584587
ct:long | mo:date_nanos
585588
8 | 2023-10-01T00:00:00.000000000Z
@@ -591,7 +594,8 @@ required_capability: date_nanos_bucket
591594

592595
FROM date_nanos
593596
| WHERE millis > "2020-01-01"
594-
| STATS ct = count(*) BY mo = BUCKET(nanos, 20, "2023-01-01", "2023-12-31");
597+
| STATS ct = count(*) BY mo = BUCKET(nanos, 20, "2023-01-01", "2023-12-31")
598+
| SORT mo DESC;
595599

596600
ct:long | mo:date_nanos
597601
8 | 2023-10-01T00:00:00.000000000Z
@@ -603,18 +607,21 @@ required_capability: date_nanos_bucket
603607

604608
FROM date_nanos
605609
| WHERE millis > "2020-01-01"
606-
| STATS ct = count(*) BY mo = BUCKET(nanos, 55, "2023-01-01", "2023-12-31");
610+
| STATS ct = count(*) BY mo = BUCKET(nanos, 55, "2023-01-01", "2023-12-31")
611+
| SORT mo DESC;
607612

608613
ct:long | mo:date_nanos
609614
8 | 2023-10-23T00:00:00.000000000Z
610615
;
616+
611617
Bucket Date nanos by 10 minutes
612618
required_capability: date_trunc_date_nanos
613619
required_capability: date_nanos_bucket
614620

615621
FROM date_nanos
616622
| WHERE millis > "2020-01-01"
617-
| STATS ct = count(*) BY mn = BUCKET(nanos, 10 minutes);
623+
| STATS ct = count(*) BY mn = BUCKET(nanos, 10 minutes)
624+
| SORT mn DESC;
618625

619626
ct:long | mn:date_nanos
620627
4 | 2023-10-23T13:50:00.000000000Z

0 commit comments

Comments
 (0)