hcq/oceanbase
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix se array of tablet range allocate too much memory and send piece msg core

Browse Source
This commit is contained in:
sdc
2023-07-24 07:18:34 +00:00
committed by ob-robot
parent 599e8f8035
commit 283a9c0b9a
10 changed files with 80 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/sql/engine/basic/ob_stat_collector_op.cpp
View File

@ -17,6 +17,7 @@
#include "sql/engine/table/ob_block_sample_scan_op.h"
#include "sql/engine/table/ob_row_sample_scan_op.h"
#include "common/ob_smart_call.h"
#include "sql/engine/px/ob_px_sqc_handler.h"
using namespace oceanbase::common;
using namespace oceanbase::sql;
@ -273,6 +274,8 @@ int ObStatCollectorOp::split_partition_range()
int64_t border_vals_cnt = MY_SPEC.sort_exprs_.count() - (int64_t)(!is_none_partition());
ObPxTabletRange::DatumKey border_vals;
ObPxTabletRange partition_range;
Ob2DArray<ObPxTabletRange> tmp_part_ranges;
int64_t datum_len_sum = 0;
OZ(border_vals.prepare_allocate(border_vals_cnt));
while (OB_SUCC(ret) && !sort_iter_end) {
if (OB_FAIL(sort_impl_.get_next_row(MY_SPEC.sort_exprs_))) {
@ -291,7 +294,7 @@ int ObStatCollectorOp::split_partition_range()
LOG_WARN("fail to get partition id", K(ret));
} else {
if (pre_tablet_id != OB_INVALID_ID) {
OZ(ctx_.add_partition_range(partition_range));
OZ(tmp_part_ranges.push_back(partition_range));
partition_range.reset();
}
if (is_none_partition()) {
@ -303,7 +306,7 @@ int ObStatCollectorOp::split_partition_range()
}
}
if (OB_SUCC(ret) && sort_iter_end) {
OZ(ctx_.add_partition_range(partition_range));
OZ(tmp_part_ranges.push_back(partition_range));
partition_range.reset();
}
CK(0 != step);
@ -321,6 +324,8 @@ int ObStatCollectorOp::split_partition_range()
} else if (OB_FAIL(border_vals.at(i - (int64_t)!is_none_partition()).
deep_copy(*cur_datum, ctx_.get_allocator()))) {
LOG_WARN("deep copy datum failed", K(ret), K(i), K(*cur_datum));
} else {
datum_len_sum += cur_datum->get_deep_copy_size();
}
}
if (OB_SUCC(ret)) {
@ -331,6 +336,17 @@ int ObStatCollectorOp::split_partition_range()
}
}
}
if (OB_SUCC(ret) && OB_LIKELY(datum_len_sum > 0)) {
void *buf = NULL;
if (OB_ISNULL(ctx_.get_sqc_handler())) {
ret = OB_ERR_UNEXPECTED;
LOG_WARN("sqc handler is null", K(ret));
} else if (OB_ISNULL(buf = ctx_.get_sqc_handler()->get_safe_allocator().alloc(datum_len_sum))) {
ret = OB_ALLOCATE_MEMORY_FAILED;
LOG_WARN("allocate memory failed", K(ret), K(datum_len_sum));
} else {
}
}
}
return ret;
}