dolysis
/
rocksdb
mirror of https://github.com/facebook/rocksdb.git
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Move compacted_db_impl.[c|h] to db/db_impl (#8082) 

Summary:
As title. All core db implementations should stay in db_impl.

Pull Request resolved: https://github.com/facebook/rocksdb/pull/8082

Test Plan: make check

Reviewed By: ajkr

Differential Revision: D27211442

Pulled By: riversand963

fbshipit-source-id: e0953fde75064740e899aaff7989ff033b7f5232
This commit is contained in:
Yanqin Jin 2021-03-23 13:47:56 -07:00 committed by Facebook GitHub Bot
parent e1aa8c160f
commit 9f7c02dad5
6 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -583,7 +583,6 @@ set(SOURCES
db/builder.cc db/builder.cc
db/c.cc db/c.cc
db/column_family.cc db/column_family.cc
db/compacted_db_impl.cc
db/compaction/compaction.cc db/compaction/compaction.cc
db/compaction/compaction_iterator.cc db/compaction/compaction_iterator.cc
db/compaction/compaction_picker.cc db/compaction/compaction_picker.cc
@ -594,6 +593,7 @@ set(SOURCES
db/compaction/sst_partitioner.cc db/compaction/sst_partitioner.cc
db/convenience.cc db/convenience.cc
db/db_filesnapshot.cc db/db_filesnapshot.cc
db/db_impl/compacted_db_impl.cc
db/db_impl/db_impl.cc db/db_impl/db_impl.cc
db/db_impl/db_impl_write.cc db/db_impl/db_impl_write.cc
db/db_impl/db_impl_compaction_flush.cc db/db_impl/db_impl_compaction_flush.cc

4
TARGETS
View File

@ -146,7 +146,6 @@ cpp_library(
"db/builder.cc", "db/builder.cc",
"db/c.cc", "db/c.cc",
"db/column_family.cc", "db/column_family.cc",
"db/compacted_db_impl.cc",
"db/compaction/compaction.cc", "db/compaction/compaction.cc",
"db/compaction/compaction_iterator.cc", "db/compaction/compaction_iterator.cc",
"db/compaction/compaction_job.cc", "db/compaction/compaction_job.cc",
@ -157,6 +156,7 @@ cpp_library(
"db/compaction/sst_partitioner.cc", "db/compaction/sst_partitioner.cc",
"db/convenience.cc", "db/convenience.cc",
"db/db_filesnapshot.cc", "db/db_filesnapshot.cc",
"db/db_impl/compacted_db_impl.cc",
"db/db_impl/db_impl.cc", "db/db_impl/db_impl.cc",
"db/db_impl/db_impl_compaction_flush.cc", "db/db_impl/db_impl_compaction_flush.cc",
"db/db_impl/db_impl_debug.cc", "db/db_impl/db_impl_debug.cc",
@ -453,7 +453,6 @@ cpp_library(
"db/builder.cc", "db/builder.cc",
"db/c.cc", "db/c.cc",
"db/column_family.cc", "db/column_family.cc",
"db/compacted_db_impl.cc",
"db/compaction/compaction.cc", "db/compaction/compaction.cc",
"db/compaction/compaction_iterator.cc", "db/compaction/compaction_iterator.cc",
"db/compaction/compaction_job.cc", "db/compaction/compaction_job.cc",
@ -464,6 +463,7 @@ cpp_library(
"db/compaction/sst_partitioner.cc", "db/compaction/sst_partitioner.cc",
"db/convenience.cc", "db/convenience.cc",
"db/db_filesnapshot.cc", "db/db_filesnapshot.cc",
"db/db_impl/compacted_db_impl.cc",
"db/db_impl/db_impl.cc", "db/db_impl/db_impl.cc",
"db/db_impl/db_impl_compaction_flush.cc", "db/db_impl/db_impl_compaction_flush.cc",
"db/db_impl/db_impl_debug.cc", "db/db_impl/db_impl_debug.cc",

3
db/compacted_db_impl.cc → db/db_impl/compacted_db_impl.cc
View File

@ -4,7 +4,7 @@
// (found in the LICENSE.Apache file in the root directory). // (found in the LICENSE.Apache file in the root directory).
#ifndef ROCKSDB_LITE #ifndef ROCKSDB_LITE
#include "db/compacted_db_impl.h" #include "db/db_impl/compacted_db_impl.h"
#include "db/db_impl/db_impl.h" #include "db/db_impl/db_impl.h"
#include "db/version_set.h" #include "db/version_set.h"
@ -78,6 +78,7 @@ std::vector<Status> CompactedDBImpl::MultiGet(const ReadOptions& options,
nullptr, nullptr, nullptr, true, nullptr, nullptr); nullptr, nullptr, nullptr, true, nullptr, nullptr);
LookupKey lkey(keys[idx], kMaxSequenceNumber); LookupKey lkey(keys[idx], kMaxSequenceNumber);
Status s = r->Get(options, lkey.internal_key(), &get_context, nullptr); Status s = r->Get(options, lkey.internal_key(), &get_context, nullptr);
assert(static_cast<size_t>(idx) < statuses.size());
if (!s.ok() && !s.IsNotFound()) { if (!s.ok() && !s.IsNotFound()) {
statuses[idx] = s; statuses[idx] = s;
} else { } else {

2
db/compacted_db_impl.h → db/db_impl/compacted_db_impl.h
View File

@ -18,7 +18,7 @@ class CompactedDBImpl : public DBImpl {
CompactedDBImpl(const CompactedDBImpl&) = delete; CompactedDBImpl(const CompactedDBImpl&) = delete;
void operator=(const CompactedDBImpl&) = delete; void operator=(const CompactedDBImpl&) = delete;
virtual ~CompactedDBImpl(); ~CompactedDBImpl() override;
static Status Open(const Options& options, const std::string& dbname, static Status Open(const Options& options, const std::string& dbname,
DB** dbptr); DB** dbptr);

2
db/db_impl/db_impl_readonly.cc
View File

@ -6,7 +6,7 @@
#include "db/db_impl/db_impl_readonly.h" #include "db/db_impl/db_impl_readonly.h"
#include "db/arena_wrapped_db_iter.h" #include "db/arena_wrapped_db_iter.h"
#include "db/compacted_db_impl.h" #include "db/db_impl/compacted_db_impl.h"
#include "db/db_impl/db_impl.h" #include "db/db_impl/db_impl.h"
#include "db/db_iter.h" #include "db/db_iter.h"
#include "db/merge_context.h" #include "db/merge_context.h"

2
src.mk
View File

@ -17,7 +17,6 @@ LIB_SOURCES = \
db/builder.cc \ db/builder.cc \
db/c.cc \ db/c.cc \
db/column_family.cc \ db/column_family.cc \
db/compacted_db_impl.cc \
db/compaction/compaction.cc \ db/compaction/compaction.cc \
db/compaction/compaction_iterator.cc \ db/compaction/compaction_iterator.cc \
db/compaction/compaction_job.cc \ db/compaction/compaction_job.cc \
@ -28,6 +27,7 @@ LIB_SOURCES = \
db/compaction/sst_partitioner.cc \ db/compaction/sst_partitioner.cc \
db/convenience.cc \ db/convenience.cc \
db/db_filesnapshot.cc \ db/db_filesnapshot.cc \
db/db_impl/compacted_db_impl.cc \
db/db_impl/db_impl.cc \ db/db_impl/db_impl.cc \
db/db_impl/db_impl_compaction_flush.cc \ db/db_impl/db_impl_compaction_flush.cc \
db/db_impl/db_impl_debug.cc \ db/db_impl/db_impl_debug.cc \