import quincy beta 17.1.0

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

diff --git a/ceph/src/rocksdb/db/fault_injection_test.cc b/ceph/src/rocksdb/db/fault_injection_test.cc
index f4ca3458a9118b5f2d1977c306a4f1cdadb40f9f..db6da361387e1d4aa41052e7dc8b8dba4ecc4cee 100644 (file)
--- a/ceph/src/rocksdb/db/fault_injection_test.cc
+++ b/ceph/src/rocksdb/db/fault_injection_test.cc
@@ -16,17 +16,17 @@
 #include "db/version_set.h"
 #include "env/mock_env.h"
 #include "file/filename.h"
-#include "logging/logging.h"
 #include "rocksdb/cache.h"
 #include "rocksdb/db.h"
 #include "rocksdb/env.h"
 #include "rocksdb/table.h"
 #include "rocksdb/write_batch.h"
-#include "test_util/fault_injection_test_env.h"
 #include "test_util/sync_point.h"
 #include "test_util/testharness.h"
 #include "test_util/testutil.h"
 #include "util/mutexlock.h"
+#include "util/random.h"
+#include "utilities/fault_injection_env.h"
 
 namespace ROCKSDB_NAMESPACE {
 
@@ -249,7 +249,8 @@ class FaultInjectionTest
   // Return the value to associate with the specified key
   Slice Value(int k, std::string* storage) const {
     Random r(k);
-    return test::RandomString(&r, kValueSize, storage);
+    *storage = r.RandomString(kValueSize);
+    return Slice(*storage);
   }
 
   void CloseDB() {