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

Upgrade ORC version from 1.5.8 to 1.5.10 #4051

Merged
merged 6 commits into from
Nov 12, 2021

Conversation

res-life
Copy link
Collaborator

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

This fixes #3227

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

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

res-life commented Nov 8, 2021

build

@res-life
Copy link
Collaborator Author

res-life commented Nov 8, 2021

  1. Upgrades ORC to 1.5.12
  2. The "generate-build-info" execution in integration pom.xml is duplicated with root pom, so delete it.

@@ -211,32 +211,6 @@
<classifier>${spark.version.classifier}</classifier>
</configuration>
</plugin>
<plugin>
Copy link
Collaborator

Choose a reason for hiding this comment

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

@pxLi and @tgravescs git blame indicates that the two of you touched this. It looks like it was added in on purpose so we get version info in both jars. Is that correct?

Copy link
Collaborator

Choose a reason for hiding this comment

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

Yes this is to make sure all jars have version properties which we then use later to make sure all the jars we pull are built from same version of source code, please put it back.

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.

@tgravescs
Copy link
Collaborator

so can we have a description on this as to why we are upgrading and why did we chose 1.5.12 when Spark 3.0.1 support 1.5.10? It probably doesn't matter anymore since we are shading it, but if it doesn't matter why aren't we upgrading to newer?

Chong Gao added 2 commits November 9, 2021 12:04
Signed-off-by: Chong Gao <res_life@163.com>
Signed-off-by: Chong Gao <res_life@163.com>
@res-life
Copy link
Collaborator Author

res-life commented Nov 9, 2021

so can we have a description on this as to why we are upgrading and why did we chose 1.5.12 when Spark 3.0.1 support 1.5.10? It probably doesn't matter anymore since we are shading it, but if it doesn't matter why aren't we upgrading to newer?

The default "buildver" version is 3.0.1, so let's use 1.5.10. The purpose of upgrading ORC I can see is to keep consistent when the "buildver" is 3.0.1.

@res-life
Copy link
Collaborator Author

res-life commented Nov 9, 2021

build

@res-life res-life changed the title Upgrade ORC version from 1.5.8 to 1.5.12 Upgrade ORC version from 1.5.8 to 1.5.10 Nov 9, 2021
@pxLi pxLi added the build Related to CI / CD or cleanly building label Nov 9, 2021
@res-life
Copy link
Collaborator Author

@jlowe @revans2 help to review.

tgravescs
tgravescs previously approved these changes Nov 10, 2021
@@ -1224,7 +1224,7 @@ private case class GpuOrcFileFilterHandler(
val searchArg = readerOpts.getSearchArgument
if (searchArg != null && orcReader.getRowIndexStride != 0) {
val sa = new SargApplier(searchArg, orcReader.getRowIndexStride, evolution,
orcReader.getWriterVersion, useUTCTimestamp)
orcReader.getWriterVersion, useUTCTimestamp, false, false)
Copy link
Member

Choose a reason for hiding this comment

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

Actually on second thought, we shouldn't be passing false, false here. We should be following what ORC 1.5.10 is doing here which is looking up the parameters from the reader and options.

Copy link
Collaborator Author

@res-life res-life Nov 11, 2021

Choose a reason for hiding this comment

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

Updated and added a test case.

Chong Gao added 3 commits November 11, 2021 14:12
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

@res-life res-life merged commit 6725c70 into NVIDIA:branch-21.12 Nov 12, 2021
@res-life res-life deleted the upgrade-orc-to-1.5.12 branch April 16, 2022 00:21
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.

[FEA] Upgrade the ORC version
5 participants