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

Implement das_simple_op for simple retry scenario

Browse Source
This commit is contained in:
obdev
2023-09-08 14:09:03 +08:00
committed by ob-robot
parent aa5acf8769
commit ac6f8ca806
11 changed files with 600 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/sql/engine/px/ob_granule_pump.cpp
View File

@ -752,7 +752,8 @@ int ObGranuleSplitter::split_gi_task(ObGranulePumpArgs &args,
taskset_ranges,
taskset_idxs);
} else {
ret = ObGranuleUtil::split_block_ranges(args.ctx_->get_allocator(),
ret = ObGranuleUtil::split_block_ranges(*args.ctx_,
args.ctx_->get_allocator(),
tsc,
ranges,
tablets,
@ -1321,7 +1322,8 @@ int ObPartitionWiseGranuleSplitter::split_insert_gi_task(ObGranulePumpArgs &args
LOG_WARN("failed to make whole range", K(ret));
} else if (OB_FAIL(ranges.push_back(each_partition_range))) {
LOG_WARN("failed to push partition range to ranges", K(ret));
} else if (OB_FAIL(ObGranuleUtil::split_block_ranges(args.ctx_->get_allocator(),
} else if (OB_FAIL(ObGranuleUtil::split_block_ranges(*args.ctx_,
args.ctx_->get_allocator(),
NULL,
ranges,
tablets,

34
src/sql/engine/px/ob_granule_util.cpp
View File

@ -27,6 +27,7 @@
#include "share/external_table/ob_external_table_file_mgr.h"
#include "share/external_table/ob_external_table_utils.h"
#include "sql/engine/table/ob_external_table_access_service.h"
#include "sql/das/ob_das_simple_op.h"
using namespace oceanbase::common;
using namespace oceanbase::share;
@ -132,7 +133,8 @@ int ObGranuleUtil::split_granule_for_external_table(ObIAllocator &allocator,
return ret;
}
int ObGranuleUtil::split_block_ranges(ObIAllocator &allocator,
int ObGranuleUtil::split_block_ranges(ObExecContext &exec_ctx,
ObIAllocator &allocator,
const ObTableScanSpec *tsc,//may be is null, attention use
const ObIArray<common::ObNewRange> &in_ranges,
const ObIArray<ObDASTabletLoc*> &tablets,
@ -184,7 +186,8 @@ int ObGranuleUtil::split_block_ranges(ObIAllocator &allocator,
}
}
LOG_TRACE("gi partition granule");
} else if (OB_FAIL(split_block_granule(allocator,
} else if (OB_FAIL(split_block_granule(exec_ctx,
allocator,
tsc,
ranges,
tablets,
@ -227,7 +230,8 @@ int ObGranuleUtil::remove_empty_range(const common::ObIArray<common::ObNewRange>
return ret;
}
int ObGranuleUtil::split_block_granule(ObIAllocator &allocator,
int ObGranuleUtil::split_block_granule(ObExecContext &exec_ctx,
ObIAllocator &allocator,
const ObTableScanSpec *tsc,//may be is null, attention use!
const ObIArray<ObNewRange> &input_ranges,
const ObIArray<ObDASTabletLoc*> &tablets,
@ -273,10 +277,9 @@ int ObGranuleUtil::split_block_granule(ObIAllocator &allocator,
input_store_ranges,
need_convert_new_range))) {
LOG_WARN("failed to convert new range to store range", K(ret));
} else if (OB_FAIL(access_service->get_multi_ranges_cost(tablet.ls_id_,
tablet.tablet_id_,
input_store_ranges,
partition_size))) {
} else if (OB_FAIL(ObDASSimpleUtils::get_multi_ranges_cost(exec_ctx, tablets.at(i),
input_store_ranges,
partition_size))) {
LOG_WARN("failed to get multi ranges cost", K(ret), K(tablet));
} else {
// B to MB
@ -339,7 +342,8 @@ int ObGranuleUtil::split_block_granule(ObIAllocator &allocator,
input_store_ranges,
need_convert_new_range))) {
LOG_WARN("failed to convert new range to store range", K(ret));
} else if (OB_FAIL(get_tasks_for_partition(allocator,
} else if (OB_FAIL(get_tasks_for_partition(exec_ctx,
allocator,
expected_task_cnt,
*tablet,
input_store_ranges,
@ -470,7 +474,8 @@ int ObGranuleUtil::compute_task_count_each_partition(int64_t total_size,
return ret;
}
int ObGranuleUtil::get_tasks_for_partition(ObIAllocator &allocator,
int ObGranuleUtil::get_tasks_for_partition(ObExecContext &exec_ctx,
ObIAllocator &allocator,
int64_t expected_task_cnt,
ObDASTabletLoc &tablet,
ObIArray<ObStoreRange> &input_storage_ranges,
@ -504,12 +509,11 @@ int ObGranuleUtil::get_tasks_for_partition(ObIAllocator &allocator,
if (!range_independent) {
tablet_idx++;
}
} else if (OB_FAIL(access_service->split_multi_ranges(tablet.ls_id_,
tablet.tablet_id_,
input_storage_ranges,
expected_task_cnt,
allocator,
multi_range_split_array))) {
} else if (OB_FAIL(ObDASSimpleUtils::split_multi_ranges(exec_ctx,
&tablet,
input_storage_ranges,
expected_task_cnt,
multi_range_split_array))) {
LOG_WARN("failed to split multi ranges", K(ret), K(tablet), K(expected_task_cnt));
} else {
LOG_TRACE("split multi ranges",

9
src/sql/engine/px/ob_granule_util.h
View File

@ -171,7 +171,8 @@ public:
* range_independent IN the random type witch affects the granule_idx
*
*/
static int split_block_ranges(common::ObIAllocator &allocator,
static int split_block_ranges(ObExecContext &exec_ctx,
common::ObIAllocator &allocator,
const ObTableScanSpec *tsc,
const common::ObIArray<common::ObNewRange> &ranges,
const common::ObIArray<ObDASTabletLoc*> &tablets,
@ -259,7 +260,8 @@ public:
* range_independent IN the random type witch affects the granule_idx
*
*/
static int split_block_granule(common::ObIAllocator &allocator,
static int split_block_granule(ObExecContext &exec_ctx,
common::ObIAllocator &allocator,
const ObTableScanSpec *tsc,
const common::ObIArray<common::ObNewRange> &input_ranges,
const common::ObIArray<ObDASTabletLoc*> &tablet_array,
@ -319,7 +321,8 @@ private:
* pkey_idx OUT the idx in granule ranges
* range_independent IN the random type witch affects the granule_idx
*/
static int get_tasks_for_partition(common::ObIAllocator &allocator,
static int get_tasks_for_partition(ObExecContext &exec_ctx,
common::ObIAllocator &allocator,
int64_t expected_task_cnt,
ObDASTabletLoc &tablet,
common::ObIArray<common::ObStoreRange> &input_storage_ranges,