From 1186192ed15cbcdc64a891786da079a2488fd7a3 Mon Sep 17 00:00:00 2001 From: Dhruba Borthakur Date: Fri, 23 Aug 2013 08:38:13 -0700 Subject: [PATCH] Replace include/leveldb with include/rocksdb. Summary: Replace include/leveldb with include/rocksdb. Test Plan: make clean; make check make clean; make release Differential Revision: https://reviews.facebook.net/D12489 --- db/builder.cc | 6 +++--- db/builder.h | 6 +++--- db/c.cc | 20 +++++++++---------- db/c_test.c | 2 +- db/corruption_test.cc | 8 ++++---- db/db_bench.cc | 12 +++++------ db/db_filesnapshot.cc | 4 ++-- db/db_impl.cc | 14 ++++++------- db/db_impl.h | 8 ++++---- db/db_impl_readonly.cc | 8 ++++---- db/db_impl_readonly.h | 4 ++-- db/db_iter.cc | 8 ++++---- db/db_iter.h | 2 +- db/db_statistics.h | 2 +- db/db_stats_logger.cc | 4 ++-- db/db_test.cc | 10 +++++----- db/dbformat.cc | 2 +- db/dbformat.h | 12 +++++------ db/deletefile_test.cc | 4 ++-- db/filename.cc | 2 +- db/filename.h | 4 ++-- db/log_reader.cc | 2 +- db/log_reader.h | 4 ++-- db/log_test.cc | 2 +- db/log_writer.cc | 2 +- db/log_writer.h | 4 ++-- db/memtable.cc | 8 ++++---- db/memtable.h | 4 ++-- db/memtablelist.cc | 6 +++--- db/memtablelist.h | 2 +- db/merge_helper.cc | 6 +++--- db/merge_helper.h | 4 ++-- db/merge_operator.cc | 2 +- db/merge_test.cc | 10 +++++----- db/perf_context.cc | 2 +- db/perf_context_test.cc | 4 ++-- db/prefix_filter_iterator.h | 2 +- db/repair.cc | 6 +++--- db/skiplist_test.cc | 2 +- db/snapshot.h | 2 +- db/table_cache.cc | 2 +- db/table_cache.h | 4 ++-- db/transaction_log_impl.h | 8 ++++---- db/version_set.cc | 6 +++--- db/write_batch.cc | 6 +++--- db/write_batch_internal.h | 8 ++++---- db/write_batch_test.cc | 6 +++--- hdfs/env_hdfs.h | 4 ++-- helpers/memenv/memenv.cc | 4 ++-- helpers/memenv/memenv.h | 7 +++---- helpers/memenv/memenv_test.cc | 4 ++-- include/{leveldb => rocksdb}/arena.h | 6 +++--- include/{leveldb => rocksdb}/c.h | 6 +++--- include/{leveldb => rocksdb}/cache.h | 8 ++++---- .../{leveldb => rocksdb}/compaction_filter.h | 6 +++--- include/{leveldb => rocksdb}/comparator.h | 6 +++--- include/{leveldb => rocksdb}/db.h | 14 ++++++------- include/{leveldb => rocksdb}/env.h | 8 ++++---- include/{leveldb => rocksdb}/filter_policy.h | 6 +++--- include/{leveldb => rocksdb}/iterator.h | 10 +++++----- include/{leveldb => rocksdb}/ldb_tool.h | 8 ++++---- include/{leveldb => rocksdb}/memtablerep.h | 12 +++++------ include/{leveldb => rocksdb}/merge_operator.h | 8 ++++---- include/{leveldb => rocksdb}/options.h | 17 ++++++++-------- include/{leveldb => rocksdb}/perf_context.h | 4 ++-- include/{leveldb => rocksdb}/slice.h | 6 +++--- .../{leveldb => rocksdb}/slice_transform.h | 6 +++--- include/{leveldb => rocksdb}/statistics.h | 6 +++--- include/{leveldb => rocksdb}/status.h | 8 ++++---- include/{leveldb => rocksdb}/table_builder.h | 10 +++++----- .../{leveldb => rocksdb}/transaction_log.h | 12 +++++------ include/{leveldb => rocksdb}/types.h | 6 +++--- .../universal_compaction.h | 4 ++-- include/{leveldb => rocksdb}/write_batch.h | 8 ++++---- include/utilities/stackable_db.h | 2 +- port/port_posix.h | 2 +- table/block.cc | 2 +- table/block.h | 2 +- table/block_builder.cc | 4 ++-- table/block_builder.h | 2 +- table/block_test.cc | 8 ++++---- table/filter_block.cc | 2 +- table/filter_block.h | 6 +++--- table/filter_block_test.cc | 2 +- table/format.cc | 2 +- table/format.h | 6 +++--- table/iter_heap.h | 2 +- table/iterator.cc | 2 +- table/merger.cc | 4 ++-- table/table.cc | 12 +++++------ table/table.h | 4 ++-- table/table_builder.cc | 10 +++++----- table/table_test.cc | 10 +++++----- table/two_level_iterator.h | 4 ++-- tools/db_repl_stress.cc | 4 ++-- tools/db_stress.cc | 8 ++++---- tools/ldb.cc | 2 +- tools/reduce_levels_test.cc | 2 +- tools/sst_dump.cc | 8 ++++---- util/arena_impl.h | 2 +- util/auto_roll_logger_test.cc | 2 +- util/bloom.cc | 4 ++-- util/bloom_test.cc | 2 +- util/cache.cc | 2 +- util/cache_test.cc | 2 +- util/comparator.cc | 4 ++-- util/env.cc | 4 ++-- util/env_hdfs.cc | 6 +++--- util/env_posix.cc | 4 ++-- util/env_test.cc | 2 +- util/filelock_test.cc | 4 ++-- util/filter_policy.cc | 2 +- util/histogram.h | 2 +- util/ldb_cmd.cc | 2 +- util/ldb_cmd.h | 8 ++++---- util/ldb_tool.cc | 2 +- util/logging.cc | 4 ++-- util/manual_compaction_test.cc | 4 ++-- util/options.cc | 14 ++++++------- util/posix_logger.h | 2 +- util/skiplistrep.cc | 2 +- util/slice.cc | 4 ++-- util/statistics.cc | 2 +- util/status.cc | 2 +- util/stl_wrappers.h | 4 ++-- util/stop_watch.h | 4 ++-- util/testharness.h | 4 ++-- util/testutil.h | 4 ++-- util/transformrep.cc | 8 ++++---- util/vectorrep.cc | 4 ++-- utilities/merge_operators.h | 2 +- utilities/merge_operators/put.cc | 4 ++-- .../string_append/stringappend.cc | 4 ++-- .../string_append/stringappend.h | 5 ++--- .../string_append/stringappend2.cc | 4 ++-- .../string_append/stringappend2.h | 5 ++--- .../string_append/stringappend_test.cc | 4 ++-- utilities/merge_operators/uint64add.cc | 6 +++--- utilities/redis/redis_list_iterator.h | 2 +- utilities/redis/redis_lists.cc | 2 +- utilities/redis/redis_lists.h | 2 +- utilities/ttl/db_ttl.cc | 4 ++-- utilities/ttl/db_ttl.h | 8 ++++---- utilities/ttl/ttl_test.cc | 2 +- 144 files changed, 369 insertions(+), 373 deletions(-) rename include/{leveldb => rocksdb}/arena.h (89%) rename include/{leveldb => rocksdb}/c.h (98%) rename include/{leveldb => rocksdb}/cache.h (96%) rename include/{leveldb => rocksdb}/compaction_filter.h (93%) rename include/{leveldb => rocksdb}/comparator.h (93%) rename include/{leveldb => rocksdb}/db.h (98%) rename include/{leveldb => rocksdb}/env.h (99%) rename include/{leveldb => rocksdb}/filter_policy.h (94%) rename include/{leveldb => rocksdb}/iterator.h (94%) rename include/{leveldb => rocksdb}/ldb_tool.h (53%) rename include/{leveldb => rocksdb}/memtablerep.h (97%) rename include/{leveldb => rocksdb}/merge_operator.h (96%) rename include/{leveldb => rocksdb}/options.h (98%) rename include/{leveldb => rocksdb}/perf_context.h (79%) rename include/{leveldb => rocksdb}/slice.h (96%) rename include/{leveldb => rocksdb}/slice_transform.h (88%) rename include/{leveldb => rocksdb}/statistics.h (98%) rename include/{leveldb => rocksdb}/status.h (96%) rename include/{leveldb => rocksdb}/table_builder.h (94%) rename include/{leveldb => rocksdb}/transaction_log.h (88%) rename include/{leveldb => rocksdb}/types.h (60%) rename include/{leveldb => rocksdb}/universal_compaction.h (96%) rename include/{leveldb => rocksdb}/write_batch.h (95%) diff --git a/db/builder.cc b/db/builder.cc index 03e703000..3d97f4656 100644 --- a/db/builder.cc +++ b/db/builder.cc @@ -9,9 +9,9 @@ #include "db/merge_helper.h" #include "db/table_cache.h" #include "db/version_edit.h" -#include "leveldb/db.h" -#include "leveldb/env.h" -#include "leveldb/iterator.h" +#include "rocksdb/db.h" +#include "rocksdb/env.h" +#include "rocksdb/iterator.h" #include "util/stop_watch.h" namespace leveldb { diff --git a/db/builder.h b/db/builder.h index 32cc6e76d..8de5d4335 100644 --- a/db/builder.h +++ b/db/builder.h @@ -5,9 +5,9 @@ #ifndef STORAGE_LEVELDB_DB_BUILDER_H_ #define STORAGE_LEVELDB_DB_BUILDER_H_ -#include "leveldb/comparator.h" -#include "leveldb/status.h" -#include "leveldb/types.h" +#include "rocksdb/comparator.h" +#include "rocksdb/status.h" +#include "rocksdb/types.h" namespace leveldb { diff --git a/db/c.cc b/db/c.cc index 7614e7edf..ff4d4fbb1 100644 --- a/db/c.cc +++ b/db/c.cc @@ -2,19 +2,19 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. See the AUTHORS file for names of contributors. -#include "leveldb/c.h" +#include "rocksdb/c.h" #include #include -#include "leveldb/cache.h" -#include "leveldb/comparator.h" -#include "leveldb/db.h" -#include "leveldb/env.h" -#include "leveldb/filter_policy.h" -#include "leveldb/iterator.h" -#include "leveldb/options.h" -#include "leveldb/status.h" -#include "leveldb/write_batch.h" +#include "rocksdb/cache.h" +#include "rocksdb/comparator.h" +#include "rocksdb/db.h" +#include "rocksdb/env.h" +#include "rocksdb/filter_policy.h" +#include "rocksdb/iterator.h" +#include "rocksdb/options.h" +#include "rocksdb/status.h" +#include "rocksdb/write_batch.h" using leveldb::Cache; using leveldb::Comparator; diff --git a/db/c_test.c b/db/c_test.c index 1d71b6508..095c455a9 100644 --- a/db/c_test.c +++ b/db/c_test.c @@ -2,7 +2,7 @@ Use of this source code is governed by a BSD-style license that can be found in the LICENSE file. See the AUTHORS file for names of contributors. */ -#include "leveldb/c.h" +#include "rocksdb/c.h" #include #include diff --git a/db/corruption_test.cc b/db/corruption_test.cc index 4ed04c0d1..5bc65b900 100644 --- a/db/corruption_test.cc +++ b/db/corruption_test.cc @@ -2,15 +2,15 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. See the AUTHORS file for names of contributors. -#include "leveldb/db.h" +#include "rocksdb/db.h" #include #include #include #include -#include "leveldb/cache.h" -#include "leveldb/env.h" -#include "leveldb/write_batch.h" +#include "rocksdb/cache.h" +#include "rocksdb/env.h" +#include "rocksdb/write_batch.h" #include "db/db_impl.h" #include "db/filename.h" #include "db/log_format.h" diff --git a/db/db_bench.cc b/db/db_bench.cc index c130063eb..2bc5354e0 100644 --- a/db/db_bench.cc +++ b/db/db_bench.cc @@ -9,12 +9,12 @@ #include "db/db_impl.h" #include "db/version_set.h" #include "db/db_statistics.h" -#include "leveldb/options.h" -#include "leveldb/cache.h" -#include "leveldb/db.h" -#include "leveldb/env.h" -#include "leveldb/write_batch.h" -#include "leveldb/statistics.h" +#include "rocksdb/options.h" +#include "rocksdb/cache.h" +#include "rocksdb/db.h" +#include "rocksdb/env.h" +#include "rocksdb/write_batch.h" +#include "rocksdb/statistics.h" #include "port/port.h" #include "util/bit_set.h" #include "util/crc32c.h" diff --git a/db/db_filesnapshot.cc b/db/db_filesnapshot.cc index ae64392e5..f3d580d37 100644 --- a/db/db_filesnapshot.cc +++ b/db/db_filesnapshot.cc @@ -8,8 +8,8 @@ #include "db/db_impl.h" #include "db/filename.h" #include "db/version_set.h" -#include "leveldb/db.h" -#include "leveldb/env.h" +#include "rocksdb/db.h" +#include "rocksdb/env.h" #include "port/port.h" #include "util/mutexlock.h" diff --git a/db/db_impl.cc b/db/db_impl.cc index 30b781873..e76570763 100644 --- a/db/db_impl.cc +++ b/db/db_impl.cc @@ -28,13 +28,13 @@ #include "db/version_set.h" #include "db/write_batch_internal.h" #include "db/transaction_log_impl.h" -#include "leveldb/compaction_filter.h" -#include "leveldb/db.h" -#include "leveldb/env.h" -#include "leveldb/merge_operator.h" -#include "leveldb/statistics.h" -#include "leveldb/status.h" -#include "leveldb/table_builder.h" +#include "rocksdb/compaction_filter.h" +#include "rocksdb/db.h" +#include "rocksdb/env.h" +#include "rocksdb/merge_operator.h" +#include "rocksdb/statistics.h" +#include "rocksdb/status.h" +#include "rocksdb/table_builder.h" #include "port/port.h" #include "table/block.h" #include "table/merger.h" diff --git a/db/db_impl.h b/db/db_impl.h index f5625eb14..4d9b09c49 100644 --- a/db/db_impl.h +++ b/db/db_impl.h @@ -12,10 +12,10 @@ #include "db/dbformat.h" #include "db/log_writer.h" #include "db/snapshot.h" -#include "leveldb/db.h" -#include "leveldb/env.h" -#include "leveldb/memtablerep.h" -#include "leveldb/transaction_log.h" +#include "rocksdb/db.h" +#include "rocksdb/env.h" +#include "rocksdb/memtablerep.h" +#include "rocksdb/transaction_log.h" #include "port/port.h" #include "util/stats_logger.h" #include "memtablelist.h" diff --git a/db/db_impl_readonly.cc b/db/db_impl_readonly.cc index 834161860..c4fa1fe26 100644 --- a/db/db_impl_readonly.cc +++ b/db/db_impl_readonly.cc @@ -21,10 +21,10 @@ #include "db/table_cache.h" #include "db/version_set.h" #include "db/write_batch_internal.h" -#include "leveldb/db.h" -#include "leveldb/env.h" -#include "leveldb/status.h" -#include "leveldb/table_builder.h" +#include "rocksdb/db.h" +#include "rocksdb/env.h" +#include "rocksdb/status.h" +#include "rocksdb/table_builder.h" #include "port/port.h" #include "table/block.h" #include "table/merger.h" diff --git a/db/db_impl_readonly.h b/db/db_impl_readonly.h index e04495e58..4f81d43d9 100644 --- a/db/db_impl_readonly.h +++ b/db/db_impl_readonly.h @@ -12,8 +12,8 @@ #include "db/dbformat.h" #include "db/log_writer.h" #include "db/snapshot.h" -#include "leveldb/db.h" -#include "leveldb/env.h" +#include "rocksdb/db.h" +#include "rocksdb/env.h" #include "port/port.h" #include "util/stats_logger.h" diff --git a/db/db_iter.cc b/db/db_iter.cc index b0c8e078e..e8643d727 100644 --- a/db/db_iter.cc +++ b/db/db_iter.cc @@ -8,10 +8,10 @@ #include "db/filename.h" #include "db/dbformat.h" -#include "leveldb/env.h" -#include "leveldb/options.h" -#include "leveldb/iterator.h" -#include "leveldb/merge_operator.h" +#include "rocksdb/env.h" +#include "rocksdb/options.h" +#include "rocksdb/iterator.h" +#include "rocksdb/merge_operator.h" #include "port/port.h" #include "util/logging.h" #include "util/mutexlock.h" diff --git a/db/db_iter.h b/db/db_iter.h index a8d849bb9..b29dfa5c9 100644 --- a/db/db_iter.h +++ b/db/db_iter.h @@ -6,7 +6,7 @@ #define STORAGE_LEVELDB_DB_DB_ITER_H_ #include -#include "leveldb/db.h" +#include "rocksdb/db.h" #include "db/dbformat.h" namespace leveldb { diff --git a/db/db_statistics.h b/db/db_statistics.h index d11eb3145..e141150be 100644 --- a/db/db_statistics.h +++ b/db/db_statistics.h @@ -10,7 +10,7 @@ #include #include -#include "leveldb/statistics.h" +#include "rocksdb/statistics.h" #include "util/histogram.h" #include "port/port.h" #include "util/mutexlock.h" diff --git a/db/db_stats_logger.cc b/db/db_stats_logger.cc index 4fd0f9103..2998df16d 100644 --- a/db/db_stats_logger.cc +++ b/db/db_stats_logger.cc @@ -7,8 +7,8 @@ #include #include #include "db/version_set.h" -#include "leveldb/db.h" -#include "leveldb/env.h" +#include "rocksdb/db.h" +#include "rocksdb/env.h" #include "port/port.h" #include "util/mutexlock.h" diff --git a/db/db_test.cc b/db/db_test.cc index 227e44b6c..3f61b2394 100644 --- a/db/db_test.cc +++ b/db/db_test.cc @@ -5,15 +5,15 @@ #include #include -#include "leveldb/db.h" -#include "leveldb/filter_policy.h" +#include "rocksdb/db.h" +#include "rocksdb/filter_policy.h" #include "db/db_impl.h" #include "db/filename.h" #include "db/version_set.h" #include "db/write_batch_internal.h" -#include "leveldb/cache.h" -#include "leveldb/compaction_filter.h" -#include "leveldb/env.h" +#include "rocksdb/cache.h" +#include "rocksdb/compaction_filter.h" +#include "rocksdb/env.h" #include "table/table.h" #include "util/hash.h" #include "util/logging.h" diff --git a/db/dbformat.cc b/db/dbformat.cc index 17288a6a8..8456ba2f2 100644 --- a/db/dbformat.cc +++ b/db/dbformat.cc @@ -6,7 +6,7 @@ #include "db/dbformat.h" #include "port/port.h" #include "util/coding.h" -#include "include/leveldb/perf_context.h" +#include "rocksdb/perf_context.h" namespace leveldb { diff --git a/db/dbformat.h b/db/dbformat.h index 0a7b50ed1..56a2580f4 100644 --- a/db/dbformat.h +++ b/db/dbformat.h @@ -6,12 +6,12 @@ #define STORAGE_LEVELDB_DB_FORMAT_H_ #include -#include "leveldb/comparator.h" -#include "leveldb/db.h" -#include "leveldb/filter_policy.h" -#include "leveldb/slice.h" -#include "leveldb/table_builder.h" -#include "leveldb/types.h" +#include "rocksdb/comparator.h" +#include "rocksdb/db.h" +#include "rocksdb/filter_policy.h" +#include "rocksdb/slice.h" +#include "rocksdb/table_builder.h" +#include "rocksdb/types.h" #include "util/coding.h" #include "util/logging.h" diff --git a/db/deletefile_test.cc b/db/deletefile_test.cc index 639137246..7845b9433 100644 --- a/db/deletefile_test.cc +++ b/db/deletefile_test.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. See the AUTHORS file for names of contributors. -#include "leveldb/db.h" +#include "rocksdb/db.h" #include "db/db_impl.h" #include "db/filename.h" #include "db/version_set.h" @@ -10,7 +10,7 @@ #include "util/testharness.h" #include "util/testutil.h" #include "boost/lexical_cast.hpp" -#include "leveldb/env.h" +#include "rocksdb/env.h" #include #include #include diff --git a/db/filename.cc b/db/filename.cc index 794410cf3..b649628a9 100644 --- a/db/filename.cc +++ b/db/filename.cc @@ -7,7 +7,7 @@ #include #include #include "db/dbformat.h" -#include "leveldb/env.h" +#include "rocksdb/env.h" #include "util/logging.h" namespace leveldb { diff --git a/db/filename.h b/db/filename.h index 53a15a5f7..a9b305e38 100644 --- a/db/filename.h +++ b/db/filename.h @@ -9,8 +9,8 @@ #include #include -#include "leveldb/slice.h" -#include "leveldb/status.h" +#include "rocksdb/slice.h" +#include "rocksdb/status.h" #include "port/port.h" namespace leveldb { diff --git a/db/log_reader.cc b/db/log_reader.cc index 250470a14..3ff62a729 100644 --- a/db/log_reader.cc +++ b/db/log_reader.cc @@ -5,7 +5,7 @@ #include "db/log_reader.h" #include -#include "leveldb/env.h" +#include "rocksdb/env.h" #include "util/coding.h" #include "util/crc32c.h" diff --git a/db/log_reader.h b/db/log_reader.h index 271286877..19acc8480 100644 --- a/db/log_reader.h +++ b/db/log_reader.h @@ -9,8 +9,8 @@ #include #include "db/log_format.h" -#include "leveldb/slice.h" -#include "leveldb/status.h" +#include "rocksdb/slice.h" +#include "rocksdb/status.h" namespace leveldb { diff --git a/db/log_test.cc b/db/log_test.cc index 367e2f18c..f808447c8 100644 --- a/db/log_test.cc +++ b/db/log_test.cc @@ -4,7 +4,7 @@ #include "db/log_reader.h" #include "db/log_writer.h" -#include "leveldb/env.h" +#include "rocksdb/env.h" #include "util/coding.h" #include "util/crc32c.h" #include "util/random.h" diff --git a/db/log_writer.cc b/db/log_writer.cc index f61abe723..c5bc73e5e 100644 --- a/db/log_writer.cc +++ b/db/log_writer.cc @@ -5,7 +5,7 @@ #include "db/log_writer.h" #include -#include "leveldb/env.h" +#include "rocksdb/env.h" #include "util/coding.h" #include "util/crc32c.h" diff --git a/db/log_writer.h b/db/log_writer.h index a15bcf65a..edcabd0a4 100644 --- a/db/log_writer.h +++ b/db/log_writer.h @@ -8,8 +8,8 @@ #include #include #include "db/log_format.h" -#include "leveldb/slice.h" -#include "leveldb/status.h" +#include "rocksdb/slice.h" +#include "rocksdb/status.h" namespace leveldb { diff --git a/db/memtable.cc b/db/memtable.cc index e3c19f3fc..eaa0777cd 100644 --- a/db/memtable.cc +++ b/db/memtable.cc @@ -7,10 +7,10 @@ #include #include "db/dbformat.h" -#include "leveldb/comparator.h" -#include "leveldb/env.h" -#include "leveldb/iterator.h" -#include "leveldb/merge_operator.h" +#include "rocksdb/comparator.h" +#include "rocksdb/env.h" +#include "rocksdb/iterator.h" +#include "rocksdb/merge_operator.h" #include "util/coding.h" #include "util/murmurhash.h" diff --git a/db/memtable.h b/db/memtable.h index 14b043643..e3b66f29f 100644 --- a/db/memtable.h +++ b/db/memtable.h @@ -11,8 +11,8 @@ #include "db/dbformat.h" #include "db/skiplist.h" #include "db/version_set.h" -#include "leveldb/db.h" -#include "leveldb/memtablerep.h" +#include "rocksdb/db.h" +#include "rocksdb/memtablerep.h" #include "util/arena_impl.h" namespace leveldb { diff --git a/db/memtablelist.cc b/db/memtablelist.cc index 56c1de545..a1e6c9674 100644 --- a/db/memtablelist.cc +++ b/db/memtablelist.cc @@ -4,10 +4,10 @@ #include "db/memtablelist.h" #include -#include "leveldb/db.h" +#include "rocksdb/db.h" #include "db/memtable.h" -#include "leveldb/env.h" -#include "leveldb/iterator.h" +#include "rocksdb/env.h" +#include "rocksdb/iterator.h" #include "util/coding.h" namespace leveldb { diff --git a/db/memtablelist.h b/db/memtablelist.h index 05a60d248..d97187b0d 100644 --- a/db/memtablelist.h +++ b/db/memtablelist.h @@ -6,7 +6,7 @@ #include #include #include -#include "leveldb/db.h" +#include "rocksdb/db.h" #include "db/dbformat.h" #include "db/skiplist.h" #include "memtable.h" diff --git a/db/merge_helper.cc b/db/merge_helper.cc index 32d4874cb..6e1f364e8 100644 --- a/db/merge_helper.cc +++ b/db/merge_helper.cc @@ -1,8 +1,8 @@ #include "merge_helper.h" #include "db/dbformat.h" -#include "leveldb/comparator.h" -#include "leveldb/db.h" -#include "leveldb/merge_operator.h" +#include "rocksdb/comparator.h" +#include "rocksdb/db.h" +#include "rocksdb/merge_operator.h" #include #include diff --git a/db/merge_helper.h b/db/merge_helper.h index 2d8ed5668..b058f9869 100644 --- a/db/merge_helper.h +++ b/db/merge_helper.h @@ -2,8 +2,8 @@ #define MERGE_HELPER_H #include "db/dbformat.h" -#include "leveldb/slice.h" -#include "leveldb/statistics.h" +#include "rocksdb/slice.h" +#include "rocksdb/statistics.h" #include #include diff --git a/db/merge_operator.cc b/db/merge_operator.cc index aee99128a..09ac26642 100644 --- a/db/merge_operator.cc +++ b/db/merge_operator.cc @@ -5,7 +5,7 @@ * Copyright 2013 Facebook */ -#include "leveldb/merge_operator.h" +#include "rocksdb/merge_operator.h" namespace leveldb { diff --git a/db/merge_test.cc b/db/merge_test.cc index 61e090838..16d213d60 100644 --- a/db/merge_test.cc +++ b/db/merge_test.cc @@ -2,11 +2,11 @@ #include #include -#include "leveldb/cache.h" -#include "leveldb/comparator.h" -#include "leveldb/db.h" -#include "leveldb/env.h" -#include "leveldb/merge_operator.h" +#include "rocksdb/cache.h" +#include "rocksdb/comparator.h" +#include "rocksdb/db.h" +#include "rocksdb/env.h" +#include "rocksdb/merge_operator.h" #include "db/dbformat.h" #include "db/db_impl.h" #include "utilities/merge_operators.h" diff --git a/db/perf_context.cc b/db/perf_context.cc index d3293b4a2..08b5d8c6e 100644 --- a/db/perf_context.cc +++ b/db/perf_context.cc @@ -1,4 +1,4 @@ -#include "include/leveldb/perf_context.h" +#include "rocksdb/perf_context.h" namespace leveldb { diff --git a/db/perf_context_test.cc b/db/perf_context_test.cc index 59330ecff..cccbb356b 100644 --- a/db/perf_context_test.cc +++ b/db/perf_context_test.cc @@ -1,7 +1,7 @@ #include -#include "leveldb/db.h" -#include "leveldb/perf_context.h" +#include "rocksdb/db.h" +#include "rocksdb/perf_context.h" #include "util/testharness.h" diff --git a/db/prefix_filter_iterator.h b/db/prefix_filter_iterator.h index 1e0fbe3ca..6b55c931a 100644 --- a/db/prefix_filter_iterator.h +++ b/db/prefix_filter_iterator.h @@ -12,7 +12,7 @@ #ifndef STORAGE_LEVELDB_DB_PREFIX_FILTER_ITERATOR_H_ #define STORAGE_LEVELDB_DB_PREFIX_FILTER_ITERATOR_H_ -#include "leveldb/iterator.h" +#include "rocksdb/iterator.h" namespace leveldb { diff --git a/db/repair.cc b/db/repair.cc index 3737b09c2..23a2b7935 100644 --- a/db/repair.cc +++ b/db/repair.cc @@ -34,9 +34,9 @@ #include "db/table_cache.h" #include "db/version_edit.h" #include "db/write_batch_internal.h" -#include "leveldb/comparator.h" -#include "leveldb/db.h" -#include "leveldb/env.h" +#include "rocksdb/comparator.h" +#include "rocksdb/db.h" +#include "rocksdb/env.h" namespace leveldb { diff --git a/db/skiplist_test.cc b/db/skiplist_test.cc index 3542183f1..4f3ab4541 100644 --- a/db/skiplist_test.cc +++ b/db/skiplist_test.cc @@ -4,7 +4,7 @@ #include "db/skiplist.h" #include -#include "leveldb/env.h" +#include "rocksdb/env.h" #include "util/arena_impl.h" #include "util/hash.h" #include "util/random.h" diff --git a/db/snapshot.h b/db/snapshot.h index ddac4d86b..cc1498e44 100644 --- a/db/snapshot.h +++ b/db/snapshot.h @@ -5,7 +5,7 @@ #ifndef STORAGE_LEVELDB_DB_SNAPSHOT_H_ #define STORAGE_LEVELDB_DB_SNAPSHOT_H_ -#include "leveldb/db.h" +#include "rocksdb/db.h" namespace leveldb { diff --git a/db/table_cache.cc b/db/table_cache.cc index 02408d95c..e32684cd6 100644 --- a/db/table_cache.cc +++ b/db/table_cache.cc @@ -6,7 +6,7 @@ #include "db/filename.h" -#include "leveldb/statistics.h" +#include "rocksdb/statistics.h" #include "table/table.h" #include "util/coding.h" #include "util/stop_watch.h" diff --git a/db/table_cache.h b/db/table_cache.h index 2f3787609..0069a8acf 100644 --- a/db/table_cache.h +++ b/db/table_cache.h @@ -10,8 +10,8 @@ #include #include #include "db/dbformat.h" -#include "leveldb/env.h" -#include "leveldb/cache.h" +#include "rocksdb/env.h" +#include "rocksdb/cache.h" #include "port/port.h" #include "table/table.h" diff --git a/db/transaction_log_impl.h b/db/transaction_log_impl.h index 27ab1936c..a880cabee 100644 --- a/db/transaction_log_impl.h +++ b/db/transaction_log_impl.h @@ -4,10 +4,10 @@ #include -#include "leveldb/env.h" -#include "leveldb/options.h" -#include "leveldb/types.h" -#include "leveldb/transaction_log.h" +#include "rocksdb/env.h" +#include "rocksdb/options.h" +#include "rocksdb/types.h" +#include "rocksdb/transaction_log.h" #include "db/log_reader.h" #include "db/filename.h" diff --git a/db/version_set.cc b/db/version_set.cc index 29741ba14..2bf477f42 100644 --- a/db/version_set.cc +++ b/db/version_set.cc @@ -12,9 +12,9 @@ #include "db/log_writer.h" #include "db/memtable.h" #include "db/table_cache.h" -#include "leveldb/env.h" -#include "leveldb/merge_operator.h" -#include "leveldb/table_builder.h" +#include "rocksdb/env.h" +#include "rocksdb/merge_operator.h" +#include "rocksdb/table_builder.h" #include "table/merger.h" #include "table/two_level_iterator.h" #include "util/coding.h" diff --git a/db/write_batch.cc b/db/write_batch.cc index 6537f3721..8cd9227ef 100644 --- a/db/write_batch.cc +++ b/db/write_batch.cc @@ -14,10 +14,10 @@ // len: varint32 // data: uint8[len] -#include "leveldb/write_batch.h" +#include "rocksdb/write_batch.h" -#include "leveldb/options.h" -#include "leveldb/statistics.h" +#include "rocksdb/options.h" +#include "rocksdb/statistics.h" #include "db/dbformat.h" #include "db/db_impl.h" #include "db/memtable.h" diff --git a/db/write_batch_internal.h b/db/write_batch_internal.h index 649752ce6..962f2a88c 100644 --- a/db/write_batch_internal.h +++ b/db/write_batch_internal.h @@ -5,10 +5,10 @@ #ifndef STORAGE_LEVELDB_DB_WRITE_BATCH_INTERNAL_H_ #define STORAGE_LEVELDB_DB_WRITE_BATCH_INTERNAL_H_ -#include "leveldb/types.h" -#include "leveldb/write_batch.h" -#include "leveldb/db.h" -#include "leveldb/options.h" +#include "rocksdb/types.h" +#include "rocksdb/write_batch.h" +#include "rocksdb/db.h" +#include "rocksdb/options.h" namespace leveldb { diff --git a/db/write_batch_test.cc b/db/write_batch_test.cc index 0a4b97eee..d03c46fbc 100644 --- a/db/write_batch_test.cc +++ b/db/write_batch_test.cc @@ -2,13 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. See the AUTHORS file for names of contributors. -#include "leveldb/db.h" +#include "rocksdb/db.h" #include #include "db/memtable.h" #include "db/write_batch_internal.h" -#include "leveldb/env.h" -#include "leveldb/memtablerep.h" +#include "rocksdb/env.h" +#include "rocksdb/memtablerep.h" #include "util/logging.h" #include "util/testharness.h" diff --git a/hdfs/env_hdfs.h b/hdfs/env_hdfs.h index 791360918..bc286fe8d 100644 --- a/hdfs/env_hdfs.h +++ b/hdfs/env_hdfs.h @@ -25,8 +25,8 @@ #include #include #include -#include "leveldb/env.h" -#include "leveldb/status.h" +#include "rocksdb/env.h" +#include "rocksdb/status.h" #ifdef USE_HDFS #include "hdfs/hdfs.h" diff --git a/helpers/memenv/memenv.cc b/helpers/memenv/memenv.cc index c3e706c59..5524e9341 100644 --- a/helpers/memenv/memenv.cc +++ b/helpers/memenv/memenv.cc @@ -4,8 +4,8 @@ #include "helpers/memenv/memenv.h" -#include "leveldb/env.h" -#include "leveldb/status.h" +#include "rocksdb/env.h" +#include "rocksdb/status.h" #include "port/port.h" #include "util/mutexlock.h" #include diff --git a/helpers/memenv/memenv.h b/helpers/memenv/memenv.h index 03b88de76..59ebf65b0 100644 --- a/helpers/memenv/memenv.h +++ b/helpers/memenv/memenv.h @@ -2,9 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. See the AUTHORS file for names of contributors. -#ifndef STORAGE_LEVELDB_HELPERS_MEMENV_MEMENV_H_ -#define STORAGE_LEVELDB_HELPERS_MEMENV_MEMENV_H_ - +#ifndef STORAGE_ROCKSDB_HELPERS_MEMENV_MEMENV_H_ +#define STORAGE_ROCKSDB_HELPERS_MEMENV_MEMENV_H_ namespace leveldb { class Env; @@ -17,4 +16,4 @@ Env* NewMemEnv(Env* base_env); } // namespace leveldb -#endif // STORAGE_LEVELDB_HELPERS_MEMENV_MEMENV_H_ +#endif // STORAGE_ROCKSDB_HELPERS_MEMENV_MEMENV_H_ diff --git a/helpers/memenv/memenv_test.cc b/helpers/memenv/memenv_test.cc index 1c6dd1509..ab04b2597 100644 --- a/helpers/memenv/memenv_test.cc +++ b/helpers/memenv/memenv_test.cc @@ -5,8 +5,8 @@ #include "helpers/memenv/memenv.h" #include "db/db_impl.h" -#include "leveldb/db.h" -#include "leveldb/env.h" +#include "rocksdb/db.h" +#include "rocksdb/env.h" #include "util/testharness.h" #include #include diff --git a/include/leveldb/arena.h b/include/rocksdb/arena.h similarity index 89% rename from include/leveldb/arena.h rename to include/rocksdb/arena.h index fb55de98d..3057d4e28 100644 --- a/include/leveldb/arena.h +++ b/include/rocksdb/arena.h @@ -5,8 +5,8 @@ // Arena class defines memory allocation methods. It's used by memtable and // skiplist. -#ifndef STORAGE_LEVELDB_INCLUDE_ARENA_H_ -#define STORAGE_LEVELDB_INCLUDE_ARENA_H_ +#ifndef STORAGE_ROCKSDB_INCLUDE_ARENA_H_ +#define STORAGE_ROCKSDB_INCLUDE_ARENA_H_ #include #include @@ -38,4 +38,4 @@ class Arena { } // namespace leveldb -#endif // STORAGE_LEVELDB_INCLUDE_ARENA_H_ +#endif // STORAGE_ROCKSDB_INCLUDE_ARENA_H_ diff --git a/include/leveldb/c.h b/include/rocksdb/c.h similarity index 98% rename from include/leveldb/c.h rename to include/rocksdb/c.h index 8799a5fb8..b7c536f13 100644 --- a/include/leveldb/c.h +++ b/include/rocksdb/c.h @@ -37,8 +37,8 @@ (5) All of the pointer arguments must be non-NULL. */ -#ifndef STORAGE_LEVELDB_INCLUDE_C_H_ -#define STORAGE_LEVELDB_INCLUDE_C_H_ +#ifndef STORAGE_ROCKSDB_INCLUDE_C_H_ +#define STORAGE_ROCKSDB_INCLUDE_C_H_ #ifdef __cplusplus extern "C" { @@ -278,4 +278,4 @@ extern void leveldb_env_destroy(leveldb_env_t*); } /* end extern "C" */ #endif -#endif /* STORAGE_LEVELDB_INCLUDE_C_H_ */ +#endif /* STORAGE_ROCKSDB_INCLUDE_C_H_ */ diff --git a/include/leveldb/cache.h b/include/rocksdb/cache.h similarity index 96% rename from include/leveldb/cache.h rename to include/rocksdb/cache.h index 8669e69d9..b43faf2de 100644 --- a/include/leveldb/cache.h +++ b/include/rocksdb/cache.h @@ -15,12 +15,12 @@ // they want something more sophisticated (like scan-resistance, a // custom eviction policy, variable cache sizing, etc.) -#ifndef STORAGE_LEVELDB_INCLUDE_CACHE_H_ -#define STORAGE_LEVELDB_INCLUDE_CACHE_H_ +#ifndef STORAGE_ROCKSDB_INCLUDE_CACHE_H_ +#define STORAGE_ROCKSDB_INCLUDE_CACHE_H_ #include #include -#include "leveldb/slice.h" +#include "rocksdb/slice.h" namespace leveldb { @@ -103,4 +103,4 @@ class Cache { } // namespace leveldb -#endif // STORAGE_LEVELDB_UTIL_CACHE_H_ +#endif // STORAGE_ROCKSDB_UTIL_CACHE_H_ diff --git a/include/leveldb/compaction_filter.h b/include/rocksdb/compaction_filter.h similarity index 93% rename from include/leveldb/compaction_filter.h rename to include/rocksdb/compaction_filter.h index 54a9b39ed..9f83d43d3 100644 --- a/include/leveldb/compaction_filter.h +++ b/include/rocksdb/compaction_filter.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. See the AUTHORS file for names of contributors. -#ifndef STORAGE_LEVELDB_INCLUDE_COMPACTION_FILTER_H_ -#define STORAGE_LEVELDB_INCLUDE_COMPACTION_FILTER_H_ +#ifndef STORAGE_ROCKSDB_INCLUDE_COMPACTION_FILTER_H_ +#define STORAGE_ROCKSDB_INCLUDE_COMPACTION_FILTER_H_ #include @@ -68,4 +68,4 @@ class DefaultCompactionFilterFactory : public CompactionFilterFactory { } // namespace leveldb -#endif // STORAGE_LEVELDB_INCLUDE_COMPACTION_FILTER_H_ +#endif // STORAGE_ROCKSDB_INCLUDE_COMPACTION_FILTER_H_ diff --git a/include/leveldb/comparator.h b/include/rocksdb/comparator.h similarity index 93% rename from include/leveldb/comparator.h rename to include/rocksdb/comparator.h index 556b984c7..2a29973cd 100644 --- a/include/leveldb/comparator.h +++ b/include/rocksdb/comparator.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. See the AUTHORS file for names of contributors. -#ifndef STORAGE_LEVELDB_INCLUDE_COMPARATOR_H_ -#define STORAGE_LEVELDB_INCLUDE_COMPARATOR_H_ +#ifndef STORAGE_ROCKSDB_INCLUDE_COMPARATOR_H_ +#define STORAGE_ROCKSDB_INCLUDE_COMPARATOR_H_ #include @@ -60,4 +60,4 @@ extern const Comparator* BytewiseComparator(); } // namespace leveldb -#endif // STORAGE_LEVELDB_INCLUDE_COMPARATOR_H_ +#endif // STORAGE_ROCKSDB_INCLUDE_COMPARATOR_H_ diff --git a/include/leveldb/db.h b/include/rocksdb/db.h similarity index 98% rename from include/leveldb/db.h rename to include/rocksdb/db.h index 2298e4597..ca122efb1 100644 --- a/include/leveldb/db.h +++ b/include/rocksdb/db.h @@ -2,17 +2,17 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. See the AUTHORS file for names of contributors. -#ifndef STORAGE_LEVELDB_INCLUDE_DB_H_ -#define STORAGE_LEVELDB_INCLUDE_DB_H_ +#ifndef STORAGE_ROCKSDB_INCLUDE_DB_H_ +#define STORAGE_ROCKSDB_INCLUDE_DB_H_ #include #include #include #include -#include "leveldb/iterator.h" -#include "leveldb/options.h" -#include "leveldb/types.h" -#include "leveldb/transaction_log.h" +#include "rocksdb/iterator.h" +#include "rocksdb/options.h" +#include "rocksdb/types.h" +#include "rocksdb/transaction_log.h" namespace leveldb { @@ -303,4 +303,4 @@ Status RepairDB(const std::string& dbname, const Options& options); } // namespace leveldb -#endif // STORAGE_LEVELDB_INCLUDE_DB_H_ +#endif // STORAGE_ROCKSDB_INCLUDE_DB_H_ diff --git a/include/leveldb/env.h b/include/rocksdb/env.h similarity index 99% rename from include/leveldb/env.h rename to include/rocksdb/env.h index 8431a23da..ebfe4021b 100644 --- a/include/leveldb/env.h +++ b/include/rocksdb/env.h @@ -10,15 +10,15 @@ // All Env implementations are safe for concurrent access from // multiple threads without any external synchronization. -#ifndef STORAGE_LEVELDB_INCLUDE_ENV_H_ -#define STORAGE_LEVELDB_INCLUDE_ENV_H_ +#ifndef STORAGE_ROCKSDB_INCLUDE_ENV_H_ +#define STORAGE_ROCKSDB_INCLUDE_ENV_H_ #include #include #include #include #include -#include "leveldb/status.h" +#include "rocksdb/status.h" namespace leveldb { @@ -531,4 +531,4 @@ class EnvWrapper : public Env { } // namespace leveldb -#endif // STORAGE_LEVELDB_INCLUDE_ENV_H_ +#endif // STORAGE_ROCKSDB_INCLUDE_ENV_H_ diff --git a/include/leveldb/filter_policy.h b/include/rocksdb/filter_policy.h similarity index 94% rename from include/leveldb/filter_policy.h rename to include/rocksdb/filter_policy.h index 1fba08001..42dd6f78a 100644 --- a/include/leveldb/filter_policy.h +++ b/include/rocksdb/filter_policy.h @@ -13,8 +13,8 @@ // Most people will want to use the builtin bloom filter support (see // NewBloomFilterPolicy() below). -#ifndef STORAGE_LEVELDB_INCLUDE_FILTER_POLICY_H_ -#define STORAGE_LEVELDB_INCLUDE_FILTER_POLICY_H_ +#ifndef STORAGE_ROCKSDB_INCLUDE_FILTER_POLICY_H_ +#define STORAGE_ROCKSDB_INCLUDE_FILTER_POLICY_H_ #include @@ -67,4 +67,4 @@ extern const FilterPolicy* NewBloomFilterPolicy(int bits_per_key); } -#endif // STORAGE_LEVELDB_INCLUDE_FILTER_POLICY_H_ +#endif // STORAGE_ROCKSDB_INCLUDE_FILTER_POLICY_H_ diff --git a/include/leveldb/iterator.h b/include/rocksdb/iterator.h similarity index 94% rename from include/leveldb/iterator.h rename to include/rocksdb/iterator.h index ad543eb46..9dde6d70f 100644 --- a/include/leveldb/iterator.h +++ b/include/rocksdb/iterator.h @@ -12,11 +12,11 @@ // non-const method, all threads accessing the same Iterator must use // external synchronization. -#ifndef STORAGE_LEVELDB_INCLUDE_ITERATOR_H_ -#define STORAGE_LEVELDB_INCLUDE_ITERATOR_H_ +#ifndef STORAGE_ROCKSDB_INCLUDE_ITERATOR_H_ +#define STORAGE_ROCKSDB_INCLUDE_ITERATOR_H_ -#include "leveldb/slice.h" -#include "leveldb/status.h" +#include "rocksdb/slice.h" +#include "rocksdb/status.h" namespace leveldb { @@ -97,4 +97,4 @@ extern Iterator* NewErrorIterator(const Status& status); } // namespace leveldb -#endif // STORAGE_LEVELDB_INCLUDE_ITERATOR_H_ +#endif // STORAGE_ROCKSDB_INCLUDE_ITERATOR_H_ diff --git a/include/leveldb/ldb_tool.h b/include/rocksdb/ldb_tool.h similarity index 53% rename from include/leveldb/ldb_tool.h rename to include/rocksdb/ldb_tool.h index 2b506dc2b..53ef6a333 100644 --- a/include/leveldb/ldb_tool.h +++ b/include/rocksdb/ldb_tool.h @@ -1,7 +1,7 @@ // Copyright 2008-present Facebook. All Rights Reserved. -#ifndef STORAGE_LEVELDB_INCLUDE_LDB_TOOL_H -#define STORAGE_LEVELDB_INCLUDE_LDB_TOOL_H -#include "leveldb/options.h" +#ifndef STORAGE_ROCKSDB_INCLUDE_LDB_TOOL_H +#define STORAGE_ROCKSDB_INCLUDE_LDB_TOOL_H +#include "rocksdb/options.h" namespace leveldb { @@ -11,4 +11,4 @@ class LDBTool { }; } // namespace leveldb -#endif // STORAGE_LEVELDB_INCLUDE_LDB_TOOL_H +#endif // STORAGE_ROCKSDB_INCLUDE_LDB_TOOL_H diff --git a/include/leveldb/memtablerep.h b/include/rocksdb/memtablerep.h similarity index 97% rename from include/leveldb/memtablerep.h rename to include/rocksdb/memtablerep.h index bf1b8abdc..4610e9f00 100644 --- a/include/leveldb/memtablerep.h +++ b/include/rocksdb/memtablerep.h @@ -36,13 +36,13 @@ // iteration over the entire collection is rare since doing so requires all the // keys to be copied into a sorted data structure. -#ifndef STORAGE_LEVELDB_DB_MEMTABLEREP_H_ -#define STORAGE_LEVELDB_DB_MEMTABLEREP_H_ +#ifndef STORAGE_ROCKSDB_DB_MEMTABLEREP_H_ +#define STORAGE_ROCKSDB_DB_MEMTABLEREP_H_ #include -#include "leveldb/arena.h" -#include "leveldb/slice.h" -#include "leveldb/slice_transform.h" +#include "rocksdb/arena.h" +#include "rocksdb/slice.h" +#include "rocksdb/slice_transform.h" namespace leveldb { @@ -227,4 +227,4 @@ public: } -#endif // STORAGE_LEVELDB_DB_MEMTABLEREP_H_ +#endif // STORAGE_ROCKSDB_DB_MEMTABLEREP_H_ diff --git a/include/leveldb/merge_operator.h b/include/rocksdb/merge_operator.h similarity index 96% rename from include/leveldb/merge_operator.h rename to include/rocksdb/merge_operator.h index e64418aee..d907c67a3 100644 --- a/include/leveldb/merge_operator.h +++ b/include/rocksdb/merge_operator.h @@ -2,12 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. See the AUTHORS file for names of contributors. -#ifndef STORAGE_LEVELDB_INCLUDE_MERGE_OPERATOR_H_ -#define STORAGE_LEVELDB_INCLUDE_MERGE_OPERATOR_H_ +#ifndef STORAGE_ROCKSDB_INCLUDE_MERGE_OPERATOR_H_ +#define STORAGE_ROCKSDB_INCLUDE_MERGE_OPERATOR_H_ #include #include -#include "leveldb/slice.h" // TODO: Remove this when migration is done; +#include "rocksdb/slice.h" // TODO: Remove this when migration is done; namespace leveldb { @@ -144,4 +144,4 @@ class AssociativeMergeOperator : public MergeOperator { } // namespace leveldb -#endif // STORAGE_LEVELDB_INCLUDE_MERGE_OPERATOR_H_ +#endif // STORAGE_ROCKSDB_INCLUDE_MERGE_OPERATOR_H_ diff --git a/include/leveldb/options.h b/include/rocksdb/options.h similarity index 98% rename from include/leveldb/options.h rename to include/rocksdb/options.h index b34042a00..e3701af09 100644 --- a/include/leveldb/options.h +++ b/include/rocksdb/options.h @@ -2,20 +2,19 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. See the AUTHORS file for names of contributors. -#ifndef STORAGE_LEVELDB_INCLUDE_OPTIONS_H_ -#define STORAGE_LEVELDB_INCLUDE_OPTIONS_H_ +#ifndef STORAGE_ROCKSDB_INCLUDE_OPTIONS_H_ +#define STORAGE_ROCKSDB_INCLUDE_OPTIONS_H_ #include #include #include #include #include -#include "leveldb/slice.h" -#include "leveldb/statistics.h" -#include "leveldb/universal_compaction.h" -#include "leveldb/memtablerep.h" - -#include "leveldb/slice_transform.h" +#include "rocksdb/slice.h" +#include "rocksdb/statistics.h" +#include "rocksdb/universal_compaction.h" +#include "rocksdb/memtablerep.h" +#include "rocksdb/slice_transform.h" namespace leveldb { @@ -631,4 +630,4 @@ struct FlushOptions { } // namespace leveldb -#endif // STORAGE_LEVELDB_INCLUDE_OPTIONS_H_ +#endif // STORAGE_ROCKSDB_INCLUDE_OPTIONS_H_ diff --git a/include/leveldb/perf_context.h b/include/rocksdb/perf_context.h similarity index 79% rename from include/leveldb/perf_context.h rename to include/rocksdb/perf_context.h index bbac3601f..953a160a6 100644 --- a/include/leveldb/perf_context.h +++ b/include/rocksdb/perf_context.h @@ -1,5 +1,5 @@ -#ifndef STORAGE_LEVELDB_INCLUDE_PERF_CONTEXT_H -#define STORAGE_LEVELDB_INCLUDE_PERF_CONTEXT_H +#ifndef STORAGE_ROCKSDB_INCLUDE_PERF_CONTEXT_H +#define STORAGE_ROCKSDB_INCLUDE_PERF_CONTEXT_H #include diff --git a/include/leveldb/slice.h b/include/rocksdb/slice.h similarity index 96% rename from include/leveldb/slice.h rename to include/rocksdb/slice.h index ba0f3467b..4eac682ef 100644 --- a/include/leveldb/slice.h +++ b/include/rocksdb/slice.h @@ -12,8 +12,8 @@ // non-const method, all threads accessing the same Slice must use // external synchronization. -#ifndef STORAGE_LEVELDB_INCLUDE_SLICE_H_ -#define STORAGE_LEVELDB_INCLUDE_SLICE_H_ +#ifndef STORAGE_ROCKSDB_INCLUDE_SLICE_H_ +#define STORAGE_ROCKSDB_INCLUDE_SLICE_H_ #include #include @@ -119,4 +119,4 @@ inline int Slice::compare(const Slice& b) const { } // namespace leveldb -#endif // STORAGE_LEVELDB_INCLUDE_SLICE_H_ +#endif // STORAGE_ROCKSDB_INCLUDE_SLICE_H_ diff --git a/include/leveldb/slice_transform.h b/include/rocksdb/slice_transform.h similarity index 88% rename from include/leveldb/slice_transform.h rename to include/rocksdb/slice_transform.h index 08dce5825..c46bb192f 100644 --- a/include/leveldb/slice_transform.h +++ b/include/rocksdb/slice_transform.h @@ -8,8 +8,8 @@ // define InDomain and InRange to determine which slices are in either // of these sets respectively. -#ifndef STORAGE_LEVELDB_INCLUDE_SLICE_TRANSFORM_H_ -#define STORAGE_LEVELDB_INCLUDE_SLICE_TRANSFORM_H_ +#ifndef STORAGE_ROCKSDB_INCLUDE_SLICE_TRANSFORM_H_ +#define STORAGE_ROCKSDB_INCLUDE_SLICE_TRANSFORM_H_ #include @@ -40,4 +40,4 @@ extern const SliceTransform* NewNoopTransform(); } -#endif // STORAGE_LEVELDB_INCLUDE_SLICE_TRANSFORM_H_ +#endif // STORAGE_ROCKSDB_INCLUDE_SLICE_TRANSFORM_H_ diff --git a/include/leveldb/statistics.h b/include/rocksdb/statistics.h similarity index 98% rename from include/leveldb/statistics.h rename to include/rocksdb/statistics.h index 9a36ffccf..c195a4987 100644 --- a/include/leveldb/statistics.h +++ b/include/rocksdb/statistics.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. See the AUTHORS file for names of contributors. -#ifndef STORAGE_LEVELDB_INCLUDE_STATISTICS_H_ -#define STORAGE_LEVELDB_INCLUDE_STATISTICS_H_ +#ifndef STORAGE_ROCKSDB_INCLUDE_STATISTICS_H_ +#define STORAGE_ROCKSDB_INCLUDE_STATISTICS_H_ #include #include @@ -236,4 +236,4 @@ inline void SetTickerCount(std::shared_ptr statistics, } // namespace leveldb -#endif // STORAGE_LEVELDB_INCLUDE_STATISTICS_H_ +#endif // STORAGE_ROCKSDB_INCLUDE_STATISTICS_H_ diff --git a/include/leveldb/status.h b/include/rocksdb/status.h similarity index 96% rename from include/leveldb/status.h rename to include/rocksdb/status.h index a20351f32..0d0c1a926 100644 --- a/include/leveldb/status.h +++ b/include/rocksdb/status.h @@ -10,11 +10,11 @@ // non-const method, all threads accessing the same Status must use // external synchronization. -#ifndef STORAGE_LEVELDB_INCLUDE_STATUS_H_ -#define STORAGE_LEVELDB_INCLUDE_STATUS_H_ +#ifndef STORAGE_ROCKSDB_INCLUDE_STATUS_H_ +#define STORAGE_ROCKSDB_INCLUDE_STATUS_H_ #include -#include "leveldb/slice.h" +#include "rocksdb/slice.h" namespace leveldb { @@ -116,4 +116,4 @@ inline void Status::operator=(const Status& s) { } // namespace leveldb -#endif // STORAGE_LEVELDB_INCLUDE_STATUS_H_ +#endif // STORAGE_ROCKSDB_INCLUDE_STATUS_H_ diff --git a/include/leveldb/table_builder.h b/include/rocksdb/table_builder.h similarity index 94% rename from include/leveldb/table_builder.h rename to include/rocksdb/table_builder.h index 6ae1ccf8b..4ae3c3eb2 100644 --- a/include/leveldb/table_builder.h +++ b/include/rocksdb/table_builder.h @@ -10,12 +10,12 @@ // non-const method, all threads accessing the same TableBuilder must use // external synchronization. -#ifndef STORAGE_LEVELDB_INCLUDE_TABLE_BUILDER_H_ -#define STORAGE_LEVELDB_INCLUDE_TABLE_BUILDER_H_ +#ifndef STORAGE_ROCKSDB_INCLUDE_TABLE_BUILDER_H_ +#define STORAGE_ROCKSDB_INCLUDE_TABLE_BUILDER_H_ #include -#include "leveldb/options.h" -#include "leveldb/status.h" +#include "rocksdb/options.h" +#include "rocksdb/status.h" namespace leveldb { @@ -92,4 +92,4 @@ class TableBuilder { } // namespace leveldb -#endif // STORAGE_LEVELDB_INCLUDE_TABLE_BUILDER_H_ +#endif // STORAGE_ROCKSDB_INCLUDE_TABLE_BUILDER_H_ diff --git a/include/leveldb/transaction_log.h b/include/rocksdb/transaction_log.h similarity index 88% rename from include/leveldb/transaction_log.h rename to include/rocksdb/transaction_log.h index a834afa86..43a699206 100644 --- a/include/leveldb/transaction_log.h +++ b/include/rocksdb/transaction_log.h @@ -1,10 +1,10 @@ // Copyright 2008-present Facebook. All Rights Reserved. -#ifndef STORAGE_LEVELDB_INCLUDE_TRANSACTION_LOG_ITERATOR_H_ -#define STORAGE_LEVELDB_INCLUDE_TRANSACTION_LOG_ITERATOR_H_ +#ifndef STORAGE_ROCKSDB_INCLUDE_TRANSACTION_LOG_ITERATOR_H_ +#define STORAGE_ROCKSDB_INCLUDE_TRANSACTION_LOG_ITERATOR_H_ -#include "leveldb/status.h" -#include "leveldb/types.h" -#include "leveldb/write_batch.h" +#include "rocksdb/status.h" +#include "rocksdb/types.h" +#include "rocksdb/write_batch.h" namespace leveldb { @@ -75,4 +75,4 @@ class TransactionLogIterator { }; } // namespace leveldb -#endif // STORAGE_LEVELDB_INCLUDE_TRANSACTION_LOG_ITERATOR_H_ +#endif // STORAGE_ROCKSDB_INCLUDE_TRANSACTION_LOG_ITERATOR_H_ diff --git a/include/leveldb/types.h b/include/rocksdb/types.h similarity index 60% rename from include/leveldb/types.h rename to include/rocksdb/types.h index 1d9109461..ad125324b 100644 --- a/include/leveldb/types.h +++ b/include/rocksdb/types.h @@ -1,5 +1,5 @@ -#ifndef STORAGE_LEVELDB_INCLUDE_TYPES_H_ -#define STORAGE_LEVELDB_INCLUDE_TYPES_H_ +#ifndef STORAGE_ROCKSDB_INCLUDE_TYPES_H_ +#define STORAGE_ROCKSDB_INCLUDE_TYPES_H_ #include @@ -11,4 +11,4 @@ namespace leveldb { typedef uint64_t SequenceNumber; } // namespace leveldb -#endif // STORAGE_LEVELDB_INCLUDE_TYPES_H_ +#endif // STORAGE_ROCKSDB_INCLUDE_TYPES_H_ diff --git a/include/leveldb/universal_compaction.h b/include/rocksdb/universal_compaction.h similarity index 96% rename from include/leveldb/universal_compaction.h rename to include/rocksdb/universal_compaction.h index df8402ca4..f5e4c09bc 100644 --- a/include/leveldb/universal_compaction.h +++ b/include/rocksdb/universal_compaction.h @@ -11,8 +11,8 @@ #include #include #include -#include "leveldb/slice.h" -#include "leveldb/statistics.h" +#include "rocksdb/slice.h" +#include "rocksdb/statistics.h" namespace leveldb { diff --git a/include/leveldb/write_batch.h b/include/rocksdb/write_batch.h similarity index 95% rename from include/leveldb/write_batch.h rename to include/rocksdb/write_batch.h index 4564b01fb..8b771712f 100644 --- a/include/leveldb/write_batch.h +++ b/include/rocksdb/write_batch.h @@ -18,11 +18,11 @@ // non-const method, all threads accessing the same WriteBatch must use // external synchronization. -#ifndef STORAGE_LEVELDB_INCLUDE_WRITE_BATCH_H_ -#define STORAGE_LEVELDB_INCLUDE_WRITE_BATCH_H_ +#ifndef STORAGE_ROCKSDB_INCLUDE_WRITE_BATCH_H_ +#define STORAGE_ROCKSDB_INCLUDE_WRITE_BATCH_H_ #include -#include "leveldb/status.h" +#include "rocksdb/status.h" namespace leveldb { @@ -95,4 +95,4 @@ class WriteBatch { } // namespace leveldb -#endif // STORAGE_LEVELDB_INCLUDE_WRITE_BATCH_H_ +#endif // STORAGE_ROCKSDB_INCLUDE_WRITE_BATCH_H_ diff --git a/include/utilities/stackable_db.h b/include/utilities/stackable_db.h index 9b4329678..6cfdf6a8d 100644 --- a/include/utilities/stackable_db.h +++ b/include/utilities/stackable_db.h @@ -5,7 +5,7 @@ #ifndef LEVELDB_INCLUDE_UTILITIES_STACKABLE_DB_H_ #define LEVELDB_INCLUDE_UTILITIES_STACKABLE_DB_H_ -#include "leveldb/db.h" +#include "rocksdb/db.h" namespace leveldb { diff --git a/port/port_posix.h b/port/port_posix.h index 979a4d609..8fa0db264 100644 --- a/port/port_posix.h +++ b/port/port_posix.h @@ -44,7 +44,7 @@ #include #include #include -#include "leveldb/options.h" +#include "rocksdb/options.h" #include "port/atomic_pointer.h" #ifndef PLATFORM_IS_LITTLE_ENDIAN diff --git a/table/block.cc b/table/block.cc index 75772eceb..bbb8d809b 100644 --- a/table/block.cc +++ b/table/block.cc @@ -8,7 +8,7 @@ #include #include -#include "leveldb/comparator.h" +#include "rocksdb/comparator.h" #include "table/format.h" #include "util/coding.h" #include "util/logging.h" diff --git a/table/block.h b/table/block.h index 12938a665..8bd26521b 100644 --- a/table/block.h +++ b/table/block.h @@ -7,7 +7,7 @@ #include #include -#include "leveldb/iterator.h" +#include "rocksdb/iterator.h" namespace leveldb { diff --git a/table/block_builder.cc b/table/block_builder.cc index 2e195223c..e3a738ee5 100644 --- a/table/block_builder.cc +++ b/table/block_builder.cc @@ -30,8 +30,8 @@ #include #include -#include "leveldb/comparator.h" -#include "leveldb/table_builder.h" +#include "rocksdb/comparator.h" +#include "rocksdb/table_builder.h" #include "util/coding.h" namespace leveldb { diff --git a/table/block_builder.h b/table/block_builder.h index bfab3a394..af8ff4f69 100644 --- a/table/block_builder.h +++ b/table/block_builder.h @@ -8,7 +8,7 @@ #include #include -#include "leveldb/slice.h" +#include "rocksdb/slice.h" namespace leveldb { diff --git a/table/block_test.cc b/table/block_test.cc index 2434a629c..1d0dddfea 100644 --- a/table/block_test.cc +++ b/table/block_test.cc @@ -5,10 +5,10 @@ #include "db/dbformat.h" #include "db/memtable.h" #include "db/write_batch_internal.h" -#include "leveldb/db.h" -#include "leveldb/env.h" -#include "leveldb/iterator.h" -#include "leveldb/table_builder.h" +#include "rocksdb/db.h" +#include "rocksdb/env.h" +#include "rocksdb/iterator.h" +#include "rocksdb/table_builder.h" #include "table/block.h" #include "table/block_builder.h" #include "table/table.h" diff --git a/table/filter_block.cc b/table/filter_block.cc index 5f687ebc7..bf211e4a6 100644 --- a/table/filter_block.cc +++ b/table/filter_block.cc @@ -5,7 +5,7 @@ #include "table/filter_block.h" #include "db/dbformat.h" -#include "leveldb/filter_policy.h" +#include "rocksdb/filter_policy.h" #include "util/coding.h" namespace leveldb { diff --git a/table/filter_block.h b/table/filter_block.h index 7e6982188..e5f4e5e6b 100644 --- a/table/filter_block.h +++ b/table/filter_block.h @@ -13,9 +13,9 @@ #include #include #include -#include "leveldb/options.h" -#include "leveldb/slice.h" -#include "leveldb/slice_transform.h" +#include "rocksdb/options.h" +#include "rocksdb/slice.h" +#include "rocksdb/slice_transform.h" #include "util/hash.h" namespace leveldb { diff --git a/table/filter_block_test.cc b/table/filter_block_test.cc index b61770fdf..aa877becf 100644 --- a/table/filter_block_test.cc +++ b/table/filter_block_test.cc @@ -4,7 +4,7 @@ #include "table/filter_block.h" -#include "leveldb/filter_policy.h" +#include "rocksdb/filter_policy.h" #include "util/coding.h" #include "util/hash.h" #include "util/logging.h" diff --git a/table/format.cc b/table/format.cc index 7110f294d..e2e6103bd 100644 --- a/table/format.cc +++ b/table/format.cc @@ -4,7 +4,7 @@ #include "table/format.h" -#include "leveldb/env.h" +#include "rocksdb/env.h" #include "port/port.h" #include "table/block.h" #include "util/coding.h" diff --git a/table/format.h b/table/format.h index 7d72fa240..88008dafd 100644 --- a/table/format.h +++ b/table/format.h @@ -7,9 +7,9 @@ #include #include -#include "leveldb/slice.h" -#include "leveldb/status.h" -#include "leveldb/table_builder.h" +#include "rocksdb/slice.h" +#include "rocksdb/status.h" +#include "rocksdb/table_builder.h" namespace leveldb { diff --git a/table/iter_heap.h b/table/iter_heap.h index 52518ba90..ac46d4dfe 100644 --- a/table/iter_heap.h +++ b/table/iter_heap.h @@ -4,7 +4,7 @@ #include -#include "leveldb/comparator.h" +#include "rocksdb/comparator.h" #include "table/iterator_wrapper.h" namespace leveldb { diff --git a/table/iterator.cc b/table/iterator.cc index 01107872f..bff98e569 100644 --- a/table/iterator.cc +++ b/table/iterator.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. See the AUTHORS file for names of contributors. -#include "leveldb/iterator.h" +#include "rocksdb/iterator.h" namespace leveldb { diff --git a/table/merger.cc b/table/merger.cc index ad6f01da5..71cae45d4 100644 --- a/table/merger.cc +++ b/table/merger.cc @@ -4,8 +4,8 @@ #include "table/merger.h" -#include "leveldb/comparator.h" -#include "leveldb/iterator.h" +#include "rocksdb/comparator.h" +#include "rocksdb/iterator.h" #include "table/iter_heap.h" #include "table/iterator_wrapper.h" diff --git a/table/table.cc b/table/table.cc index 9a5f1b761..22f9619f2 100644 --- a/table/table.cc +++ b/table/table.cc @@ -6,12 +6,12 @@ #include "db/dbformat.h" -#include "leveldb/cache.h" -#include "leveldb/comparator.h" -#include "leveldb/env.h" -#include "leveldb/filter_policy.h" -#include "leveldb/options.h" -#include "leveldb/statistics.h" +#include "rocksdb/cache.h" +#include "rocksdb/comparator.h" +#include "rocksdb/env.h" +#include "rocksdb/filter_policy.h" +#include "rocksdb/options.h" +#include "rocksdb/statistics.h" #include "table/block.h" #include "table/filter_block.h" diff --git a/table/table.h b/table/table.h index c2cb5a32b..489b61c9e 100644 --- a/table/table.h +++ b/table/table.h @@ -7,8 +7,8 @@ #include #include -#include "leveldb/iterator.h" -#include "leveldb/env.h" +#include "rocksdb/iterator.h" +#include "rocksdb/env.h" namespace leveldb { diff --git a/table/table_builder.cc b/table/table_builder.cc index 4e6b047e6..be779af38 100644 --- a/table/table_builder.cc +++ b/table/table_builder.cc @@ -2,13 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. See the AUTHORS file for names of contributors. -#include "leveldb/table_builder.h" +#include "rocksdb/table_builder.h" #include -#include "leveldb/comparator.h" -#include "leveldb/env.h" -#include "leveldb/filter_policy.h" -#include "leveldb/options.h" +#include "rocksdb/comparator.h" +#include "rocksdb/env.h" +#include "rocksdb/filter_policy.h" +#include "rocksdb/options.h" #include "table/block_builder.h" #include "table/filter_block.h" #include "table/format.h" diff --git a/table/table_test.cc b/table/table_test.cc index d78725dac..268c9555a 100644 --- a/table/table_test.cc +++ b/table/table_test.cc @@ -7,11 +7,11 @@ #include "db/dbformat.h" #include "db/memtable.h" #include "db/write_batch_internal.h" -#include "leveldb/db.h" -#include "leveldb/env.h" -#include "leveldb/iterator.h" -#include "leveldb/table_builder.h" -#include "leveldb/memtablerep.h" +#include "rocksdb/db.h" +#include "rocksdb/env.h" +#include "rocksdb/iterator.h" +#include "rocksdb/table_builder.h" +#include "rocksdb/memtablerep.h" #include "table/block.h" #include "table/block_builder.h" #include "table/format.h" diff --git a/table/two_level_iterator.h b/table/two_level_iterator.h index bb2828224..a398254b8 100644 --- a/table/two_level_iterator.h +++ b/table/two_level_iterator.h @@ -5,8 +5,8 @@ #ifndef STORAGE_LEVELDB_TABLE_TWO_LEVEL_ITERATOR_H_ #define STORAGE_LEVELDB_TABLE_TWO_LEVEL_ITERATOR_H_ -#include "leveldb/iterator.h" -#include "leveldb/env.h" +#include "rocksdb/iterator.h" +#include "rocksdb/env.h" namespace leveldb { diff --git a/tools/db_repl_stress.cc b/tools/db_repl_stress.cc index 010fa573d..a7b1ba060 100644 --- a/tools/db_repl_stress.cc +++ b/tools/db_repl_stress.cc @@ -1,8 +1,8 @@ #include #include "db/write_batch_internal.h" -#include "leveldb/db.h" -#include "leveldb/types.h" +#include "rocksdb/db.h" +#include "rocksdb/types.h" #include "port/atomic_pointer.h" #include "util/testutil.h" diff --git a/tools/db_stress.cc b/tools/db_stress.cc index e9f31e208..74691a454 100644 --- a/tools/db_stress.cc +++ b/tools/db_stress.cc @@ -21,11 +21,11 @@ #include "db/db_impl.h" #include "db/version_set.h" #include "db/db_statistics.h" -#include "leveldb/cache.h" +#include "rocksdb/cache.h" #include "utilities/utility_db.h" -#include "leveldb/env.h" -#include "leveldb/write_batch.h" -#include "leveldb/statistics.h" +#include "rocksdb/env.h" +#include "rocksdb/write_batch.h" +#include "rocksdb/statistics.h" #include "port/port.h" #include "util/coding.h" #include "util/crc32c.h" diff --git a/tools/ldb.cc b/tools/ldb.cc index 8430df7f7..7fb899265 100644 --- a/tools/ldb.cc +++ b/tools/ldb.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "leveldb/ldb_tool.h" +#include "rocksdb/ldb_tool.h" int main(int argc, char** argv) { leveldb::LDBTool tool; diff --git a/tools/reduce_levels_test.cc b/tools/reduce_levels_test.cc index 8f2a4ce17..b520d364c 100644 --- a/tools/reduce_levels_test.cc +++ b/tools/reduce_levels_test.cc @@ -3,7 +3,7 @@ // found in the LICENSE file. -#include "leveldb/db.h" +#include "rocksdb/db.h" #include "db/db_impl.h" #include "db/version_set.h" #include "util/logging.h" diff --git a/tools/sst_dump.cc b/tools/sst_dump.cc index 074f17376..b6ef26988 100644 --- a/tools/sst_dump.cc +++ b/tools/sst_dump.cc @@ -7,10 +7,10 @@ #include "db/dbformat.h" #include "db/memtable.h" #include "db/write_batch_internal.h" -#include "leveldb/db.h" -#include "leveldb/env.h" -#include "leveldb/iterator.h" -#include "leveldb/table_builder.h" +#include "rocksdb/db.h" +#include "rocksdb/env.h" +#include "rocksdb/iterator.h" +#include "rocksdb/table_builder.h" #include "table/block.h" #include "table/block_builder.h" #include "table/format.h" diff --git a/util/arena_impl.h b/util/arena_impl.h index a5425e87a..8c4a3f0b6 100644 --- a/util/arena_impl.h +++ b/util/arena_impl.h @@ -13,7 +13,7 @@ #include #include #include -#include "leveldb/arena.h" +#include "rocksdb/arena.h" namespace leveldb { diff --git a/util/auto_roll_logger_test.cc b/util/auto_roll_logger_test.cc index be9a1eda7..7ee3809e5 100755 --- a/util/auto_roll_logger_test.cc +++ b/util/auto_roll_logger_test.cc @@ -6,7 +6,7 @@ #include #include "util/testharness.h" #include "util/auto_roll_logger.h" -#include "leveldb/db.h" +#include "rocksdb/db.h" #include #include #include diff --git a/util/bloom.cc b/util/bloom.cc index d5ad9f215..1fffa0972 100644 --- a/util/bloom.cc +++ b/util/bloom.cc @@ -2,9 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. See the AUTHORS file for names of contributors. -#include "leveldb/filter_policy.h" +#include "rocksdb/filter_policy.h" -#include "leveldb/slice.h" +#include "rocksdb/slice.h" #include "util/hash.h" namespace leveldb { diff --git a/util/bloom_test.cc b/util/bloom_test.cc index d29a0b201..84fac01db 100644 --- a/util/bloom_test.cc +++ b/util/bloom_test.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. See the AUTHORS file for names of contributors. -#include "leveldb/filter_policy.h" +#include "rocksdb/filter_policy.h" #include "util/logging.h" #include "util/testharness.h" diff --git a/util/cache.cc b/util/cache.cc index 5eff58a65..5a2ce38a6 100644 --- a/util/cache.cc +++ b/util/cache.cc @@ -6,7 +6,7 @@ #include #include -#include "leveldb/cache.h" +#include "rocksdb/cache.h" #include "port/port.h" #include "util/hash.h" #include "util/mutexlock.h" diff --git a/util/cache_test.cc b/util/cache_test.cc index 396b08e6d..cf2b3b048 100644 --- a/util/cache_test.cc +++ b/util/cache_test.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. See the AUTHORS file for names of contributors. -#include "leveldb/cache.h" +#include "rocksdb/cache.h" #include #include diff --git a/util/comparator.cc b/util/comparator.cc index 4b7b5724e..16449d804 100644 --- a/util/comparator.cc +++ b/util/comparator.cc @@ -4,8 +4,8 @@ #include #include -#include "leveldb/comparator.h" -#include "leveldb/slice.h" +#include "rocksdb/comparator.h" +#include "rocksdb/slice.h" #include "port/port.h" #include "util/logging.h" diff --git a/util/env.cc b/util/env.cc index d8a3797c9..97d4c709d 100644 --- a/util/env.cc +++ b/util/env.cc @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. See the AUTHORS file for names of contributors. -#include "leveldb/env.h" -#include "leveldb/options.h" +#include "rocksdb/env.h" +#include "rocksdb/options.h" namespace leveldb { diff --git a/util/env_hdfs.cc b/util/env_hdfs.cc index b702e6a22..350164fa5 100644 --- a/util/env_hdfs.cc +++ b/util/env_hdfs.cc @@ -27,8 +27,8 @@ #include #include #include -#include "leveldb/env.h" -#include "leveldb/status.h" +#include "rocksdb/env.h" +#include "rocksdb/status.h" #include "hdfs/hdfs.h" #include "hdfs/env_hdfs.h" @@ -512,7 +512,7 @@ Status HdfsEnv::NewLogger(const std::string& fname, #else // USE_HDFS // dummy placeholders used when HDFS is not available -#include "leveldb/env.h" +#include "rocksdb/env.h" #include "hdfs/env_hdfs.h" namespace leveldb { Status HdfsEnv::NewSequentialFile(const std::string& fname, diff --git a/util/env_posix.cc b/util/env_posix.cc index 4e24163a8..59314fefb 100644 --- a/util/env_posix.cc +++ b/util/env_posix.cc @@ -27,8 +27,8 @@ #if defined(LEVELDB_PLATFORM_ANDROID) #include #endif -#include "leveldb/env.h" -#include "leveldb/slice.h" +#include "rocksdb/env.h" +#include "rocksdb/slice.h" #include "port/port.h" #include "util/coding.h" #include "util/logging.h" diff --git a/util/env_test.cc b/util/env_test.cc index 4f899f149..c7695501e 100644 --- a/util/env_test.cc +++ b/util/env_test.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. See the AUTHORS file for names of contributors. -#include "leveldb/env.h" +#include "rocksdb/env.h" #include #include "port/port.h" diff --git a/util/filelock_test.cc b/util/filelock_test.cc index ea24527c3..8738be72a 100644 --- a/util/filelock_test.cc +++ b/util/filelock_test.cc @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "leveldb/status.h" -#include "leveldb/env.h" +#include "rocksdb/status.h" +#include "rocksdb/env.h" #include #include "util/coding.h" diff --git a/util/filter_policy.cc b/util/filter_policy.cc index 7b045c8c9..df338ee46 100644 --- a/util/filter_policy.cc +++ b/util/filter_policy.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. See the AUTHORS file for names of contributors. -#include "leveldb/filter_policy.h" +#include "rocksdb/filter_policy.h" namespace leveldb { diff --git a/util/histogram.h b/util/histogram.h index 2ddb6e6c3..3d10d93c4 100644 --- a/util/histogram.h +++ b/util/histogram.h @@ -5,7 +5,7 @@ #ifndef STORAGE_LEVELDB_UTIL_HISTOGRAM_H_ #define STORAGE_LEVELDB_UTIL_HISTOGRAM_H_ -#include "leveldb/statistics.h" +#include "rocksdb/statistics.h" #include #include diff --git a/util/ldb_cmd.cc b/util/ldb_cmd.cc index aacfb0354..31e0d8ca2 100644 --- a/util/ldb_cmd.cc +++ b/util/ldb_cmd.cc @@ -9,7 +9,7 @@ #include "db/log_reader.h" #include "db/filename.h" #include "db/write_batch_internal.h" -#include "leveldb/write_batch.h" +#include "rocksdb/write_batch.h" #include "util/coding.h" #include diff --git a/util/ldb_cmd.h b/util/ldb_cmd.h index 753322b61..f590924d4 100644 --- a/util/ldb_cmd.h +++ b/util/ldb_cmd.h @@ -13,10 +13,10 @@ #include #include "db/version_set.h" -#include "leveldb/env.h" -#include "leveldb/options.h" -#include "leveldb/iterator.h" -#include "leveldb/slice.h" +#include "rocksdb/env.h" +#include "rocksdb/options.h" +#include "rocksdb/iterator.h" +#include "rocksdb/slice.h" #include "util/logging.h" #include "util/ldb_cmd_execute_result.h" #include "util/string_util.h" diff --git a/util/ldb_tool.cc b/util/ldb_tool.cc index eec1f4e0e..64c7c5dd6 100644 --- a/util/ldb_tool.cc +++ b/util/ldb_tool.cc @@ -1,6 +1,6 @@ // Copyright 2008-present Facebook. All Rights Reserved. -#include "leveldb/ldb_tool.h" +#include "rocksdb/ldb_tool.h" #include "util/ldb_cmd.h" namespace leveldb { diff --git a/util/logging.cc b/util/logging.cc index 9fb463045..a0f7f0ece 100644 --- a/util/logging.cc +++ b/util/logging.cc @@ -8,8 +8,8 @@ #include #include #include -#include "leveldb/env.h" -#include "leveldb/slice.h" +#include "rocksdb/env.h" +#include "rocksdb/slice.h" namespace leveldb { diff --git a/util/manual_compaction_test.cc b/util/manual_compaction_test.cc index 5dbffd4cf..db1e8d2b4 100644 --- a/util/manual_compaction_test.cc +++ b/util/manual_compaction_test.cc @@ -3,8 +3,8 @@ #include #include -#include "leveldb/db.h" -#include "leveldb/write_batch.h" +#include "rocksdb/db.h" +#include "rocksdb/write_batch.h" #include "util/testharness.h" namespace { diff --git a/util/options.cc b/util/options.cc index 18b708bea..7907f7171 100644 --- a/util/options.cc +++ b/util/options.cc @@ -2,16 +2,16 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. See the AUTHORS file for names of contributors. -#include "leveldb/options.h" +#include "rocksdb/options.h" #include -#include "leveldb/cache.h" -#include "leveldb/compaction_filter.h" -#include "leveldb/comparator.h" -#include "leveldb/env.h" -#include "leveldb/filter_policy.h" -#include "leveldb/merge_operator.h" +#include "rocksdb/cache.h" +#include "rocksdb/compaction_filter.h" +#include "rocksdb/comparator.h" +#include "rocksdb/env.h" +#include "rocksdb/filter_policy.h" +#include "rocksdb/merge_operator.h" namespace leveldb { diff --git a/util/posix_logger.h b/util/posix_logger.h index 176523398..1ddba0069 100644 --- a/util/posix_logger.h +++ b/util/posix_logger.h @@ -17,7 +17,7 @@ #ifdef OS_LINUX #include #endif -#include "leveldb/env.h" +#include "rocksdb/env.h" #include namespace leveldb { diff --git a/util/skiplistrep.cc b/util/skiplistrep.cc index 0c3c81987..ab768bf79 100644 --- a/util/skiplistrep.cc +++ b/util/skiplistrep.cc @@ -1,4 +1,4 @@ -#include "leveldb/memtablerep.h" +#include "rocksdb/memtablerep.h" #include "db/memtable.h" #include "db/skiplist.h" diff --git a/util/slice.cc b/util/slice.cc index a9cdaa5f7..5caa27d74 100644 --- a/util/slice.cc +++ b/util/slice.cc @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. See the AUTHORS file for names of contributors. -#include "leveldb/slice_transform.h" -#include "leveldb/slice.h" +#include "rocksdb/slice_transform.h" +#include "rocksdb/slice.h" namespace leveldb { diff --git a/util/statistics.cc b/util/statistics.cc index a3fbf3135..b9ba8f1e7 100644 --- a/util/statistics.cc +++ b/util/statistics.cc @@ -1,4 +1,4 @@ -#include "leveldb/statistics.h" +#include "rocksdb/statistics.h" #include namespace leveldb { diff --git a/util/status.cc b/util/status.cc index 2cd737579..31dcbba17 100644 --- a/util/status.cc +++ b/util/status.cc @@ -4,7 +4,7 @@ #include #include "port/port.h" -#include "leveldb/status.h" +#include "rocksdb/status.h" namespace leveldb { diff --git a/util/stl_wrappers.h b/util/stl_wrappers.h index 412341978..60b86cda9 100644 --- a/util/stl_wrappers.h +++ b/util/stl_wrappers.h @@ -4,8 +4,8 @@ #include "util/murmurhash.h" #include "util/coding.h" -#include "leveldb/memtablerep.h" -#include "leveldb/slice.h" +#include "rocksdb/memtablerep.h" +#include "rocksdb/slice.h" namespace leveldb { namespace stl_wrappers { diff --git a/util/stop_watch.h b/util/stop_watch.h index 3e5798b62..ac0c02b9b 100644 --- a/util/stop_watch.h +++ b/util/stop_watch.h @@ -1,8 +1,8 @@ #ifndef STORAGE_LEVELDB_UTIL_STOP_WATCH_H_ #define STORAGE_LEVELDB_UTIL_STOP_WATCH_H_ -#include "leveldb/env.h" -#include "leveldb/statistics.h" +#include "rocksdb/env.h" +#include "rocksdb/statistics.h" namespace leveldb { // Auto-scoped. diff --git a/util/testharness.h b/util/testharness.h index da4fe68bb..3e0326044 100644 --- a/util/testharness.h +++ b/util/testharness.h @@ -8,8 +8,8 @@ #include #include #include -#include "leveldb/env.h" -#include "leveldb/slice.h" +#include "rocksdb/env.h" +#include "rocksdb/slice.h" #include "util/random.h" namespace leveldb { diff --git a/util/testutil.h b/util/testutil.h index dd399af8c..e8f570e1e 100644 --- a/util/testutil.h +++ b/util/testutil.h @@ -5,8 +5,8 @@ #ifndef STORAGE_LEVELDB_UTIL_TESTUTIL_H_ #define STORAGE_LEVELDB_UTIL_TESTUTIL_H_ -#include "leveldb/env.h" -#include "leveldb/slice.h" +#include "rocksdb/env.h" +#include "rocksdb/slice.h" #include "util/random.h" namespace leveldb { diff --git a/util/transformrep.cc b/util/transformrep.cc index 10c988427..2020a71d6 100644 --- a/util/transformrep.cc +++ b/util/transformrep.cc @@ -4,10 +4,10 @@ #include #include -#include "leveldb/memtablerep.h" -#include "leveldb/arena.h" -#include "leveldb/slice.h" -#include "leveldb/slice_transform.h" +#include "rocksdb/memtablerep.h" +#include "rocksdb/arena.h" +#include "rocksdb/slice.h" +#include "rocksdb/slice_transform.h" #include "port/port.h" #include "util/mutexlock.h" #include "util/murmurhash.h" diff --git a/util/vectorrep.cc b/util/vectorrep.cc index c38ffad77..14443c731 100644 --- a/util/vectorrep.cc +++ b/util/vectorrep.cc @@ -1,4 +1,4 @@ -#include "leveldb/memtablerep.h" +#include "rocksdb/memtablerep.h" #include #include @@ -6,7 +6,7 @@ #include #include -#include "leveldb/arena.h" +#include "rocksdb/arena.h" #include "port/port.h" #include "util/mutexlock.h" #include "util/stl_wrappers.h" diff --git a/utilities/merge_operators.h b/utilities/merge_operators.h index d4661300e..8557d75de 100644 --- a/utilities/merge_operators.h +++ b/utilities/merge_operators.h @@ -4,7 +4,7 @@ #include #include -#include "leveldb/merge_operator.h" +#include "rocksdb/merge_operator.h" namespace leveldb { diff --git a/utilities/merge_operators/put.cc b/utilities/merge_operators/put.cc index 39da05a7e..d9f306096 100644 --- a/utilities/merge_operators/put.cc +++ b/utilities/merge_operators/put.cc @@ -1,6 +1,6 @@ #include -#include "leveldb/slice.h" -#include "leveldb/merge_operator.h" +#include "rocksdb/slice.h" +#include "rocksdb/merge_operator.h" #include "utilities/merge_operators.h" using namespace leveldb; diff --git a/utilities/merge_operators/string_append/stringappend.cc b/utilities/merge_operators/string_append/stringappend.cc index ff5301f27..d55505d85 100644 --- a/utilities/merge_operators/string_append/stringappend.cc +++ b/utilities/merge_operators/string_append/stringappend.cc @@ -9,8 +9,8 @@ #include #include -#include "leveldb/slice.h" -#include "leveldb/merge_operator.h" +#include "rocksdb/slice.h" +#include "rocksdb/merge_operator.h" #include "utilities/merge_operators.h" namespace leveldb { diff --git a/utilities/merge_operators/string_append/stringappend.h b/utilities/merge_operators/string_append/stringappend.h index fe60de904..79fb31b51 100644 --- a/utilities/merge_operators/string_append/stringappend.h +++ b/utilities/merge_operators/string_append/stringappend.h @@ -5,9 +5,8 @@ */ #pragma once - -#include "leveldb/merge_operator.h" -#include "leveldb/slice.h" +#include "rocksdb/merge_operator.h" +#include "rocksdb/slice.h" namespace leveldb { diff --git a/utilities/merge_operators/string_append/stringappend2.cc b/utilities/merge_operators/string_append/stringappend2.cc index c409a1105..5b14d50ca 100644 --- a/utilities/merge_operators/string_append/stringappend2.cc +++ b/utilities/merge_operators/string_append/stringappend2.cc @@ -8,8 +8,8 @@ #include #include -#include "leveldb/slice.h" -#include "leveldb/merge_operator.h" +#include "rocksdb/slice.h" +#include "rocksdb/merge_operator.h" #include "utilities/merge_operators.h" namespace leveldb { diff --git a/utilities/merge_operators/string_append/stringappend2.h b/utilities/merge_operators/string_append/stringappend2.h index c16a69299..5b85ec170 100644 --- a/utilities/merge_operators/string_append/stringappend2.h +++ b/utilities/merge_operators/string_append/stringappend2.h @@ -11,9 +11,8 @@ */ #pragma once - -#include "leveldb/merge_operator.h" -#include "leveldb/slice.h" +#include "rocksdb/merge_operator.h" +#include "rocksdb/slice.h" namespace leveldb { diff --git a/utilities/merge_operators/string_append/stringappend_test.cc b/utilities/merge_operators/string_append/stringappend_test.cc index 50e3f7779..97061e205 100644 --- a/utilities/merge_operators/string_append/stringappend_test.cc +++ b/utilities/merge_operators/string_append/stringappend_test.cc @@ -9,8 +9,8 @@ #include #include -#include "leveldb/db.h" -#include "leveldb/merge_operator.h" +#include "rocksdb/db.h" +#include "rocksdb/merge_operator.h" #include "utilities/merge_operators.h" #include "utilities/merge_operators/string_append/stringappend.h" #include "utilities/merge_operators/string_append/stringappend2.h" diff --git a/utilities/merge_operators/uint64add.cc b/utilities/merge_operators/uint64add.cc index b3c51d5b3..53a4aca5e 100644 --- a/utilities/merge_operators/uint64add.cc +++ b/utilities/merge_operators/uint64add.cc @@ -1,7 +1,7 @@ #include -#include "leveldb/env.h" -#include "leveldb/merge_operator.h" -#include "leveldb/slice.h" +#include "rocksdb/env.h" +#include "rocksdb/merge_operator.h" +#include "rocksdb/slice.h" #include "util/coding.h" #include "utilities/merge_operators.h" diff --git a/utilities/redis/redis_list_iterator.h b/utilities/redis/redis_list_iterator.h index bcb9ee9dd..4c614f200 100644 --- a/utilities/redis/redis_list_iterator.h +++ b/utilities/redis/redis_list_iterator.h @@ -42,7 +42,7 @@ #include #include "redis_list_exception.h" -#include "leveldb/slice.h" +#include "rocksdb/slice.h" #include "util/coding.h" namespace leveldb { diff --git a/utilities/redis/redis_lists.cc b/utilities/redis/redis_lists.cc index e16f5c9f5..47e19df87 100644 --- a/utilities/redis/redis_lists.cc +++ b/utilities/redis/redis_lists.cc @@ -27,7 +27,7 @@ #include #include -#include "leveldb/slice.h" +#include "rocksdb/slice.h" #include "util/coding.h" namespace leveldb diff --git a/utilities/redis/redis_lists.h b/utilities/redis/redis_lists.h index b3aa515d4..e6f973da2 100644 --- a/utilities/redis/redis_lists.h +++ b/utilities/redis/redis_lists.h @@ -11,7 +11,7 @@ #pragma once #include -#include "leveldb/db.h" +#include "rocksdb/db.h" #include "redis_list_iterator.h" #include "redis_list_exception.h" diff --git a/utilities/ttl/db_ttl.cc b/utilities/ttl/db_ttl.cc index a7e6b938a..27ca0433e 100644 --- a/utilities/ttl/db_ttl.cc +++ b/utilities/ttl/db_ttl.cc @@ -5,8 +5,8 @@ #include "utilities/ttl/db_ttl.h" #include "db/filename.h" #include "util/coding.h" -#include "include/leveldb/env.h" -#include "include/leveldb/iterator.h" +#include "include/rocksdb/env.h" +#include "include/rocksdb/iterator.h" namespace leveldb { diff --git a/utilities/ttl/db_ttl.h b/utilities/ttl/db_ttl.h index 3a6103ac2..e9442bc0b 100644 --- a/utilities/ttl/db_ttl.h +++ b/utilities/ttl/db_ttl.h @@ -5,10 +5,10 @@ #ifndef LEVELDB_UTILITIES_TTL_DB_TTL_H_ #define LEVELDB_UTILITIES_TTL_DB_TTL_H_ -#include "leveldb/db.h" -#include "leveldb/env.h" -#include "leveldb/compaction_filter.h" -#include "leveldb/merge_operator.h" +#include "rocksdb/db.h" +#include "rocksdb/env.h" +#include "rocksdb/compaction_filter.h" +#include "rocksdb/merge_operator.h" #include "utilities/utility_db.h" #include "db/db_impl.h" diff --git a/utilities/ttl/ttl_test.cc b/utilities/ttl/ttl_test.cc index 3d357e0cf..fdd555d45 100644 --- a/utilities/ttl/ttl_test.cc +++ b/utilities/ttl/ttl_test.cc @@ -3,7 +3,7 @@ // found in the LICENSE file. See the AUTHORS file for names of contributors. #include -#include "leveldb/compaction_filter.h" +#include "rocksdb/compaction_filter.h" #include "utilities/utility_db.h" #include "util/testharness.h" #include "util/logging.h"