Fix merge conflict with branch-21.10 #3748
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
…tabricks] (NVIDIA#3719) * Fix issues with AQE and DPP enabled on Spark 3.2 Signed-off-by: Jason Lowe <jlowe@nvidia.com> * Add canonicalized parameter for 301db shim * Fix double-close when batch contains multiple columns * Fix HostColumnVector deserialization * Advertise CPU sort and partitioning expressions to avoid AQE replanning issues Signed-off-by: Jason Lowe <jlowe@nvidia.com> * Fix IndexOutOfBoundsException errors from WindowFunctionSuite * Update other shims * Fix 311db build * Fix 311db GpuWindowsInPandasExec and update optimized sort comment * Specify GpuPartitioning type when expecting a GPU partitioning argument * Add ability to override withNewChildren and fix BatchedByKey * Fix 301db GpuWindowInPandasExec * Use separate parameter list to pass CPU expressions * Exclude CPU expressions from assertOnGpu checks * Fix scalastyle on imports
|
build |
tgravescs
approved these changes
Oct 5, 2021
Codecov Report
@@ Coverage Diff @@
## branch-21.12 #3748 +/- ##
===============================================
Coverage ? 47.97%
Complexity ? 1742
===============================================
Files ? 231
Lines ? 29766
Branches ? 4958
===============================================
Hits ? 14281
Misses ? 13321
Partials ? 2164 Continue to review full report at Codecov.
|
|
build |
|
CI failed due to known issue #3742. Merging this to restore auto-merge functionality. |
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.
NOTE: This must be merged with a merge commit, not squashed!
Fixes the merge conflict identified in #3747. Conflict was in GpuCoalesceBatches where collect and total time metrics were removed in 21.12.