Remove db_impl_readonly dependency on utilities

Summary: Seems like the cleanest way to resolve this is to move CompactedDBImpl into db/.  CompactedDBImpl should probably live in the same place as DBImplReadonly since Opening the latter could end up instantiating the former.  Both DBImplReadonly and CompactedDBImpl inherit from DBImpl access protected members of DBImpl( and the latter access friendly private methods).

Test Plan: unit tests

Reviewers: sdong, yhchiang, kradhakrishnan, igor

Reviewed By: igor

Subscribers: dhruba, leveldb

Differential Revision: https://reviews.facebook.net/D42027
main
agiardullo 9 years ago
parent 49640bd82f
commit 18d5e1bf88
  1. 2
      db/compacted_db_impl.cc
  2. 0
      db/compacted_db_impl.h
  3. 3
      db/db_impl_readonly.cc
  4. 2
      src.mk

@ -4,7 +4,7 @@
// of patent rights can be found in the PATENTS file in the same directory.
#ifndef ROCKSDB_LITE
#include "utilities/compacted_db/compacted_db_impl.h"
#include "db/compacted_db_impl.h"
#include "db/db_impl.h"
#include "db/version_set.h"
#include "table/get_context.h"

@ -5,7 +5,8 @@
#include "db/db_impl_readonly.h"
#include "utilities/compacted_db/compacted_db_impl.h"
#include "db/compacted_db_impl.h"
#include "db/db_impl.h"
#include "db/merge_context.h"
#include "db/db_iter.h"

@ -3,6 +3,7 @@ LIB_SOURCES = \
db/builder.cc \
db/c.cc \
db/column_family.cc \
db/compacted_db_impl.cc \
db/compaction.cc \
db/compaction_job.cc \
db/compaction_picker.cc \
@ -97,7 +98,6 @@ LIB_SOURCES = \
utilities/backupable/backupable_db.cc \
utilities/convenience/convenience.cc \
utilities/checkpoint/checkpoint.cc \
utilities/compacted_db/compacted_db_impl.cc \
utilities/document/document_db.cc \
utilities/document/json_document_builder.cc \
utilities/document/json_document.cc \

Loading…
Cancel
Save