From 3d7a94954c58b80ca15219449b197bc45f6cd2ad Mon Sep 17 00:00:00 2001
From: Joe Buck <jbbuck@gmail.com>
Date: Wed, 14 Aug 2013 22:29:46 -0700
Subject: [PATCH] Renamed filestore_backend test

Renamed filestore_backend to testfilestore_backend in
order to resolve compilation time issue.

Signed-off-by: Joe Buck <jbbuck@gmail.com>
---
 src/Makefile.am                                        |  4 ++--
 src/test/bench/small_io_bench_fs.cc                    |  4 ++--
 .../{filestore_backend.cc => testfilestore_backend.cc} |  8 ++++----
 .../{filestore_backend.h => testfilestore_backend.h}   | 10 +++++-----
 4 files changed, 13 insertions(+), 13 deletions(-)
 rename src/test/bench/{filestore_backend.cc => testfilestore_backend.cc} (92%)
 rename src/test/bench/{filestore_backend.h => testfilestore_backend.h} (75%)

diff --git a/src/Makefile.am b/src/Makefile.am
index f268cab5e2b2a..353a1db639ac0 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -268,7 +268,7 @@ ceph_smalliobench_SOURCES = test/bench/small_io_bench.cc test/bench/rados_backen
 ceph_smalliobench_LDADD = librados.la -lboost_program_options $(LIBGLOBAL_LDA)
 bin_DEBUGPROGRAMS += ceph_smalliobench
 
-ceph_smalliobenchfs_SOURCES = test/bench/small_io_bench_fs.cc test/bench/filestore_backend.cc test/bench/detailed_stat_collector.cc test/bench/bencher.cc
+ceph_smalliobenchfs_SOURCES = test/bench/small_io_bench_fs.cc test/bench/testfilestore_backend.cc test/bench/detailed_stat_collector.cc test/bench/bencher.cc
 ceph_smalliobenchfs_LDADD = librados.la -lboost_program_options $(LIBOS_LDA) $(LIBGLOBAL_LDA)
 ceph_smalliobenchfs_CXXFLAGS = ${CRYPTO_CXXFLAGS} ${AM_CXXFLAGS}
 bin_DEBUGPROGRAMS += ceph_smalliobenchfs
@@ -2281,7 +2281,7 @@ noinst_HEADERS = \
         test/bench/dumb_backend.h \
         test/bench/stat_collector.h \
         test/bench/detailed_stat_collector.h \
-        test/bench/filestore_backend.h \
+        test/bench/testfilestore_backend.h \
         test/common/ObjectContents.h \
         test/encoding/types.h \
         test/filestore/DeterministicOpSequence.h \
diff --git a/src/test/bench/small_io_bench_fs.cc b/src/test/bench/small_io_bench_fs.cc
index a37a7e71153a6..6f4ac07d3620a 100644
--- a/src/test/bench/small_io_bench_fs.cc
+++ b/src/test/bench/small_io_bench_fs.cc
@@ -21,7 +21,7 @@
 #include "distribution.h"
 #include "global/global_init.h"
 #include "os/FileStore.h"
-#include "filestore_backend.h"
+#include "testfilestore_backend.h"
 #include "common/perf_counters.h"
 
 namespace po = boost::program_options;
@@ -217,7 +217,7 @@ int main(int argc, char **argv)
     Bencher *bencher = new Bencher(
       gen,
       col,
-      new FileStoreBackend(&fs, vm["write-infos"].as<bool>()),
+      new TestFileStoreBackend(&fs, vm["write-infos"].as<bool>()),
       vm["num-concurrent-ops"].as<unsigned>(),
       vm["duration"].as<unsigned>(),
       vm["max-ops"].as<unsigned>());
diff --git a/src/test/bench/filestore_backend.cc b/src/test/bench/testfilestore_backend.cc
similarity index 92%
rename from src/test/bench/filestore_backend.cc
rename to src/test/bench/testfilestore_backend.cc
index 44abee98b6b8a..4e2ca80033b53 100644
--- a/src/test/bench/filestore_backend.cc
+++ b/src/test/bench/testfilestore_backend.cc
@@ -1,6 +1,6 @@
 // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
 
-#include "filestore_backend.h"
+#include "testfilestore_backend.h"
 #include "global/global_init.h"
 #include "os/ObjectStore.h"
 
@@ -16,14 +16,14 @@ struct C_DeleteTransWrapper : public Context {
   }
 };
 
-FileStoreBackend::FileStoreBackend(
+TestFileStoreBackend::TestFileStoreBackend(
   ObjectStore *os, bool write_infos)
   : os(os), finisher(g_ceph_context), write_infos(write_infos)
 {
   finisher.start();
 }
 
-void FileStoreBackend::write(
+void TestFileStoreBackend::write(
   const string &oid,
   uint64_t offset,
   const bufferlist &bl,
@@ -60,7 +60,7 @@ void FileStoreBackend::write(
     on_commit);
 }
 
-void FileStoreBackend::read(
+void TestFileStoreBackend::read(
   const string &oid,
   uint64_t offset,
   uint64_t length,
diff --git a/src/test/bench/filestore_backend.h b/src/test/bench/testfilestore_backend.h
similarity index 75%
rename from src/test/bench/filestore_backend.h
rename to src/test/bench/testfilestore_backend.h
index 714299338607a..2c3f8e6dc0521 100644
--- a/src/test/bench/filestore_backend.h
+++ b/src/test/bench/testfilestore_backend.h
@@ -1,22 +1,22 @@
 // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
 
-#ifndef FILESTOREBACKENDH
-#define FILESTOREBACKENDH
+#ifndef TESTFILESTOREBACKENDH
+#define TESTFILESTOREBACKENDH
 
 #include "common/Finisher.h"
 #include "backend.h"
 #include "include/Context.h"
 #include "os/ObjectStore.h"
 
-class FileStoreBackend : public Backend {
+class TestFileStoreBackend : public Backend {
   ObjectStore *os;
   Finisher finisher;
   map<string, ObjectStore::Sequencer> osrs;
   const bool write_infos;
 
 public:
-  FileStoreBackend(ObjectStore *os, bool write_infos);
-  ~FileStoreBackend() {
+  TestFileStoreBackend(ObjectStore *os, bool write_infos);
+  ~TestFileStoreBackend() {
     finisher.stop();
   }
   void write(
-- 
2.39.5