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.

Sign up for GitHub

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
Merged

Upgrade ORC version from 1.5.8 to 1.5.10 #4051

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0cbd8ee
Upgrade ORC version from 1.5.8 to 1.5.12
Nov 8, 2021
7cbdb27
Revert generate-build-info in pom.xml
Nov 9, 2021
d697f31
Use ORC 1.5.10
Nov 9, 2021
e467291
Update
Nov 11, 2021
4234176
Merge branch 'branch-21.12' into upgrade-orc-to-1.5.12
Nov 11, 2021
ae46c26
Add test case
Nov 11, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 0 additions & 26 deletions integration_tests/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.

<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<version>1.8</version>
<executions>
<execution>
<id>generate-build-info</id>
<phase>generate-resources</phase>
<configuration>
<!-- Execute the shell script to generate the plugin build information. -->
<target>
<mkdir dir="${project.build.directory}/extra-resources"/>
<mkdir dir="${project.build.directory}/tmp"/>
<exec executable="bash" failonerror="true" output="${project.build.directory}/extra-resources/rapids4spark-version-info.properties">
<arg value="${user.dir}/build/build-info"/>
<arg value="${project.version}"/>
<arg value="${cudf.version}"/>
</exec>
</target>
</configuration>
<goals>
<goal>run</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<configuration>
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -798,7 +798,7 @@
<cudf.version>21.12.0-SNAPSHOT</cudf.version>
<scala.binary.version>2.12</scala.binary.version>
<scala.version>2.12.8</scala.version>
<orc.version>1.5.8</orc.version>
<orc.version>1.5.12</orc.version>
<orc.classifier/>
<!--
If the shade package changes we need to also update jenkins/spark-premerge-build.sh
Expand Down Expand Up @@ -839,7 +839,7 @@
<guava.cdh.version>30.0-jre</guava.cdh.version>
<shim.module.name>${spark.version.classifier}</shim.module.name>
<slf4j.version>1.7.30</slf4j.version>
<hive.storage.api.version>2.6.0</hive.storage.api.version>
<hive.storage.api.version>2.7.1</hive.storage.api.version>
<protobuf.java.version>2.5.0</protobuf.java.version>
<flatbuffers.java.version>1.11.0</flatbuffers.java.version>
<scala.local-lib.path>org/scala-lang/scala-library/${scala.version}/scala-library-${scala.version}.jar</scala.local-lib.path>
Expand Down
2 changes: 1 addition & 1 deletion sql-plugin/src/main/scala/com/nvidia/spark/rapids/GpuOrcScanBase.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 •
edited
Loading

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.

// SargApplier.sargColumns is unfortunately not visible so we redundantly compute it here.
val filterCols = RecordReaderImpl.mapSargColumnsToOrcInternalColIdx(searchArg.getLeaves,
evolution)
Expand Down