Skip to content

Commit 51f940e

Browse files
committed
precommit
1 parent 8489e4b commit 51f940e

File tree

2 files changed

+4
-11
lines changed

2 files changed

+4
-11
lines changed

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/optimizer/rules/logical/ReplaceAggregateNestedExpressionWithEval.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
import java.util.ArrayList;
3535
import java.util.HashMap;
3636
import java.util.List;
37+
import java.util.Locale;
3738
import java.util.Map;
3839

3940
/**
@@ -277,7 +278,7 @@ private static String syntheticName(Expression expression, Expression func, int
277278

278279
private static Literal formatToMinimalInterval(String format, Source source) {
279280
try {
280-
DateTimeFormatter formatter = DateTimeFormatter.ofPattern(format);
281+
DateTimeFormatter formatter = DateTimeFormatter.ofPattern(format, Locale.ROOT);
281282
String formatterAsString = formatter.toString();
282283
if (formatterAsString.contains(ChronoField.NANO_OF_SECOND.toString())
283284
|| formatterAsString.contains(ChronoField.NANO_OF_DAY.toString())) {

x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/optimizer/LogicalPlanOptimizerTests.java

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7873,22 +7873,14 @@ public void testSampleNoPushDownChangePoint() {
78737873
*/
78747874
public void testReplaceGroupingByDateFormatWithDateTrunc() {
78757875

7876-
List<String> formats = List.of(
7877-
"yyyy",
7878-
"YYYY",
7879-
"MM/yyyy",
7880-
"yy-mm",
7881-
"yyyy-dd-MM",
7882-
"DD",
7883-
"yyyy-MM-dd HH:mm:ss"
7884-
);
7876+
List<String> formats = List.of("yyyy", "YYYY", "MM/yyyy", "yy-mm", "yyyy-dd-MM", "DD", "yyyy-MM-dd HH:mm:ss");
78857877

78867878
for (var format : formats) {
78877879
var query = """
78887880
FROM test
78897881
| STATS avg = AVG(salary) BY date = DATE_FORMAT("%s", hire_date)
78907882
""";
7891-
String format1 = String.format(query, format);
7883+
String format1 = String.format(Locale.ROOT, query, format);
78927884
var optimized = optimizedPlan(format1);
78937885

78947886
var project = as(optimized, Project.class);

0 commit comments

Comments
 (0)