Fix conversion to timestamp.

Signed-off-by: Yury-Fridlyand <[email protected]>
Bit-Quill · Oct 14, 2022 · 9d3f6be · 9d3f6be
1 parent 61875c3
commit 9d3f6be
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/core/src/main/java/org/opensearch/sql/data/model/ExprDateValue.java b/core/src/main/java/org/opensearch/sql/data/model/ExprDateValue.java
@@ -67,7 +67,7 @@ public LocalDateTime datetimeValue() {
 
   @Override
   public Instant timestampValue() {
-    return ZonedDateTime.of(date, timeValue(), ZoneId.systemDefault()).toInstant();
+    return ZonedDateTime.of(date, timeValue(), ZoneId.of("UTC")).toInstant();
   }
 
   @Override

diff --git a/core/src/main/java/org/opensearch/sql/data/model/ExprTimeValue.java b/core/src/main/java/org/opensearch/sql/data/model/ExprTimeValue.java
@@ -68,7 +68,7 @@ public LocalDateTime datetimeValue() {
 
   @Override
   public Instant timestampValue() {
-    return ZonedDateTime.of(dateValue(), timeValue(), ZoneId.systemDefault()).toInstant();
+    return ZonedDateTime.of(dateValue(), timeValue(), ZoneId.of("UTC")).toInstant();
   }
 
   @Override

diff --git a/core/src/test/java/org/opensearch/sql/data/model/DateTimeValueTest.java b/core/src/test/java/org/opensearch/sql/data/model/DateTimeValueTest.java
@@ -34,7 +34,7 @@ public void timeValueInterfaceTest() {
     assertEquals(LocalDate.now(), timeValue.dateValue());
     assertEquals(LocalDate.now().atTime(1, 1, 1), timeValue.datetimeValue());
     assertEquals(ZonedDateTime.of(LocalTime.parse("01:01:01").atDate(LocalDate.now()),
-        ZoneId.systemDefault()).toInstant(), timeValue.timestampValue());
+        ZoneId.of("UTC")).toInstant(), timeValue.timestampValue());
     assertEquals("01:01:01", timeValue.value());
     assertEquals("TIME '01:01:01'", timeValue.toString());
     assertThrows(ExpressionEvaluationException.class, () -> integerValue(1).timeValue(),
@@ -65,7 +65,7 @@ public void dateValueInterfaceTest() {
     assertEquals(LocalTime.parse("00:00:00"), dateValue.timeValue());
     assertEquals(LocalDateTime.parse("2012-07-07T00:00:00"), dateValue.datetimeValue());
     assertEquals(ZonedDateTime.of(LocalDateTime.parse("2012-07-07T00:00:00"),
-        ZoneId.systemDefault()).toInstant(), dateValue.timestampValue());
+        ZoneId.of("UTC")).toInstant(), dateValue.timestampValue());
     ExpressionEvaluationException exception =
         assertThrows(ExpressionEvaluationException.class, () -> integerValue(1).dateValue());
     assertEquals("invalid to get dateValue from value of type INTEGER",