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.

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

fix temporal data type handling in mysql source #15504

Merged
merged 18 commits into from
Aug 12, 2022

Conversation

subodh1810
Copy link
Contributor

@subodh1810 subodh1810 commented Aug 10, 2022

Issue : #14628, #15381

🚨 User Impact 🚨

Are there any breaking changes? What is the end result perceived by the user? If yes, please merge this PR with the 🚨🚨 emoji so changelog authors can further highlight this if needed.

Pre-merge Checklist

Expand the relevant checklist and delete the others.

New Connector

Community member or Airbyter

  • Community member? Grant edit access to maintainers (instructions)
  • Secrets in the connector's spec are annotated with airbyte_secret
  • Unit & integration tests added and passing. Community members, please provide proof of success locally e.g: screenshot or copy-paste unit, integration, and acceptance test output. To run acceptance tests for a Python connector, follow instructions in the README. For java connectors run ./gradlew :airbyte-integrations:connectors:<name>:integrationTest.
  • Code reviews completed
  • Documentation updated
    • Connector's README.md
    • Connector's bootstrap.md. See description and examples
    • docs/integrations/<source or destination>/<name>.md including changelog. See changelog example
    • docs/integrations/README.md
    • airbyte-integrations/builds.md
  • PR name follows PR naming conventions

Airbyter

If this is a community PR, the Airbyte engineer reviewing this PR is responsible for the below items.

  • Create a non-forked branch based on this PR and test the below items on it
  • Build is successful
  • If new credentials are required for use in CI, add them to GSM. Instructions.
  • /test connector=connectors/<name> command is passing
  • New Connector version released on Dockerhub by running the /publish command described here
  • After the connector is published, connector added to connector index as described here
  • Seed specs have been re-generated by building the platform and committing the changes to the seed spec files, as described here
Updating a connector

Community member or Airbyter

  • Grant edit access to maintainers (instructions)
  • Secrets in the connector's spec are annotated with airbyte_secret
  • Unit & integration tests added and passing. Community members, please provide proof of success locally e.g: screenshot or copy-paste unit, integration, and acceptance test output. To run acceptance tests for a Python connector, follow instructions in the README. For java connectors run ./gradlew :airbyte-integrations:connectors:<name>:integrationTest.
  • Code reviews completed
  • Documentation updated
    • Connector's README.md
    • Connector's bootstrap.md. See description and examples
    • Changelog updated in docs/integrations/<source or destination>/<name>.md including changelog. See changelog example
  • PR name follows PR naming conventions

Airbyter

If this is a community PR, the Airbyte engineer reviewing this PR is responsible for the below items.

  • Create a non-forked branch based on this PR and test the below items on it
  • Build is successful
  • If new credentials are required for use in CI, add them to GSM. Instructions.
  • /test connector=connectors/<name> command is passing
  • New Connector version released on Dockerhub and connector version bumped by running the /publish command described here
Connector Generator
  • Issue acceptance criteria met
  • PR name follows PR naming conventions
  • If adding a new generator, add it to the list of scaffold modules being tested
  • The generator test modules (all connectors with -scaffold in their name) have been updated with the latest scaffold by running ./gradlew :airbyte-integrations:connector-templates:generator:testScaffoldTemplates then checking in your changes
  • Documentation which references the generator is updated as needed

Tests

Unit

Put your unit tests output here.

Integration

Put your integration tests output here.

Acceptance

Put your acceptance tests output here.

@subodh1810 subodh1810 self-assigned this Aug 10, 2022
@github-actions github-actions bot added the area/connectors Connector related issues label Aug 10, 2022
@subodh1810 subodh1810 changed the base branch from master to fix-postgres-data-handling-in-transaction-logs August 10, 2022 10:14
@subodh1810 subodh1810 temporarily deployed to more-secrets August 10, 2022 10:32 Inactive
@subodh1810 subodh1810 temporarily deployed to more-secrets August 10, 2022 10:34 Inactive
@subodh1810 subodh1810 temporarily deployed to more-secrets August 10, 2022 14:46 Inactive
@subodh1810 subodh1810 changed the title Fix temporal type handling mysql fix temporal data type handling in mysql source Aug 10, 2022
@subodh1810
Copy link
Contributor Author

subodh1810 commented Aug 10, 2022

/test connector=connectors/source-mysql

🕑 connectors/source-mysql https://github.com/airbytehq/airbyte/actions/runs/2833702737
❌ connectors/source-mysql https://github.com/airbytehq/airbyte/actions/runs/2833702737
🐛 https://gradle.com/s/z66bdvmtjyabg

Build Failed

Test summary info:

Could not find result summary

@subodh1810 subodh1810 temporarily deployed to more-secrets August 10, 2022 15:13 Inactive
Base automatically changed from fix-postgres-data-handling-in-transaction-logs to master August 10, 2022 16:18
# Conflicts:
#	airbyte-db/db-lib/src/main/java/io/airbyte/db/jdbc/DateTimeConverter.java
@subodh1810
Copy link
Contributor Author

/test connector=connectors/source-mysql

@subodh1810
Copy link
Contributor Author

subodh1810 commented Aug 10, 2022

/test connector=connectors/source-mysql

🕑 connectors/source-mysql https://github.com/airbytehq/airbyte/actions/runs/2834441705
❌ connectors/source-mysql https://github.com/airbytehq/airbyte/actions/runs/2834441705
🐛

Build Failed

Test summary info:

Could not find result summary

@subodh1810
Copy link
Contributor Author

/test connector=connectors/source-mysql

@subodh1810
Copy link
Contributor Author

subodh1810 commented Aug 10, 2022

/test connector=connectors/source-mysql

🕑 connectors/source-mysql https://github.com/airbytehq/airbyte/actions/runs/2835163536
✅ connectors/source-mysql https://github.com/airbytehq/airbyte/actions/runs/2835163536
No Python unittests run

Build Passed

Test summary info:

All Passed

@subodh1810 subodh1810 marked this pull request as ready for review August 10, 2022 19:46
@subodh1810 subodh1810 requested a review from a team as a code owner August 10, 2022 19:46
@subodh1810 subodh1810 requested review from edgao and tuliren August 10, 2022 19:48
@subodh1810 subodh1810 linked an issue Aug 10, 2022 that may be closed by this pull request
@subodh1810
Copy link
Contributor Author

@edgao can you confirm this will also cover the scope of the issue (I think it would but would be nice to get your approval as well)

Copy link
Contributor

@edgao edgao left a comment

Choose a reason for hiding this comment

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

yep, it covers all the data types for that issue (date/datetime/timestamp)

added a few comments, but nothing relevant to the actual code change

try {
preparedStatement.setObject(parameterIndex, LocalDateTime.parse(value));
} catch (final DateTimeParseException e) {
// attempt to parse the datetime with timezone. This can be caused by schema created with an older
Copy link
Contributor

Choose a reason for hiding this comment

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

are there test cases for this behavior?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

added tests for the behaviour

.sourceType("timestamp")
.airbyteType(JsonSchemaType.STRING_TIMESTAMP_WITH_TIMEZONE)
.addInsertValues("null", "'2021-01-00'", "'2021-00-00'", "'0000-00-00'", "'2022-08-09T10:17:16.161342Z'")
.addExpectedValues(null, null, null, null, "2022-08-09T10:17:16.000000Z")
Copy link
Contributor

Choose a reason for hiding this comment

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

why are these returning null? is it because the insert values aren't valid timestamps?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yup

container.start();

config = Jsons.jsonNode(ImmutableMap.builder()
.put(JdbcUtils.HOST_KEY, container.getHost())
Copy link
Contributor

Choose a reason for hiding this comment

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

prefer HostPortResolver.resolveHost() and resolvePort() for the host/portname - otherwise this breaks on m1 macs (maybe? at the very least, george and I had issues with postgres tests which were fixed by switching to HostPortResolver)

(iirc the DSLContextFactory still needs to use container.getHost/getPort because that's running directly on the host laptop, not inside a container)

.sourceType("timestamp")
.airbyteType(JsonSchemaType.STRING_TIMESTAMP_WITH_TIMEZONE)
.addInsertValues("null", "'2021-01-00'", "'2021-00-00'", "'0000-00-00'", "'2022-08-09T10:17:16.161342Z'")
.addExpectedValues(null, "1970-01-01T00:00:00.000000Z", "1970-01-01T00:00:00.000000Z", "1970-01-01T00:00:00.000000Z",
Copy link
Contributor

Choose a reason for hiding this comment

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

is 1970-01-01 the equivalent of the null entries in the default test cases? (adding this as a comment would be helpful)

@subodh1810
Copy link
Contributor Author

subodh1810 commented Aug 12, 2022

/test connector=connectors/source-mysql

🕑 connectors/source-mysql https://github.com/airbytehq/airbyte/actions/runs/2846108958
❌ connectors/source-mysql https://github.com/airbytehq/airbyte/actions/runs/2846108958
🐛 https://gradle.com/s/palwm6uq3fxva

Build Failed

Test summary info:

Could not find result summary

@subodh1810
Copy link
Contributor Author

subodh1810 commented Aug 12, 2022

/test connector=connectors/source-mysql

🕑 connectors/source-mysql https://github.com/airbytehq/airbyte/actions/runs/2846944140
✅ connectors/source-mysql https://github.com/airbytehq/airbyte/actions/runs/2846944140
No Python unittests run

Build Passed

Test summary info:

All Passed

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Source MySQL should correctly map temporal types to JsonSchema
3 participants