Merge pull request ceph#63145 from tchaikov/no-using-std

tools/ceph_dedup: remove 'using namespace std'

Reviewed-by: Ilya Dryomov <[email protected]>
Reviewed-by: Myoungwon Oh <[email protected]>

Author: tchaikov

src/tools/ceph_dedup/ceph_dedup_daemon.cc

@@ -34,16 +34,16 @@ po::options_description make_usage() {
   return desc;
 }
 
-using AioCompRef = unique_ptr<AioCompletion>;
+using AioCompRef = std::unique_ptr<AioCompletion>;
 
 class SampleDedupWorkerThread : public Thread
 {
 public:
   struct chunk_t {
-    string oid = "";
+    std::string oid = "";
     size_t start = 0;
     size_t size = 0;
-    string fingerprint = "";
+    std::string fingerprint = "";
     bufferlist data;
   };
 
@@ -187,7 +187,7 @@ class SampleDedupWorkerThread : public Thread
       }
     }
 
-    bool contains(string& fp) {
+    bool contains(std::string& fp) {
       std::shared_lock lock(fingerprint_lock);
       return fp_map.contains(fp);
     }
@@ -319,11 +319,11 @@ class SampleDedupWorkerThread : public Thread
   void try_dedup_and_accumulate_result(ObjectItem &object, snap_t snap = 0);
   int do_chunk_dedup(chunk_t &chunk, snap_t snap);
   bufferlist read_object(ObjectItem &object);
-  std::vector<std::tuple<bufferlist, pair<uint64_t, uint64_t>>> do_cdc(
+  std::vector<std::tuple<bufferlist, std::pair<uint64_t, uint64_t>>> do_cdc(
     ObjectItem &object,
     bufferlist &data);
   std::string generate_fingerprint(bufferlist chunk_data);
-  AioCompRef do_async_evict(string oid);
+  AioCompRef do_async_evict(std::string oid);
 
   IoCtx io_ctx;
   IoCtx chunk_io_ctx;
@@ -362,7 +362,7 @@ void SampleDedupWorkerThread::crawl()
 	op.list_snaps(&snap_set, &snap_ret);
 	io_ctx.operate(target.oid, &op, NULL);
 
-	for (vector<librados::clone_info_t>::const_iterator r = snap_set.clones.begin();
+	for (std::vector<librados::clone_info_t>::const_iterator r = snap_set.clones.begin();
 	  r != snap_set.clones.end();
 	  ++r) {
 	  io_ctx.snap_set_read(r->cloneid);
@@ -378,7 +378,7 @@ void SampleDedupWorkerThread::crawl()
     }
   }
 
-  vector<AioCompRef> evict_completions(oid_for_evict.size());
+  std::vector<AioCompRef> evict_completions(oid_for_evict.size());
   int i = 0;
   for (auto &oid : oid_for_evict) {
     if (snap) {
@@ -392,7 +392,7 @@ void SampleDedupWorkerThread::crawl()
   }
 }
 
-AioCompRef SampleDedupWorkerThread::do_async_evict(string oid)
+AioCompRef SampleDedupWorkerThread::do_async_evict(std::string oid)
 {
   Rados rados;
   ObjectReadOperation op_tier;
@@ -432,7 +432,7 @@ std::vector<size_t> SampleDedupWorkerThread::sample_object(size_t count)
   for (size_t i = 0 ; i < count ; i++) {
     indexes[i] = i;
   }
-  default_random_engine generator;
+  std::default_random_engine generator;
   shuffle(indexes.begin(), indexes.end(), generator);
   size_t sampling_count = static_cast<double>(count) *
     sample_dedup_global.sampling_ratio;
@@ -466,7 +466,7 @@ void SampleDedupWorkerThread::try_dedup_and_accumulate_result(
   }
 
   size_t duplicated_size = 0;
-  list<chunk_t> redundant_chunks;
+  std::list<chunk_t> redundant_chunks;
   for (auto &chunk : chunks) {
     auto &chunk_data = std::get<0>(chunk);
     std::string fingerprint = generate_fingerprint(chunk_data);
@@ -525,14 +525,14 @@ bufferlist SampleDedupWorkerThread::read_object(ObjectItem &object)
   return whole_data;
 }
 
-std::vector<std::tuple<bufferlist, pair<uint64_t, uint64_t>>> SampleDedupWorkerThread::do_cdc(
+std::vector<std::tuple<bufferlist, std::pair<uint64_t, uint64_t>>> SampleDedupWorkerThread::do_cdc(
   ObjectItem &object,
   bufferlist &data)
 {
-  std::vector<std::tuple<bufferlist, pair<uint64_t, uint64_t>>> ret;
+  std::vector<std::tuple<bufferlist, std::pair<uint64_t, uint64_t>>> ret;
 
-  unique_ptr<CDC> cdc = CDC::create(chunk_algo, cbits(chunk_size) - 1);
-  vector<pair<uint64_t, uint64_t>> chunks;
+  std::unique_ptr<CDC> cdc = CDC::create(chunk_algo, cbits(chunk_size) - 1);
+  std::vector<std::pair<uint64_t, uint64_t>> chunks;
   cdc->calc_chunks(data, &chunks);
   for (auto &p : chunks) {
     bufferlist chunk;
@@ -545,7 +545,7 @@ std::vector<std::tuple<bufferlist, pair<uint64_t, uint64_t>>> SampleDedupWorkerT
 
 std::string SampleDedupWorkerThread::generate_fingerprint(bufferlist chunk_data)
 {
-  string ret;
+  std::string ret;
 
   switch (fp_type) {
     case pg_pool_t::TYPE_FINGERPRINT_SHA1:
@@ -598,8 +598,8 @@ int SampleDedupWorkerThread::do_chunk_dedup(chunk_t &chunk, snap_t snap)
 
 int run_crawling_daemon(const po::variables_map &opts)
 {
-  string base_pool_name = get_opts_pool_name(opts);
-  string chunk_pool_name = get_opts_chunk_pool(opts);
+  std::string base_pool_name = get_opts_pool_name(opts);
+  std::string chunk_pool_name = get_opts_chunk_pool(opts);
   unsigned max_thread = get_opts_max_thread(opts);
   uint32_t report_period = get_opts_report_period(opts);
   bool run_once = false; // for debug
@@ -612,7 +612,7 @@ int run_crawling_daemon(const po::variables_map &opts)
   if (opts.count("chunk-size")) {
     chunk_size = opts["chunk-size"].as<int>();
   } else {
-    cout << "8192 is set as chunk size by default" << std::endl;
+    std::cout << "8192 is set as chunk size by default" << std::endl;
   }
   bool snap = false;
   if (opts.count("snap")) {
@@ -641,14 +641,14 @@ int run_crawling_daemon(const po::variables_map &opts)
   if (opts.count("wakeup-period")) {
     wakeup_period = opts["wakeup-period"].as<int>();
   } else {
-    cout << "100 second is set as wakeup period by default" << std::endl;
+    std::cout << "100 second is set as wakeup period by default" << std::endl;
   }
 
   const size_t fp_threshold = opts["fpstore-threshold"].as<size_t>();
 
   std::string fp_algo = get_opts_fp_algo(opts);
 
-  list<string> pool_names;
+  std::list<std::string> pool_names;
   IoCtx io_ctx, chunk_io_ctx;
   pool_names.push_back(base_pool_name);
   ret = rados.ioctx_create(base_pool_name.c_str(), io_ctx);
@@ -731,7 +731,7 @@ int run_crawling_daemon(const po::variables_map &opts)
 
     sleep(wakeup_period);
 
-    map<string, librados::pool_stat_t> stats;
+    std::map<std::string, librados::pool_stat_t> stats;
     ret = rados.get_pool_stats(pool_names, stats);
     if (ret < 0) {
       derr << "error fetching pool stats: " << cpp_strerror(ret) << dendl;
@@ -756,7 +756,7 @@ int main(int argc, const char **argv)
 {
   auto args = argv_to_vec(argc, argv);
   if (args.empty()) {
-    cerr << argv[0] << ": -h or --help for usage" << std::endl;
+    std::cerr << argv[0] << ": -h or --help for usage" << std::endl;
     exit(1);
   }
 
@@ -774,7 +774,7 @@ int main(int argc, const char **argv)
     return 1;
   }
   if (opts.count("help") || opts.count("h")) {
-    cout<< desc << std::endl;
+    std::cout<< desc << std::endl;
     exit(0);
   }
 
@@ -787,7 +787,7 @@ int main(int argc, const char **argv)
     std::string err;
     int r = forker.prefork(err);
     if (r < 0) {
-      cerr << err << std::endl;
+      std::cerr << err << std::endl;
       return r;
     }
     if (forker.is_parent()) {