database/doris
2
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

[fix](ut) fix DeltaWriter::close_wait parameter mismatch in delta_writer_test (#9457)

Browse Source
This commit is contained in:
Xinyi Zou
2022-05-09 09:38:12 +08:00
committed by GitHub
parent 7e86c1beab
commit ae01862ae4
3 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
be/src/olap/delta_writer.cpp
View File

@ -324,9 +324,11 @@ Status DeltaWriter::close_wait(google::protobuf::RepeatedPtrField<PTabletInfo>*
// return error if previous flush failed
Status s = _flush_token->wait();
if (!s.ok()) {
#ifndef BE_TEST
PTabletError* tablet_error = tablet_errors->Add();
tablet_error->set_tablet_id(_tablet->tablet_id());
tablet_error->set_msg(s.get_error_msg());
#endif
return s;
}

12
be/test/olap/delta_writer_test.cpp
View File

@ -367,7 +367,7 @@ TEST_F(TestDeltaWriter, open) {
EXPECT_NE(delta_writer, nullptr);
res = delta_writer->close();
EXPECT_EQ(Status::OK(), res);
res = delta_writer->close_wait(nullptr, false);
res = delta_writer->close_wait(nullptr, nullptr, false);
EXPECT_EQ(Status::OK(), res);
SAFE_DELETE(delta_writer);
@ -376,7 +376,7 @@ TEST_F(TestDeltaWriter, open) {
EXPECT_NE(delta_writer, nullptr);
res = delta_writer->close();
EXPECT_EQ(Status::OK(), res);
res = delta_writer->close_wait(nullptr, false);
res = delta_writer->close_wait(nullptr, nullptr, false);
EXPECT_EQ(Status::OK(), res);
SAFE_DELETE(delta_writer);
@ -475,7 +475,7 @@ TEST_F(TestDeltaWriter, write) {
res = delta_writer->close();
EXPECT_EQ(Status::OK(), res);
res = delta_writer->close_wait(nullptr, false);
res = delta_writer->close_wait(nullptr, nullptr, false);
EXPECT_EQ(Status::OK(), res);
// publish version success
@ -609,7 +609,7 @@ TEST_F(TestDeltaWriter, vec_write) {
res = delta_writer->close();
ASSERT_TRUE(res.ok());
res = delta_writer->close_wait(nullptr, false);
res = delta_writer->close_wait(nullptr, nullptr, false);
ASSERT_TRUE(res.ok());
// publish version success
@ -687,7 +687,7 @@ TEST_F(TestDeltaWriter, sequence_col) {
res = delta_writer->close();
EXPECT_EQ(Status::OK(), res);
res = delta_writer->close_wait(nullptr, false);
res = delta_writer->close_wait(nullptr, nullptr, false);
EXPECT_EQ(Status::OK(), res);
// publish version success
@ -772,7 +772,7 @@ TEST_F(TestDeltaWriter, vec_sequence_col) {
res = delta_writer->close();
ASSERT_TRUE(res.ok());
res = delta_writer->close_wait(nullptr, false);
res = delta_writer->close_wait(nullptr, nullptr, false);
ASSERT_TRUE(res.ok());
// publish version success

2
be/test/olap/engine_storage_migration_task_test.cpp
View File

@ -194,7 +194,7 @@ TEST_F(TestEngineStorageMigrationTask, write_and_migration) {
res = delta_writer->close();
EXPECT_EQ(Status::OK(), res);
res = delta_writer->close_wait(nullptr, false);
res = delta_writer->close_wait(nullptr, nullptr, false);
EXPECT_EQ(Status::OK(), res);
// publish version success