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

fix scn legacy issues

Browse Source
This commit is contained in:
obdev
2022-11-28 02:36:53 +00:00
committed by ob-robot
parent c4b4322d26
commit 4c49f6e7c5
118 changed files with 13655 additions and 2157 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
unittest/logservice/test_ob_election_with_priority.cpp
View File

@ -195,7 +195,7 @@ void init_pri(ElectionPriorityImpl &pri)
{
pri.priority_tuple_.element<1>().is_valid_ = true;
pri.priority_tuple_.element<1>().is_primary_region_ = true;
pri.priority_tuple_.element<1>().scn_.value_.set_base();
pri.priority_tuple_.element<1>().scn_.set_base();
pri.priority_tuple_.element<1>().zone_priority_ = 0;
}
@ -271,7 +271,7 @@ TEST_F(TestElectionWithPriority, not_change_leader_because_follower_memership_ve
ASSERT_EQ(stop_to_be_follower_count, 0);
// 1的membership version再加1，同时让2的log_ts超过比较阈值
election_group[1]->proposer_.memberlist_with_states_.p_impl_->member_list_.membership_version_.config_seq_ += 1;
v_pri[2].priority_tuple_.element<1>().scn_.value_.convert_for_lsn_allocator(100 * 1000 * 1000 * 1000L);// 此时并不会触发切主
v_pri[2].priority_tuple_.element<1>().scn_.convert_for_lsn_allocator(100 * 1000 * 1000 * 1000L);// 此时并不会触发切主
this_thread::sleep_for(chrono::seconds(1));// 等待切主
ASSERT_EQ(election_group[1]->proposer_.role_, ObRole::LEADER);
ASSERT_EQ(leader_takeover_times, 1);

3
unittest/sql/test_sql_utils.cpp
View File

@ -357,10 +357,7 @@ void TestSqlUtils::do_resolve(
ObParser parser(allocator_, mode);
ObString query = ObString::make_string(query_str);
ParseResult parse_result;
ObObj use_px;
ObArenaAllocator tmp_alloc;
use_px.set_int(1);
ASSERT_EQ(OB_SUCCESS, session_info_.update_sys_variable(SYS_VAR__OB_USE_PARALLEL_EXECUTION, use_px));
OK(parser.parse(query, parse_result));
if (true){
if (JSON_FORMAT == format) {