Skip to content

Simplify TimeZoneKey to ZoneId conversion #14550

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
findepi merged 1 commit into from
Oct 11, 2022
Merged

Simplify TimeZoneKey to ZoneId conversion #14550

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion core/trino-main/src/test/java/io/trino/operator/scalar/TestDateTimeFunctions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ private void assertCurrentDateAtInstant(TimeZoneKey timeZoneKey, Instant instant

private static long epochDaysInZone(TimeZoneKey timeZoneKey, Instant instant)
{
return LocalDate.from(instant.atZone(ZoneId.of(timeZoneKey.getId()))).toEpochDay();
return LocalDate.from(instant.atZone(timeZoneKey.getZoneId())).toEpochDay();
}

@Test
Expand Down
2 changes: 1 addition & 1 deletion plugin/trino-cassandra/src/test/java/io/trino/plugin/cassandra/TestCassandraTypeMapping.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -557,7 +557,7 @@ public Object[][] sessionZonesDataProvider()
// using two non-JVM zones so that we don't need to worry what Cassandra system zone is
{vilnius},
{kathmandu},
{ZoneId.of(TestingSession.DEFAULT_TIME_ZONE_KEY.getId())},
{TestingSession.DEFAULT_TIME_ZONE_KEY.getZoneId()},
};
}

Expand Down
2 changes: 1 addition & 1 deletion .../trino-clickhouse/src/test/java/io/trino/plugin/clickhouse/BaseClickHouseTypeMapping.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -787,7 +787,7 @@ public Object[][] sessionZonesDataProvider()
// using two non-JVM zones so that we don't need to worry what ClickHouse system zone is
{vilnius},
{kathmandu},
{ZoneId.of(TestingSession.DEFAULT_TIME_ZONE_KEY.getId())},
{TestingSession.DEFAULT_TIME_ZONE_KEY.getZoneId()},
};
}

Expand Down
2 changes: 1 addition & 1 deletion plugin/trino-mariadb/src/test/java/io/trino/plugin/mariadb/TestMariaDbTypeMapping.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -864,7 +864,7 @@ public Object[][] sessionZonesDataProvider()
{jvmZone},
{vilnius},
{kathmandu},
{ZoneId.of(TestingSession.DEFAULT_TIME_ZONE_KEY.getId())},
{TestingSession.DEFAULT_TIME_ZONE_KEY.getZoneId()},
};
}

Expand Down
2 changes: 1 addition & 1 deletion plugin/trino-mongodb/src/test/java/io/trino/plugin/mongodb/TestMongoTypeMapping.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -385,7 +385,7 @@ public Object[][] sessionZonesDataProvider()
{ZoneId.of("Europe/Vilnius")},
// minutes offset change since 1970-01-01, no DST
{ZoneId.of("Asia/Kathmandu")},
{ZoneId.of(TestingSession.DEFAULT_TIME_ZONE_KEY.getId())},
{TestingSession.DEFAULT_TIME_ZONE_KEY.getZoneId()},
};
}

Expand Down
2 changes: 1 addition & 1 deletion plugin/trino-mysql/src/test/java/io/trino/plugin/mysql/TestMySqlTypeMapping.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -926,7 +926,7 @@ public Object[][] sessionZonesDataProvider()
{ZoneId.of("Europe/Vilnius")},
// minutes offset change since 1970-01-01, no DST
{ZoneId.of("Asia/Kathmandu")},
{ZoneId.of(TestingSession.DEFAULT_TIME_ZONE_KEY.getId())},
{TestingSession.DEFAULT_TIME_ZONE_KEY.getZoneId()},
};
}

Expand Down
2 changes: 1 addition & 1 deletion plugin/trino-oracle/src/test/java/io/trino/plugin/oracle/AbstractTestOracleTypeMapping.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -768,7 +768,7 @@ public Object[][] sessionZonesDataProvider()
// using two non-JVM zones so that we don't need to worry what Oracle system zone is
{vilnius},
{kathmandu},
{ZoneId.of(TestingSession.DEFAULT_TIME_ZONE_KEY.getId())},
{TestingSession.DEFAULT_TIME_ZONE_KEY.getZoneId()},
};
}

Expand Down
2 changes: 1 addition & 1 deletion plugin/trino-phoenix5/src/test/java/io/trino/plugin/phoenix5/TestPhoenixTypeMapping.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -720,7 +720,7 @@ public Object[][] sessionZonesDataProvider()
// using two non-JVM zones so that we don't need to worry what Phoenix system zone is
{vilnius},
{kathmandu},
{ZoneId.of(TestingSession.DEFAULT_TIME_ZONE_KEY.getId())},
{TestingSession.DEFAULT_TIME_ZONE_KEY.getZoneId()},
};
}

Expand Down
2 changes: 1 addition & 1 deletion .../trino-postgresql/src/test/java/io/trino/plugin/postgresql/TestPostgreSqlTypeMapping.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1490,7 +1490,7 @@ public Object[][] sessionZonesDataProvider()
// using two non-JVM zones so that we don't need to worry what Postgres system zone is
{vilnius},
{kathmandu},
{ZoneId.of(TestingSession.DEFAULT_TIME_ZONE_KEY.getId())},
{TestingSession.DEFAULT_TIME_ZONE_KEY.getZoneId()},
};
}

Expand Down
2 changes: 1 addition & 1 deletion ...ino-singlestore/src/test/java/io/trino/plugin/singlestore/TestSingleStoreTypeMapping.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -924,7 +924,7 @@ public Object[][] sessionZonesDataProvider()
{ZoneId.of("Europe/Vilnius")},
// minutes offset change since 1970-01-01, no DST
{ZoneId.of("Asia/Kathmandu")},
{ZoneId.of(TestingSession.DEFAULT_TIME_ZONE_KEY.getId())},
{TestingSession.DEFAULT_TIME_ZONE_KEY.getZoneId()},
};
}

Expand Down
2 changes: 1 addition & 1 deletion plugin/trino-sqlserver/src/test/java/io/trino/plugin/sqlserver/BaseSqlServerTypeMapping.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -815,7 +815,7 @@ public Object[][] sessionZonesDataProvider()
{ZoneId.of("Europe/Vilnius")},
// minutes offset change since 1970-01-01, no DST
{ZoneId.of("Asia/Kathmandu")},
{ZoneId.of(TestingSession.DEFAULT_TIME_ZONE_KEY.getId())},
{TestingSession.DEFAULT_TIME_ZONE_KEY.getZoneId()},
};
}

Expand Down
3 changes: 1 addition & 2 deletions testing/trino-testing/src/main/java/io/trino/testing/AbstractTestingTrinoClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@

import java.io.Closeable;
import java.net.URI;
import java.time.ZoneId;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
Expand Down Expand Up @@ -157,7 +156,7 @@ private static ClientSession toClientSession(Session session, URI server, Durati
.catalog(session.getCatalog().orElse(null))
.schema(session.getSchema().orElse(null))
.path(session.getPath().toString())
.timeZone(ZoneId.of(session.getTimeZoneKey().getId()))
.timeZone(session.getTimeZoneKey().getZoneId())
.locale(session.getLocale())
.resourceEstimates(resourceEstimates.buildOrThrow())
.properties(properties.buildOrThrow())
Expand Down