From 7c48e979b5db60314678c7b1e83b94fcf4e58c39 Mon Sep 17 00:00:00 2001 From: obdev Date: Tue, 14 Mar 2023 16:13:46 +0000 Subject: [PATCH] [MDS] add virtual table placeholder --- src/share/inner_table/ob_inner_table_schema_def.py | 2 ++ unittest/logservice/test_ob_election.cpp | 12 ++++++------ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/share/inner_table/ob_inner_table_schema_def.py b/src/share/inner_table/ob_inner_table_schema_def.py index 0e54e58e6..603b1226a 100644 --- a/src/share/inner_table/ob_inner_table_schema_def.py +++ b/src/share/inner_table/ob_inner_table_schema_def.py @@ -11412,6 +11412,8 @@ def_table_schema( # 12371: __all_virtual_external_table_file # 12372: __all_virtual_io_tracer # 12373: __all_virtual_mds_node_stat +# 12374: __all_virtual_mds_event_history +# 12375: __all_virtual_time_guard_slow_history # # 余留位置 diff --git a/unittest/logservice/test_ob_election.cpp b/unittest/logservice/test_ob_election.cpp index 8357b64e7..4d1af8b35 100644 --- a/unittest/logservice/test_ob_election.cpp +++ b/unittest/logservice/test_ob_election.cpp @@ -177,9 +177,9 @@ vector create_election_group(const int election_num, const vecto } ); index++; - assert(ret == OB_SUCCESS); + OB_ASSERT(ret == OB_SUCCESS); ret = election->set_memberlist(member_list); - assert(ret == OB_SUCCESS); + OB_ASSERT(ret == OB_SUCCESS); } port += election_num; return v; @@ -422,10 +422,10 @@ TEST_F(TestElection, config_vresion_not_same_and_wont_split_vote) { for (int i = 0; i < 3; ++i) { palf::LogConfigVersion version; - assert(OB_SUCCESS == version.generate(2, i)); + OB_ASSERT(OB_SUCCESS == version.generate(2, i)); member_list.set_new_member_list(addr_list, version, 3); int ret = election_list[i]->set_memberlist(member_list); - assert(OB_SUCCESS == ret); + OB_ASSERT(OB_SUCCESS == ret); } this_thread::sleep_for(chrono::seconds(10)); @@ -506,10 +506,10 @@ TEST_F(TestElection, inner_priority_seed_not_valid_when_membership_version_not_e for (int i = 0; i < 3; ++i) { palf::LogConfigVersion version; - assert(OB_SUCCESS == version.generate(2, i)); + OB_ASSERT(OB_SUCCESS == version.generate(2, i)); member_list.set_new_member_list(addr_list, version, 3); int ret = election_list[i]->set_memberlist(member_list); - assert(OB_SUCCESS == ret); + OB_ASSERT(OB_SUCCESS == ret); } for (auto &election_1 : election_list) { for (auto &election_2 : election_list) {