Moving Some includes from options.h to forward declaration

Summary: By removing some includes form options.h and reply on forward declaration, we can more easily reason the dependencies.

Test Plan: make all check

Reviewers: kailiu, haobo, igor, dhruba

Reviewed By: kailiu

CC: leveldb

Differential Revision: https://reviews.facebook.net/D15411
main
Siying Dong 11 years ago
parent f653fdcf5a
commit 8477255da3
  1. 2
      db/compaction_picker.cc
  2. 2
      db/db_bench.cc
  3. 2
      db/db_test.cc
  4. 2
      db/prefix_filter_iterator.h
  5. 1
      db/skiplist.h
  6. 2
      db/tailing_iter.cc
  7. 7
      include/rocksdb/memtablerep.h
  8. 10
      include/rocksdb/options.h
  9. 6
      include/rocksdb/universal_compaction.h
  10. 2
      tools/db_stress.cc
  11. 4
      util/coding.cc
  12. 2
      util/coding.h
  13. 4
      util/options.cc
  14. 1
      utilities/backupable/backupable_db.cc

@ -8,6 +8,8 @@
// found in the LICENSE file. See the AUTHORS file for names of contributors. // found in the LICENSE file. See the AUTHORS file for names of contributors.
#include "db/compaction_picker.h" #include "db/compaction_picker.h"
#include <limits>
#include "util/statistics.h" #include "util/statistics.h"
namespace rocksdb { namespace rocksdb {

@ -21,6 +21,8 @@
#include "rocksdb/env.h" #include "rocksdb/env.h"
#include "rocksdb/memtablerep.h" #include "rocksdb/memtablerep.h"
#include "rocksdb/write_batch.h" #include "rocksdb/write_batch.h"
#include "rocksdb/slice.h"
#include "rocksdb/slice_transform.h"
#include "rocksdb/statistics.h" #include "rocksdb/statistics.h"
#include "port/port.h" #include "port/port.h"
#include "util/bit_set.h" #include "util/bit_set.h"

@ -21,6 +21,8 @@
#include "rocksdb/cache.h" #include "rocksdb/cache.h"
#include "rocksdb/compaction_filter.h" #include "rocksdb/compaction_filter.h"
#include "rocksdb/env.h" #include "rocksdb/env.h"
#include "rocksdb/slice.h"
#include "rocksdb/slice_transform.h"
#include "rocksdb/table.h" #include "rocksdb/table.h"
#include "util/hash.h" #include "util/hash.h"
#include "util/logging.h" #include "util/logging.h"

@ -12,6 +12,8 @@
#pragma once #pragma once
#include "rocksdb/iterator.h" #include "rocksdb/iterator.h"
#include "rocksdb/slice.h"
#include "rocksdb/slice_transform.h"
namespace rocksdb { namespace rocksdb {

@ -35,6 +35,7 @@
#include <stdlib.h> #include <stdlib.h>
#include "port/port.h" #include "port/port.h"
#include "util/random.h" #include "util/random.h"
#include "rocksdb/arena.h"
namespace rocksdb { namespace rocksdb {

@ -8,6 +8,8 @@
#include <string> #include <string>
#include <utility> #include <utility>
#include "db/db_impl.h" #include "db/db_impl.h"
#include "rocksdb/slice.h"
#include "rocksdb/slice_transform.h"
namespace rocksdb { namespace rocksdb {

@ -37,12 +37,13 @@
#define STORAGE_ROCKSDB_DB_MEMTABLEREP_H_ #define STORAGE_ROCKSDB_DB_MEMTABLEREP_H_
#include <memory> #include <memory>
#include "rocksdb/arena.h"
#include "rocksdb/slice.h"
#include "rocksdb/slice_transform.h"
namespace rocksdb { namespace rocksdb {
class Arena;
class Slice;
class SliceTransform;
class MemTableRep { class MemTableRep {
public: public:
// KeyComparator provides a means to compare keys, which are internal keys // KeyComparator provides a means to compare keys, which are internal keys

@ -15,11 +15,6 @@
#include <vector> #include <vector>
#include <stdint.h> #include <stdint.h>
#include "rocksdb/memtablerep.h"
#include "rocksdb/slice.h"
#include "rocksdb/slice_transform.h"
#include "rocksdb/statistics.h"
#include "rocksdb/table_properties.h"
#include "rocksdb/universal_compaction.h" #include "rocksdb/universal_compaction.h"
namespace rocksdb { namespace rocksdb {
@ -34,6 +29,11 @@ class Logger;
class MergeOperator; class MergeOperator;
class Snapshot; class Snapshot;
class TableFactory; class TableFactory;
class MemTableRepFactory;
class TablePropertiesCollector;
class Slice;
class SliceTransform;
class Statistics;
using std::shared_ptr; using std::shared_ptr;

@ -6,14 +6,8 @@
#ifndef STORAGE_ROCKSDB_UNIVERSAL_COMPACTION_OPTIONS_H #ifndef STORAGE_ROCKSDB_UNIVERSAL_COMPACTION_OPTIONS_H
#define STORAGE_ROCKSDB_UNIVERSAL_COMPACTION_OPTIONS_H #define STORAGE_ROCKSDB_UNIVERSAL_COMPACTION_OPTIONS_H
#include <stddef.h>
#include <string>
#include <memory>
#include <vector>
#include <stdint.h> #include <stdint.h>
#include <climits> #include <climits>
#include "rocksdb/slice.h"
#include "rocksdb/statistics.h"
namespace rocksdb { namespace rocksdb {

@ -31,6 +31,8 @@
#include "utilities/utility_db.h" #include "utilities/utility_db.h"
#include "rocksdb/env.h" #include "rocksdb/env.h"
#include "rocksdb/write_batch.h" #include "rocksdb/write_batch.h"
#include "rocksdb/slice.h"
#include "rocksdb/slice_transform.h"
#include "rocksdb/statistics.h" #include "rocksdb/statistics.h"
#include "port/port.h" #include "port/port.h"
#include "util/coding.h" #include "util/coding.h"

@ -9,6 +9,10 @@
#include "util/coding.h" #include "util/coding.h"
#include "rocksdb/slice.h"
#include "rocksdb/slice_transform.h"
#include <algorithm> #include <algorithm>
namespace rocksdb { namespace rocksdb {

@ -16,6 +16,8 @@
#include <stdint.h> #include <stdint.h>
#include <string.h> #include <string.h>
#include <string> #include <string>
#include "rocksdb/write_batch.h"
#include "port/port.h" #include "port/port.h"
namespace rocksdb { namespace rocksdb {

@ -17,6 +17,10 @@
#include "rocksdb/env.h" #include "rocksdb/env.h"
#include "rocksdb/filter_policy.h" #include "rocksdb/filter_policy.h"
#include "rocksdb/merge_operator.h" #include "rocksdb/merge_operator.h"
#include "rocksdb/memtablerep.h"
#include "rocksdb/slice.h"
#include "rocksdb/slice_transform.h"
#include "rocksdb/table_properties.h"
#include "table/block_based_table_factory.h" #include "table/block_based_table_factory.h"
namespace rocksdb { namespace rocksdb {

@ -21,6 +21,7 @@
#include <string> #include <string>
#include <limits> #include <limits>
#include <atomic> #include <atomic>
#include <unordered_map>
namespace rocksdb { namespace rocksdb {

Loading…
Cancel
Save