Skip to content

Commit d3321d1

Browse files
committed
Add notes and minor cleanup
1 parent be59f2f commit d3321d1

File tree

1 file changed

+4
-5
lines changed

1 file changed

+4
-5
lines changed

flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/accessor/impl/calendar/ArrowFlightJdbcTimeStampVectorAccessor.java

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
import java.time.ZonedDateTime;
3232
import java.time.temporal.ChronoUnit;
3333
import java.util.Calendar;
34+
import java.util.Objects;
3435
import java.util.TimeZone;
3536
import java.util.concurrent.TimeUnit;
3637
import java.util.function.IntSupplier;
@@ -71,7 +72,9 @@ public ArrowFlightJdbcTimeStampVectorAccessor(
7172
this.holder = new Holder();
7273
this.getter = createGetter(vector);
7374

75+
// whether the vector included TZ info
7476
this.isZoned = getVectorIsZoned(vector);
77+
// non-null, either the vector TZ or default to UTC
7578
this.timeZone = getTimeZoneForVector(vector);
7679
this.timeUnit = getTimeUnitForVector(vector);
7780
this.longToLocalDateTime = getLongToLocalDateTimeForVector(vector, this.timeZone);
@@ -231,11 +234,7 @@ protected static TimeZone getTimeZoneForVector(TimeStampVector vector) {
231234
ArrowType.Timestamp arrowType =
232235
(ArrowType.Timestamp) vector.getField().getFieldType().getType();
233236

234-
String timezoneName = arrowType.getTimezone();
235-
if (timezoneName == null) {
236-
return TimeZone.getTimeZone("UTC");
237-
}
238-
237+
String timezoneName = Objects.requireNonNullElse(arrowType.getTimezone(), "UTC");
239238
return TimeZone.getTimeZone(timezoneName);
240239
}
241240

0 commit comments

Comments
 (0)