This is an automated email from the ASF dual-hosted git repository.
yiguolei pushed a commit to branch branch-1.1-lts
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-1.1-lts by this push:
new 2d55649e4c [bugfix](ut) errors when cherry-pick add tablet erros when
close_wait return error (#12568)
2d55649e4c is described below
commit 2d55649e4c23e6e50b1b71848807c86f559872bd
Author: dujl <dujunl...@bytedance.com>
AuthorDate: Wed Sep 14 09:08:46 2022 +0800
[bugfix](ut) errors when cherry-pick add tablet erros when close_wait
return error (#12568)
---
be/test/olap/delta_writer_test.cpp | 235 +------------------------------------
1 file changed, 2 insertions(+), 233 deletions(-)
diff --git a/be/test/olap/delta_writer_test.cpp
b/be/test/olap/delta_writer_test.cpp
index e51dbe9605..9fb7f74213 100644
--- a/be/test/olap/delta_writer_test.cpp
+++ b/be/test/olap/delta_writer_test.cpp
@@ -479,149 +479,9 @@ TEST_F(TestDeltaWriter, write) {
}
res = delta_writer->close();
-<<<<<<< HEAD
ASSERT_EQ(OLAP_SUCCESS, res);
- res = delta_writer->close_wait(nullptr, false);
- ASSERT_EQ(OLAP_SUCCESS, res);
-=======
- EXPECT_EQ(Status::OK(), res);
res = delta_writer->close_wait();
- EXPECT_EQ(Status::OK(), res);
-
- // publish version success
- TabletSharedPtr tablet =
- k_engine->tablet_manager()->get_tablet(write_req.tablet_id,
write_req.schema_hash);
- OlapMeta* meta = tablet->data_dir()->get_meta();
- Version version;
- version.first = tablet->rowset_with_max_version()->end_version() + 1;
- version.second = tablet->rowset_with_max_version()->end_version() + 1;
- std::map<TabletInfo, RowsetSharedPtr> tablet_related_rs;
- StorageEngine::instance()->txn_manager()->get_txn_related_tablets(
- write_req.txn_id, write_req.partition_id, &tablet_related_rs);
- for (auto& tablet_rs : tablet_related_rs) {
- RowsetSharedPtr rowset = tablet_rs.second;
- res = k_engine->txn_manager()->publish_txn(meta,
write_req.partition_id, write_req.txn_id,
- write_req.tablet_id,
write_req.schema_hash,
- tablet_rs.first.tablet_uid,
version);
- EXPECT_EQ(Status::OK(), res);
- res = tablet->add_inc_rowset(rowset);
- EXPECT_EQ(Status::OK(), res);
- }
- EXPECT_EQ(1, tablet->num_rows());
-
- auto tablet_id = 10003;
- auto schema_hash = 270068375;
- res = k_engine->tablet_manager()->drop_tablet(tablet_id, schema_hash);
- EXPECT_EQ(Status::OK(), res);
- delete delta_writer;
-}
-
-TEST_F(TestDeltaWriter, vec_write) {
- TCreateTabletReq request;
- create_tablet_request(10004, 270068376, &request);
- Status res = k_engine->create_tablet(request);
- ASSERT_TRUE(res.ok());
-
- TDescriptorTable tdesc_tbl = create_descriptor_tablet();
- ObjectPool obj_pool;
- DescriptorTbl* desc_tbl = nullptr;
- DescriptorTbl::create(&obj_pool, tdesc_tbl, &desc_tbl);
- TupleDescriptor* tuple_desc = desc_tbl->get_tuple_descriptor(0);
- // const std::vector<SlotDescriptor*>& slots = tuple_desc->slots();
-
- PUniqueId load_id;
- load_id.set_hi(0);
- load_id.set_lo(0);
- WriteRequest write_req = {10004, 270068376, WriteType::LOAD, 20002,
- 30002, load_id, tuple_desc,
&(tuple_desc->slots())};
- DeltaWriter* delta_writer = nullptr;
- DeltaWriter::open(&write_req, &delta_writer, true);
- ASSERT_NE(delta_writer, nullptr);
-
- auto tracker = std::make_shared<MemTracker>();
- MemPool pool(tracker.get());
-
- vectorized::Block block;
- for (const auto& slot_desc : tuple_desc->slots()) {
-
block.insert(vectorized::ColumnWithTypeAndName(slot_desc->get_empty_mutable_column(),
-
slot_desc->get_data_type_ptr(),
- slot_desc->col_name()));
- }
-
- auto columns = block.mutate_columns();
- {
- int8_t k1 = -127;
- columns[0]->insert_data((const char*)&k1, sizeof(k1));
-
- int16_t k2 = -32767;
- columns[1]->insert_data((const char*)&k2, sizeof(k2));
-
- int32_t k3 = -2147483647;
- columns[2]->insert_data((const char*)&k3, sizeof(k3));
-
- int64_t k4 = -9223372036854775807L;
- columns[3]->insert_data((const char*)&k4, sizeof(k4));
-
- int128_t k5 = -90000;
- columns[4]->insert_data((const char*)&k5, sizeof(k5));
-
- DateTimeValue k6;
- k6.from_date_str("2048-11-10", 10);
- auto k6_int = k6.to_int64();
- columns[5]->insert_data((const char*)&k6_int, sizeof(k6_int));
-
- DateTimeValue k7;
- k7.from_date_str("2636-08-16 19:39:43", 19);
- auto k7_int = k7.to_int64();
- columns[6]->insert_data((const char*)&k7_int, sizeof(k7_int));
-
- columns[7]->insert_data("abcd", 4);
- columns[8]->insert_data("abcde", 5);
-
- DecimalV2Value decimal_value;
- decimal_value.assign_from_double(1.1);
- columns[9]->insert_data((const char*)&decimal_value,
sizeof(decimal_value));
-
- int8_t v1 = -127;
- columns[10]->insert_data((const char*)&v1, sizeof(v1));
-
- int16_t v2 = -32767;
- columns[11]->insert_data((const char*)&v2, sizeof(v2));
-
- int32_t v3 = -2147483647;
- columns[12]->insert_data((const char*)&v3, sizeof(v3));
-
- int64_t v4 = -9223372036854775807L;
- columns[13]->insert_data((const char*)&v4, sizeof(v4));
-
- int128_t v5 = -90000;
- columns[14]->insert_data((const char*)&v5, sizeof(v5));
-
- DateTimeValue v6;
- v6.from_date_str("2048-11-10", 10);
- auto v6_int = v6.to_int64();
- columns[15]->insert_data((const char*)&v6_int, sizeof(v6_int));
-
- DateTimeValue v7;
- v7.from_date_str("2636-08-16 19:39:43", 19);
- auto v7_int = v7.to_int64();
- columns[16]->insert_data((const char*)&v7_int, sizeof(v7_int));
-
- columns[17]->insert_data("abcd", 4);
- columns[18]->insert_data("abcde", 5);
-
- decimal_value.assign_from_double(1.1);
- columns[19]->insert_data((const char*)&decimal_value,
sizeof(decimal_value));
-
- res = delta_writer->write(&block, {0});
- ASSERT_TRUE(res.ok());
- }
-
- res = delta_writer->close();
- ASSERT_TRUE(res.ok());
- res = delta_writer->close_wait();
- ASSERT_TRUE(res.ok());
->>>>>>> 75b3707a2 ([refactor](load) add tablet errors when close_wait return
error (#9619))
+ ASSERT_EQ(OLAP_SUCCESS, res);
// publish version success
TabletSharedPtr tablet =
@@ -697,100 +557,9 @@ TEST_F(TestDeltaWriter, sequence_col) {
}
res = delta_writer->close();
-<<<<<<< HEAD
- ASSERT_EQ(OLAP_SUCCESS, res);
- res = delta_writer->close_wait(nullptr, false);
ASSERT_EQ(OLAP_SUCCESS, res);
-=======
- EXPECT_EQ(Status::OK(), res);
res = delta_writer->close_wait();
- EXPECT_EQ(Status::OK(), res);
-
- // publish version success
- TabletSharedPtr tablet =
- k_engine->tablet_manager()->get_tablet(write_req.tablet_id,
write_req.schema_hash);
- OlapMeta* meta = tablet->data_dir()->get_meta();
- Version version;
- version.first = tablet->rowset_with_max_version()->end_version() + 1;
- version.second = tablet->rowset_with_max_version()->end_version() + 1;
- std::map<TabletInfo, RowsetSharedPtr> tablet_related_rs;
- StorageEngine::instance()->txn_manager()->get_txn_related_tablets(
- write_req.txn_id, write_req.partition_id, &tablet_related_rs);
- for (auto& tablet_rs : tablet_related_rs) {
- RowsetSharedPtr rowset = tablet_rs.second;
- res = k_engine->txn_manager()->publish_txn(meta,
write_req.partition_id, write_req.txn_id,
- write_req.tablet_id,
write_req.schema_hash,
- tablet_rs.first.tablet_uid,
version);
- EXPECT_EQ(Status::OK(), res);
- res = tablet->add_inc_rowset(rowset);
- EXPECT_EQ(Status::OK(), res);
- }
- EXPECT_EQ(1, tablet->num_rows());
-
- auto tablet_id = 10005;
- auto schema_hash = 270068377;
- res = k_engine->tablet_manager()->drop_tablet(tablet_id, schema_hash);
- EXPECT_EQ(Status::OK(), res);
- delete delta_writer;
-}
-
-TEST_F(TestDeltaWriter, vec_sequence_col) {
- TCreateTabletReq request;
- sleep(20);
- create_tablet_request_with_sequence_col(10005, 270068377, &request);
- Status res = k_engine->create_tablet(request);
- ASSERT_TRUE(res.ok());
-
- TDescriptorTable tdesc_tbl = create_descriptor_tablet_with_sequence_col();
- ObjectPool obj_pool;
- DescriptorTbl* desc_tbl = nullptr;
- DescriptorTbl::create(&obj_pool, tdesc_tbl, &desc_tbl);
- TupleDescriptor* tuple_desc = desc_tbl->get_tuple_descriptor(0);
-
- PUniqueId load_id;
- load_id.set_hi(0);
- load_id.set_lo(0);
- WriteRequest write_req = {10005, 270068377, WriteType::LOAD, 20003,
- 30003, load_id, tuple_desc,
&(tuple_desc->slots())};
- DeltaWriter* delta_writer = nullptr;
- DeltaWriter::open(&write_req, &delta_writer, true);
- ASSERT_NE(delta_writer, nullptr);
-
- MemTracker tracker;
- MemPool pool(&tracker);
-
- vectorized::Block block;
- for (const auto& slot_desc : tuple_desc->slots()) {
-
block.insert(vectorized::ColumnWithTypeAndName(slot_desc->get_empty_mutable_column(),
-
slot_desc->get_data_type_ptr(),
- slot_desc->col_name()));
- }
-
- auto columns = block.mutate_columns();
- {
- int8_t c1 = 123;
- columns[0]->insert_data((const char*)&c1, sizeof(c1));
-
- int16_t c2 = 456;
- columns[1]->insert_data((const char*)&c2, sizeof(c2));
-
- int32_t c3 = 1;
- columns[2]->insert_data((const char*)&c3, sizeof(c2));
-
- DateTimeValue c4;
- c4.from_date_str("2020-07-16 19:39:43", 19);
- int64_t c4_int = c4.to_int64();
- columns[3]->insert_data((const char*)&c4_int, sizeof(c4));
-
- res = delta_writer->write(&block, {0});
- ASSERT_TRUE(res.ok());
- }
-
- res = delta_writer->close();
- ASSERT_TRUE(res.ok());
- res = delta_writer->close_wait();
- ASSERT_TRUE(res.ok());
->>>>>>> 75b3707a2 ([refactor](load) add tablet errors when close_wait return
error (#9619))
+ ASSERT_EQ(OLAP_SUCCESS, res);
// publish version success
TabletSharedPtr tablet =
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
