[SPARK-48172][SQL][FOLLOWUP] Fix escaping issues in JDBCDialects #46807
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
|
@milastdbx Please take a look at this PR, problems were in #46588 as 3.4 and 3.5 are run with different JDK version. |
yaooqinn
reviewed
May 31, 2024
| connection.prepareStatement("INSERT INTO pattern_testing_table " | ||
| + "VALUES ('special_character_quote''_present')") | ||
| .executeUpdate() | ||
| connection.prepareStatement("INSERT INTO pattern_testing_table " |
There was a problem hiding this comment.
nit: Can these *not* values be collapsed？
There was a problem hiding this comment.
Collapsing them now would require changes in the ordering of results of tests in V2JDBCTest, as collapsing might reorder inputs, so maybe it is better to keep this change scoped to fixing the JDK problem for CI runs.
yaooqinn
changed the title
yaooqinn
pushed a commit
that referenced
this pull request
May 31, 2024
### What changes were proposed in this pull request? Removal of stripMargin from the code in `DockerJDBCIntegrationV2Suite`. ### Why are the changes needed? #46588 Given PR was merged to master/3.5/3.4. This PR broke daily jobs for `OracleIntegrationSuite`. Upon inspection, it was noted that 3.4 and 3.5 are run with JDK8 while master is run with JDK21 and stripMargin was behaving differently in those cases. Upon removing stripMargin and spliting `INSERT INTO` statements into multiple lines, all integration tests have passed. ### Does this PR introduce _any_ user-facing change? No, only loading of the test data was changed to follow language requirements. ### How was this patch tested? Existing suite was aborted in the job and now it is running. ### Was this patch authored or co-authored using generative AI tooling? No Closes #46806 Closes #46807 from mihailom-db/FixOracleMaster. Authored-by: Mihailo Milosevic <mihailo.milosevic@databricks.com> Signed-off-by: Kent Yao <yao@apache.org> (cherry picked from commit 4360ec7) Signed-off-by: Kent Yao <yao@apache.org>
yaooqinn
pushed a commit
that referenced
this pull request
May 31, 2024
### What changes were proposed in this pull request? Removal of stripMargin from the code in `DockerJDBCIntegrationV2Suite`. ### Why are the changes needed? #46588 Given PR was merged to master/3.5/3.4. This PR broke daily jobs for `OracleIntegrationSuite`. Upon inspection, it was noted that 3.4 and 3.5 are run with JDK8 while master is run with JDK21 and stripMargin was behaving differently in those cases. Upon removing stripMargin and spliting `INSERT INTO` statements into multiple lines, all integration tests have passed. ### Does this PR introduce _any_ user-facing change? No, only loading of the test data was changed to follow language requirements. ### How was this patch tested? Existing suite was aborted in the job and now it is running. ### Was this patch authored or co-authored using generative AI tooling? No Closes #46806 Closes #46807 from mihailom-db/FixOracleMaster. Authored-by: Mihailo Milosevic <mihailo.milosevic@databricks.com> Signed-off-by: Kent Yao <yao@apache.org> (cherry picked from commit 4360ec7) Signed-off-by: Kent Yao <yao@apache.org>
|
Merged to master/3.5/3.4. Thank you @mihailom-db |
riyaverm-db
pushed a commit
to riyaverm-db/spark
that referenced
this pull request
Jun 7, 2024
### What changes were proposed in this pull request? Removal of stripMargin from the code in `DockerJDBCIntegrationV2Suite`. ### Why are the changes needed? apache#46588 Given PR was merged to master/3.5/3.4. This PR broke daily jobs for `OracleIntegrationSuite`. Upon inspection, it was noted that 3.4 and 3.5 are run with JDK8 while master is run with JDK21 and stripMargin was behaving differently in those cases. Upon removing stripMargin and spliting `INSERT INTO` statements into multiple lines, all integration tests have passed. ### Does this PR introduce _any_ user-facing change? No, only loading of the test data was changed to follow language requirements. ### How was this patch tested? Existing suite was aborted in the job and now it is running. ### Was this patch authored or co-authored using generative AI tooling? No Closes apache#46806 Closes apache#46807 from mihailom-db/FixOracleMaster. Authored-by: Mihailo Milosevic <mihailo.milosevic@databricks.com> Signed-off-by: Kent Yao <yao@apache.org>
szehon-ho
pushed a commit
to szehon-ho/spark
that referenced
this pull request
Aug 7, 2024
### What changes were proposed in this pull request? Removal of stripMargin from the code in `DockerJDBCIntegrationV2Suite`. ### Why are the changes needed? apache#46588 Given PR was merged to master/3.5/3.4. This PR broke daily jobs for `OracleIntegrationSuite`. Upon inspection, it was noted that 3.4 and 3.5 are run with JDK8 while master is run with JDK21 and stripMargin was behaving differently in those cases. Upon removing stripMargin and spliting `INSERT INTO` statements into multiple lines, all integration tests have passed. ### Does this PR introduce _any_ user-facing change? No, only loading of the test data was changed to follow language requirements. ### How was this patch tested? Existing suite was aborted in the job and now it is running. ### Was this patch authored or co-authored using generative AI tooling? No Closes apache#46806 Closes apache#46807 from mihailom-db/FixOracleMaster. Authored-by: Mihailo Milosevic <mihailo.milosevic@databricks.com> Signed-off-by: Kent Yao <yao@apache.org> (cherry picked from commit 4360ec7) Signed-off-by: Kent Yao <yao@apache.org> (cherry picked from commit 1d74d9dd0f832a5e5c03f6b808cb3a3b1b379556)
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.
What changes were proposed in this pull request?
Removal of stripMargin from the code in
DockerJDBCIntegrationV2Suite.Why are the changes needed?
#46588
Given PR was merged to master/3.5/3.4. This PR broke daily jobs for
OracleIntegrationSuite. Upon inspection, it was noted that 3.4 and 3.5 are run with JDK8 while master is run with JDK21 and stripMargin was behaving differently in those cases. Upon removing stripMargin and splitingINSERT INTOstatements into multiple lines, all integration tests have passed.Does this PR introduce any user-facing change?
No, only loading of the test data was changed to follow language requirements.
How was this patch tested?
Existing suite was aborted in the job and now it is running.
Was this patch authored or co-authored using generative AI tooling?
No
Closes #46806