-
Notifications
You must be signed in to change notification settings - Fork 244
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.
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
Use the new chunked API from multi-get_json_object #11289
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -220,29 +220,19 @@ case class GpuMultiGetJsonObject(json: Expression, | |
case _ => None | ||
} | ||
|
||
var validPathsIndex = 0 | ||
val validPaths = validPathsWithIndexes.map(_._1) | ||
withResource(new Array[ColumnVector](validPaths.length)) { validPathColumns => | ||
var validPathsIndex = 0 | ||
withResource(json.columnarEval(batch)) { input => | ||
// The get_json_object implementation will allocate an output that is as large | ||
// as the input for each path being processed. This can cause memory to grow | ||
// by a lot. We want to avoid this, but still try to run as many in parallel | ||
// as we can | ||
val p = parallel.getOrElse { | ||
val inputSize = input.getBase.getDeviceMemorySize | ||
// Our memory budget is 4x the target batch size. This is technically going | ||
// to go over that, but in practice it is okay with the default settings | ||
Math.max(Math.ceil((targetBatchSize * 4.0) / inputSize).toInt, 1) | ||
} | ||
validPaths.grouped(p).foreach { validPathChunk => | ||
withResource(JSONUtils.getJsonObjectMultiplePaths(input.getBase, | ||
java.util.Arrays.asList(validPathChunk: _*))) { chunkedResult => | ||
chunkedResult.foreach { cr => | ||
validPathColumns(validPathsIndex) = cr.incRefCount() | ||
validPathsIndex += 1 | ||
} | ||
withResource(JSONUtils.getJsonObjectMultiplePaths(input.getBase, | ||
java.util.Arrays.asList(validPaths: _*), 4 * targetBatchSize, | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. nit: throughout this file constructs like |
||
parallel.getOrElse(-1))) { chunkedResult => | ||
chunkedResult.foreach { cr => | ||
validPathColumns(validPathsIndex) = cr.incRefCount() | ||
validPathsIndex += 1 | ||
} | ||
} | ||
|
||
withResource(new Array[ColumnVector](paths.length)) { columns => | ||
if (nullIndexes.nonEmpty) { | ||
val nullCol = withResource(GpuScalar.from(null, StringType)) { s => | ||
|
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
the comment about memory budget is being removed. Consider re-adding or making 4 a mnemonic constant.