Revert "Include candidate files under options.db_log_dir in FindObsoleteFiles()"

siying · siying · commit 48081777f3ce · 2014-08-12T18:14:27.000-07:00
This reverts commit 54153ab.
diff --git a/db/db_impl.cc b/db/db_impl.cc
@@ -598,14 +598,6 @@ void DBImpl::FindObsoleteFiles(DeletionState& deletion_state,
         deletion_state.candidate_files.emplace_back(log_file, 0);
       }
     }
-    // Add info log files in db_log_dir
-    if (options_.db_log_dir.empty() && options_.db_log_dir != dbname_) {
-      std::vector<std::string> info_log_files;
-      env_->GetChildren(options_.db_log_dir, &info_log_files);  // Ignore errors
-      for (std::string log_file : info_log_files) {
-        deletion_state.candidate_files.emplace_back(log_file, 0);
-      }
-    }
   }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -598,14 +598,6 @@ void DBImpl::FindObsoleteFiles(DeletionState& deletion_state,`
`598`	`598`	`deletion_state.candidate_files.emplace_back(log_file, 0);`
`599`	`599`	`}`
`600`	`600`	`}`
`601`		`- // Add info log files in db_log_dir`
`602`		`- if (options_.db_log_dir.empty() && options_.db_log_dir != dbname_) {`
`603`		`- std::vector<std::string> info_log_files;`
`604`		`- env_->GetChildren(options_.db_log_dir, &info_log_files); // Ignore errors`
`605`		`- for (std::string log_file : info_log_files) {`
`606`		`- deletion_state.candidate_files.emplace_back(log_file, 0);`
`607`		`- }`
`608`		`- }`
`609`	`601`	`}`
`610`	`602`	`}`
`611`	`603`