From: Ronen Friedman <rfriedma@redhat.com>
Date: Wed, 18 Aug 2021 08:25:49 +0000 (+0000)
Subject: key_value_store: fix missing std
X-Git-Tag: v17.1.0~1080^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F42827%2Fhead;p=ceph.git

key_value_store: fix missing std

following the removal of 'using std' in PR #42742, and missed
in PR #42790.

Signed-off-by: Ronen Friedman <rfriedma@redhat.com>
---

diff --git a/src/key_value_store/cls_kvs.cc b/src/key_value_store/cls_kvs.cc
index d206e3743d37..a246e5f2a510 100644
--- a/src/key_value_store/cls_kvs.cc
+++ b/src/key_value_store/cls_kvs.cc
@@ -13,6 +13,9 @@
 #include <iostream>
 #include <climits>
 
+using std::string;
+using std::map;
+using std::set;
 
 /**
  * finds the index_data where a key belongs.
@@ -390,7 +393,7 @@ static int omap_insert(cls_method_context_t hctx,
   int new_size_int = old_size_int + omap.size() - (assert_bound - bound);
   CLS_LOG(20, "old size is %d, new size is %d", old_size_int, new_size_int);
   bufferlist new_size;
-  stringstream s;
+  std::stringstream s;
   s << new_size_int;
   new_size.append(s.str());
 
@@ -435,7 +438,7 @@ static int create_with_omap(cls_method_context_t hctx,
   int new_size_int = omap.size();
   CLS_LOG(20, "omap insert: new size is %d", new_size_int);
   bufferlist new_size;
-  stringstream s;
+  std::stringstream s;
   s << new_size_int;
   new_size.append(s.str());
 
@@ -533,7 +536,7 @@ static int omap_remove(cls_method_context_t hctx,
   int new_size_int = old_size_int - omap.size();
   CLS_LOG(20, "old size is %d, new size is %d", old_size_int, new_size_int);
   bufferlist new_size;
-  stringstream s;
+  std::stringstream s;
   s << new_size_int;
   new_size.append(s.str());
 
diff --git a/src/key_value_store/key_value_structure.h b/src/key_value_store/key_value_structure.h
index c73adc1a1e58..e0408e583c37 100644
--- a/src/key_value_store/key_value_structure.h
+++ b/src/key_value_store/key_value_structure.h
@@ -18,9 +18,6 @@
 #include "include/utime.h"
 #include <vector>
 
-using std::string;
-using std::map;
-using std::set;
 using ceph::bufferlist;
 
 class KeyValueStructure;
@@ -39,7 +36,7 @@ typedef void (*callback)(int * err, void *arg);
 
 class KeyValueStructure{
 public:
-  map<char, int> opmap;
+  std::map<char, int> opmap;
 
   //these are injection methods. By default, nothing is called at each
   //interruption point.
@@ -77,18 +74,18 @@ public:
    * if update_on_existing is false, returns an error if
    * key already exists in the structure
    */
-  virtual int set(const string &key, const bufferlist &val,
+  virtual int set(const std::string &key, const bufferlist &val,
       bool update_on_existing) = 0;
 
   /**
    * efficiently insert the contents of in_map into the structure
    */
-  virtual int set_many(const map<string, bufferlist> &in_map) = 0;
+  virtual int set_many(const std::map<std::string, bufferlist> &in_map) = 0;
 
   /**
    * removes the key-value for key. returns an error if key does not exist
    */
-  virtual int remove(const string &key) = 0;
+  virtual int remove(const std::string &key) = 0;
 
   /**
    * removes all keys and values
@@ -99,19 +96,19 @@ public:
   /**
    * launches a thread to get the value of key. When complete, calls cb(cb_args)
    */
-  virtual void aio_get(const string &key, bufferlist *val, callback cb,
+  virtual void aio_get(const std::string &key, bufferlist *val, callback cb,
       void *cb_args, int * err) = 0;
 
   /**
    * launches a thread to set key to val. When complete, calls cb(cb_args)
    */
-  virtual void aio_set(const string &key, const bufferlist &val, bool exclusive,
+  virtual void aio_set(const std::string &key, const bufferlist &val, bool exclusive,
       callback cb, void * cb_args, int * err) = 0;
 
   /**
    * launches a thread to remove key. When complete, calls cb(cb_args)
    */
-  virtual void aio_remove(const string &key, callback cb, void *cb_args,
+  virtual void aio_remove(const std::string &key, callback cb, void *cb_args,
       int * err) = 0;
 
   ////////////////READERS////////////////////
@@ -122,17 +119,17 @@ public:
    * @param val the value is stored in this
    * @return error code
    */
-  virtual int get(const string &key, bufferlist *val) = 0;
+  virtual int get(const std::string &key, bufferlist *val) = 0;
 
   /**
    * stores all keys in keys. set should put them in order by key.
    */
-  virtual int get_all_keys(std::set<string> *keys) = 0;
+  virtual int get_all_keys(std::set<std::string> *keys) = 0;
 
   /**
    * stores all keys and values in kv_map. map should put them in order by key.
    */
-  virtual int get_all_keys_and_values(map<string,bufferlist> *kv_map) = 0;
+  virtual int get_all_keys_and_values(std::map<std::string,bufferlist> *kv_map) = 0;
 
   /**
    * True if the structure meets its own requirements for consistency.
@@ -142,7 +139,7 @@ public:
   /**
    * prints a string representation of the structure
    */
-  virtual string str() = 0;
+  virtual std::string str() = 0;
 };
 
 
diff --git a/src/key_value_store/kvs_arg_types.h b/src/key_value_store/kvs_arg_types.h
index 9798aec77dde..5bcc4b1311e4 100644
--- a/src/key_value_store/kvs_arg_types.h
+++ b/src/key_value_store/kvs_arg_types.h
@@ -37,7 +37,7 @@ struct assert_size_args {
 WRITE_CLASS_ENCODER(assert_size_args)
 
 struct idata_from_key_args {
-  string key;
+  std::string key;
   index_data idata;
   index_data next_idata;
 
@@ -78,7 +78,7 @@ struct idata_from_idata_args {
 WRITE_CLASS_ENCODER(idata_from_idata_args)
 
 struct omap_set_args {
-  map<string, bufferlist> omap;
+  std::map<std::string, bufferlist> omap;
   uint64_t bound;
   bool exclusive;
 
@@ -100,7 +100,7 @@ struct omap_set_args {
 WRITE_CLASS_ENCODER(omap_set_args)
 
 struct omap_rm_args {
-  std::set<string> omap;
+  std::set<std::string> omap;
   uint64_t bound;
 
   void encode(bufferlist &bl) const {