Skip to content

Commit 047feb7

Browse files
committed
more name conflict tests
1 parent 4885af7 commit 047feb7

File tree

2 files changed

+78
-2
lines changed

2 files changed

+78
-2
lines changed

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

Lines changed: 74 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -452,7 +452,7 @@ FROM k8s
452452
;
453453

454454

455-
reuse column names
455+
reuse input column names
456456
required_capability: change_point
457457

458458
FROM k8s
@@ -488,6 +488,79 @@ null | null
488488
;
489489

490490

491+
reuse value column name twice
492+
required_capability: change_point
493+
494+
FROM k8s
495+
| STATS count=COUNT() BY @timestamp=BUCKET(@timestamp, 1 MINUTE)
496+
| EVAL count=count+CASE(@timestamp=="2024-05-10T00:08:00.000Z", 100, 0)
497+
| CHANGE_POINT count ON @timestamp AS count, count
498+
;
499+
500+
@timestamp:datetime | count:double
501+
2024-05-10T00:00:00.000Z | null
502+
2024-05-10T00:01:00.000Z | null
503+
2024-05-10T00:02:00.000Z | null
504+
2024-05-10T00:03:00.000Z | null
505+
2024-05-10T00:04:00.000Z | null
506+
2024-05-10T00:05:00.000Z | null
507+
2024-05-10T00:06:00.000Z | null
508+
2024-05-10T00:07:00.000Z | null
509+
2024-05-10T00:08:00.000Z | 1.7502597878858522E-193
510+
2024-05-10T00:09:00.000Z | null
511+
2024-05-10T00:10:00.000Z | null
512+
2024-05-10T00:11:00.000Z | null
513+
2024-05-10T00:12:00.000Z | null
514+
2024-05-10T00:13:00.000Z | null
515+
2024-05-10T00:14:00.000Z | null
516+
2024-05-10T00:15:00.000Z | null
517+
2024-05-10T00:16:00.000Z | null
518+
2024-05-10T00:17:00.000Z | null
519+
2024-05-10T00:18:00.000Z | null
520+
2024-05-10T00:19:00.000Z | null
521+
2024-05-10T00:20:00.000Z | null
522+
2024-05-10T00:21:00.000Z | null
523+
2024-05-10T00:22:00.000Z | null
524+
;
525+
526+
527+
rename columns
528+
required_capability: change_point
529+
530+
FROM k8s
531+
| STATS count=COUNT() BY @timestamp=BUCKET(@timestamp, 1 MINUTE)
532+
| EVAL count=count+CASE(@timestamp=="2024-05-10T00:08:00.000Z", 100, 0)
533+
| RENAME count AS count2, @timestamp AS time2
534+
| CHANGE_POINT count2 ON time2 AS type, pvalue
535+
| RENAME time2 AS time, count2 AS cnt, type AS kind, pvalue AS significance
536+
;
537+
538+
time:datetime | cnt:long | kind:keyword | significance:double
539+
2024-05-10T00:00:00.000Z | 4 | null | null
540+
2024-05-10T00:01:00.000Z | 4 | null | null
541+
2024-05-10T00:02:00.000Z | 8 | null | null
542+
2024-05-10T00:03:00.000Z | 8 | null | null
543+
2024-05-10T00:04:00.000Z | 5 | null | null
544+
2024-05-10T00:05:00.000Z | 8 | null | null
545+
2024-05-10T00:06:00.000Z | 10 | null | null
546+
2024-05-10T00:07:00.000Z | 5 | null | null
547+
2024-05-10T00:08:00.000Z | 112 | spike | 1.7502597878858522E-193
548+
2024-05-10T00:09:00.000Z | 20 | null | null
549+
2024-05-10T00:10:00.000Z | 5 | null | null
550+
2024-05-10T00:11:00.000Z | 7 | null | null
551+
2024-05-10T00:12:00.000Z | 8 | null | null
552+
2024-05-10T00:13:00.000Z | 9 | null | null
553+
2024-05-10T00:14:00.000Z | 9 | null | null
554+
2024-05-10T00:15:00.000Z | 11 | null | null
555+
2024-05-10T00:16:00.000Z | 7 | null | null
556+
2024-05-10T00:17:00.000Z | 15 | null | null
557+
2024-05-10T00:18:00.000Z | 17 | null | null
558+
2024-05-10T00:19:00.000Z | 5 | null | null
559+
2024-05-10T00:20:00.000Z | 10 | null | null
560+
2024-05-10T00:21:00.000Z | 4 | null | null
561+
2024-05-10T00:22:00.000Z | 9 | null | null
562+
;
563+
491564
null values
492565
required_capability: change_point
493566

x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/analysis/VerifierTests.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2009,11 +2009,14 @@ public void testChangePoint() {
20092009
"1:17: change point key [location] must be sortable",
20102010
error("FROM airports | CHANGE_POINT scalerank ON location", airports)
20112011
);
2012+
assertEquals(
2013+
"1:17: change point value [name] must be numeric",
2014+
error("FROM airports | CHANGE_POINT name ON scalerank", airports)
2015+
);
20122016
assertEquals(
20132017
"1:17: change point value [location] must be numeric",
20142018
error("FROM airports | CHANGE_POINT location ON scalerank", airports)
20152019
);
2016-
20172020
}
20182021

20192022
public void testSortByAggregate() {

0 commit comments

Comments
 (0)