Fix auto merge conflict 5789 #5790
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
Signed-off-by: Firestarman <firestarmanllc@gmail.com>
…ricks] (NVIDIA#5784) * Update the error string for test_cast_neg_to_decimal_err on 330 Signed-off-by: Firestarman <firestarmanllc@gmail.com> * address comments Signed-off-by: Firestarman <firestarmanllc@gmail.com>
… files on the GPU [databricks] (NVIDIA#5761) * Throw useful message when parquet columnar encryption enabled * update message * fix message * handle native encrypted * move variable * cleanup * fix native check * cleanup imports * fix import order * Sign off Signed-off-by: Thomas Graves <tgraves@nvidia.com> * Shim the parquet crypto exception check Signed-off-by: Thomas Graves <tgraves@nvidia.com> * shim 320cdh * Add test for parquet encryption Signed-off-by: Thomas Graves <tgraves@nvidia.com>
Passes the datatype of round-like functions directly to GPU overrides, so as to adapt different Spark versions. Signed-off-by: sperlingxx <lovedreamf@gmail.com>
…IDIA#5766) Fixes NVIDIA#5765 Fix the potential overflow when casting float/double to decimal. The overflow occurs on the container decimal for HALF_UP round. Signed-off-by: sperlingxx <lovedreamf@gmail.com>
tgravescs
requested review from
GaryShen2008,
NvTimLiu and
zhanga5
as code owners
|
build |
1 similar comment
|
build |
|
Upmreged again to latest should be all of them. |
|
build |
jlowe
approved these changes
Jun 8, 2022
|
I merged with wrong button will have to redo |
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.
fixes merge conflicts from #5789
Merge conflicts were in the imports in GpuParquetScan and in the adding in vals PARQUET_ENCRYPTION_CONFS
The arithmetic_ops_test was conflict due to Spark 3.1.4, 3.2.2 and 3.4.0 being handled by code in 22.08.
I also updated the pom.xml to put the parquet.hadoop.version into the 3.4.0 section.
NOTE: This needs to be committed with a merge commit, not squashed!