[feat]Support spark3.3+ and spark2.2- compile #4301
Merged
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
peacewong
reviewed
Mar 6, 2023
| @@ -187,12 +187,21 @@ | |||
| <artifactId>linkis-rpc</artifactId> | |||
| <version>${project.version}</version> | |||
| </dependency> | |||
| <dependency> | |||
| <groupId>net.sf.py4j</groupId> | |||
| <artifactId>py4j</artifactId> | |||
There was a problem hiding this comment.
Here py4j is compatible and should not be introduced separately, because spark jars already have this dependency, which will cause low version conflicts
There was a problem hiding this comment.
have set the dependency as provided
rarexixi
reviewed
Mar 6, 2023
| @@ -58,7 +60,7 @@ class JdbcSink extends DataCalcSink[JdbcSinkConfig] with Logging { | |||
| .repartition(1) | |||
| .foreachPartition((_: Iterator[Row]) => { | |||
| val jdbcOptions = new JDBCOptions(options) | |||
| val conn: Connection = JdbcUtils.createConnectionFactory(jdbcOptions)() | |||
| val conn: Connection = createConnectionFactory(jdbcOptions)() | |||
There was a problem hiding this comment.
Replace with DriverManager.getConnection(config.getUrl, config.getUser, config.getPassword) here.
rarexixi
reviewed
Mar 6, 2023
| break() | ||
| } | ||
| }) | ||
| } |
|
LGTM. |
GuoPhilipse
added a commit
to GuoPhilipse/incubator-linkis
that referenced
this pull request
Mar 20, 2023
7 tasks
peacewong
pushed a commit
that referenced
this pull request
Mar 21, 2023
aiceflower
added a commit
to aiceflower/linkis
that referenced
this pull request
Mar 24, 2023
This reverts commit f5a9bfb.
2 tasks
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 is the purpose of the change
1、after spark 3.3.0 JdbcUtils#createConnectionFactory was moved, we can improve code to support spark3.3 +
2、OrcFileFormat may be lack(take before spark2.2.1) ,we can improve code to support lower spark version
3、HiveTableRelation may be lack(take before spark2.2.1) ,we can improve code to support lower spark version
4、querytimeout may be lack(take before spark2.4.0) ,we can improve code to support lower spark version
5、authtoken may be lack(before spark2.4.0) ,we can improve code to support lower spark version
Related issues/PRs
Related issues: #4298
Related pr: #4301
Brief change log
1、rewrite
JdbcUtils#createConnectionFactoryin linkis for supporting for higher version spark（methodcreateConnectionFactorywas moved at https://issues.apache.org/jira/browse/SPARK-38361）2、use reflectiong to keep
OrcFileFormatcode compatability for higher version spark3、comment
HiveTableRelationto keepHiveTableRelationcode compatability for lower version spark(further check at
https://github.com/apache/spark/blob/v2.2.1/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/catalog/interface.scala
https://github.com/apache/spark/blob/v2.2.0/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/catalog/interface.scala)
4、decision spark version to keep
querytimeoutcode compatability for lower version spark4、use higher py4jversion to keep
authtokencode compatability for lower version pysparkplease note: for lower version if compile failed for netty, you may try to compile source code with -Dnetty.version=4.1.51.Final
Checklist