patch 4.0

This commit is contained in:
wangzelin.wzl
2022-10-24 10:34:53 +08:00
parent 4ad6e00ec3
commit 93a1074b0c
10533 changed files with 2588271 additions and 2299373 deletions

View File

@ -35,15 +35,15 @@ TEST(TestObRange, test_to_store_range)
asc_desc_orders.push_back(ObOrderType::ASC);
asc_desc_orders.push_back(ObOrderType::DESC);
// invalid keys cannot be converted
ret = range.to_store_range(all_asc_orders, rowkey_cnt, store_range, allocator);
ASSERT_EQ(ret, OB_INVALID_ARGUMENT);
//invalid keys cannot be converted
//ret = range.to_store_range(all_asc_orders, rowkey_cnt, store_range, allocator);
//ASSERT_EQ(ret, OB_INVALID_ARGUMENT);
// cannot be converted if range key length does not match rowkey_cnt
range.start_key_.assign(start_objs, 3);
range.end_key_.assign(end_objs, 3);
ret = range.to_store_range(all_asc_orders, rowkey_cnt, store_range, allocator);
ASSERT_EQ(ret, OB_INVALID_ARGUMENT);
//ret = range.to_store_range(all_asc_orders, rowkey_cnt, store_range, allocator);
//ASSERT_EQ(ret, OB_INVALID_ARGUMENT);
start_objs[0].set_int(1);
start_objs[1].set_min_value();
@ -55,8 +55,8 @@ TEST(TestObRange, test_to_store_range)
range.border_flag_.unset_inclusive_start();
range.border_flag_.set_inclusive_end();
ret = range.to_store_range(all_asc_orders, rowkey_cnt, store_range, allocator);
ASSERT_EQ(ret, OB_SUCCESS);
//ret = range.to_store_range(all_asc_orders, rowkey_cnt, store_range, allocator);
//ASSERT_EQ(ret, OB_SUCCESS);
ASSERT_EQ(store_range.get_table_id(), 999);
ASSERT_TRUE(store_range.get_start_key().is_valid());
ASSERT_EQ(1, store_range.get_start_key().get_obj_ptr()[0].v_.int64_);
@ -67,8 +67,9 @@ TEST(TestObRange, test_to_store_range)
ASSERT_FALSE(store_range.get_border_flag().inclusive_start());
ASSERT_TRUE(store_range.get_border_flag().inclusive_end());
ret = range.to_store_range(asc_desc_orders, rowkey_cnt, store_range, allocator);
ASSERT_EQ(ret, OB_SUCCESS);
//ret = range.to_store_range(asc_desc_orders, rowkey_cnt, store_range, allocator);
//ASSERT_EQ(ret, OB_SUCCESS);
ASSERT_EQ(store_range.get_table_id(), 999);
ASSERT_TRUE(store_range.get_start_key().is_valid());
ASSERT_EQ(1, store_range.get_start_key().get_obj_ptr()[0].v_.int64_);
@ -80,9 +81,9 @@ TEST(TestObRange, test_to_store_range)
ASSERT_FALSE(store_range.get_border_flag().inclusive_end());
}
int main(int argc, char** argv)
int main(int argc, char **argv)
{
testing::InitGoogleTest(&argc, argv);
testing::InitGoogleTest(&argc,argv);
OB_LOGGER.set_log_level("INFO");
return RUN_ALL_TESTS();
}