journal: Use unqualified encode/decode

This is a portion of the namespace project.

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>

diff --git a/src/journal/Entry.cc b/src/journal/Entry.cc
index 257fa583af5e4eb8fd48508f659d751ae5952855..988faf43eda066923c0be30b619593fa498cfa5a 100644 (file)
--- a/src/journal/Entry.cc
+++ b/src/journal/Entry.cc
@@ -25,42 +25,44 @@ uint32_t Entry::get_fixed_size() {
 }
 
 void Entry::encode(bufferlist &bl) const {
+  using ceph::encode;
   bufferlist data_bl;
-  ::encode(preamble, data_bl);
-  ::encode(static_cast<uint8_t>(1), data_bl);
-  ::encode(m_entry_tid, data_bl);
-  ::encode(m_tag_tid, data_bl);
-  ::encode(m_data, data_bl);
+  encode(preamble, data_bl);
+  encode(static_cast<uint8_t>(1), data_bl);
+  encode(m_entry_tid, data_bl);
+  encode(m_tag_tid, data_bl);
+  encode(m_data, data_bl);
 
   uint32_t crc = data_bl.crc32c(0);
   uint32_t bl_offset = bl.length();
   bl.claim_append(data_bl);
-  ::encode(crc, bl);
+  encode(crc, bl);
   assert(get_fixed_size() + m_data.length() + bl_offset == bl.length());
 }
 
 void Entry::decode(bufferlist::iterator &iter) {
+  using ceph::decode;
   uint32_t start_offset = iter.get_off();
   uint64_t bl_preamble;
-  ::decode(bl_preamble, iter);
+  decode(bl_preamble, iter);
   if (bl_preamble != preamble) {
     throw buffer::malformed_input("incorrect preamble: " +
                                   stringify(bl_preamble));
   }
 
   uint8_t version;
-  ::decode(version, iter);
+  decode(version, iter);
   if (version != 1) {
     throw buffer::malformed_input("unknown version: " + stringify(version));
   }
 
-  ::decode(m_entry_tid, iter);
-  ::decode(m_tag_tid, iter);
-  ::decode(m_data, iter);
+  decode(m_entry_tid, iter);
+  decode(m_tag_tid, iter);
+  decode(m_data, iter);
   uint32_t end_offset = iter.get_off();
 
   uint32_t crc;
-  ::decode(crc, iter);
+  decode(crc, iter);
 
   bufferlist data_bl;
   data_bl.substr_of(iter.get_bl(), start_offset, end_offset - start_offset);
@@ -81,13 +83,14 @@ void Entry::dump(Formatter *f) const {
 }
 
 bool Entry::is_readable(bufferlist::iterator iter, uint32_t *bytes_needed) {
+  using ceph::decode;
   uint32_t start_off = iter.get_off();
   if (iter.get_remaining() < HEADER_FIXED_SIZE) {
     *bytes_needed = HEADER_FIXED_SIZE - iter.get_remaining();
     return false;
   }
   uint64_t bl_preamble;
-  ::decode(bl_preamble, iter);
+  decode(bl_preamble, iter);
   if (bl_preamble != preamble) {
     *bytes_needed = 0;
     return false;
@@ -99,7 +102,7 @@ bool Entry::is_readable(bufferlist::iterator iter, uint32_t *bytes_needed) {
     return false;
   }
   uint32_t data_size;
-  ::decode(data_size, iter);
+  decode(data_size, iter);
 
   if (iter.get_remaining() < data_size) {
     *bytes_needed = data_size - iter.get_remaining();
@@ -118,7 +121,7 @@ bool Entry::is_readable(bufferlist::iterator iter, uint32_t *bytes_needed) {
 
   *bytes_needed = 0;
   uint32_t crc;
-  ::decode(crc, iter);
+  decode(crc, iter);
   if (crc != crc_bl.crc32c(0)) {
     return false;
   }

diff --git a/src/journal/Entry.h b/src/journal/Entry.h
index 7867a19a3bfe65863782b65200c28c7e3fbd7675..01b4833bc03f25615f8e0ad2e25bf1d189b9d649 100644 (file)
--- a/src/journal/Entry.h
+++ b/src/journal/Entry.h
@@ -54,11 +54,9 @@ private:
 };
 
 std::ostream &operator<<(std::ostream &os, const Entry &entry);
+WRITE_CLASS_ENCODER(journal::Entry)
 
 } // namespace journal
 
-using journal::operator<<;
-
-WRITE_CLASS_ENCODER(journal::Entry)
 
 #endif // CEPH_JOURNAL_ENTRY_H

diff --git a/src/journal/JournalRecorder.cc b/src/journal/JournalRecorder.cc
index 9c38758fccaa787e3cc132a8d31a5448e5f5297f..c7d8cd1ac1efb9f43cf946932286f2e4415dea99 100644 (file)
--- a/src/journal/JournalRecorder.cc
+++ b/src/journal/JournalRecorder.cc
@@ -103,8 +103,8 @@ Future JournalRecorder::append(uint64_t tag_tid,
   m_lock.Unlock();
 
   bufferlist entry_bl;
-  ::encode(Entry(future->get_tag_tid(), future->get_entry_tid(), payload_bl),
-           entry_bl);
+  encode(Entry(future->get_tag_tid(), future->get_entry_tid(), payload_bl),
+        entry_bl);
   assert(entry_bl.length() <= m_journal_metadata->get_object_size());
 
   bool object_full = object_ptr->append_unlock({{future, entry_bl}});

diff --git a/src/journal/ObjectPlayer.cc b/src/journal/ObjectPlayer.cc
index 8292ebb1abfcb5801fed45ee62df2eceb87fd1c4..d5a8b0d6078e2c9bde0b5533672117b28030a83f 100644 (file)
--- a/src/journal/ObjectPlayer.cc
+++ b/src/journal/ObjectPlayer.cc
@@ -160,7 +160,7 @@ int ObjectPlayer::handle_fetch_complete(int r, const bufferlist &bl,
     }
 
     Entry entry;
-    ::decode(entry, iter);
+    decode(entry, iter);
     ldout(m_cct, 20) << ": " << entry << " decoded" << dendl;
 
     uint32_t entry_len = iter.get_off() - bl_off;

diff --git a/src/test/journal/test_Entry.cc b/src/test/journal/test_Entry.cc
index 44fbb0fe2304c62f615ac5d97adeda9c27c69d04..49b060ecbde87894e57f3fe508c475289bfb0634 100644 (file)
--- a/src/test/journal/test_Entry.cc
+++ b/src/test/journal/test_Entry.cc
@@ -39,7 +39,7 @@ TEST_F(TestEntry, IsReadable) {
   journal::Entry entry(234, 123, data);
 
   bufferlist full_bl;
-  ::encode(entry, full_bl);
+  encode(entry, full_bl);
 
   uint32_t bytes_needed;
   for (size_t i = 0; i < full_bl.length() - 1; ++i) {
@@ -63,7 +63,7 @@ TEST_F(TestEntry, IsReadableBadPreamble) {
   uint64_t stray_bytes = 0x1122334455667788;
   bufferlist full_bl;
   ::encode(stray_bytes, full_bl);
-  ::encode(entry, full_bl);
+  encode(entry, full_bl);
 
   uint32_t bytes_needed;
   bufferlist::iterator it = full_bl.begin();
@@ -81,7 +81,7 @@ TEST_F(TestEntry, IsReadableBadCRC) {
   journal::Entry entry(234, 123, data);
 
   bufferlist full_bl;
-  ::encode(entry, full_bl);
+  encode(entry, full_bl);
 
   bufferlist bad_bl;
   bad_bl.substr_of(full_bl, 0, full_bl.length() - 4);

diff --git a/src/test/journal/test_JournalPlayer.cc b/src/test/journal/test_JournalPlayer.cc
index 7522198ec18ace9465f198c96279c6268457174d..3ae04c07ad94b6635d896f017e5aa6f3479f0ef3 100644 (file)
--- a/src/test/journal/test_JournalPlayer.cc
+++ b/src/test/journal/test_JournalPlayer.cc
@@ -127,7 +127,7 @@ public:
   int write_entry(const std::string &oid, uint64_t object_num,
                   uint64_t tag_tid, uint64_t entry_tid) {
     bufferlist bl;
-    ::encode(create_entry(tag_tid, entry_tid), bl);
+    encode(create_entry(tag_tid, entry_tid), bl);
     return append(oid + "." + stringify(object_num), bl);
   }
 

diff --git a/src/test/journal/test_ObjectPlayer.cc b/src/test/journal/test_ObjectPlayer.cc
index 90a3334a7aa20a61cceb63d7a2ce4f68a344f065..661a9eb36064d97ee749e69ab9a7ae02bc8e4d16 100644 (file)
--- a/src/test/journal/test_ObjectPlayer.cc
+++ b/src/test/journal/test_ObjectPlayer.cc
@@ -78,8 +78,8 @@ TYPED_TEST(TestObjectPlayer, Fetch) {
   journal::Entry entry2(234, 124, this->create_payload(std::string(24, '1')));
 
   bufferlist bl;
-  ::encode(entry1, bl);
-  ::encode(entry2, bl);
+  encode(entry1, bl);
+  encode(entry2, bl);
   ASSERT_EQ(0, this->append(this->get_object_name(oid), bl));
 
   journal::ObjectPlayerPtr object = this->create_object(oid, 14);
@@ -101,8 +101,8 @@ TYPED_TEST(TestObjectPlayer, FetchLarge) {
   journal::Entry entry2(234, 124, this->create_payload(""));
 
   bufferlist bl;
-  ::encode(entry1, bl);
-  ::encode(entry2, bl);
+  encode(entry1, bl);
+  encode(entry2, bl);
   ASSERT_EQ(0, this->append(this->get_object_name(oid), bl));
 
   journal::ObjectPlayerPtr object = this->create_object(oid, 12);
@@ -123,8 +123,8 @@ TYPED_TEST(TestObjectPlayer, FetchDeDup) {
   journal::Entry entry2(234, 123, this->create_payload(std::string(24, '2')));
 
   bufferlist bl;
-  ::encode(entry1, bl);
-  ::encode(entry2, bl);
+  encode(entry1, bl);
+  encode(entry2, bl);
   ASSERT_EQ(0, this->append(this->get_object_name(oid), bl));
 
   journal::ObjectPlayerPtr object = this->create_object(oid, 14);
@@ -157,9 +157,9 @@ TYPED_TEST(TestObjectPlayer, FetchCorrupt) {
   journal::Entry entry2(234, 124, this->create_payload(std::string(24, '2')));
 
   bufferlist bl;
-  ::encode(entry1, bl);
+  encode(entry1, bl);
   ::encode(this->create_payload("corruption"), bl);
-  ::encode(entry2, bl);
+  encode(entry2, bl);
   ASSERT_EQ(0, this->append(this->get_object_name(oid), bl));
 
   journal::ObjectPlayerPtr object = this->create_object(oid, 14);
@@ -180,7 +180,7 @@ TYPED_TEST(TestObjectPlayer, FetchAppend) {
   journal::Entry entry2(234, 124, this->create_payload(std::string(24, '2')));
 
   bufferlist bl;
-  ::encode(entry1, bl);
+  encode(entry1, bl);
   ASSERT_EQ(0, this->append(this->get_object_name(oid), bl));
 
   journal::ObjectPlayerPtr object = this->create_object(oid, 14);
@@ -194,7 +194,7 @@ TYPED_TEST(TestObjectPlayer, FetchAppend) {
   ASSERT_EQ(expected_entries, entries);
 
   bl.clear();
-  ::encode(entry2, bl);
+  encode(entry2, bl);
   ASSERT_EQ(0, this->append(this->get_object_name(oid), bl));
   ASSERT_LE(0, this->fetch(object));
 
@@ -212,8 +212,8 @@ TYPED_TEST(TestObjectPlayer, PopEntry) {
   journal::Entry entry2(234, 124, this->create_payload(std::string(24, '1')));
 
   bufferlist bl;
-  ::encode(entry1, bl);
-  ::encode(entry2, bl);
+  encode(entry1, bl);
+  encode(entry2, bl);
   ASSERT_EQ(0, this->append(this->get_object_name(oid), bl));
 
   journal::ObjectPlayerPtr object = this->create_object(oid, 14);
@@ -244,7 +244,7 @@ TYPED_TEST(TestObjectPlayer, Watch) {
   journal::Entry entry2(234, 124, this->create_payload(std::string(24, '1')));
 
   bufferlist bl;
-  ::encode(entry1, bl);
+  encode(entry1, bl);
   ASSERT_EQ(0, this->append(this->get_object_name(oid), bl));
   ASSERT_LE(0, cond1.wait());
 
@@ -260,7 +260,7 @@ TYPED_TEST(TestObjectPlayer, Watch) {
   object->watch(&cond2, 0.1);
 
   bl.clear();
-  ::encode(entry2, bl);
+  encode(entry2, bl);
   ASSERT_EQ(0, this->append(this->get_object_name(oid), bl));
   ASSERT_LE(0, cond2.wait());