[CP] fix correctness problem because of gi split tasks randomly

This commit is contained in:
sdc
2023-09-20 14:15:14 +00:00
committed by ob-robot
parent cc74381bb9
commit db195563f0
4 changed files with 50 additions and 34 deletions

View File

@ -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,tenant_id,px_part_info);
affinitize_rule.add_partition(i,i,parallel,px_part_info);
}
affinitize_rule.do_random(true);
affinitize_rule.do_random(true, tenant_id);
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(2, result.at(1).worker_id_);
ASSERT_EQ(0, result.at(1).worker_id_);
ASSERT_EQ(2, result.at(2).worker_id_);
ASSERT_EQ(0, result.at(3).worker_id_);
ASSERT_EQ(0, result.at(4).worker_id_);
ASSERT_EQ(2, result.at(3).worker_id_);
ASSERT_EQ(1, result.at(4).worker_id_);
}
{
@ -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,tenant_id,px_part_info);
affinitize_rule.add_partition(0,0,parallel,px_part_info);
px_part_info.physical_row_count_ = 1000;
affinitize_rule.add_partition(1,1,parallel,tenant_id,px_part_info);
affinitize_rule.add_partition(1,1,parallel,px_part_info);
px_part_info.physical_row_count_ = 2500;
affinitize_rule.add_partition(2,2,parallel,tenant_id,px_part_info);
affinitize_rule.add_partition(2,2,parallel,px_part_info);
px_part_info.physical_row_count_ = 3500;
affinitize_rule.add_partition(3,3,parallel,tenant_id,px_part_info);
affinitize_rule.add_partition(3,3,parallel,px_part_info);
px_part_info.physical_row_count_ = 2000;
affinitize_rule.add_partition(4,4,parallel,tenant_id,px_part_info);
affinitize_rule.add_partition(4,4,parallel,px_part_info);
affinitize_rule.do_random(true);
affinitize_rule.do_random(true, tenant_id);
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(3, result.at(0).worker_id_);
ASSERT_EQ(0, result.at(1).worker_id_);
ASSERT_EQ(4, result.at(0).worker_id_);
ASSERT_EQ(2, result.at(1).worker_id_);
ASSERT_EQ(1, result.at(2).worker_id_);
ASSERT_EQ(2, result.at(3).worker_id_);
ASSERT_EQ(4, result.at(4).worker_id_);
ASSERT_EQ(0, result.at(3).worker_id_);
ASSERT_EQ(3, result.at(4).worker_id_);
}
{
@ -103,17 +103,17 @@ TEST_F(ObRandomAffiTaskSplitTest, split_task_test) {
ObPxAffinityByRandom affinitize_rule;
px_part_info.physical_row_count_ = 3000;
affinitize_rule.add_partition(0,0,parallel,tenant_id,px_part_info);
affinitize_rule.add_partition(0,0,parallel,px_part_info);
px_part_info.physical_row_count_ = 4000;
affinitize_rule.add_partition(1,1,parallel,tenant_id,px_part_info);
affinitize_rule.add_partition(1,1,parallel,px_part_info);
px_part_info.physical_row_count_ = 2500;
affinitize_rule.add_partition(2,2,parallel,tenant_id,px_part_info);
affinitize_rule.add_partition(2,2,parallel,px_part_info);
px_part_info.physical_row_count_ = 1500;
affinitize_rule.add_partition(3,3,parallel,tenant_id,px_part_info);
affinitize_rule.add_partition(3,3,parallel,px_part_info);
px_part_info.physical_row_count_ = 2000;
affinitize_rule.add_partition(4,4,parallel,tenant_id,px_part_info);
affinitize_rule.add_partition(4,4,parallel,px_part_info);
affinitize_rule.do_random(true);
affinitize_rule.do_random(true, tenant_id);
const common::ObIArray<ObPxAffinityByRandom::TabletHashValue>& result = affinitize_rule.get_result();
for (int i = 0; i < 5; ++i) {
@ -121,10 +121,10 @@ TEST_F(ObRandomAffiTaskSplitTest, split_task_test) {
}
ASSERT_EQ(1, result.at(0).worker_id_);
ASSERT_EQ(2, result.at(1).worker_id_);
ASSERT_EQ(0, result.at(1).worker_id_);
ASSERT_EQ(2, result.at(2).worker_id_);
ASSERT_EQ(0, result.at(3).worker_id_);
ASSERT_EQ(0, result.at(4).worker_id_);
ASSERT_EQ(2, result.at(3).worker_id_);
ASSERT_EQ(1, result.at(4).worker_id_);
}
}