update source to Ceph Pacific 16.2.2

[ceph.git] / ceph / src / rocksdb / db / manual_compaction_test.cc

diff --git a/ceph/src/rocksdb/db/manual_compaction_test.cc b/ceph/src/rocksdb/db/manual_compaction_test.cc
index 02732a555830050c05c79d280938d64bda240ed7..22cd919b517e59646dffd4071a3bc6d5444e5553 100644 (file)
--- a/ceph/src/rocksdb/db/manual_compaction_test.cc
+++ b/ceph/src/rocksdb/db/manual_compaction_test.cc
@@ -8,14 +8,14 @@
 #include <sstream>
 #include <cstdlib>
 
-#include "rocksdb/db.h"
+#include "port/port.h"
 #include "rocksdb/compaction_filter.h"
+#include "rocksdb/db.h"
 #include "rocksdb/slice.h"
 #include "rocksdb/write_batch.h"
-#include "util/testharness.h"
-#include "port/port.h"
+#include "test_util/testharness.h"
 
-using namespace rocksdb;
+using namespace ROCKSDB_NAMESPACE;
 
 namespace {
 
@@ -40,8 +40,8 @@ class ManualCompactionTest : public testing::Test {
  public:
   ManualCompactionTest() {
     // Get rid of any state from an old run.
-    dbname_ = rocksdb::test::PerThreadDBPath("rocksdb_cbug_test");
-    DestroyDB(dbname_, rocksdb::Options());
+    dbname_ = ROCKSDB_NAMESPACE::test::PerThreadDBPath("rocksdb_cbug_test");
+    DestroyDB(dbname_, ROCKSDB_NAMESPACE::Options());
   }
 
   std::string dbname_;
@@ -71,7 +71,7 @@ TEST_F(ManualCompactionTest, CompactTouchesAllKeys) {
       options.compaction_style = kCompactionStyleUniversal;
     }
     options.create_if_missing = true;
-    options.compression = rocksdb::kNoCompression;
+    options.compression = ROCKSDB_NAMESPACE::kNoCompression;
     options.compaction_filter = new DestroyAllCompactionFilter();
     ASSERT_OK(DB::Open(options, dbname_, &db));
 
@@ -100,45 +100,46 @@ TEST_F(ManualCompactionTest, Test) {
   // Open database.  Disable compression since it affects the creation
   // of layers and the code below is trying to test against a very
   // specific scenario.
-  rocksdb::DB* db;
-  rocksdb::Options db_options;
+  ROCKSDB_NAMESPACE::DB* db;
+  ROCKSDB_NAMESPACE::Options db_options;
   db_options.write_buffer_size = 1024;
   db_options.create_if_missing = true;
-  db_options.compression = rocksdb::kNoCompression;
-  ASSERT_OK(rocksdb::DB::Open(db_options, dbname_, &db));
+  db_options.compression = ROCKSDB_NAMESPACE::kNoCompression;
+  ASSERT_OK(ROCKSDB_NAMESPACE::DB::Open(db_options, dbname_, &db));
 
   // create first key range
-  rocksdb::WriteBatch batch;
+  ROCKSDB_NAMESPACE::WriteBatch batch;
   for (int i = 0; i < kNumKeys; i++) {
     batch.Put(Key1(i), "value for range 1 key");
   }
-  ASSERT_OK(db->Write(rocksdb::WriteOptions(), &batch));
+  ASSERT_OK(db->Write(ROCKSDB_NAMESPACE::WriteOptions(), &batch));
 
   // create second key range
   batch.Clear();
   for (int i = 0; i < kNumKeys; i++) {
     batch.Put(Key2(i), "value for range 2 key");
   }
-  ASSERT_OK(db->Write(rocksdb::WriteOptions(), &batch));
+  ASSERT_OK(db->Write(ROCKSDB_NAMESPACE::WriteOptions(), &batch));
 
   // delete second key range
   batch.Clear();
   for (int i = 0; i < kNumKeys; i++) {
     batch.Delete(Key2(i));
   }
-  ASSERT_OK(db->Write(rocksdb::WriteOptions(), &batch));
+  ASSERT_OK(db->Write(ROCKSDB_NAMESPACE::WriteOptions(), &batch));
 
   // compact database
   std::string start_key = Key1(0);
   std::string end_key = Key1(kNumKeys - 1);
-  rocksdb::Slice least(start_key.data(), start_key.size());
-  rocksdb::Slice greatest(end_key.data(), end_key.size());
+  ROCKSDB_NAMESPACE::Slice least(start_key.data(), start_key.size());
+  ROCKSDB_NAMESPACE::Slice greatest(end_key.data(), end_key.size());
 
   // commenting out the line below causes the example to work correctly
   db->CompactRange(CompactRangeOptions(), &least, &greatest);
 
   // count the keys
-  rocksdb::Iterator* iter = db->NewIterator(rocksdb::ReadOptions());
+  ROCKSDB_NAMESPACE::Iterator* iter =
+      db->NewIterator(ROCKSDB_NAMESPACE::ReadOptions());
   int num_keys = 0;
   for (iter->SeekToFirst(); iter->Valid(); iter->Next()) {
     num_keys++;
@@ -148,7 +149,7 @@ TEST_F(ManualCompactionTest, Test) {
 
   // close database
   delete db;
-  DestroyDB(dbname_, rocksdb::Options());
+  DestroyDB(dbname_, ROCKSDB_NAMESPACE::Options());
 }
 
 }  // anonymous namespace