Skip to content

Commit

Permalink
revert code: the code with and without this commit will cause differe…
Browse files Browse the repository at this point in the history 
…nces in the partition mapping rules
  • Loading branch information
@ob-robot
obdev authored and ob-robot committed Sep 27, 2023
1 parent dba77c1 commit 7b0f436
Show file tree
Hide file tree
Showing 4 changed files with 34 additions and 50 deletions.
4 changes: 2 additions & 2 deletions src/sql/engine/px/ob_granule_pump.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1096,14 +1096,14 @@ int ObAffinitizeGranuleSplitter::split_tasks_affinity(ObExecContext &ctx,
} else if (OB_FAIL(affinitize_rule.add_partition(tablet_loc.tablet_id_.id(),
tablet_idx,
parallelism,
my_session->get_effective_tenant_id(),
partition_row_info))) {
LOG_WARN("Failed to get affinitize taskid" , K(ret));
}
}
}
if (OB_FAIL(ret)) {
} else if (OB_FAIL(affinitize_rule.do_random(!partitions_info_.empty(),
my_session->get_effective_tenant_id()))) {
} else if (OB_FAIL(affinitize_rule.do_random(!partitions_info_.empty()))) {
LOG_WARN("failed to do random", K(ret));
} else {
const ObIArray<ObPxAffinityByRandom::TabletHashValue> &partition_worker_pairs = affinitize_rule.get_result();
Expand Down
29 changes: 6 additions & 23 deletions src/sql/engine/px/ob_px_util.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2607,6 +2607,7 @@ int ObPxChannelUtil::sqcs_channles_asyn_wait(ObIArray<ObPxSqcMeta *> &sqcs)
int ObPxAffinityByRandom::add_partition(int64_t tablet_id,
int64_t tablet_idx,
int64_t worker_cnt,
uint64_t tenant_id,
ObPxTabletInfo &partition_row_info)
{
int ret = OB_SUCCESS;
Expand All @@ -2615,7 +2616,8 @@ int ObPxAffinityByRandom::add_partition(int64_t tablet_id,
LOG_WARN("The worker cnt is invalid", K(ret), K(worker_cnt));
} else {
TabletHashValue part_hash_value;
part_hash_value.hash_value_ = 0;
uint64_t value = (tenant_id << 32 | tablet_idx);
part_hash_value.hash_value_ = common::murmurhash(&value, sizeof(value), worker_cnt);
part_hash_value.tablet_idx_ = tablet_idx;
part_hash_value.tablet_id_ = tablet_id;
part_hash_value.partition_info_ = partition_row_info;
Expand All @@ -2627,7 +2629,7 @@ int ObPxAffinityByRandom::add_partition(int64_t tablet_id,
return ret;
}

int ObPxAffinityByRandom::do_random(bool use_partition_info, uint64_t tenant_id)
int ObPxAffinityByRandom::do_random(bool use_partition_info)
{
int ret = OB_SUCCESS;
common::ObArray<int64_t> workers_load;
Expand All @@ -2648,31 +2650,12 @@ int ObPxAffinityByRandom::do_random(bool use_partition_info, uint64_t tenant_id)
&& (tablet_hash_values_.at(0).tablet_idx_ > tablet_hash_values_.at(1).tablet_idx_)) {
asc_order = false;
}
// in partition wise affinity scenario, partition_idx of a pair of partitions may be different.
// for example, T1 consists of p0, p1, p2 and T2 consists of p1, p2
// T1.p1 <===> T2.p1 and T1.p2 <===> T2.p2
// The partition_idx of T1.p1 is 1 and the partition_idx of T2.p1 is 0.
// If we calculate hash value of partition_idx and sort partitions by the hash value,
// T1.p1 and T2.p1 may be assigned to different worker.
// So we sort partitions by partition_idx and generate a relative_idx which starts from zero.
// Then calculate hash value with the relative_idx
auto part_idx_compare_fun = [](TabletHashValue a, TabletHashValue b) -> bool { return a.tablet_idx_ > b.tablet_idx_; };
std::sort(tablet_hash_values_.begin(),
tablet_hash_values_.end(),
part_idx_compare_fun);
int64_t relative_idx = 0;
for (int64_t i = 0; i < tablet_hash_values_.count(); i++) {
uint64_t value = ((tenant_id << 32) | relative_idx);
tablet_hash_values_.at(i).hash_value_ = common::murmurhash(&value, sizeof(value), worker_cnt_);
relative_idx++;
}

// 先打乱所有的序
auto compare_fun = [](TabletHashValue a, TabletHashValue b) -> bool { return a.hash_value_ > b.hash_value_; };
std::sort(tablet_hash_values_.begin(),
tablet_hash_values_.end(),
compare_fun);
LOG_TRACE("after sort partition_hash_values randomly", K(tablet_hash_values_));

// 如果没有partition的统计信息则将它们round放置
if (!use_partition_info) {
Expand Down Expand Up @@ -3423,13 +3406,13 @@ int ObSlaveMapUtil::build_ppwj_ch_mn_map(ObExecContext &ctx, ObDfo &parent, ObDf
} else if (OB_FAIL(affinitize_rule.add_partition(location.tablet_id_.id(),
tablet_idx,
sqc.get_task_count(),
ctx.get_my_session()->get_effective_tenant_id(),
partition_row_info))) {
LOG_WARN("fail calc task_id", K(location.tablet_id_), K(sqc), K(ret));
}
}
if (OB_FAIL(ret)) {
} else if (OB_FAIL(affinitize_rule.do_random(!sqc.get_partitions_info().empty(),
ctx.get_my_session()->get_effective_tenant_id()))) {
} else if (OB_FAIL(affinitize_rule.do_random(!sqc.get_partitions_info().empty()))) {
LOG_WARN("failed to do random", K(ret));
} else {
const ObIArray<ObPxAffinityByRandom::TabletHashValue> &partition_worker_pairs =
Expand Down
3 changes: 2 additions & 1 deletion src/sql/engine/px/ob_px_util.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -443,8 +443,9 @@ class ObPxAffinityByRandom
int add_partition(int64_t tablet_id,
int64_t tablet_idx,
int64_t worker_cnt,
uint64_t tenant_id,
ObPxTabletInfo &partition_row_info);
int do_random(bool use_partition_info, uint64_t tenant_id);
int do_random(bool use_partition_info);
const ObIArray<TabletHashValue> &get_result() { return tablet_hash_values_; }
static int get_tablet_info(int64_t tablet_id, ObIArray<ObPxTabletInfo> &partitions_info, ObPxTabletInfo &partition_info);
private:
Expand Down
48 changes: 24 additions & 24 deletions unittest/sql/engine/px/test_random_affi.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,18 +52,18 @@ TEST_F(ObRandomAffiTaskSplitTest, split_task_test) {
ObPxAffinityByRandom affinitize_rule;
for (int i = 0; i < 5; ++i) {
px_part_info.physical_row_count_ = (10 - i) * 100;
affinitize_rule.add_partition(i,i,parallel,px_part_info);
affinitize_rule.add_partition(i,i,parallel,tenant_id,px_part_info);
}
affinitize_rule.do_random(true, tenant_id);
affinitize_rule.do_random(true);
const common::ObIArray<ObPxAffinityByRandom::TabletHashValue>& result = affinitize_rule.get_result();
for (int i = 0; i < result.count(); ++i) {
LOG_INFO("result", K(result.at(i).tablet_id_), K(result.at(i).worker_id_), K(result.at(i).partition_info_.physical_row_count_));
}
ASSERT_EQ(1, result.at(0).worker_id_);
ASSERT_EQ(0, result.at(1).worker_id_);
ASSERT_EQ(2, result.at(1).worker_id_);
ASSERT_EQ(2, result.at(2).worker_id_);
ASSERT_EQ(2, result.at(3).worker_id_);
ASSERT_EQ(1, result.at(4).worker_id_);
ASSERT_EQ(0, result.at(3).worker_id_);
ASSERT_EQ(0, result.at(4).worker_id_);
}

{
Expand All @@ -73,27 +73,27 @@ TEST_F(ObRandomAffiTaskSplitTest, split_task_test) {
ObPxAffinityByRandom affinitize_rule;

px_part_info.physical_row_count_ = 3000;
affinitize_rule.add_partition(0,0,parallel,px_part_info);
affinitize_rule.add_partition(0,0,parallel,tenant_id,px_part_info);
px_part_info.physical_row_count_ = 1000;
affinitize_rule.add_partition(1,1,parallel,px_part_info);
affinitize_rule.add_partition(1,1,parallel,tenant_id,px_part_info);
px_part_info.physical_row_count_ = 2500;
affinitize_rule.add_partition(2,2,parallel,px_part_info);
affinitize_rule.add_partition(2,2,parallel,tenant_id,px_part_info);
px_part_info.physical_row_count_ = 3500;
affinitize_rule.add_partition(3,3,parallel,px_part_info);
affinitize_rule.add_partition(3,3,parallel,tenant_id,px_part_info);
px_part_info.physical_row_count_ = 2000;
affinitize_rule.add_partition(4,4,parallel,px_part_info);
affinitize_rule.add_partition(4,4,parallel,tenant_id,px_part_info);

affinitize_rule.do_random(true, tenant_id);
affinitize_rule.do_random(true);

const common::ObIArray<ObPxAffinityByRandom::TabletHashValue>& result = affinitize_rule.get_result();
for (int i = 0; i < 5; ++i) {
LOG_INFO("result", K(result.at(i).tablet_id_), K(result.at(i).worker_id_), K(result.at(i).partition_info_.physical_row_count_));
}
ASSERT_EQ(4, result.at(0).worker_id_);
ASSERT_EQ(2, result.at(1).worker_id_);
ASSERT_EQ(3, result.at(0).worker_id_);
ASSERT_EQ(0, result.at(1).worker_id_);
ASSERT_EQ(1, result.at(2).worker_id_);
ASSERT_EQ(0, result.at(3).worker_id_);
ASSERT_EQ(3, result.at(4).worker_id_);
ASSERT_EQ(2, result.at(3).worker_id_);
ASSERT_EQ(4, result.at(4).worker_id_);
}

{
Expand All @@ -103,28 +103,28 @@ TEST_F(ObRandomAffiTaskSplitTest, split_task_test) {
ObPxAffinityByRandom affinitize_rule;

px_part_info.physical_row_count_ = 3000;
affinitize_rule.add_partition(0,0,parallel,px_part_info);
affinitize_rule.add_partition(0,0,parallel,tenant_id,px_part_info);
px_part_info.physical_row_count_ = 4000;
affinitize_rule.add_partition(1,1,parallel,px_part_info);
affinitize_rule.add_partition(1,1,parallel,tenant_id,px_part_info);
px_part_info.physical_row_count_ = 2500;
affinitize_rule.add_partition(2,2,parallel,px_part_info);
affinitize_rule.add_partition(2,2,parallel,tenant_id,px_part_info);
px_part_info.physical_row_count_ = 1500;
affinitize_rule.add_partition(3,3,parallel,px_part_info);
affinitize_rule.add_partition(3,3,parallel,tenant_id,px_part_info);
px_part_info.physical_row_count_ = 2000;
affinitize_rule.add_partition(4,4,parallel,px_part_info);
affinitize_rule.add_partition(4,4,parallel,tenant_id,px_part_info);

affinitize_rule.do_random(true, tenant_id);
affinitize_rule.do_random(true);

const common::ObIArray<ObPxAffinityByRandom::TabletHashValue>& result = affinitize_rule.get_result();
for (int i = 0; i < 5; ++i) {
LOG_INFO("result", K(result.at(i).tablet_id_), K(result.at(i).worker_id_), K(result.at(i).partition_info_.physical_row_count_));
}

ASSERT_EQ(1, result.at(0).worker_id_);
ASSERT_EQ(0, result.at(1).worker_id_);
ASSERT_EQ(2, result.at(1).worker_id_);
ASSERT_EQ(2, result.at(2).worker_id_);
ASSERT_EQ(2, result.at(3).worker_id_);
ASSERT_EQ(1, result.at(4).worker_id_);
ASSERT_EQ(0, result.at(3).worker_id_);
ASSERT_EQ(0, result.at(4).worker_id_);
}

}
Expand Down

0 comments on commit 7b0f436

Please sign in to comment.