ESQL: Timezone support in DATE_TRUNC, BUCKET and TBUCKET

benchmarks/src/main/java/org/elasticsearch/benchmark/compute/operator/EvalBenchmark.java

@@ -217,7 +217,12 @@ private static EvalOperator.ExpressionEvaluator evaluator(String operation) {
                 );
                 yield EvalMapper.toEvaluator(
                     FOLD_CONTEXT,
-                    new DateTrunc(Source.EMPTY, new Literal(Source.EMPTY, Duration.ofHours(24), DataType.TIME_DURATION), timestamp),
+                    new DateTrunc(
+                        Source.EMPTY,
+                        new Literal(Source.EMPTY, Duration.ofHours(24), DataType.TIME_DURATION),
+                        timestamp,
+                        configuration()
+                    ),
                     layout(timestamp)
                 ).get(driverContext);
             }

docs/changelog/137450.yaml

@@ -0,0 +1,5 @@
+pr: 137450
+summary: "Timezone support in DATE_TRUNC, BUCKET and TBUCKET"
+area: ES|QL
+type: feature
+issues: []

x-pack/plugin/esql/qa/testFixtures/src/main/java/org/elasticsearch/xpack/esql/ConfigurationBuilder.java

@@ -0,0 +1,151 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+package org.elasticsearch.xpack.esql;
+
+import org.elasticsearch.xpack.esql.plugin.QueryPragmas;
+import org.elasticsearch.xpack.esql.session.Configuration;
+
+import java.time.ZoneId;
+import java.util.Locale;
+import java.util.Map;
+
+/**
+ * Builder to modify configurations on tests.
+ * <p>
+ *     The {@link Configuration#now()} field is actually modified, so built configurations will also differ there.
+ * </p>
+ */
+public class ConfigurationBuilder {
+
+    private String clusterName;
+    private String username;
+    private ZoneId zoneId;
+
+    private QueryPragmas pragmas;
+
+    private int resultTruncationMaxSizeRegular;
+    private int resultTruncationDefaultSizeRegular;
+    private int resultTruncationMaxSizeTimeseries;
+    private int resultTruncationDefaultSizeTimeseries;
+
+    private Locale locale;
+
+    private String query;
+
+    private boolean profile;
+    private boolean allowPartialResults;
+
+    private Map<String, Map<String, Column>> tables;
+    private long queryStartTimeNanos;
+
+    public ConfigurationBuilder(Configuration configuration) {
+        clusterName = configuration.clusterName();
+        username = configuration.username();
+        zoneId = configuration.zoneId();
+        pragmas = configuration.pragmas();
+        resultTruncationMaxSizeRegular = configuration.resultTruncationMaxSize(false);
+        resultTruncationDefaultSizeRegular = configuration.resultTruncationDefaultSize(false);
+        resultTruncationMaxSizeTimeseries = configuration.resultTruncationMaxSize(true);
+        resultTruncationDefaultSizeTimeseries = configuration.resultTruncationDefaultSize(true);
+        locale = configuration.locale();
+        query = configuration.query();
+        profile = configuration.profile();
+        allowPartialResults = configuration.allowPartialResults();
+        tables = configuration.tables();
+        queryStartTimeNanos = configuration.queryStartTimeNanos();
+    }
+
+    public ConfigurationBuilder clusterName(String clusterName) {
+        this.clusterName = clusterName;
+        return this;
+    }
+
+    public ConfigurationBuilder username(String username) {
+        this.username = username;
+        return this;
+    }
+
+    public ConfigurationBuilder zoneId(ZoneId zoneId) {
+        this.zoneId = zoneId;
+        return this;
+    }
+
+    public ConfigurationBuilder pragmas(QueryPragmas pragmas) {
+        this.pragmas = pragmas;
+        return this;
+    }
+
+    public ConfigurationBuilder resultTruncationMaxSizeRegular(int resultTruncationMaxSizeRegular) {
+        this.resultTruncationMaxSizeRegular = resultTruncationMaxSizeRegular;
+        return this;
+    }
+
+    public ConfigurationBuilder resultTruncationDefaultSizeRegular(int resultTruncationDefaultSizeRegular) {
+        this.resultTruncationDefaultSizeRegular = resultTruncationDefaultSizeRegular;
+        return this;
+    }
+
+    public ConfigurationBuilder resultTruncationMaxSizeTimeseries(int resultTruncationMaxSizeTimeseries) {
+        this.resultTruncationMaxSizeTimeseries = resultTruncationMaxSizeTimeseries;
+        return this;
+    }
+
+    public ConfigurationBuilder resultTruncationDefaultSizeTimeseries(int resultTruncationDefaultSizeTimeseries) {
+        this.resultTruncationDefaultSizeTimeseries = resultTruncationDefaultSizeTimeseries;
+        return this;
+    }
+
+    public ConfigurationBuilder locale(Locale locale) {
+        this.locale = locale;
+        return this;
+    }
+
+    public ConfigurationBuilder query(String query) {
+        this.query = query;
+        return this;
+    }
+
+    public ConfigurationBuilder profile(boolean profile) {
+        this.profile = profile;
+        return this;
+    }
+
+    public ConfigurationBuilder allowPartialResults(boolean allowPartialResults) {
+        this.allowPartialResults = allowPartialResults;
+        return this;
+    }
+
+    public ConfigurationBuilder tables(Map<String, Map<String, Column>> tables) {
+        this.tables = tables;
+        return this;
+    }
+
+    public ConfigurationBuilder queryStartTimeNanos(long queryStartTimeNanos) {
+        this.queryStartTimeNanos = queryStartTimeNanos;
+        return this;
+    }
+
+    public Configuration build() {
+        return new Configuration(
+            zoneId,
+            locale,
+            username,
+            clusterName,
+            pragmas,
+            resultTruncationMaxSizeRegular,
+            resultTruncationDefaultSizeRegular,
+            query,
+            profile,
+            tables,
+            queryStartTimeNanos,
+            allowPartialResults,
+            resultTruncationMaxSizeTimeseries,
+            resultTruncationDefaultSizeTimeseries
+        );
+    }
+}

x-pack/plugin/esql/qa/testFixtures/src/main/java/org/elasticsearch/xpack/esql/ConfigurationTestUtils.java

@@ -40,6 +40,7 @@
 import static org.elasticsearch.test.ESTestCase.randomRealisticUnicodeOfLength;
 import static org.elasticsearch.test.ESTestCase.randomZone;
 import static org.elasticsearch.xpack.esql.EsqlTestUtils.randomLiteral;
+import static org.elasticsearch.xpack.esql.EsqlTestUtils.tables;
 import static org.elasticsearch.xpack.esql.session.Configuration.QUERY_COMPRESS_THRESHOLD_CHARS;
 
 /**

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

@@ -988,3 +988,22 @@ COUNT(*):long | bucket:datetime
 1             | 1986-07-09T00:00:00.000Z
 1             | 1986-09-17T00:00:00.000Z
 ;
+
+bucketWithTimezone
+required_capability: date_trunc_timezone_support
+
+SET time_zone = "+05:00"\;
+FROM employees
+| WHERE hire_date >= "1980-01-01T00:00:00Z"
+| STATS by hire_date, bucketHours = BUCKET(hire_date, 3 hours), bucketDay = BUCKET(hire_date, 1 day)
+| SORT hire_date
+| LIMIT 5
+;
+
+hire_date:date           | bucketHours:date          | bucketDay:date
+1985-02-18T00:00:00.000Z | 1985-02-17T22:00:00.000Z | 1985-02-17T19:00:00.000Z
+1985-02-24T00:00:00.000Z | 1985-02-23T22:00:00.000Z | 1985-02-23T19:00:00.000Z
+1985-05-13T00:00:00.000Z | 1985-05-12T22:00:00.000Z | 1985-05-12T19:00:00.000Z
+1985-07-09T00:00:00.000Z | 1985-07-08T22:00:00.000Z | 1985-07-08T19:00:00.000Z
+1985-09-17T00:00:00.000Z | 1985-09-16T22:00:00.000Z | 1985-09-16T19:00:00.000Z
+;