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

Commonize v2 shim [databricks] #4235

Merged
merged 6 commits into from
Dec 3, 2021
Merged

Conversation

res-life
Copy link
Collaborator

@res-life res-life commented Nov 30, 2021

Rename SparkBaseShims to Spark30XShims, delete unused 312db sources directory in sql-plugin.
Fixes #3660

Signed-off-by: Chong Gao res_life@163.com

Signed-off-by: Chong Gao <res_life@163.com>
@res-life
Copy link
Collaborator Author

build

@firestarman
Copy link
Collaborator

It would be better to give a short introduction of your change in the PR description.

@res-life
Copy link
Collaborator Author

@firestarman @tgravescs Please help to review.

Signed-off-by: Chong Gao <res_life@163.com>
@res-life
Copy link
Collaborator Author

res-life commented Dec 1, 2021

build

@tgravescs
Copy link
Collaborator

looks like there are compile errors on data bricks. 4 I think in total, here is one:

06:04:24 [ERROR] /home/ubuntu/spark-rapids/sql-plugin/src/main/301until330-all/scala/com/nvidia/spark/rapids/shims/v2/Spark30Xuntil33XShims.scala:323: type mismatch;

Chong Gao added 2 commits December 2, 2021 10:49
This reverts commit 2554927.
Signed-off-by: Chong Gao <res_life@163.com>
@res-life
Copy link
Collaborator Author

res-life commented Dec 2, 2021

build

@@ -441,12 +440,12 @@
<source>${project.basedir}/src/main/301+-nondb/scala</source>
<source>${project.basedir}/src/main/301until320-all/scala</source>
<source>${project.basedir}/src/main/301until320-nondb/scala</source>
<source>${project.basedir}/src/main/301until330-all/scala</source>
Copy link
Collaborator

Choose a reason for hiding this comment

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

👍


override def getSparkShimVersion: ShimVersion = SparkShimServiceProvider.VERSION

override def hasCastFloatTimestampUpcast: Boolean = true
Copy link
Collaborator

Choose a reason for hiding this comment

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

nit: why reorder methods?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Reverted.

gerashegalov
gerashegalov previously approved these changes Dec 2, 2021
Copy link
Collaborator

@gerashegalov gerashegalov left a comment

Choose a reason for hiding this comment

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

LGTM

Signed-off-by: Chong Gao <res_life@163.com>
@res-life
Copy link
Collaborator Author

res-life commented Dec 2, 2021

build

@res-life
Copy link
Collaborator Author

res-life commented Dec 2, 2021

After reordering two methods, pre-merge failed, this should not impact the pre-merge.

@res-life
Copy link
Collaborator Author

res-life commented Dec 2, 2021

build

pom.xml Show resolved Hide resolved
Signed-off-by: Chong Gao <res_life@163.com>
@res-life
Copy link
Collaborator Author

res-life commented Dec 3, 2021

build

@jlowe jlowe added the build Related to CI / CD or cleanly building label Dec 3, 2021
@tgravescs tgravescs merged commit 82ca15a into NVIDIA:branch-22.02 Dec 3, 2021
@res-life res-life deleted the shims branch December 4, 2021 07:35
res-life pushed a commit to res-life/spark-rapids that referenced this pull request Dec 6, 2021
* Commonize v2 shim

Signed-off-by: Chong Gao <res_life@163.com>

* Reuse some codes

Signed-off-by: Chong Gao <res_life@163.com>

* Revert "Reuse some codes"

This reverts commit 2554927.

* Reuse codes

Signed-off-by: Chong Gao <res_life@163.com>

* Revert a file

Signed-off-by: Chong Gao <res_life@163.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
build Related to CI / CD or cleanly building
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Commonize v2 shim code where possible
5 participants