Skip to content

Commit 64664f4

Browse files
committed
Add m alias for minute duration literal
1 parent 71d9d17 commit 64664f4

File tree

4 files changed

+5
-3
lines changed

4 files changed

+5
-3
lines changed

docs/reference/query-languages/esql/esql-time-spans.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ POST /_query
120120
| week | w, weeks |
121121
| day | d, days |
122122
| hour | h, hours |
123-
| minute | min, minutes |
123+
| minute | m, min, minutes |
124124
| second | s, sec, seconds |
125125
| millisecond | ms, milliseconds |
126126

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@ required_capability: tbucket
259259
FROM sample_data
260260
| WHERE client_ip IS NOT NULL
261261
| KEEP *stamp*, client_ip, event_duration
262-
| STATS p95 = PERCENTILE(event_duration, 95) BY ten_min = TBUCKET(10min), client_ip
262+
| STATS p95 = PERCENTILE(event_duration, 95) BY ten_min = TBUCKET(10m), client_ip
263263
;
264264
ignoreOrder:true
265265

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/type/EsqlDataTypeConverter.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,6 +175,7 @@ public enum INTERVALS {
175175
MINUTE,
176176
MINUTES,
177177
MIN,
178+
M,
178179
HOUR,
179180
HOURS,
180181
H,
@@ -488,7 +489,7 @@ public static TemporalAmount parseTemporalAmount(Number value, String temporalUn
488489
return switch (INTERVALS.valueOf(temporalUnit.toUpperCase(Locale.ROOT))) {
489490
case MILLISECOND, MILLISECONDS, MS -> Duration.ofMillis(safeToLong(value));
490491
case SECOND, SECONDS, SEC, S -> Duration.ofSeconds(safeToLong(value));
491-
case MINUTE, MINUTES, MIN -> Duration.ofMinutes(safeToLong(value));
492+
case MINUTE, MINUTES, MIN, M -> Duration.ofMinutes(safeToLong(value));
492493
case HOUR, HOURS, H -> Duration.ofHours(safeToLong(value));
493494

494495
case DAY, DAYS, D -> Period.ofDays(safeToInt(safeToLong(value)));

x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/parser/ExpressionTests.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -393,6 +393,7 @@ public void testDurationLiterals() {
393393
assertEquals(l(Duration.ofMinutes(value), TIME_DURATION), whereExpression(value + "minute"));
394394
assertEquals(l(Duration.ofMinutes(value), TIME_DURATION), whereExpression(value + " minutes"));
395395
assertEquals(l(Duration.ofMinutes(value), TIME_DURATION), whereExpression(value + " min"));
396+
assertEquals(l(Duration.ofMinutes(value), TIME_DURATION), whereExpression(value + " m"));
396397

397398
assertEquals(l(Duration.ZERO, TIME_DURATION), whereExpression("0 hour"));
398399
assertEquals(l(Duration.ofHours(value), TIME_DURATION), whereExpression(value + "hour"));

0 commit comments

Comments
 (0)