From d432305450d6454f2f7d4cd7202d05d61972b29a Mon Sep 17 00:00:00 2001 From: raffertyyu Date: Fri, 10 May 2024 21:36:05 +0800 Subject: [PATCH] fix gcc warning about dangling-reference in backup_engine_test --- utilities/backup/backup_engine_test.cc | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/utilities/backup/backup_engine_test.cc b/utilities/backup/backup_engine_test.cc index 917effceab8..6e6f31c0d5f 100644 --- a/utilities/backup/backup_engine_test.cc +++ b/utilities/backup/backup_engine_test.cc @@ -4406,9 +4406,9 @@ TEST_F(BackupEngineTest, ExcludeFiles) { delete db; db = nullptr; - for (auto be_pair : - {std::make_pair(backup_engine_.get(), alt_backup_engine), - std::make_pair(alt_backup_engine, backup_engine_.get())}) { + auto backup_engine = backup_engine_.get(); + for (auto be_pair : {std::make_pair(backup_engine, alt_backup_engine), + std::make_pair(alt_backup_engine, backup_engine)}) { ASSERT_OK(DestroyDB(dbname_, options_)); RestoreOptions ro; // Fails without alternate dir @@ -4430,9 +4430,8 @@ TEST_F(BackupEngineTest, ExcludeFiles) { CloseBackupEngine(); OpenBackupEngine(); - for (auto be_pair : - {std::make_pair(backup_engine_.get(), alt_backup_engine), - std::make_pair(alt_backup_engine, backup_engine_.get())}) { + for (auto be_pair : {std::make_pair(backup_engine, alt_backup_engine), + std::make_pair(alt_backup_engine, backup_engine)}) { ASSERT_OK(DestroyDB(dbname_, options_)); RestoreOptions ro; ro.alternate_dirs.push_front(be_pair.second); @@ -4459,9 +4458,8 @@ TEST_F(BackupEngineTest, ExcludeFiles) { AssertBackupInfoConsistency(/*allow excluded*/ true); // Excluded file(s) deleted, unable to restore - for (auto be_pair : - {std::make_pair(backup_engine_.get(), alt_backup_engine), - std::make_pair(alt_backup_engine, backup_engine_.get())}) { + for (auto be_pair : {std::make_pair(backup_engine, alt_backup_engine), + std::make_pair(alt_backup_engine, backup_engine)}) { RestoreOptions ro; ro.alternate_dirs.push_front(be_pair.second); ASSERT_TRUE(be_pair.first->RestoreDBFromLatestBackup(dbname_, dbname_, ro) @@ -4475,9 +4473,8 @@ TEST_F(BackupEngineTest, ExcludeFiles) { AssertBackupInfoConsistency(/*allow excluded*/ true); // Excluded file(s) deleted, unable to restore - for (auto be_pair : - {std::make_pair(backup_engine_.get(), alt_backup_engine), - std::make_pair(alt_backup_engine, backup_engine_.get())}) { + for (auto be_pair : {std::make_pair(backup_engine, alt_backup_engine), + std::make_pair(alt_backup_engine, backup_engine)}) { RestoreOptions ro; ro.alternate_dirs.push_front(be_pair.second); ASSERT_TRUE(be_pair.first->RestoreDBFromLatestBackup(dbname_, dbname_, ro)