Commit 424cf726 authored by Yuan's avatar Yuan Committed by yiwu-arbug

misc: unified scope for unique_ptr (#24)

parent b4b4181a
...@@ -287,7 +287,7 @@ Status BlobGCJob::DoRunGC() { ...@@ -287,7 +287,7 @@ Status BlobGCJob::DoRunGC() {
if (!s.ok()) { if (!s.ok()) {
break; break;
} }
blob_file_builder = unique_ptr<BlobFileBuilder>( blob_file_builder = std::unique_ptr<BlobFileBuilder>(
new BlobFileBuilder(db_options_, blob_gc_->titan_cf_options(), new BlobFileBuilder(db_options_, blob_gc_->titan_cf_options(),
blob_file_handle->GetFile())); blob_file_handle->GetFile()));
file_size = 0; file_size = 0;
...@@ -339,7 +339,8 @@ Status BlobGCJob::DoRunGC() { ...@@ -339,7 +339,8 @@ Status BlobGCJob::DoRunGC() {
return s; return s;
} }
Status BlobGCJob::BuildIterator(unique_ptr<BlobFileMergeIterator>* result) { Status BlobGCJob::BuildIterator(
std::unique_ptr<BlobFileMergeIterator>* result) {
Status s; Status s;
const auto& inputs = blob_gc_->sampled_inputs(); const auto& inputs = blob_gc_->sampled_inputs();
assert(!inputs.empty()); assert(!inputs.empty());
......
...@@ -1192,7 +1192,7 @@ class ReportFileOpEnv : public EnvWrapper { ...@@ -1192,7 +1192,7 @@ class ReportFileOpEnv : public EnvWrapper {
ReportFileOpCounters* counters_; ReportFileOpCounters* counters_;
public: public:
CountingFile(unique_ptr<SequentialFile>&& target, CountingFile(std::unique_ptr<SequentialFile>&& target,
ReportFileOpCounters* counters) ReportFileOpCounters* counters)
: target_(std::move(target)), counters_(counters) {} : target_(std::move(target)), counters_(counters) {}
...@@ -1224,7 +1224,7 @@ class ReportFileOpEnv : public EnvWrapper { ...@@ -1224,7 +1224,7 @@ class ReportFileOpEnv : public EnvWrapper {
ReportFileOpCounters* counters_; ReportFileOpCounters* counters_;
public: public:
CountingFile(unique_ptr<RandomAccessFile>&& target, CountingFile(std::unique_ptr<RandomAccessFile>&& target,
ReportFileOpCounters* counters) ReportFileOpCounters* counters)
: target_(std::move(target)), counters_(counters) {} : target_(std::move(target)), counters_(counters) {}
virtual Status Read(uint64_t offset, size_t n, Slice* result, virtual Status Read(uint64_t offset, size_t n, Slice* result,
...@@ -1253,7 +1253,7 @@ class ReportFileOpEnv : public EnvWrapper { ...@@ -1253,7 +1253,7 @@ class ReportFileOpEnv : public EnvWrapper {
ReportFileOpCounters* counters_; ReportFileOpCounters* counters_;
public: public:
CountingFile(unique_ptr<WritableFile>&& target, CountingFile(std::unique_ptr<WritableFile>&& target,
ReportFileOpCounters* counters) ReportFileOpCounters* counters)
: target_(std::move(target)), counters_(counters) {} : target_(std::move(target)), counters_(counters) {}
......
...@@ -902,7 +902,7 @@ class SharedState { ...@@ -902,7 +902,7 @@ class SharedState {
if (status.ok()) { if (status.ok()) {
status = FLAGS_env->GetFileSize(FLAGS_expected_values_path, &size); status = FLAGS_env->GetFileSize(FLAGS_expected_values_path, &size);
} }
unique_ptr<WritableFile> wfile; std::unique_ptr<WritableFile> wfile;
if (status.ok() && size == 0) { if (status.ok() && size == 0) {
const EnvOptions soptions; const EnvOptions soptions;
status = FLAGS_env->NewWritableFile(FLAGS_expected_values_path, &wfile, status = FLAGS_env->NewWritableFile(FLAGS_expected_values_path, &wfile,
...@@ -2444,7 +2444,7 @@ class NonBatchedOpsStressTest : public StressTest { ...@@ -2444,7 +2444,7 @@ class NonBatchedOpsStressTest : public StressTest {
} }
if (!thread->rand.OneIn(2)) { if (!thread->rand.OneIn(2)) {
// Use iterator to verify this range // Use iterator to verify this range
unique_ptr<Iterator> iter( std::unique_ptr<Iterator> iter(
db_->NewIterator(options, column_families_[cf])); db_->NewIterator(options, column_families_[cf]));
iter->Seek(Key(start)); iter->Seek(Key(start));
for (auto i = start; i < end; i++) { for (auto i = start; i < end; i++) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment