Skip to content

[fix][cp] Fix SortBuffer batchSize computation overflow #437

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.

Sign up for GitHub

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

Open
WangGuangxin wants to merge 1 commit into
base: main
Choose a base branch
from
Open

[fix][cp] Fix SortBuffer batchSize computation overflow #437

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion bolt/exec/SortBuffer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -396,7 +396,7 @@ void SortBuffer::prepareOutput(uint32_t maxOutputRows) {
BOLT_CHECK_GT(numInputRows_, numOutputRows_);

const size_t batchSize =
std::min<size_t>(numInputRows_ - numOutputRows_, maxOutputRows);
std::min<uint64_t>(numInputRows_ - numOutputRows_, maxOutputRows);

if (output_ != nullptr) {
VectorPtr output = std::move(output_);
Expand Down
4 changes: 2 additions & 2 deletions bolt/exec/SortBuffer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ class SortBuffer {
// sort buffer object.
bool noMoreInput_ = false;
// The number of received input rows.
size_t numInputRows_ = 0;
uint64_t numInputRows_ = 0;
// Used to store the input data in row format.
std::unique_ptr<RowContainer> data_;
std::vector<char*> sortedRows_;
Expand All @@ -207,7 +207,7 @@ class SortBuffer {
// 'data_->estimateRowSize()' across all accumulated data set.
std::optional<uint64_t> estimatedOutputRowSize_{};
// The number of rows that has been returned.
size_t numOutputRows_{0};
uint64_t numOutputRows_{0};

HybridSorter sorter_;

Expand Down