This is an automated email from the ASF dual-hosted git repository.
morningman pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-doris.git
The following commit(s) were added to refs/heads/master by this push:
new ae01862ae4 [fix](ut) fix DeltaWriter::close_wait parameter mismatch in
delta_writer_test (#9457)
ae01862ae4 is described below
commit ae01862ae4d264b00726c2e8665ca42ae22daebe
Author: Xinyi Zou <zouxiny...@gmail.com>
AuthorDate: Mon May 9 09:38:12 2022 +0800
[fix](ut) fix DeltaWriter::close_wait parameter mismatch in
delta_writer_test (#9457)
---
be/src/olap/delta_writer.cpp | 2 ++
be/test/olap/delta_writer_test.cpp | 12 ++++++------
be/test/olap/engine_storage_migration_task_test.cpp | 2 +-
3 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/be/src/olap/delta_writer.cpp b/be/src/olap/delta_writer.cpp
index 2a6f597642..b40677e2b0 100644
--- a/be/src/olap/delta_writer.cpp
+++ b/be/src/olap/delta_writer.cpp
@@ -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;
}
diff --git a/be/test/olap/delta_writer_test.cpp
b/be/test/olap/delta_writer_test.cpp
index 019d252581..2096900dbf 100644
--- a/be/test/olap/delta_writer_test.cpp
+++ b/be/test/olap/delta_writer_test.cpp
@@ -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
diff --git a/be/test/olap/engine_storage_migration_task_test.cpp
b/be/test/olap/engine_storage_migration_task_test.cpp
index 7d70f1cb01..df5f685eff 100644
--- a/be/test/olap/engine_storage_migration_task_test.cpp
+++ b/be/test/olap/engine_storage_migration_task_test.cpp
@@ -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
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
