Fix Operator outputBatchRows may overflow #10868
Closed
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
facebook-github-bot
added
the
CLA Signed
✅ Deploy Preview for meta-velox canceled.
|
|
@mbasmanova Can you help review this PR? Thanks! |
xiaoxmeng
reviewed
Aug 28, 2024
velox/core/QueryConfig.h
Outdated
| uint32_t preferredOutputBatchRows() const { | ||
| return get<uint32_t>(kPreferredOutputBatchRows, 1024); | ||
| int32_t preferredOutputBatchRows() const { | ||
| uint32_t batchRows = get<uint32_t>(kPreferredOutputBatchRows, 1024); |
velox/core/QueryConfig.h
Outdated
| uint32_t maxOutputBatchRows() const { | ||
| return get<uint32_t>(kMaxOutputBatchRows, 10'000); | ||
| int32_t maxOutputBatchRows() const { | ||
| uint32_t maxBatchRows = get<uint32_t>(kMaxOutputBatchRows, 10'000); |
velox/dwio/common/SortingWriter.cpp
Outdated
| if (sortBuffer_->estimateOutputRowSize().has_value() && | ||
| sortBuffer_->estimateOutputRowSize().value() != 0) { | ||
| estimatedMaxOutputRows = | ||
| uint64_t maxOutputRows = |
velox/exec/Operator.cpp
Outdated
| if (UNLIKELY(batchSize > std::numeric_limits<vector_size_t>::max())) { | ||
| return std::numeric_limits<vector_size_t>::max(); | ||
| } | ||
| return std::max<vector_size_t>( |
There was a problem hiding this comment.
const uint64_t batchSize =
return std::max<vector_size_t>(batchSize, 1);
velox/exec/Operator.cpp
Outdated
| if (!averageRowSize.has_value()) { | ||
| return queryConfig.preferredOutputBatchRows(); | ||
| } | ||
|
|
||
| const uint64_t rowSize = averageRowSize.value(); | ||
|
|
||
| if (rowSize * queryConfig.maxOutputBatchRows() < | ||
| uint64_t batchBytes; |
There was a problem hiding this comment.
if (queryConfig.preferredOutputBatchBytes() / rowSize > queryConfig.maxOutputBatchRows()) {
return queryConfig.maxOutputBatchRows();
}
return outputBatchRowsByBytes(queryConfig, rowSize);
xiaoxmeng
reviewed
Aug 29, 2024
velox/exec/Operator.cpp
Outdated
| return queryConfig.maxOutputBatchRows(); | ||
| } | ||
| return std::max<uint32_t>( | ||
| queryConfig.preferredOutputBatchBytes() / rowSize, 1); | ||
| return std::max<uint64_t>(batchSize, 1); |
There was a problem hiding this comment.
return std::max<vector_size_t>(batchSize, 1);
xiaoxmeng
reviewed
Aug 29, 2024
| TEST_F(OperatorUtilsTest, outputBatchRows) { | ||
| RowTypePtr rowType = ROW({"c0"}, {INTEGER()}); | ||
| { | ||
| setBatchConfig(10, 20, 234); |
There was a problem hiding this comment.
s/setBatchConfig/setTaskOutputBatchConfig/
xiaoxmeng
approved these changes
Aug 29, 2024
mbasmanova
approved these changes
Aug 29, 2024
There was a problem hiding this comment.
@jinchengchenghh Thank you for the fix.
@xiaoxmeng Thank you for reviewing.
xiaoxmeng
reviewed
Aug 30, 2024
jinchengchenghh
force-pushed
the
rowoverflow
branch
from
aca6bc5
to
fafcd0c
Compare
|
@xiaoxmeng has imported this pull request. If you are a Meta employee, you can view this diff on Phabricator. |
|
@xiaoxmeng merged this pull request in 4499332. |
|
Conbench analyzed the 1 benchmark run on commit There were no benchmark performance regressions. 🎉 The full Conbench report has more details. |
Joe-Abraham
pushed a commit
to Joe-Abraham/velox
that referenced
this pull request
Sep 2, 2024
Summary: The computation of function outputBatchRows() may overflow, fix it. And refactor the relevant output batch size config from uint32_t to vector_size_t(int32_t) because the RowVector numRows type is vector_size_t. Pull Request resolved: facebookincubator#10868 Reviewed By: gggrace14 Differential Revision: D62013297 Pulled By: xiaoxmeng fbshipit-source-id: 087b603967ff3666624e8d4c8b1a23c6130846f9
Joe-Abraham
pushed a commit
to Joe-Abraham/velox
that referenced
this pull request
Sep 3, 2024
Summary: The computation of function outputBatchRows() may overflow, fix it. And refactor the relevant output batch size config from uint32_t to vector_size_t(int32_t) because the RowVector numRows type is vector_size_t. Pull Request resolved: facebookincubator#10868 Reviewed By: gggrace14 Differential Revision: D62013297 Pulled By: xiaoxmeng fbshipit-source-id: 087b603967ff3666624e8d4c8b1a23c6130846f9
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.
The computation of function outputBatchRows() may overflow, fix it. And refactor the relevant output batch size config from uint32_t to vector_size_t(int32_t) because the RowVector numRows type is vector_size_t.