This repository was archived by the owner on May 14, 2025. It is now read-only.
Update JdbcSearchableJobExecutionDao to support Batch 4 and 5 schemas#5613
Merged
corneil merged 11 commits intospring-attic:mainfrom Dec 22, 2023
Merged
Conversation
d973c28 to
3f6474a
Compare
cppwfs
reviewed
Dec 19, 2023
Contributor
cppwfs
left a comment
There was a problem hiding this comment.
Looks good. Just some nitpicks and we probably need to test the BATCH_5 paths. Good work!
...-server-core/src/main/java/org/springframework/cloud/dataflow/server/batch/BatchVersion.java
Show resolved
Hide resolved
...main/java/org/springframework/cloud/dataflow/server/batch/JdbcSearchableJobExecutionDao.java
Show resolved
Hide resolved
...main/java/org/springframework/cloud/dataflow/server/batch/JdbcSearchableJobExecutionDao.java
Show resolved
Hide resolved
...test/java/org/springframework/cloud/dataflow/server/batch/AbstractSimpleJobServiceTests.java
Outdated
Show resolved
Hide resolved
… because of the removal of JOB_CONFIGURATION_LOCATION. Fixes spring-attic#5609
3f6474a to
8e6a356
Compare
… because of the removal of JOB_CONFIGURATION_LOCATION. Fixes spring-attic#5609
onobc
reviewed
Dec 19, 2023
...main/java/org/springframework/cloud/dataflow/server/batch/JdbcSearchableJobExecutionDao.java
Show resolved
Hide resolved
onobc
reviewed
Dec 19, 2023
...main/java/org/springframework/cloud/dataflow/server/batch/JdbcSearchableJobExecutionDao.java
Outdated
Show resolved
Hide resolved
onobc
reviewed
Dec 19, 2023
...main/java/org/springframework/cloud/dataflow/server/batch/JdbcSearchableJobExecutionDao.java
Outdated
Show resolved
Hide resolved
onobc
reviewed
Dec 20, 2023
...test/java/org/springframework/cloud/dataflow/server/batch/AbstractSimpleJobServiceTests.java
Outdated
Show resolved
Hide resolved
…sts can be moved to AbstractSimpleJobServiceTests.
Contributor
Author
|
Working to combine all the tests from AbstractJdbcJobSearchableExecutionDaoTests into AbstractSimpleJobServiceTests. |
…ctSimpleJobServiceTests. Fix JobParameter loading on JdbcSearchableJobExecutionDao.
Contributor
Author
|
The PR build is failing with errors. The testcontainer is running out of connections. |
cppwfs
reviewed
Dec 21, 2023
Contributor
cppwfs
left a comment
There was a problem hiding this comment.
I followed the changes and only nitipicks. But the tests are failing locally on my machine and on the CI.
.../test/java/org/springframework/cloud/dataflow/server/batch/SimpleJobServiceMariadbTests.java
Outdated
Show resolved
Hide resolved
...test/java/org/springframework/cloud/dataflow/server/batch/AbstractSimpleJobServiceTests.java
Outdated
Show resolved
Hide resolved
…ServicePostgresTests.
Contributor
|
After the changes you Chris and I paired coding through, the tests look good. It LGTM after you resolve mine and Chris Nitpicks. |
onobc
reviewed
Dec 21, 2023
...main/java/org/springframework/cloud/dataflow/server/repository/JobExecutionDaoContainer.java
Outdated
Show resolved
Hide resolved
onobc
reviewed
Dec 21, 2023
spring-cloud-dataflow-server-core/src/test/resources/schemas/drop-table-schema-mariadb.sql
Show resolved
Hide resolved
onobc
approved these changes
Dec 21, 2023
This file contains hidden or 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
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
3 participants
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.
Update JdbcSearchableJobExecutionDao to support Batch 4 and 5 schemas because of the removal of JOB_CONFIGURATION_LOCATION.
Fixes #5609