From d88d8ecf807accd403ac0a01db4d6a20e7e80de7 Mon Sep 17 00:00:00 2001
From: Igor Canadi <icanadi@fb.com>
Date: Tue, 12 Nov 2013 20:32:07 -0800
Subject: [PATCH] Fix deleting files

Summary: One more fix! In some cases, our filenames start with "/". Apparently, env_ can't handle filenames with double //

Test Plan:
deletefile_test does not include this line in the LOG anymore:
2013/11/12-18:11:43.150149 7fe4a6fff700 RenameFile logfile #3 FAILED -- IO error: /tmp/rocksdbtest-3574/deletefile_test//000003.log: No such file or directory

Reviewers: dhruba, haobo

Reviewed By: haobo

CC: leveldb

Differential Revision: https://reviews.facebook.net/D14055
---
 db/db_impl.cc | 30 +++++++++++++++++++-----------
 1 file changed, 19 insertions(+), 11 deletions(-)

diff --git a/db/db_impl.cc b/db/db_impl.cc
index 444cfbd7f..524e7fb00 100644
--- a/db/db_impl.cc
+++ b/db/db_impl.cc
@@ -505,7 +505,7 @@ void DBImpl::PurgeObsoleteFiles(DeletionState& state) {
   state.all_files.reserve(state.all_files.size() +
       state.sst_delete_files.size());
   for (auto file : state.sst_delete_files) {
-    state.all_files.push_back(TableFileName("", file->number));
+    state.all_files.push_back(TableFileName("", file->number).substr(1));
     delete file;
   }
 
@@ -513,11 +513,16 @@ void DBImpl::PurgeObsoleteFiles(DeletionState& state) {
       state.log_delete_files.size());
   for (auto filenum : state.log_delete_files) {
     if (filenum > 0) {
-      state.all_files.push_back(LogFileName("", filenum));
+      state.all_files.push_back(LogFileName("", filenum).substr(1));
     }
   }
 
-  for (size_t i = 0; i < state.all_files.size(); i++) {
+  // dedup state.all_files so we don't try to delete the same
+  // file twice
+  sort(state.all_files.begin(), state.all_files.end());
+  auto unique_end = unique(state.all_files.begin(), state.all_files.end());
+
+  for (size_t i = 0; state.all_files.begin() + i < unique_end; i++) {
     if (ParseFileName(state.all_files[i], &number, &type)) {
       bool keep = true;
       switch (type) {
@@ -557,22 +562,25 @@ void DBImpl::PurgeObsoleteFiles(DeletionState& state) {
           // evict from cache
           table_cache_->Evict(number);
         }
-        Log(options_.info_log, "Delete type=%d #%llu", int(type), number);
+        std::string fname = dbname_ + "/" + state.all_files[i];
+
+        Log(options_.info_log, "Delete type=%d #%lu -- %s",
+            int(type), number, fname.c_str());
 
         Status st;
         if (type == kLogFile && (options_.WAL_ttl_seconds > 0 ||
               options_.WAL_size_limit_MB > 0)) {
-            st = env_->RenameFile(dbname_ + "/" + state.all_files[i],
-                                  ArchivedLogFileName(options_.wal_dir,
-                                                      number));
+            st = env_->RenameFile(fname,
+                ArchivedLogFileName(options_.wal_dir, number));
             if (!st.ok()) {
-              Log(options_.info_log, "RenameFile logfile #%llu FAILED", number);
+              Log(options_.info_log, "RenameFile logfile #%lu FAILED -- %s\n",
+                  number, st.ToString().c_str());
             }
         } else {
-          st = env_->DeleteFile(dbname_ + "/" + state.all_files[i]);
+          st = env_->DeleteFile(fname);
           if (!st.ok()) {
-            Log(options_.info_log, "Delete type=%d #%llu FAILED\n",
-                int(type), number);
+            Log(options_.info_log, "Delete type=%d #%lu FAILED -- %s\n",
+                int(type), number, st.ToString().c_str());
           }
         }
       }