From ab5c5c28fe7c25d5a1e270fb2704edb2ca1f0c90 Mon Sep 17 00:00:00 2001
From: Mayank Agarwal <amayank@fb.com>
Date: Sun, 1 Sep 2013 01:52:32 -0700
Subject: [PATCH] Fix build caused by DeleteFile not tolerating / at the
 beginning

Summary: db->DeleteFile calls ParseFileName to check name that was returned for sst file. Now, sst filename is returned using TableFileName which uses MakeFileName. This puts a / at the front of the name and ParseFileName doesn't like that. Changed ParseFileName to tolerate /s at the beginning. The test delet_file_test used to pass earlier because this behaviour of MakeFileName had been changed a while back to not return a / during which delete_file_test was checked in. But MakeFileName had to be reverted to add / at the front because GetLiveFiles used at many places outside rocksdb used the previous behaviour of MakeFileName.

Test Plan: make;./delete_filetest;make all check

Reviewers: dhruba, haobo, vamsi

Reviewed By: dhruba

CC: leveldb

Differential Revision: https://reviews.facebook.net/D12663
---
 db/db_impl.cc         | 3 +--
 db/deletefile_test.cc | 2 +-
 db/filename.cc        | 4 ++++
 db/version_set.cc     | 8 ++++----
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/db/db_impl.cc b/db/db_impl.cc
index d806b2749..4c7488fa9 100644
--- a/db/db_impl.cc
+++ b/db/db_impl.cc
@@ -3042,8 +3042,7 @@ Status DBImpl::DeleteFile(std::string name) {
   return status;
 }
 
-void DBImpl::GetLiveFilesMetaData(
-  std::vector<LiveFileMetaData> *metadata) {
+void DBImpl::GetLiveFilesMetaData(std::vector<LiveFileMetaData> *metadata) {
   MutexLock l(&mutex_);
   return versions_->GetLiveFilesMetaData(metadata);
 }
diff --git a/db/deletefile_test.cc b/db/deletefile_test.cc
index 7845b9433..158baf065 100644
--- a/db/deletefile_test.cc
+++ b/db/deletefile_test.cc
@@ -167,7 +167,7 @@ TEST(DeleteFileTest, DeleteFileWithIterator) {
   }
 
   Status status = db_->DeleteFile(level2file);
-  fprintf(stderr, "Deletion status %s: %s\n",
+  fprintf(stdout, "Deletion status %s: %s\n",
           level2file.c_str(), status.ToString().c_str());
   ASSERT_TRUE(status.ok());
   it->SeekToFirst();
diff --git a/db/filename.cc b/db/filename.cc
index f47855289..626a27107 100644
--- a/db/filename.cc
+++ b/db/filename.cc
@@ -130,10 +130,14 @@ std::string MetaDatabaseName(const std::string& dbname, uint64_t number) {
 //    dbname/MANIFEST-[0-9]+
 //    dbname/[0-9]+.(log|sst)
 //    dbname/METADB-[0-9]+
+//    Disregards / at the beginning
 bool ParseFileName(const std::string& fname,
                    uint64_t* number,
                    FileType* type) {
   Slice rest(fname);
+  if (fname.length() > 1 && fname[0] == '/') {
+    rest.remove_prefix(1);
+  }
   if (rest == "CURRENT") {
     *number = 0;
     *type = kCurrentFile;
diff --git a/db/version_set.cc b/db/version_set.cc
index 531a0b391..4f02176e4 100644
--- a/db/version_set.cc
+++ b/db/version_set.cc
@@ -2674,9 +2674,9 @@ void VersionSet::SetupOtherInputs(Compaction* c) {
 }
 
 Status VersionSet::GetMetadataForFile(
-  uint64_t number,
-  int *filelevel,
-  FileMetaData *meta) {
+    uint64_t number,
+    int *filelevel,
+    FileMetaData *meta) {
   for (int level = 0; level < NumberLevels(); level++) {
     const std::vector<FileMetaData*>& files = current_->files_[level];
     for (size_t i = 0; i < files.size(); i++) {
@@ -2691,7 +2691,7 @@ Status VersionSet::GetMetadataForFile(
 }
 
 void VersionSet::GetLiveFilesMetaData(
-  std::vector<LiveFileMetaData> * metadata) {
+    std::vector<LiveFileMetaData> * metadata) {
   for (int level = 0; level < NumberLevels(); level++) {
     const std::vector<FileMetaData*>& files = current_->files_[level];
     for (size_t i = 0; i < files.size(); i++) {