update sources to ceph Nautilus 14.2.1

[ceph.git] / ceph / src / test / ObjectMap / test_keyvaluedb_atomicity.cc

diff --git a/ceph/src/test/ObjectMap/test_keyvaluedb_atomicity.cc b/ceph/src/test/ObjectMap/test_keyvaluedb_atomicity.cc
index 6e7fc8d2fa775ca8ab48eaa7608d76c1142e9631..f93e68c4aafeb743b23d9603f248a21093d33e34 100644 (file)
--- a/ceph/src/test/ObjectMap/test_keyvaluedb_atomicity.cc
+++ b/ceph/src/test/ObjectMap/test_keyvaluedb_atomicity.cc
@@ -6,7 +6,6 @@
 #include <dirent.h>
 #include <string>
 #include <vector>
-#include "include/memory.h"
 #include <boost/scoped_ptr.hpp>
 #include <iostream>
 #include <sstream>
@@ -38,8 +37,8 @@ int verify(KeyValueDB *db) {
       for (map<int, KeyValueDB::Iterator>::iterator i = iterators.begin();
           i != iterators.end();
           ++i) {
-       assert(i->second->valid());
-       assert(i->second->key() == iterators.rbegin()->second->key());
+       ceph_assert(i->second->valid());
+       ceph_assert(i->second->key() == iterators.rbegin()->second->key());
        bufferlist r = i->second->value();
        bufferlist l = iterators.rbegin()->second->value();
        i->second->next();
@@ -48,7 +47,7 @@ int verify(KeyValueDB *db) {
     for (map<int, KeyValueDB::Iterator>::iterator i = iterators.begin();
         i != iterators.end();
         ++i) {
-      assert(!i->second->valid());
+      ceph_assert(!i->second->valid());
     }
   }
   return 0;
@@ -74,7 +73,7 @@ void *write(void *_db) {
     for (int j = 0; j < NUM_COPIES; ++j) {
       t->set(prefix_gen(j), to_set);
     }
-    assert(!db->submit_transaction(t));
+    ceph_assert(!db->submit_transaction(t));
   }
   return 0;
 }
@@ -89,7 +88,7 @@ int main() {
   string strpath(path);
   std::cerr << "Using path: " << strpath << std::endl;
   KeyValueDB *store = KeyValueDB::create(g_ceph_context, "leveldb", strpath);
-  assert(!store->create_and_open(std::cerr));
+  ceph_assert(!store->create_and_open(std::cerr));
   db.reset(store);
 
   verify(db.get());