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

fix coding specification

Browse Source
This commit is contained in:
nroskill
2024-02-07 08:32:09 +00:00
committed by ob-robot
parent 2569072042
commit 2f8052a0c5
2 changed files with 23 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/share/io/ob_io_calibration.cpp
View File

@ -159,6 +159,12 @@ bool ObIOAbility::operator==(const ObIOAbility &other) const
int ObIOAbility::add_measure_item(const ObIOBenchResult &item)
{
struct {
bool operator()(const ObIOBenchResult &left, const ObIOBenchResult &right) const
{
return left.size_ < right.size_;
}
} sort_fn;
int ret = OB_SUCCESS;
if (OB_UNLIKELY(!item.is_valid())) {
ret = OB_INVALID_ARGUMENT;
@ -167,9 +173,7 @@ int ObIOAbility::add_measure_item(const ObIOBenchResult &item)
LOG_WARN("push back measure_items failed", K(ret), K(item));
} else {
std::sort(measure_items_[static_cast<int>(item.mode_)].begin(), measure_items_[static_cast<int>(item.mode_)].end(),
[](const ObIOBenchResult &left, const ObIOBenchResult &right) {
return left.size_ < right.size_;
});
sort_fn);
}
return ret;
}
@ -242,6 +246,12 @@ int ObIOAbility::get_rt(const ObIOMode mode, const int64_t size, double &rt_us)
int ObIOAbility::find_item(const ObIOMode mode, const int64_t size, int64_t &item_idx) const
{
struct {
bool operator()(const ObIOBenchResult &left, const int64_t size) const
{
return left.size_ < size;
}
} bound_fn;
int ret = OB_SUCCESS;
const MeasureItemArray &item_array = measure_items_[static_cast<int>(mode)];
if (OB_UNLIKELY(item_array.count() <= 0)) {
@ -249,9 +259,7 @@ int ObIOAbility::find_item(const ObIOMode mode, const int64_t size, int64_t &ite
LOG_WARN("invalid measure_items", K(ret), K(mode), K(item_array.count()));
} else {
MeasureItemArray::const_iterator found_it = std::lower_bound(item_array.begin(), item_array.end(), size,
[](const ObIOBenchResult &left, const int64_t size) {
return left.size_ < size;
});
bound_fn);
if (found_it != item_array.end()) {
item_idx = found_it - item_array.begin();
} else {

13
src/share/io/ob_io_struct.cpp
View File

@ -3435,7 +3435,7 @@ ObIOTracer::~ObIOTracer()
int ObIOTracer::init(const uint64_t tenant_id)
{
int ret = OB_SUCCESS;
auto attr = SET_USE_500("io_trace_map");
const ObMemAttr attr = SET_USE_500("io_trace_map");
if (OB_UNLIKELY(is_inited_)) {
ret = OB_INIT_TWICE;
LOG_WARN("init twice", K(ret));
@ -3588,6 +3588,13 @@ void ObIOTracer::print_status()
ObIArray<TraceItem> &trace_array_;
};
struct {
bool operator()(const TraceItem &left, const TraceItem &right) const
{
return left.count_ < right.count_;
}
} sort_fn;
int ret = OB_SUCCESS;
CountFn counter;
if (OB_FAIL(counter.init())) {
@ -3602,9 +3609,7 @@ void ObIOTracer::print_status()
} else if (OB_FAIL(counter.bt_count_.foreach_refactored(store_fn))) {
LOG_WARN("get max backtrace count failed", K(ret));
} else {
std::sort(trace_array.begin(), trace_array.end(), [](const TraceItem &left, const TraceItem &right) {
return left.count_ > right.count_;
});
std::sort(trace_array.begin(), trace_array.end(), sort_fn);
LOG_INFO("[IO STATUS TRACER]", K_(tenant_id), "trace_request_count", counter.req_count_, "distinct_backtrace_count", trace_array.count());
const int64_t print_count = min(5, trace_array.count());
for (int64_t i = 0; OB_SUCC(ret) && i < print_count; ++i) {