database/doris
2
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

[GroupingSet] Fix core when using grouping sets in large data (#2858)

Browse Source 
dst_tuples memory size to Allocate is wrong
This commit is contained in:
yangzhg
2020-02-07 21:40:29 +08:00
committed by GitHub
parent feb02ab27a
commit 502fa2eb50
1 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
be/src/exec/repeat_node.cpp
View File

@ -80,13 +80,6 @@ Status RepeatNode::get_repeated_batch(
const vector<TupleDescriptor*>& src_tuple_descs = child_row_batch->row_desc().tuple_descriptors();
const vector<TupleDescriptor*>& dst_tuple_descs = row_batch->row_desc().tuple_descriptors();
vector<Tuple*> dst_tuples(src_tuple_descs.size(), nullptr);
for (Tuple* &tuple : dst_tuples) {
void* tuple_buffer = tuple_pool->allocate(0);
if (tuple_buffer == nullptr) {
return Status::InternalError("Allocate memory for row batch failed.");
}
tuple = reinterpret_cast<Tuple*>(tuple_buffer);
}
for (int i = 0; i < child_row_batch->num_rows(); ++i) {
int row_idx = row_batch->add_row();
TupleRow* dst_row = row_batch->get_row(row_idx);
@ -100,10 +93,18 @@ Status RepeatNode::get_repeated_batch(
continue;
}
char* new_tuple = reinterpret_cast<char*>(dst_tuples[j]);
new_tuple += (*dst_it)->byte_size();
dst_tuples[j] = reinterpret_cast<Tuple*>(new_tuple);
if (dst_tuples[j] == nullptr) {
int size = row_batch->capacity() * (*dst_it)->byte_size();
void* tuple_buffer = tuple_pool->allocate(size);
if (tuple_buffer == nullptr) {
return Status::InternalError("Allocate memory for row batch failed.");
}
dst_tuples[j] = reinterpret_cast<Tuple*>(tuple_buffer);
} else {
char* new_tuple = reinterpret_cast<char*>(dst_tuples[j]);
new_tuple += (*dst_it)->byte_size();
dst_tuples[j] = reinterpret_cast<Tuple*>(new_tuple);
}
dst_row->set_tuple(j, dst_tuples[j]);
memset(dst_tuples[j], 0, (*dst_it)->num_null_bytes());
src_tuple->deep_copy(dst_tuples[j], **dst_it, tuple_pool);