Skip to content

Commit 1350a8b

Browse files
committed
Update Java to 23.0.2
This brings updated timezonedb to version 2024b (openjdk/jdk23u@73b2341) which amends historical timezone definitions for Mexico/Bahia_Banderas that we use for testing timezone gap around the unix timestamp epoch. Corresponding Joda time update also has these timezone definitions updated. PostgreSQL test server was upgraded to 12 to correctly handle UTC around epoch. MySQL was updated to 8.0.41 due to the same reason. Temporary downgrade JDK for ppc64 to make CI happy
1 parent 5c43149 commit 1350a8b

File tree

31 files changed

+52
-97
lines changed

31 files changed

+52
-97
lines changed

client/trino-jdbc/src/test/java/io/trino/jdbc/BaseTestJdbcResultSet.java

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -273,25 +273,6 @@ public void testDate()
273273
assertThat(rs.getString(column)).isEqualTo(localDate.toString());
274274
});
275275

276-
// date which midnight does not exist in test JVM zone
277-
checkRepresentation(connectedStatement.getStatement(), "DATE '1970-01-01'", Types.DATE, (rs, column) -> {
278-
LocalDate localDate = LocalDate.of(1970, 1, 1);
279-
Date sqlDate = Date.valueOf(localDate);
280-
281-
assertThat(rs.getObject(column)).isEqualTo(sqlDate);
282-
assertThat(rs.getObject(column, Date.class)).isEqualTo(sqlDate);
283-
assertThat(rs.getObject(column, LocalDate.class)).isEqualTo(localDate);
284-
assertThat(rs.getDate(column)).isEqualTo(sqlDate);
285-
assertThatThrownBy(() -> rs.getTime(column))
286-
.isInstanceOf(IllegalArgumentException.class)
287-
.hasMessage("Expected column to be a time type but is date");
288-
assertThatThrownBy(() -> rs.getTimestamp(column))
289-
.isInstanceOf(IllegalArgumentException.class)
290-
.hasMessage("Expected column to be a timestamp type but is date");
291-
292-
assertThat(rs.getString(column)).isEqualTo(localDate.toString());
293-
});
294-
295276
// the Julian-Gregorian calendar "default cut-over"
296277
checkRepresentation(connectedStatement.getStatement(), "DATE '1582-10-04'", Types.DATE, (rs, column) -> {
297278
LocalDate localDate = LocalDate.of(1582, 10, 4);

client/trino-jdbc/src/test/java/io/trino/jdbc/TestJdbcPreparedStatement.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1093,11 +1093,11 @@ private void testConvertLocalDate(boolean explicitPrepare)
10931093
assertBind((ps, i) -> ps.setObject(i, date, Types.TIMESTAMP_WITH_TIMEZONE), explicitPrepare)
10941094
.isInvalid("Cannot convert instance of java.time.LocalDate to timestamp with time zone");
10951095

1096-
LocalDate jvmGapDate = LocalDate.of(1970, 1, 1);
1096+
LocalDate jvmGapDate = LocalDate.of(1932, 4, 1);
10971097
checkIsGap(ZoneId.systemDefault(), jvmGapDate.atTime(LocalTime.MIDNIGHT));
10981098

10991099
assertBind((ps, i) -> ps.setObject(i, jvmGapDate), explicitPrepare)
1100-
.resultsIn("date", "DATE '1970-01-01'")
1100+
.resultsIn("date", "DATE '1932-04-01'")
11011101
.roundTripsAs(Types.DATE, Date.valueOf(jvmGapDate));
11021102

11031103
assertBind((ps, i) -> ps.setObject(i, jvmGapDate, Types.DATE), explicitPrepare)

core/jdk/current

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
temurin/jdk-23.0.1+11
1+
temurin/jdk-23.0.2+7

core/jdk/temurin/jdk-23.0.1+11/amd64

Lines changed: 0 additions & 1 deletion
This file was deleted.

core/jdk/temurin/jdk-23.0.1+11/arm64

Lines changed: 0 additions & 1 deletion
This file was deleted.

core/jdk/temurin/jdk-23.0.1+11/ppc64le

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
distributionUrl=https://api.adoptium.net/v3/binary/version/jdk-22.0.2+9/linux/x64/jdk/hotspot/normal/eclipse?project=jdk
1+
distributionUrl=https://api.adoptium.net/v3/binary/version/jdk-23.0.2+7/linux/x64/jdk/hotspot/normal/eclipse?project=jdk
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
distributionUrl=https://api.adoptium.net/v3/binary/version/jdk-22.0.2+9/linux/aarch64/jdk/hotspot/normal/eclipse?project=jdk
1+
distributionUrl=https://api.adoptium.net/v3/binary/version/jdk-23.0.2+7/linux/aarch64/jdk/hotspot/normal/eclipse?project=jdk
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
distributionUrl=https://api.adoptium.net/v3/binary/version/jdk-22.0.2+9/linux/ppc64le/jdk/hotspot/normal/eclipse?project=jdk
1+
distributionUrl=https://api.adoptium.net/v3/binary/version/jdk-23.0.2+7/linux/ppc64le/jdk/hotspot/normal/eclipse?project=jdk

core/trino-server-rpm/src/test/java/io/trino/server/rpm/ServerIT.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,8 @@ public void testInstallUninstall()
7575
throws Exception
7676
{
7777
// Release names as in the https://api.adoptium.net/q/swagger-ui/#/Release%20Info/getReleaseNames
78-
testInstall("jdk-23.0.1+11", "/usr/lib/jvm/temurin-23", "23");
79-
testUninstall("jdk-23.0.1+11", "/usr/lib/jvm/temurin-23");
78+
testInstall("jdk-23.0.2+7", "/usr/lib/jvm/temurin-23", "23");
79+
testUninstall("jdk-23.0.2+7", "/usr/lib/jvm/temurin-23");
8080
}
8181

8282
private void testInstall(String temurinReleaseName, String javaHome, String expectedJavaVersion)

0 commit comments

Comments
 (0)