Skip to content
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

Jump to bottom

Use Avatica DateTimeUtils for getString in Date/Time #7

Merged
merged 5 commits into from
Mar 15, 2022
Merged

Use Avatica DateTimeUtils for getString in Date/Time #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
716fdf3
Make UTC the default tz instead of using local tz
vfraga Mar 8, 2022
db808f2
Use Avatica DateTimeUtils for getString in Date/Time/TimeStamp
vfraga Mar 8, 2022
95725af
Correct usage for unix*ToString
vfraga Mar 10, 2022
7687a95
Add unit tests for Date/Time getString
vfraga Mar 10, 2022
fdd4d16
Check wasNull
vfraga Mar 10, 2022
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
22 changes: 19 additions & 3 deletions ...rg/apache/arrow/driver/jdbc/accessor/impl/calendar/ArrowFlightJdbcDateVectorAccessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@
import static org.apache.arrow.driver.jdbc.accessor.impl.calendar.ArrowFlightJdbcDateVectorGetter.Getter;
import static org.apache.arrow.driver.jdbc.accessor.impl.calendar.ArrowFlightJdbcDateVectorGetter.Holder;
import static org.apache.arrow.driver.jdbc.accessor.impl.calendar.ArrowFlightJdbcDateVectorGetter.createGetter;
import static org.apache.calcite.avatica.util.DateTimeUtils.MILLIS_PER_DAY;
import static org.apache.calcite.avatica.util.DateTimeUtils.unixDateToString;

import java.sql.Date;
import java.sql.Timestamp;
Expand Down Expand Up @@ -84,9 +86,7 @@ public Object getObject() {

@Override
public Date getDate(Calendar calendar) {
getter.get(getCurrentRow(), holder);
this.wasNull = holder.isSet == 0;
this.wasNullConsumer.setWasNull(this.wasNull);
fillHolder();
if (this.wasNull) {
return null;
}
Expand All @@ -97,6 +97,12 @@ public Date getDate(Calendar calendar) {
return new Date(DateTimeUtils.applyCalendarOffset(milliseconds, calendar));
}

private void fillHolder() {
getter.get(getCurrentRow(), holder);
this.wasNull = holder.isSet == 0;
this.wasNullConsumer.setWasNull(this.wasNull);
}

@Override
public Timestamp getTimestamp(Calendar calendar) {
Date date = getDate(calendar);
Expand All @@ -106,6 +112,16 @@ public Timestamp getTimestamp(Calendar calendar) {
return new Timestamp(date.getTime());
}

@Override
public String getString() {
fillHolder();
if (wasNull) {
return null;
}
long milliseconds = timeUnit.toMillis(holder.value);
return unixDateToString((int) (milliseconds / MILLIS_PER_DAY));
}

protected static TimeUnit getTimeUnitForVector(ValueVector vector) {
if (vector instanceof DateDayVector) {
return TimeUnit.DAYS;
Expand Down
2 changes: 1 addition & 1 deletion ...ache/arrow/driver/jdbc/accessor/impl/calendar/ArrowFlightJdbcTimeStampVectorAccessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ protected static TimeZone getTimeZoneForVector(TimeStampVector vector) {

String timezoneName = arrowType.getTimezone();
if (timezoneName == null) {
return TimeZone.getDefault();
return TimeZone.getTimeZone("UTC");
}

return TimeZone.getTimeZone(timezoneName);
Expand Down
22 changes: 19 additions & 3 deletions ...rg/apache/arrow/driver/jdbc/accessor/impl/calendar/ArrowFlightJdbcTimeVectorAccessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@
import static org.apache.arrow.driver.jdbc.accessor.impl.calendar.ArrowFlightJdbcTimeVectorGetter.Getter;
import static org.apache.arrow.driver.jdbc.accessor.impl.calendar.ArrowFlightJdbcTimeVectorGetter.Holder;
import static org.apache.arrow.driver.jdbc.accessor.impl.calendar.ArrowFlightJdbcTimeVectorGetter.createGetter;
import static org.apache.calcite.avatica.util.DateTimeUtils.MILLIS_PER_DAY;
import static org.apache.calcite.avatica.util.DateTimeUtils.unixTimeToString;

import java.sql.Time;
import java.sql.Timestamp;
Expand Down Expand Up @@ -116,9 +118,7 @@ public Object getObject() {

@Override
public Time getTime(Calendar calendar) {
getter.get(getCurrentRow(), holder);
this.wasNull = holder.isSet == 0;
this.wasNullConsumer.setWasNull(this.wasNull);
fillHolder();
if (this.wasNull) {
return null;
}
Expand All @@ -129,6 +129,12 @@ public Time getTime(Calendar calendar) {
return new Time(DateTimeUtils.applyCalendarOffset(milliseconds, calendar));
}

private void fillHolder() {
getter.get(getCurrentRow(), holder);
this.wasNull = holder.isSet == 0;
this.wasNullConsumer.setWasNull(this.wasNull);
}

@Override
public Timestamp getTimestamp(Calendar calendar) {
Time time = getTime(calendar);
Expand All @@ -138,6 +144,16 @@ public Timestamp getTimestamp(Calendar calendar) {
return new Timestamp(time.getTime());
}

@Override
public String getString() {
fillHolder();
if (wasNull) {
return null;
}
long milliseconds = timeUnit.toMillis(holder.value);
return unixTimeToString((int) (milliseconds % MILLIS_PER_DAY));
}

protected static TimeUnit getTimeUnitForVector(ValueVector vector) {
if (vector instanceof TimeNanoVector) {
return TimeUnit.NANOSECONDS;
Expand Down
25 changes: 25 additions & 0 deletions ...pache/arrow/driver/jdbc/accessor/impl/calendar/ArrowFlightJdbcDateVectorAccessorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import static org.apache.arrow.driver.jdbc.accessor.impl.calendar.ArrowFlightJdbcDateVectorAccessor.getTimeUnitForVector;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.not;

import java.sql.Date;
import java.sql.Timestamp;
Expand Down Expand Up @@ -205,6 +206,30 @@ public void testShouldGetStringBeConsistentWithVarCharAccessorWithCalendar() thr
assertGetStringIsConsistentWithVarCharAccessor(calendar);
}

@Test
public void testValidateGetStringTimeZoneConsistency() throws Exception {
accessorIterator.iterate(vector, (accessor, currentRow) -> {
final TimeZone defaultTz = TimeZone.getDefault();
try {
final String string = accessor.getString(); // Should always be UTC as no calendar is provided

// Validate with UTC
Date date = accessor.getDate(null);
TimeZone.setDefault(TimeZone.getTimeZone("UTC"));
collector.checkThat(date.toString(), is(string));

// Validate with different TZ
TimeZone.setDefault(TimeZone.getTimeZone(AMERICA_VANCOUVER));
collector.checkThat(date.toString(), not(string));

collector.checkThat(accessor.wasNull(), is(false));
} finally {
// Set default Tz back
TimeZone.setDefault(defaultTz);
}
});
}

private void assertGetStringIsConsistentWithVarCharAccessor(Calendar calendar) throws Exception {
try (VarCharVector varCharVector = new VarCharVector("",
rootAllocatorTestRule.getRootAllocator())) {
Expand Down
25 changes: 25 additions & 0 deletions ...pache/arrow/driver/jdbc/accessor/impl/calendar/ArrowFlightJdbcTimeVectorAccessorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import static org.apache.arrow.driver.jdbc.accessor.impl.calendar.ArrowFlightJdbcTimeVectorAccessor.getTimeUnitForVector;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.not;

import java.sql.Time;
import java.sql.Timestamp;
Expand Down Expand Up @@ -214,6 +215,30 @@ public void testShouldGetStringBeConsistentWithVarCharAccessorWithCalendar() thr
assertGetStringIsConsistentWithVarCharAccessor(calendar);
}

@Test
public void testValidateGetStringTimeZoneConsistency() throws Exception {
accessorIterator.iterate(vector, (accessor, currentRow) -> {
final TimeZone defaultTz = TimeZone.getDefault();
try {
final String string = accessor.getString(); // Should always be UTC as no calendar is provided

// Validate with UTC
Time time = accessor.getTime(null);
TimeZone.setDefault(TimeZone.getTimeZone("UTC"));
collector.checkThat(time.toString(), is(string));

// Validate with different TZ
TimeZone.setDefault(TimeZone.getTimeZone(AMERICA_VANCOUVER));
collector.checkThat(time.toString(), not(string));

collector.checkThat(accessor.wasNull(), is(false));
} finally {
// Set default Tz back
TimeZone.setDefault(defaultTz);
}
});
}

private void assertGetStringIsConsistentWithVarCharAccessor(Calendar calendar) throws Exception {
try (VarCharVector varCharVector = new VarCharVector("",
rootAllocatorTestRule.getRootAllocator())) {
Expand Down