Fix merge conflict 3122 from branch-21.06 [skip ci] #3124
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
* Update spark 301db shim to new ParquetFilter api (NVIDIA#3100) Signed-off-by: Thomas Graves <[email protected]> * Fix ParquetFilters issue (NVIDIA#2961) * Fix ParquetFilters issue Spark has added datetime rebase mode into constructor of ParquetFilters, see SPARK-36034, which causes the build failed. This change is adding getParquetFilters in the shim layers to match different Spark version. Signed-off-by: Bobby Wang <[email protected]> * Fix compiling error Co-authored-by: Bobby Wang <[email protected]>
pxLi
added
documentation
|
build |
|
this will merged as a merge commit |
pxLi
changed the title
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.
fix merge conflict of #3122
also update changelog script