From: Sage Weil <sage@redhat.com>
Date: Thu, 18 Jun 2015 23:39:51 +0000 (-0700)
Subject: test: misc objectstore tests: use explicit ghobject_t ctor
X-Git-Tag: v9.0.3~52^2~3^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1d40bffd8fedbc1b9524973e7256e26cb5e5c74b;p=ceph.git

test: misc objectstore tests: use explicit ghobject_t ctor

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/test/streamtest.cc b/src/test/streamtest.cc
index d4ccadf18e1..7639a7668f8 100644
--- a/src/test/streamtest.cc
+++ b/src/test/streamtest.cc
@@ -159,7 +159,7 @@ int main(int argc, const char **argv)
 
     set_start(pos, ceph_clock_now(g_ceph_context));
     ObjectStore::Transaction *t = new ObjectStore::Transaction;
-    t->write(coll_t(), hobject_t(poid), pos, bytes, bl);
+    t->write(coll_t(), ghobject_t(hobject_t(poid)), pos, bytes, bl);
     fs->queue_transaction(NULL, t, new C_Ack(pos), new C_Commit(pos));
     pos += bytes;
 
diff --git a/src/test/test_trans.cc b/src/test/test_trans.cc
index 43821c13aec..aa81840ba26 100644
--- a/src/test/test_trans.cc
+++ b/src/test/test_trans.cc
@@ -65,7 +65,7 @@ int main(int argc, const char **argv)
     char f[30];
     snprintf(f, sizeof(f), "foo%d\n", i);
     sobject_t soid(f, CEPH_NOSNAP);
-    t.write(coll_t(), hobject_t(soid), 0, bl.length(), bl);
+    t.write(coll_t(), ghobject_t(hobject_t(soid)), 0, bl.length(), bl);
   }
   
   dout(0) << "starting thread" << dendl;
diff --git a/src/test/xattr_bench.cc b/src/test/xattr_bench.cc
index 38080000cce..6cf3edd9096 100644
--- a/src/test/xattr_bench.cc
+++ b/src/test/xattr_bench.cc
@@ -100,7 +100,7 @@ uint64_t do_run(ObjectStore *store, int attrsize, int numattrs,
       stringstream obj_str;
       obj_str << i;
       t.touch(coll,
-	      hobject_t(sobject_t(obj_str.str(), CEPH_NOSNAP)));
+	      ghobject_t(hobject_t(sobject_t(obj_str.str(), CEPH_NOSNAP))));
       objects.insert(obj_str.str());
     }
     collections[coll] = make_pair(objects, new ObjectStore::Sequencer(coll.to_str()));
@@ -129,7 +129,7 @@ uint64_t do_run(ObjectStore *store, int attrsize, int numattrs,
 	stringstream ss;
 	ss << i << ", " << j << ", " << *obj;
 	t->setattr(iter->first,
-		   hobject_t(sobject_t(*obj, CEPH_NOSNAP)),
+		   ghobject_t(hobject_t(sobject_t(*obj, CEPH_NOSNAP))),
 		   ss.str().c_str(),
 		   bl);
       }