RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2024-12-17 08:57:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #16690 from scienceluo/wip-luo-unused-var-branch

Browse Source 
common/rgw/rbd: remove some unused variables

Reviewed-by: Jos Collin <jcollin@redhat.com>
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
This commit is contained in:
Yuri Weinstein 2017-08-02 08:57:33 -07:00 committed by GitHub
commit 36430b9f50
7 changed files with 0 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/common/options.cc
View File

@ -88,7 +88,6 @@ void Option::dump(Formatter *f) const
f->dump_string("name", name);
f->dump_string("type", type_to_str(type));
std::string level_str;
f->dump_string("level", level_to_str(level));

1
src/rgw/rgw_admin.cc
View File

@ -2215,7 +2215,6 @@ static void sync_status(Formatter *formatter)
for (auto iter : store->zone_conn_map) {
const string& source_id = iter.first;
string zone_name;
string source_str = "source: ";
string s = source_str + source_id;
auto siter = store->zone_by_id.find(source_id);

1
src/rgw/rgw_bucket.cc
View File

@ -1323,7 +1323,6 @@ int RGWBucketAdminOp::check_index(RGWRados *store, RGWBucketAdminOpState& op_sta
RGWFormatterFlusher& flusher)
{
int ret;
map<string, rgw_bucket_dir_entry> result;
map<RGWObjCategory, RGWStorageStats> existing_stats;
map<RGWObjCategory, RGWStorageStats> calculated_stats;

1
src/rgw/rgw_common.h
View File

@ -1630,7 +1630,6 @@ struct rgw_obj_key {
* part of the given namespace, it returns false.
*/
static bool oid_to_key_in_ns(const string& oid, rgw_obj_key *key, const string& ns) {
string obj_ns;
bool ret = parse_raw_oid(oid, key);
if (!ret) {
return ret;

2
src/rgw/rgw_es_main.cc
View File

@ -22,8 +22,6 @@ int main(int argc, char *argv[])
common_init_finish(g_ceph_context);
list<string> infix;
string expr;
if (argc > 1) {

5
src/rgw/rgw_rados.cc
View File

@ -8122,7 +8122,6 @@ int RGWRados::copy_obj(RGWObjectCtx& obj_ctx,
if (tail_placement.bucket.name.empty()) {
manifest.set_tail_placement(tail_placement.placement_rule, src_obj.bucket);
}
string oid, key;
for (; miter != astate->manifest.obj_end(); ++miter) {
ObjectWriteOperation op;
cls_refcount_get(op, tag, true);
@ -8176,8 +8175,6 @@ done_ret:
if (!copy_itself) {
vector<rgw_raw_obj>::iterator riter;
string oid, key;
/* rollback reference */
for (riter = ref_objs.begin(); riter != ref_objs.end(); ++riter) {
ObjectWriteOperation op;
@ -10092,7 +10089,6 @@ int RGWRados::Object::Read::read(int64_t ofs, int64_t end, bufferlist& bl)
RGWRados *store = source->get_store();
CephContext *cct = store->ctx();
std::string oid, key;
rgw_raw_obj read_obj;
uint64_t read_ofs = ofs;
uint64_t len, read_len;
@ -11588,7 +11584,6 @@ int RGWRados::get_bucket_stats(RGWBucketInfo& bucket_info, int shard_id, string
BucketIndexShardsManager ver_mgr;
BucketIndexShardsManager master_ver_mgr;
BucketIndexShardsManager marker_mgr;
string shard_marker;
char buf[64];
for(; iter != headers.end(); ++iter, ++viter) {
accumulate_raw_stats(iter->second, stats);

2
src/test/cls_rbd/test_cls_rbd.cc
View File

@ -1013,7 +1013,6 @@ TEST_F(TestClsRbd, snapshots_namespaces)
ASSERT_EQ(0, create_image(&ioctx, oid, 10, 22, 0, oid, -1));
vector<string> snap_names;
vector<cls::rbd::SnapshotNamespace> snap_namespaces;
SnapContext snapc;
@ -1051,7 +1050,6 @@ TEST_F(TestClsRbd, snapshots_timestamps)
ASSERT_EQ(0, create_image(&ioctx, oid, 10, 22, 0, oid, -1));
vector<string> snap_names;
vector<utime_t> snap_timestamps;
SnapContext snapc;