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

Fix jdbc date conversion offset 1 day #22738

Merged
merged 2 commits into from
Aug 30, 2022
Merged

Fix jdbc date conversion offset 1 day #22738

merged 2 commits into from
Aug 30, 2022

Conversation

Abacn
Copy link
Contributor

@Abacn Abacn commented Aug 16, 2022

Fixes #21115

  • Use java.time.LocalDate directly instead of obtaining it from
    legacy java.sql.Date

Please add a meaningful description for your change here

Thank you for your contribution! Follow this checklist to help us incorporate your contribution quickly and easily:

  • Choose reviewer(s) and mention them in a comment (R: @username).
  • Mention the appropriate issue in your description (for example: addresses #123), if applicable. This will automatically add a link to the pull request in the issue. If you would like the issue to automatically close on merging the pull request, comment fixes #<ISSUE NUMBER> instead.
  • Update CHANGES.md with noteworthy changes.
  • If this contribution is large, please file an Apache Individual Contributor License Agreement.

See the Contributor Guide for more tips on how to make review process smoother.

To check the build health, please visit https://github.com/apache/beam/blob/master/.test-infra/BUILD_STATUS.md

GitHub Actions Tests Status (on master branch)

Build python source distribution and wheels
Python tests
Java tests
Go tests

See CI.md for more information about GitHub Actions CI.

@Abacn
Fix jdbc date conversion offset 1 day
a3feb1b 
* Use java.time.LocalDate directly instead of obtaining it from
  legacy java.sql.Date
@Abacn
Copy link
Contributor Author

Abacn commented Aug 16, 2022

Tested on MacOS 12.5/M1

setup table:

postgres=# create table datetest(f_id INTEGER, f_date DATE);
CREATE TABLE
postgres=# insert into datetest values(1, '2022-08-16'),(2, NULL);
INSERT 0 2
postgres=# select * from datetest;
 f_id |   f_date   
------+------------
    1 | 2022-08-16
    2 | 
(2 rows)

v2.40.0:

Row: 
f_id:2
f_time:<null>

Row: 
f_id:1
f_time:2022-08-15T00:00:00.000Z

With change:

Row: 
f_id:2
f_date:<null>

Row: 
f_id:1
f_date:2022-08-16T00:00:00.000Z

@Abacn Abacn marked this pull request as ready for review August 16, 2022 18:32
@Abacn
Copy link
Contributor Author

Abacn commented Aug 16, 2022

R: @johnjcasey

johnjcasey
johnjcasey reviewed Aug 16, 2022
View reviewed changes
sdks/java/io/jdbc/src/main/java/org/apache/beam/sdk/io/jdbc/SchemaUtil.java
@@ -313,11 +311,11 @@ private static <InputT, BaseT> ResultSetFieldExtractor createLogicalTypeExtracto
/** Convert SQL date type to Beam DateTime. */
private static ResultSetFieldExtractor createDateExtractor() {
return (rs, i) -> {
Date date = rs.getDate(i, Calendar.getInstance(TimeZone.getTimeZone(ZoneOffset.UTC)));
java.time.LocalDate date = rs.getObject(i, java.time.LocalDate.class);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can we change this to an import?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unfortunately there is import of org.joda.time.LocalDate and used everywhere. There is an issue #19215 to eliminate joda.time in release 3.0.0

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Gross, but understandable. Can you add a TODO here linked to that issue to clean this up?

@github-actions
Copy link
Contributor

Assigning reviewers. If you would like to opt out of this review, comment assign to next reviewer:

R: @kileys for label java.
R: @johnjcasey for label io.

Available commands:

  • stop reviewer notifications - opt out of the automated review tooling
  • remind me after tests pass - tag the comment author after tests pass
  • waiting on author - shift the attention set back to the author (any comment or push by the author will return the attention set to the reviewers)

The PR bot will only process comments in the main thread (not review comments).

@github-actions
Copy link
Contributor

Stopping reviewer notifications for this pull request: review requested by someone other than the bot, ceding control

@johnjcasey
Copy link
Contributor

LGTM, I'll merge once the java test passes

@Abacn
Copy link
Contributor Author

Abacn commented Aug 30, 2022

@johnjcasey Tests passed

@johnjcasey johnjcasey merged commit 37ac00b into apache:master Aug 30, 2022
@Abacn Abacn deleted the fixjdbcdate branch August 30, 2022 17:44
@Abacn Abacn mentioned this pull request Sep 26, 2022
Closed
@Abacn Abacn mentioned this pull request Sep 12, 2023
Merged
3 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@johnjcasey johnjcasey johnjcasey left review comments

Assignees
No one assigned
Labels
io java jdbc Next Action: Reviewers
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

JdbcIO date conversion is sensitive to OS
2 participants
@Abacn @johnjcasey