This is an automated email from the ASF dual-hosted git repository. w41ter pushed a commit to branch avoid_clear_binlog_dir in repository https://gitbox.apache.org/repos/asf/doris.git
commit 23b10a93bcbb1bc3649919fea4822b3f9b057cff Author: w41ter <[email protected]> AuthorDate: Wed Dec 18 04:35:18 2024 +0000 [fix](binlog) Avoid clear binlog dir Fix the issue introduced by #45445 --- be/src/olap/rowset/beta_rowset.cpp | 6 ++---- be/test/olap/rowset/beta_rowset_test.cpp | 10 ---------- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/be/src/olap/rowset/beta_rowset.cpp b/be/src/olap/rowset/beta_rowset.cpp index 2546c87492d..d568e573779 100644 --- a/be/src/olap/rowset/beta_rowset.cpp +++ b/be/src/olap/rowset/beta_rowset.cpp @@ -586,13 +586,11 @@ Status BetaRowset::add_to_binlog() { if (binlog_dir.empty()) { binlog_dir = std::filesystem::path(seg_file).parent_path().append("_binlog").string(); - // Delete all existing files in binlog dir, to keep binlog dir clean. bool exists = true; RETURN_IF_ERROR(fs->exists(binlog_dir, &exists)); - if (exists) { - RETURN_IF_ERROR(fs->delete_directory(binlog_dir)); + if (!exists) { + RETURN_IF_ERROR(fs->create_directory(binlog_dir)); } - RETURN_IF_ERROR(fs->create_directory(binlog_dir)); } auto binlog_file = diff --git a/be/test/olap/rowset/beta_rowset_test.cpp b/be/test/olap/rowset/beta_rowset_test.cpp index 0c3001758f0..1ed3a9ed04b 100644 --- a/be/test/olap/rowset/beta_rowset_test.cpp +++ b/be/test/olap/rowset/beta_rowset_test.cpp @@ -292,14 +292,4 @@ TEST_F(BetaRowsetTest, ReadTest) { } } -TEST_F(BetaRowsetTest, AddToBinlogTest) { - RowsetMetaSharedPtr rowset_meta = std::make_shared<RowsetMeta>(); - BetaRowset rowset(nullptr, rowset_meta, ""); - std::string resource_id = "10000"; - Status s = rowset.add_to_binlog(); - ASSERT_TRUE(s.ok()) << "first add_to_binlog(): " << s; - s = rowset.add_to_binlog(); - ASSERT_TRUE(s.ok()) << "second add_to_binlog(): " << s; -} - } // namespace doris --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
