ESQL: Time_zone tests #136748

ivancea · 2025-10-17T12:55:47Z

Continuation of #136637

Configure tests to work with SET, and add/update tests for:

Request "time_zone" parameter
"SET" "time_zone" parameter
Functions currently affected by Configuration.zoneId

Also, use random configurations by default for unit tests, so we catch and update functions not testing configuration changes.

… ones that use it

# Conflicts: # x-pack/plugin/esql/qa/testFixtures/src/main/java/org/elasticsearch/xpack/esql/EsqlTestUtils.java # x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/action/EsqlCapabilities.java # x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/CsvTests.java # x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/date/DateFormatTests.java

ivancea · 2025-10-27T11:52:46Z

...c/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/string/ToLowerTests.java

This depends on the locale, so a random locale would break the tests

ivancea · 2025-10-27T11:52:57Z

...c/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/string/ToUpperTests.java

This depends on the locale, so a random locale would break the tests

ivancea · 2025-10-27T13:38:30Z

...sql/src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/date/NowTests.java

We're testing the configuration "now()", so we reuse it. It could be randomized too

ivancea · 2025-10-27T13:39:38Z

...c/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/date/MonthNameTests.java

This depends on both the zoneId and the locale

ivancea · 2025-10-27T13:39:44Z

...src/test/java/org/elasticsearch/xpack/esql/expression/function/scalar/date/DayNameTests.java

This depends on both the zoneId and the locale

ivancea · 2025-10-27T13:41:08Z

.../test/java/org/elasticsearch/xpack/esql/expression/function/scalar/date/DateFormatTests.java

This depends on the locale.
As unary() and sibling functions doesn't accept a custom logic on testcases, I added that "mapTestCase()" at the end.

ivancea · 2025-10-27T13:41:23Z

...test/java/org/elasticsearch/xpack/esql/expression/function/scalar/date/DateExtractTests.java

This depends on the zoneId

ivancea · 2025-10-27T13:51:51Z

...asticsearch/xpack/esql/expression/function/scalar/AbstractConfigurationFunctionTestCase.java

        assertNotEquals(expr, differentExpr);
    }
-
-    private static Configuration randomConfiguration() {


Reusing ConfigurationTestUtils

...in/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/TestCaseSupplier.java

ivancea · 2025-10-27T15:00:12Z

...ck/plugin/esql/qa/testFixtures/src/main/java/org/elasticsearch/xpack/esql/CsvSpecReader.java

+                    if (line.endsWith("\\;")) {
+                        // SET statement with escaped ";"


We could use other mechanism; I just chose a typical one here. Listening for opinions

I guess we have plenty of queries that end with a ;, so the practical alternatives to this would be

change hundreds of tests and move the ; to a new line

give up and always have a SET followed by a FROM on the same line.

In conclusion, your solution seems reasonable

elasticsearchmachine · 2025-10-27T16:47:38Z

Pinging @elastic/es-analytical-engine (Team:Analytics)

ivancea · 2025-10-28T12:04:15Z

...ck/plugin/esql/qa/testFixtures/src/main/java/org/elasticsearch/xpack/esql/CsvSpecReader.java

        public Object parse(String line) {
            // read the query
            if (testCase == null) {
-                if (line.startsWith(SCHEMA_PREFIX)) {


This came from QL; I removed it here. It wasn't being used anywhere

luigidellaquila

LGTM, thanks @ivancea!

You only have one failing test due to randomization, but the problem is not in your PR (the test needs a fix)

...in/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/TestCaseSupplier.java

luigidellaquila · 2025-10-28T14:24:33Z

...ck/plugin/esql/qa/testFixtures/src/main/java/org/elasticsearch/xpack/esql/CsvSpecReader.java

        public Object parse(String line) {
            // read the query
            if (testCase == null) {
-                if (line.startsWith(SCHEMA_PREFIX)) {


luigidellaquila · 2025-10-28T14:26:33Z

...ck/plugin/esql/qa/testFixtures/src/main/java/org/elasticsearch/xpack/esql/CsvSpecReader.java

+                    if (line.endsWith("\\;")) {
+                        // SET statement with escaped ";"


I guess we have plenty of queries that end with a ;, so the practical alternatives to this would be

change hundreds of tests and move the ; to a new line

give up and always have a SET followed by a FROM on the same line.

In conclusion, your solution seems reasonable

# Conflicts: # x-pack/plugin/esql/qa/testFixtures/src/main/java/org/elasticsearch/xpack/esql/EsqlTestUtils.java

Continuation of elastic#136637 Configure tests to work with SET, and add/update tests for: - Request "time_zone" parameter - "SET" "time_zone" parameter - Functions currently affected by `Configuration.zoneId` Also, use random configurations by default for unit tests, so we catch and update functions not testing configuration changes.

ivancea added 3 commits October 17, 2025 12:51

Add capability and YAML tests for request and SET time_zone parameters

f95c2a8

Add SET CSV tests, and adapted CsvTests to work with SET statements

569d9e5

Escape ; in csv tests with backslash

cc15c9f

ivancea added >test Issues or PRs that are addressing/adding tests Team:Analytics Meta label for analytical engine team (ESQL/Aggs/Geo) :Analytics/ES|QL AKA ESQL v9.3.0 labels Oct 17, 2025

ivancea and others added 3 commits October 17, 2025 18:12

Randomize configuration in function tests, and make it static for the…

449abe6

… ones that use it

[CI] Auto commit changes from spotless

5dec7c3

ivancea commented Oct 27, 2025

View reviewed changes

Moved custom config cases to another method

b088abf

ivancea commented Oct 27, 2025

View reviewed changes

...test/java/org/elasticsearch/xpack/esql/expression/function/scalar/date/DateExtractTests.java

Copy link

Contributor Author

ivancea Oct 27, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This depends on the zoneId

Add comment on function with config dserialization randomization

ee1316c

ivancea commented Oct 27, 2025

View reviewed changes

...in/esql/src/test/java/org/elasticsearch/xpack/esql/expression/function/TestCaseSupplier.java Show resolved Hide resolved

ivancea commented Oct 27, 2025

View reviewed changes

ivancea mentioned this pull request Oct 27, 2025

ES|QL: Move SET command out of snapshot and move validation to single settings #137204

Merged

ivancea and others added 2 commits October 27, 2025 17:46

Fix multi cluster tests to accept SET statements

13d8b4b

Merge branch 'main' into esql-time-zone-tests

d794329

ivancea marked this pull request as ready for review October 27, 2025 16:47

ivancea added 3 commits October 28, 2025 12:10

Fix configuration and source matching in random tests

2713280

Added function tests for timezones

f76f5ec

Fix typo

9005c78

ivancea commented Oct 28, 2025

View reviewed changes

ivancea requested review from alex-spies and luigidellaquila October 28, 2025 12:19

Fixed capability requirement

fad189f

luigidellaquila approved these changes Oct 28, 2025

View reviewed changes

ivancea and others added 3 commits October 28, 2025 15:42

Fix ScalbTests

4f62f23

[CI] Auto commit changes from spotless

4c5adc0

Merge branch 'main' into esql-time-zone-tests

d81729b

# Conflicts: # x-pack/plugin/esql/qa/testFixtures/src/main/java/org/elasticsearch/xpack/esql/EsqlTestUtils.java

ivancea enabled auto-merge (squash) October 29, 2025 11:04

ivancea merged commit a328b58 into elastic:main Oct 29, 2025
34 checks passed

ivancea deleted the esql-time-zone-tests branch October 29, 2025 12:11

ivancea mentioned this pull request Nov 4, 2025

ESQL: Add function tests that randomize EsqlConfiguration #107997

Closed

		if (line.endsWith("\\;")) {
		// SET statement with escaped ";"

ESQL: Time_zone tests #136748

ESQL: Time_zone tests #136748

Uh oh!

Conversation

ivancea commented Oct 17, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

ivancea Oct 27, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

ivancea Oct 27, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

ivancea Oct 27, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

elasticsearchmachine commented Oct 27, 2025

Uh oh!

ivancea Oct 28, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

luigidellaquila left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

ivancea commented Oct 17, 2025 •

edited

Loading

ivancea Oct 27, 2025 •

edited

Loading

ivancea Oct 27, 2025 •

edited

Loading

ivancea Oct 27, 2025 •

edited

Loading

ivancea Oct 28, 2025 •

edited

Loading