Fix merge from 22.04 to 22.06 #5059
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
* Support ORC forced positional evolution for Spark 3.2+ Signed-off-by: Niranjan Artal <nartal@nvidia.com> * add test and update force position evolution Signed-off-by: Niranjan Artal <nartal@nvidia.com>
…ExpExtract (NVIDIA#5052) Signed-off-by: Jason Lowe <jlowe@nvidia.com>
|
build |
…r [databricks] (NVIDIA#4976)" (NVIDIA#5051) This reverts commit 1297916. Signed-off-by: Alessandro Bellina <abellina@nvidia.com>
jlowe
requested review from
revans2,
tgravescs,
GaryShen2008 and
NvTimLiu
as code owners
|
build |
tgravescs
approved these changes
Mar 25, 2022
# for free
to join this conversation on GitHub.
Already have an account?
# 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.
Fixes the merge conflict reported by #5057. The merge was automatically performed by git, so not sure why it was flagged as a merge conflict unless the auto-merge bot somehow was tripped up by the GpuOrcScanBase -> GpuOrcScan rename. The git CLI was able to resolve it automatically for me.
NOTE: This must be committed with a merge commit, not squashed!