introduce method to query jobs database by end timestamp of attempts #6505
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
|
davinchia
reviewed
Sep 28, 2021
| database.transaction(ctx -> { | ||
| // override any other terminal statuses if we are now succeeded. | ||
| updateJobStatus(ctx, jobId, JobStatus.SUCCEEDED, now); | ||
|
|
||
| ctx.execute( | ||
| "UPDATE attempts SET status = CAST(? as ATTEMPT_STATUS), updated_at = ? WHERE job_id = ? AND attempt_number = ?", | ||
| "UPDATE attempts SET status = CAST(? as ATTEMPT_STATUS), updated_at = ? , ended_at = ? WHERE job_id = ? AND attempt_number = ?", |
There was a problem hiding this comment.
can you create an issue to make sure this is standardised?
There was a problem hiding this comment.
😬 damn. so we previously haven't been setting ended_at? good catch.
davinchia
approved these changes
Sep 28, 2021
cgardens
reviewed
Sep 28, 2021
| return database.query(ctx -> getJobsFromResult(ctx | ||
| .fetch(BASE_JOB_SELECT_AND_JOIN + "WHERE " + | ||
| "CAST(config_type AS VARCHAR) IN " + Sqls.toSqlInFragment(Sets.newHashSet(configType)) + " AND " + | ||
| " attempts.ended_at > ? ORDER BY jobs.created_at ASC, attempts.created_at ASC", timeConvertedIntoLocalDateTime))); |
There was a problem hiding this comment.
I think you can make your life a little easier here. In the other listJobs method in this class the order by query is already there as a constant. See:
cgardens
approved these changes
Sep 28, 2021
Comment on lines
419
to
421
| .fetch(BASE_JOB_SELECT_AND_JOIN + "WHERE " + | ||
| "CAST(config_type AS VARCHAR) IN " + Sqls.toSqlInFragment(Sets.newHashSet(configType)) + " AND " + | ||
| " attempts.ended_at > ? ORDER BY jobs.created_at ASC, attempts.created_at ASC", timeConvertedIntoLocalDateTime))); |
There was a problem hiding this comment.
Suggested change
| .fetch(BASE_JOB_SELECT_AND_JOIN + "WHERE " + | |
| "CAST(config_type AS VARCHAR) IN " + Sqls.toSqlInFragment(Sets.newHashSet(configType)) + " AND " + | |
| " attempts.ended_at > ? ORDER BY jobs.created_at ASC, attempts.created_at ASC", timeConvertedIntoLocalDateTime))); | |
| .fetch(BASE_JOB_SELECT_AND_JOIN + "WHERE " + | |
| "CAST(config_type AS VARCHAR) = ? AND attempts.ended_at > ? " + | |
| ORDER_BY_JOB_TIME_ATTEMPT_TIME, | |
| configType, | |
| timeConvertedIntoLocalDateTime))); |
This may not be 100% syntactically right, but I think it expresses what I mean.
| database.transaction(ctx -> { | ||
| // override any other terminal statuses if we are now succeeded. | ||
| updateJobStatus(ctx, jobId, JobStatus.SUCCEEDED, now); | ||
|
|
||
| ctx.execute( | ||
| "UPDATE attempts SET status = CAST(? as ATTEMPT_STATUS), updated_at = ? WHERE job_id = ? AND attempt_number = ?", | ||
| "UPDATE attempts SET status = CAST(? as ATTEMPT_STATUS), updated_at = ? , ended_at = ? WHERE job_id = ? AND attempt_number = ?", |
There was a problem hiding this comment.
😬 damn. so we previously haven't been setting ended_at? good catch.
cgardens
approved these changes
Sep 29, 2021
There was a problem hiding this comment.
i think this comment (https://github.com/airbytehq/airbyte/pull/6505/files#r717770848) is still not addressed? otherwise looks good.
This was referenced Sep 29, 2021
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
For billing I need to be able to query the jobs database by end timestamp of attempts.
Pre-merge Checklist
Expand the relevant checklist and delete the others.
New Connector
Community member or Airbyter
airbyte_secret./gradlew :airbyte-integrations:connectors:<name>:integrationTest.README.mdbootstrap.md. See description and examplesdocs/SUMMARY.mddocs/integrations/<source or destination>/<name>.mdincluding changelog. See changelog exampledocs/integrations/README.mdairbyte-integrations/builds.mdAirbyter
If this is a community PR, the Airbyte engineer reviewing this PR is responsible for the below items.
/test connector=connectors/<name>command is passing./publishcommand described hereUpdating a connector
Community member or Airbyter
airbyte_secret./gradlew :airbyte-integrations:connectors:<name>:integrationTest.README.mdbootstrap.md. See description and examplesdocs/integrations/<source or destination>/<name>.mdincluding changelog. See changelog exampleAirbyter
If this is a community PR, the Airbyte engineer reviewing this PR is responsible for the below items.
/test connector=connectors/<name>command is passing./publishcommand described hereConnector Generator
-scaffoldin their name) have been updated with the latest scaffold by running./gradlew :airbyte-integrations:connector-templates:generator:testScaffoldTemplatesthen checking in your changes