From 1a1cb696f74761bcb5a2a298a0438af8f8e97990 Mon Sep 17 00:00:00 2001 From: Vinnie Falco Date: Thu, 21 Nov 2013 16:59:54 -0800 Subject: [PATCH] Make include paths relative --- src/ripple/rocksdb/rocksdb/db/builder.cc | 24 +++---- src/ripple/rocksdb/rocksdb/db/builder.h | 8 +-- src/ripple/rocksdb/rocksdb/db/db_bench.cc | 38 +++++------ .../rocksdb/rocksdb/db/db_filesnapshot.cc | 14 ++-- src/ripple/rocksdb/rocksdb/db/db_impl.cc | 64 +++++++++---------- src/ripple/rocksdb/rocksdb/db/db_impl.h | 20 +++--- .../rocksdb/rocksdb/db/db_impl_readonly.cc | 38 +++++------ .../rocksdb/rocksdb/db/db_impl_readonly.h | 16 ++--- src/ripple/rocksdb/rocksdb/db/db_iter.cc | 22 +++---- src/ripple/rocksdb/rocksdb/db/db_iter.h | 4 +- src/ripple/rocksdb/rocksdb/db/db_statistics.h | 8 +-- .../rocksdb/rocksdb/db/db_stats_logger.cc | 12 ++-- src/ripple/rocksdb/rocksdb/db/dbformat.cc | 8 +-- src/ripple/rocksdb/rocksdb/db/dbformat.h | 16 ++--- src/ripple/rocksdb/rocksdb/db/filename.cc | 8 +-- src/ripple/rocksdb/rocksdb/db/filename.h | 8 +-- src/ripple/rocksdb/rocksdb/db/log_reader.cc | 8 +-- src/ripple/rocksdb/rocksdb/db/log_reader.h | 6 +- src/ripple/rocksdb/rocksdb/db/log_writer.cc | 8 +-- src/ripple/rocksdb/rocksdb/db/log_writer.h | 6 +- src/ripple/rocksdb/rocksdb/db/memtable.cc | 18 +++--- src/ripple/rocksdb/rocksdb/db/memtable.h | 12 ++-- src/ripple/rocksdb/rocksdb/db/memtablelist.cc | 12 ++-- src/ripple/rocksdb/rocksdb/db/memtablelist.h | 6 +- src/ripple/rocksdb/rocksdb/db/merge_helper.cc | 8 +-- src/ripple/rocksdb/rocksdb/db/merge_helper.h | 6 +- .../rocksdb/rocksdb/db/merge_operator.cc | 2 +- .../rocksdb/db/prefix_filter_iterator.h | 2 +- src/ripple/rocksdb/rocksdb/db/repair.cc | 26 ++++---- src/ripple/rocksdb/rocksdb/db/skiplist.h | 4 +- src/ripple/rocksdb/rocksdb/db/snapshot.h | 2 +- src/ripple/rocksdb/rocksdb/db/table_cache.cc | 12 ++-- src/ripple/rocksdb/rocksdb/db/table_cache.h | 10 +-- .../rocksdb/db/table_properties_collector.cc | 6 +- .../rocksdb/db/table_properties_collector.h | 2 +- .../rocksdb/db/transaction_log_impl.cc | 4 +- .../rocksdb/rocksdb/db/transaction_log_impl.h | 14 ++-- src/ripple/rocksdb/rocksdb/db/version_edit.cc | 6 +- src/ripple/rocksdb/rocksdb/db/version_edit.h | 2 +- src/ripple/rocksdb/rocksdb/db/version_set.cc | 24 +++---- src/ripple/rocksdb/rocksdb/db/version_set.h | 8 +-- .../db/version_set_reduce_num_levels.cc | 8 +-- src/ripple/rocksdb/rocksdb/db/write_batch.cc | 18 +++--- .../rocksdb/rocksdb/db/write_batch_internal.h | 8 +-- .../rocksdb/rocksdb/helpers/memenv/memenv.cc | 8 +-- .../rocksdb/rocksdb/include/rocksdb/cache.h | 2 +- .../rocksdb/rocksdb/include/rocksdb/db.h | 8 +-- .../rocksdb/rocksdb/include/rocksdb/env.h | 2 +- .../rocksdb/include/rocksdb/iterator.h | 4 +- .../rocksdb/include/rocksdb/ldb_tool.h | 2 +- .../rocksdb/include/rocksdb/memtablerep.h | 6 +- .../rocksdb/include/rocksdb/merge_operator.h | 2 +- .../rocksdb/rocksdb/include/rocksdb/options.h | 16 ++--- .../rocksdb/rocksdb/include/rocksdb/status.h | 2 +- .../rocksdb/rocksdb/include/rocksdb/table.h | 8 +-- .../include/rocksdb/table_properties.h | 2 +- .../rocksdb/include/rocksdb/transaction_log.h | 6 +- .../include/rocksdb/universal_compaction.h | 4 +- .../rocksdb/include/rocksdb/write_batch.h | 2 +- .../rocksdb/include/utilities/stackable_db.h | 2 +- src/ripple/rocksdb/rocksdb/port/port.h | 2 +- src/ripple/rocksdb/rocksdb/port/port_posix.cc | 4 +- src/ripple/rocksdb/rocksdb/port/port_posix.h | 4 +- .../rocksdb/rocksdb/port/stack_trace.cc | 2 +- src/ripple/rocksdb/rocksdb/table/block.cc | 10 +-- src/ripple/rocksdb/rocksdb/table/block.h | 4 +- .../table/block_based_table_builder.cc | 32 +++++----- .../rocksdb/table/block_based_table_builder.h | 8 +-- .../table/block_based_table_factory.cc | 6 +- .../rocksdb/table/block_based_table_factory.h | 6 +- .../rocksdb/table/block_based_table_reader.cc | 30 ++++----- .../rocksdb/table/block_based_table_reader.h | 14 ++-- .../rocksdb/rocksdb/table/block_builder.cc | 6 +- .../rocksdb/rocksdb/table/block_builder.h | 2 +- .../rocksdb/rocksdb/table/block_test.cc | 26 ++++---- .../rocksdb/rocksdb/table/filter_block.cc | 8 +-- .../rocksdb/rocksdb/table/filter_block.h | 8 +-- .../rocksdb/table/filter_block_test.cc | 14 ++-- .../rocksdb/table/flush_block_policy.cc | 6 +- src/ripple/rocksdb/rocksdb/table/format.cc | 12 ++-- src/ripple/rocksdb/rocksdb/table/format.h | 8 +-- src/ripple/rocksdb/rocksdb/table/iter_heap.h | 4 +- src/ripple/rocksdb/rocksdb/table/iterator.cc | 2 +- src/ripple/rocksdb/rocksdb/table/merger.cc | 10 +-- .../rocksdb/table/two_level_iterator.cc | 12 ++-- .../rocksdb/table/two_level_iterator.h | 4 +- src/ripple/rocksdb/rocksdb/util/arena_impl.cc | 2 +- src/ripple/rocksdb/rocksdb/util/arena_impl.h | 2 +- .../rocksdb/rocksdb/util/auto_roll_logger.cc | 4 +- .../rocksdb/rocksdb/util/auto_roll_logger.h | 6 +- src/ripple/rocksdb/rocksdb/util/blob_store.cc | 2 +- src/ripple/rocksdb/rocksdb/util/blob_store.h | 10 +-- src/ripple/rocksdb/rocksdb/util/bloom.cc | 6 +- src/ripple/rocksdb/rocksdb/util/cache.cc | 8 +-- src/ripple/rocksdb/rocksdb/util/coding.cc | 2 +- src/ripple/rocksdb/rocksdb/util/coding.h | 2 +- src/ripple/rocksdb/rocksdb/util/comparator.cc | 8 +-- src/ripple/rocksdb/rocksdb/util/crc32c.cc | 4 +- src/ripple/rocksdb/rocksdb/util/env.cc | 4 +- src/ripple/rocksdb/rocksdb/util/env_hdfs.cc | 6 +- src/ripple/rocksdb/rocksdb/util/env_posix.cc | 14 ++-- src/ripple/rocksdb/rocksdb/util/env_test.cc | 10 +-- .../rocksdb/rocksdb/util/filelock_test.cc | 8 +-- .../rocksdb/rocksdb/util/filter_policy.cc | 2 +- src/ripple/rocksdb/rocksdb/util/hash.cc | 4 +- .../rocksdb/rocksdb/util/hash_skiplist_rep.cc | 16 ++--- src/ripple/rocksdb/rocksdb/util/histogram.cc | 4 +- src/ripple/rocksdb/rocksdb/util/histogram.h | 2 +- src/ripple/rocksdb/rocksdb/util/ldb_cmd.cc | 16 ++--- src/ripple/rocksdb/rocksdb/util/ldb_cmd.h | 16 ++--- src/ripple/rocksdb/rocksdb/util/ldb_tool.cc | 4 +- src/ripple/rocksdb/rocksdb/util/logging.cc | 6 +- src/ripple/rocksdb/rocksdb/util/logging.h | 2 +- src/ripple/rocksdb/rocksdb/util/mutexlock.h | 2 +- src/ripple/rocksdb/rocksdb/util/options.cc | 14 ++-- .../rocksdb/rocksdb/util/perf_context.cc | 2 +- .../rocksdb/rocksdb/util/perf_context_imp.h | 4 +- .../rocksdb/rocksdb/util/posix_logger.h | 2 +- .../rocksdb/rocksdb/util/signal_test.cc | 2 +- .../rocksdb/rocksdb/util/skiplistrep.cc | 6 +- src/ripple/rocksdb/rocksdb/util/slice.cc | 4 +- src/ripple/rocksdb/rocksdb/util/statistics.cc | 2 +- src/ripple/rocksdb/rocksdb/util/status.cc | 4 +- .../rocksdb/rocksdb/util/stl_wrappers.h | 8 +-- src/ripple/rocksdb/rocksdb/util/stop_watch.h | 4 +- .../rocksdb/rocksdb/util/testharness.cc | 2 +- src/ripple/rocksdb/rocksdb/util/testharness.h | 6 +- src/ripple/rocksdb/rocksdb/util/testutil.cc | 4 +- src/ripple/rocksdb/rocksdb/util/testutil.h | 6 +- .../rocksdb/rocksdb/util/transformrep.cc | 16 ++--- src/ripple/rocksdb/rocksdb/util/vectorrep.cc | 10 +-- 131 files changed, 572 insertions(+), 572 deletions(-) diff --git a/src/ripple/rocksdb/rocksdb/db/builder.cc b/src/ripple/rocksdb/rocksdb/db/builder.cc index b3bf894ef..63fd43b08 100644 --- a/src/ripple/rocksdb/rocksdb/db/builder.cc +++ b/src/ripple/rocksdb/rocksdb/db/builder.cc @@ -7,20 +7,20 @@ // 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 "db/builder.h" +#include "builder.h" -#include "db/filename.h" -#include "db/dbformat.h" -#include "db/merge_helper.h" -#include "db/table_cache.h" -#include "db/version_edit.h" -#include "rocksdb/db.h" -#include "rocksdb/table.h" -#include "rocksdb/env.h" -#include "rocksdb/iterator.h" -#include "rocksdb/options.h" +#include "filename.h" +#include "dbformat.h" +#include "merge_helper.h" +#include "table_cache.h" +#include "version_edit.h" +#include "../include/rocksdb/db.h" +#include "../include/rocksdb/table.h" +#include "../include/rocksdb/env.h" +#include "../include/rocksdb/iterator.h" +#include "../include/rocksdb/options.h" #include "table/block_based_table_builder.h" -#include "util/stop_watch.h" +#include "../util/stop_watch.h" namespace rocksdb { diff --git a/src/ripple/rocksdb/rocksdb/db/builder.h b/src/ripple/rocksdb/rocksdb/db/builder.h index 8c525bd05..b7eb4d93d 100644 --- a/src/ripple/rocksdb/rocksdb/db/builder.h +++ b/src/ripple/rocksdb/rocksdb/db/builder.h @@ -6,10 +6,10 @@ // 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. #pragma once -#include "rocksdb/comparator.h" -#include "rocksdb/status.h" -#include "rocksdb/types.h" -#include "rocksdb/options.h" +#include "../include/rocksdb/comparator.h" +#include "../include/rocksdb/status.h" +#include "../include/rocksdb/types.h" +#include "../include/rocksdb/options.h" namespace rocksdb { diff --git a/src/ripple/rocksdb/rocksdb/db/db_bench.cc b/src/ripple/rocksdb/rocksdb/db/db_bench.cc index 63cc906e7..5d9d98e43 100644 --- a/src/ripple/rocksdb/rocksdb/db/db_bench.cc +++ b/src/ripple/rocksdb/rocksdb/db/db_bench.cc @@ -12,25 +12,25 @@ #include #include #include -#include "db/db_impl.h" -#include "db/version_set.h" -#include "db/db_statistics.h" -#include "rocksdb/options.h" -#include "rocksdb/cache.h" -#include "rocksdb/db.h" -#include "rocksdb/env.h" -#include "rocksdb/memtablerep.h" -#include "rocksdb/write_batch.h" -#include "rocksdb/statistics.h" -#include "port/port.h" -#include "util/bit_set.h" -#include "util/crc32c.h" -#include "util/histogram.h" -#include "util/mutexlock.h" -#include "util/random.h" -#include "util/stack_trace.h" -#include "util/string_util.h" -#include "util/testutil.h" +#include "db_impl.h" +#include "version_set.h" +#include "db_statistics.h" +#include "../include/rocksdb/options.h" +#include "../include/rocksdb/cache.h" +#include "../include/rocksdb/db.h" +#include "../include/rocksdb/env.h" +#include "../include/rocksdb/memtablerep.h" +#include "../include/rocksdb/write_batch.h" +#include "../include/rocksdb/statistics.h" +#include "../port/port.h" +#include "../util/bit_set.h" +#include "../util/crc32c.h" +#include "../util/histogram.h" +#include "../util/mutexlock.h" +#include "../util/random.h" +#include "../util/stack_trace.h" +#include "../util/string_util.h" +#include "../util/testutil.h" #include "hdfs/env_hdfs.h" #include "utilities/merge_operators.h" diff --git a/src/ripple/rocksdb/rocksdb/db/db_filesnapshot.cc b/src/ripple/rocksdb/rocksdb/db/db_filesnapshot.cc index 7b9c5ddeb..8c57b98f5 100644 --- a/src/ripple/rocksdb/rocksdb/db/db_filesnapshot.cc +++ b/src/ripple/rocksdb/rocksdb/db/db_filesnapshot.cc @@ -10,13 +10,13 @@ #include #include #include -#include "db/db_impl.h" -#include "db/filename.h" -#include "db/version_set.h" -#include "rocksdb/db.h" -#include "rocksdb/env.h" -#include "port/port.h" -#include "util/mutexlock.h" +#include "db_impl.h" +#include "filename.h" +#include "version_set.h" +#include "../include/rocksdb/db.h" +#include "../include/rocksdb/env.h" +#include "../port/port.h" +#include "../util/mutexlock.h" namespace rocksdb { diff --git a/src/ripple/rocksdb/rocksdb/db/db_impl.cc b/src/ripple/rocksdb/rocksdb/db/db_impl.cc index 5a2f0de4a..40b1d5f4d 100644 --- a/src/ripple/rocksdb/rocksdb/db/db_impl.cc +++ b/src/ripple/rocksdb/rocksdb/db/db_impl.cc @@ -7,7 +7,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 "db/db_impl.h" +#include "db_impl.h" #include #include @@ -19,41 +19,41 @@ #include #include -#include "db/builder.h" -#include "db/dbformat.h" -#include "db/db_iter.h" -#include "db/filename.h" -#include "db/log_reader.h" -#include "db/log_writer.h" -#include "db/memtable.h" -#include "db/memtablelist.h" -#include "db/merge_helper.h" -#include "db/prefix_filter_iterator.h" -#include "db/table_cache.h" -#include "db/table_properties_collector.h" -#include "db/transaction_log_impl.h" -#include "db/version_set.h" -#include "db/write_batch_internal.h" -#include "port/port.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.h" -#include "port/port.h" +#include "builder.h" +#include "dbformat.h" +#include "db_iter.h" +#include "filename.h" +#include "log_reader.h" +#include "log_writer.h" +#include "memtable.h" +#include "memtablelist.h" +#include "merge_helper.h" +#include "prefix_filter_iterator.h" +#include "table_cache.h" +#include "table_properties_collector.h" +#include "transaction_log_impl.h" +#include "version_set.h" +#include "write_batch_internal.h" +#include "../port/port.h" +#include "../include/rocksdb/compaction_filter.h" +#include "../include/rocksdb/db.h" +#include "../include/rocksdb/env.h" +#include "../include/rocksdb/merge_operator.h" +#include "../include/rocksdb/statistics.h" +#include "../include/rocksdb/status.h" +#include "../include/rocksdb/table.h" +#include "../port/port.h" #include "table/block.h" #include "table/block_based_table_factory.h" #include "table/merger.h" #include "table/two_level_iterator.h" -#include "util/auto_roll_logger.h" -#include "util/build_version.h" -#include "util/coding.h" -#include "util/logging.h" -#include "util/mutexlock.h" -#include "util/perf_context_imp.h" -#include "util/stop_watch.h" +#include "../util/auto_roll_logger.h" +#include "../util/build_version.h" +#include "../util/coding.h" +#include "../util/logging.h" +#include "../util/mutexlock.h" +#include "../util/perf_context_imp.h" +#include "../util/stop_watch.h" namespace rocksdb { diff --git a/src/ripple/rocksdb/rocksdb/db/db_impl.h b/src/ripple/rocksdb/rocksdb/db/db_impl.h index dc4c20a51..e0e96d460 100644 --- a/src/ripple/rocksdb/rocksdb/db/db_impl.h +++ b/src/ripple/rocksdb/rocksdb/db/db_impl.h @@ -11,16 +11,16 @@ #include #include #include -#include "db/dbformat.h" -#include "db/log_writer.h" -#include "db/snapshot.h" -#include "db/version_edit.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 "dbformat.h" +#include "log_writer.h" +#include "snapshot.h" +#include "version_edit.h" +#include "../include/rocksdb/db.h" +#include "../include/rocksdb/env.h" +#include "../include/rocksdb/memtablerep.h" +#include "../include/rocksdb/transaction_log.h" +#include "../port/port.h" +#include "../util/stats_logger.h" #include "memtablelist.h" namespace rocksdb { diff --git a/src/ripple/rocksdb/rocksdb/db/db_impl_readonly.cc b/src/ripple/rocksdb/rocksdb/db/db_impl_readonly.cc index 27d5c31ed..605c31715 100644 --- a/src/ripple/rocksdb/rocksdb/db/db_impl_readonly.cc +++ b/src/ripple/rocksdb/rocksdb/db/db_impl_readonly.cc @@ -7,8 +7,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "db/db_impl_readonly.h" -#include "db/db_impl.h" +#include "db_impl_readonly.h" +#include "db_impl.h" #include #include @@ -17,26 +17,26 @@ #include #include #include -#include "db/db_iter.h" -#include "db/dbformat.h" -#include "db/filename.h" -#include "db/log_reader.h" -#include "db/log_writer.h" -#include "db/memtable.h" -#include "db/table_cache.h" -#include "db/version_set.h" -#include "db/write_batch_internal.h" -#include "rocksdb/db.h" -#include "rocksdb/env.h" -#include "rocksdb/status.h" -#include "rocksdb/table.h" -#include "port/port.h" +#include "db_iter.h" +#include "dbformat.h" +#include "filename.h" +#include "log_reader.h" +#include "log_writer.h" +#include "memtable.h" +#include "table_cache.h" +#include "version_set.h" +#include "write_batch_internal.h" +#include "../include/rocksdb/db.h" +#include "../include/rocksdb/env.h" +#include "../include/rocksdb/status.h" +#include "../include/rocksdb/table.h" +#include "../port/port.h" #include "table/block.h" #include "table/merger.h" #include "table/two_level_iterator.h" -#include "util/coding.h" -#include "util/logging.h" -#include "util/build_version.h" +#include "../util/coding.h" +#include "../util/logging.h" +#include "../util/build_version.h" namespace rocksdb { diff --git a/src/ripple/rocksdb/rocksdb/db/db_impl_readonly.h b/src/ripple/rocksdb/rocksdb/db/db_impl_readonly.h index af9c79ed0..db8ebc86b 100644 --- a/src/ripple/rocksdb/rocksdb/db/db_impl_readonly.h +++ b/src/ripple/rocksdb/rocksdb/db/db_impl_readonly.h @@ -8,17 +8,17 @@ // found in the LICENSE file. #pragma once -#include "db/db_impl.h" +#include "db_impl.h" #include #include -#include "db/dbformat.h" -#include "db/log_writer.h" -#include "db/snapshot.h" -#include "rocksdb/db.h" -#include "rocksdb/env.h" -#include "port/port.h" -#include "util/stats_logger.h" +#include "dbformat.h" +#include "log_writer.h" +#include "snapshot.h" +#include "../include/rocksdb/db.h" +#include "../include/rocksdb/env.h" +#include "../port/port.h" +#include "../util/stats_logger.h" namespace rocksdb { diff --git a/src/ripple/rocksdb/rocksdb/db/db_iter.cc b/src/ripple/rocksdb/rocksdb/db/db_iter.cc index 4e3c52c6e..2f0858c49 100644 --- a/src/ripple/rocksdb/rocksdb/db/db_iter.cc +++ b/src/ripple/rocksdb/rocksdb/db/db_iter.cc @@ -7,20 +7,20 @@ // 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 "db/db_iter.h" +#include "db_iter.h" #include #include -#include "db/filename.h" -#include "db/dbformat.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" -#include "util/perf_context_imp.h" +#include "filename.h" +#include "dbformat.h" +#include "../include/rocksdb/env.h" +#include "../include/rocksdb/options.h" +#include "../include/rocksdb/iterator.h" +#include "../include/rocksdb/merge_operator.h" +#include "../port/port.h" +#include "../util/logging.h" +#include "../util/mutexlock.h" +#include "../util/perf_context_imp.h" namespace rocksdb { diff --git a/src/ripple/rocksdb/rocksdb/db/db_iter.h b/src/ripple/rocksdb/rocksdb/db/db_iter.h index b44e67454..57b98aa0f 100644 --- a/src/ripple/rocksdb/rocksdb/db/db_iter.h +++ b/src/ripple/rocksdb/rocksdb/db/db_iter.h @@ -9,8 +9,8 @@ #pragma once #include -#include "rocksdb/db.h" -#include "db/dbformat.h" +#include "../include/rocksdb/db.h" +#include "dbformat.h" namespace rocksdb { diff --git a/src/ripple/rocksdb/rocksdb/db/db_statistics.h b/src/ripple/rocksdb/rocksdb/db/db_statistics.h index 87bc86304..2e1511480 100644 --- a/src/ripple/rocksdb/rocksdb/db/db_statistics.h +++ b/src/ripple/rocksdb/rocksdb/db/db_statistics.h @@ -13,10 +13,10 @@ #include #include -#include "rocksdb/statistics.h" -#include "util/histogram.h" -#include "port/port.h" -#include "util/mutexlock.h" +#include "../include/rocksdb/statistics.h" +#include "../util/histogram.h" +#include "../port/port.h" +#include "../util/mutexlock.h" namespace rocksdb { diff --git a/src/ripple/rocksdb/rocksdb/db/db_stats_logger.cc b/src/ripple/rocksdb/rocksdb/db/db_stats_logger.cc index 91810abe3..705306d51 100644 --- a/src/ripple/rocksdb/rocksdb/db/db_stats_logger.cc +++ b/src/ripple/rocksdb/rocksdb/db/db_stats_logger.cc @@ -7,15 +7,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 "db/db_impl.h" +#include "db_impl.h" #include #include #include -#include "db/version_set.h" -#include "rocksdb/db.h" -#include "rocksdb/env.h" -#include "port/port.h" -#include "util/mutexlock.h" +#include "version_set.h" +#include "../include/rocksdb/db.h" +#include "../include/rocksdb/env.h" +#include "../port/port.h" +#include "../util/mutexlock.h" namespace rocksdb { diff --git a/src/ripple/rocksdb/rocksdb/db/dbformat.cc b/src/ripple/rocksdb/rocksdb/db/dbformat.cc index 3d7e61010..04f9ced45 100644 --- a/src/ripple/rocksdb/rocksdb/db/dbformat.cc +++ b/src/ripple/rocksdb/rocksdb/db/dbformat.cc @@ -8,10 +8,10 @@ // found in the LICENSE file. See the AUTHORS file for names of contributors. #include -#include "db/dbformat.h" -#include "port/port.h" -#include "util/coding.h" -#include "util/perf_context_imp.h" +#include "dbformat.h" +#include "../port/port.h" +#include "../util/coding.h" +#include "../util/perf_context_imp.h" namespace rocksdb { diff --git a/src/ripple/rocksdb/rocksdb/db/dbformat.h b/src/ripple/rocksdb/rocksdb/db/dbformat.h index 64a2c9f05..1863ff5b9 100644 --- a/src/ripple/rocksdb/rocksdb/db/dbformat.h +++ b/src/ripple/rocksdb/rocksdb/db/dbformat.h @@ -9,14 +9,14 @@ #pragma once #include -#include "rocksdb/comparator.h" -#include "rocksdb/db.h" -#include "rocksdb/filter_policy.h" -#include "rocksdb/slice.h" -#include "rocksdb/table.h" -#include "rocksdb/types.h" -#include "util/coding.h" -#include "util/logging.h" +#include "../include/rocksdb/comparator.h" +#include "../include/rocksdb/db.h" +#include "../include/rocksdb/filter_policy.h" +#include "../include/rocksdb/slice.h" +#include "../include/rocksdb/table.h" +#include "../include/rocksdb/types.h" +#include "../util/coding.h" +#include "../util/logging.h" namespace rocksdb { diff --git a/src/ripple/rocksdb/rocksdb/db/filename.cc b/src/ripple/rocksdb/rocksdb/db/filename.cc index cdbd1bc7a..5b9526a50 100644 --- a/src/ripple/rocksdb/rocksdb/db/filename.cc +++ b/src/ripple/rocksdb/rocksdb/db/filename.cc @@ -7,13 +7,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 "db/filename.h" +#include "filename.h" #include #include -#include "db/dbformat.h" -#include "rocksdb/env.h" -#include "util/logging.h" +#include "dbformat.h" +#include "../include/rocksdb/env.h" +#include "../util/logging.h" namespace rocksdb { diff --git a/src/ripple/rocksdb/rocksdb/db/filename.h b/src/ripple/rocksdb/rocksdb/db/filename.h index 8e55f1139..a97a1360b 100644 --- a/src/ripple/rocksdb/rocksdb/db/filename.h +++ b/src/ripple/rocksdb/rocksdb/db/filename.h @@ -12,10 +12,10 @@ #pragma once #include #include -#include "rocksdb/slice.h" -#include "rocksdb/status.h" -#include "rocksdb/transaction_log.h" -#include "port/port.h" +#include "../include/rocksdb/slice.h" +#include "../include/rocksdb/status.h" +#include "../include/rocksdb/transaction_log.h" +#include "../port/port.h" namespace rocksdb { diff --git a/src/ripple/rocksdb/rocksdb/db/log_reader.cc b/src/ripple/rocksdb/rocksdb/db/log_reader.cc index 6596cd84f..548013d53 100644 --- a/src/ripple/rocksdb/rocksdb/db/log_reader.cc +++ b/src/ripple/rocksdb/rocksdb/db/log_reader.cc @@ -7,12 +7,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. -#include "db/log_reader.h" +#include "log_reader.h" #include -#include "rocksdb/env.h" -#include "util/coding.h" -#include "util/crc32c.h" +#include "../include/rocksdb/env.h" +#include "../util/coding.h" +#include "../util/crc32c.h" namespace rocksdb { namespace log { diff --git a/src/ripple/rocksdb/rocksdb/db/log_reader.h b/src/ripple/rocksdb/rocksdb/db/log_reader.h index 8e277c821..07c1df87a 100644 --- a/src/ripple/rocksdb/rocksdb/db/log_reader.h +++ b/src/ripple/rocksdb/rocksdb/db/log_reader.h @@ -11,9 +11,9 @@ #include #include -#include "db/log_format.h" -#include "rocksdb/slice.h" -#include "rocksdb/status.h" +#include "log_format.h" +#include "../include/rocksdb/slice.h" +#include "../include/rocksdb/status.h" namespace rocksdb { diff --git a/src/ripple/rocksdb/rocksdb/db/log_writer.cc b/src/ripple/rocksdb/rocksdb/db/log_writer.cc index df601a470..6a5154bf1 100644 --- a/src/ripple/rocksdb/rocksdb/db/log_writer.cc +++ b/src/ripple/rocksdb/rocksdb/db/log_writer.cc @@ -7,12 +7,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. -#include "db/log_writer.h" +#include "log_writer.h" #include -#include "rocksdb/env.h" -#include "util/coding.h" -#include "util/crc32c.h" +#include "../include/rocksdb/env.h" +#include "../util/coding.h" +#include "../util/crc32c.h" namespace rocksdb { namespace log { diff --git a/src/ripple/rocksdb/rocksdb/db/log_writer.h b/src/ripple/rocksdb/rocksdb/db/log_writer.h index d7b7afff0..5357375d9 100644 --- a/src/ripple/rocksdb/rocksdb/db/log_writer.h +++ b/src/ripple/rocksdb/rocksdb/db/log_writer.h @@ -10,9 +10,9 @@ #pragma once #include #include -#include "db/log_format.h" -#include "rocksdb/slice.h" -#include "rocksdb/status.h" +#include "log_format.h" +#include "../include/rocksdb/slice.h" +#include "../include/rocksdb/status.h" namespace rocksdb { diff --git a/src/ripple/rocksdb/rocksdb/db/memtable.cc b/src/ripple/rocksdb/rocksdb/db/memtable.cc index 291899c21..d9f9d86a7 100644 --- a/src/ripple/rocksdb/rocksdb/db/memtable.cc +++ b/src/ripple/rocksdb/rocksdb/db/memtable.cc @@ -7,18 +7,18 @@ // 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 "db/memtable.h" +#include "memtable.h" #include -#include "db/dbformat.h" -#include "rocksdb/comparator.h" -#include "rocksdb/env.h" -#include "rocksdb/iterator.h" -#include "rocksdb/merge_operator.h" -#include "util/coding.h" -#include "util/mutexlock.h" -#include "util/murmurhash.h" +#include "dbformat.h" +#include "../include/rocksdb/comparator.h" +#include "../include/rocksdb/env.h" +#include "../include/rocksdb/iterator.h" +#include "../include/rocksdb/merge_operator.h" +#include "../util/coding.h" +#include "../util/mutexlock.h" +#include "../util/murmurhash.h" namespace std { template <> diff --git a/src/ripple/rocksdb/rocksdb/db/memtable.h b/src/ripple/rocksdb/rocksdb/db/memtable.h index 93b9b7e2c..d345b7a7c 100644 --- a/src/ripple/rocksdb/rocksdb/db/memtable.h +++ b/src/ripple/rocksdb/rocksdb/db/memtable.h @@ -11,12 +11,12 @@ #include #include #include -#include "db/dbformat.h" -#include "db/skiplist.h" -#include "db/version_set.h" -#include "rocksdb/db.h" -#include "rocksdb/memtablerep.h" -#include "util/arena_impl.h" +#include "dbformat.h" +#include "skiplist.h" +#include "version_set.h" +#include "../include/rocksdb/db.h" +#include "../include/rocksdb/memtablerep.h" +#include "../util/arena_impl.h" namespace rocksdb { diff --git a/src/ripple/rocksdb/rocksdb/db/memtablelist.cc b/src/ripple/rocksdb/rocksdb/db/memtablelist.cc index 3f2a88592..7b7f2f4a0 100644 --- a/src/ripple/rocksdb/rocksdb/db/memtablelist.cc +++ b/src/ripple/rocksdb/rocksdb/db/memtablelist.cc @@ -3,14 +3,14 @@ // LICENSE file in the root directory of this source tree. An additional grant // of patent rights can be found in the PATENTS file in the same directory. // -#include "db/memtablelist.h" +#include "memtablelist.h" #include -#include "rocksdb/db.h" -#include "db/memtable.h" -#include "rocksdb/env.h" -#include "rocksdb/iterator.h" -#include "util/coding.h" +#include "../include/rocksdb/db.h" +#include "memtable.h" +#include "../include/rocksdb/env.h" +#include "../include/rocksdb/iterator.h" +#include "../util/coding.h" namespace rocksdb { diff --git a/src/ripple/rocksdb/rocksdb/db/memtablelist.h b/src/ripple/rocksdb/rocksdb/db/memtablelist.h index 20ea9ecda..4f67b5804 100644 --- a/src/ripple/rocksdb/rocksdb/db/memtablelist.h +++ b/src/ripple/rocksdb/rocksdb/db/memtablelist.h @@ -8,9 +8,9 @@ #include #include #include -#include "rocksdb/db.h" -#include "db/dbformat.h" -#include "db/skiplist.h" +#include "../include/rocksdb/db.h" +#include "dbformat.h" +#include "skiplist.h" #include "memtable.h" namespace rocksdb { diff --git a/src/ripple/rocksdb/rocksdb/db/merge_helper.cc b/src/ripple/rocksdb/rocksdb/db/merge_helper.cc index 9d757a5e6..f1a37ebe1 100644 --- a/src/ripple/rocksdb/rocksdb/db/merge_helper.cc +++ b/src/ripple/rocksdb/rocksdb/db/merge_helper.cc @@ -4,10 +4,10 @@ // of patent rights can be found in the PATENTS file in the same directory. // #include "merge_helper.h" -#include "db/dbformat.h" -#include "rocksdb/comparator.h" -#include "rocksdb/db.h" -#include "rocksdb/merge_operator.h" +#include "dbformat.h" +#include "../include/rocksdb/comparator.h" +#include "../include/rocksdb/db.h" +#include "../include/rocksdb/merge_operator.h" #include #include diff --git a/src/ripple/rocksdb/rocksdb/db/merge_helper.h b/src/ripple/rocksdb/rocksdb/db/merge_helper.h index 34e2edd94..950b121e6 100644 --- a/src/ripple/rocksdb/rocksdb/db/merge_helper.h +++ b/src/ripple/rocksdb/rocksdb/db/merge_helper.h @@ -6,9 +6,9 @@ #ifndef MERGE_HELPER_H #define MERGE_HELPER_H -#include "db/dbformat.h" -#include "rocksdb/slice.h" -#include "rocksdb/statistics.h" +#include "dbformat.h" +#include "../include/rocksdb/slice.h" +#include "../include/rocksdb/statistics.h" #include #include diff --git a/src/ripple/rocksdb/rocksdb/db/merge_operator.cc b/src/ripple/rocksdb/rocksdb/db/merge_operator.cc index 7d1ee4e5f..9250e6b8f 100644 --- a/src/ripple/rocksdb/rocksdb/db/merge_operator.cc +++ b/src/ripple/rocksdb/rocksdb/db/merge_operator.cc @@ -7,7 +7,7 @@ * Back-end implementation details specific to the Merge Operator. */ -#include "rocksdb/merge_operator.h" +#include "../include/rocksdb/merge_operator.h" namespace rocksdb { diff --git a/src/ripple/rocksdb/rocksdb/db/prefix_filter_iterator.h b/src/ripple/rocksdb/rocksdb/db/prefix_filter_iterator.h index f4488379c..abf499f8c 100644 --- a/src/ripple/rocksdb/rocksdb/db/prefix_filter_iterator.h +++ b/src/ripple/rocksdb/rocksdb/db/prefix_filter_iterator.h @@ -11,7 +11,7 @@ // keys in the dataset. #pragma once -#include "rocksdb/iterator.h" +#include "../include/rocksdb/iterator.h" namespace rocksdb { diff --git a/src/ripple/rocksdb/rocksdb/db/repair.cc b/src/ripple/rocksdb/rocksdb/db/repair.cc index 66aa95ae2..2cd578f94 100644 --- a/src/ripple/rocksdb/rocksdb/db/repair.cc +++ b/src/ripple/rocksdb/rocksdb/db/repair.cc @@ -29,19 +29,19 @@ // Store per-table metadata (smallest, largest, largest-seq#, ...) // in the table's meta section to speed up ScanTable. -#include "db/builder.h" -#include "db/db_impl.h" -#include "db/dbformat.h" -#include "db/filename.h" -#include "db/log_reader.h" -#include "db/log_writer.h" -#include "db/memtable.h" -#include "db/table_cache.h" -#include "db/version_edit.h" -#include "db/write_batch_internal.h" -#include "rocksdb/comparator.h" -#include "rocksdb/db.h" -#include "rocksdb/env.h" +#include "builder.h" +#include "db_impl.h" +#include "dbformat.h" +#include "filename.h" +#include "log_reader.h" +#include "log_writer.h" +#include "memtable.h" +#include "table_cache.h" +#include "version_edit.h" +#include "write_batch_internal.h" +#include "../include/rocksdb/comparator.h" +#include "../include/rocksdb/db.h" +#include "../include/rocksdb/env.h" namespace rocksdb { diff --git a/src/ripple/rocksdb/rocksdb/db/skiplist.h b/src/ripple/rocksdb/rocksdb/db/skiplist.h index 06a35d911..6af96af3b 100644 --- a/src/ripple/rocksdb/rocksdb/db/skiplist.h +++ b/src/ripple/rocksdb/rocksdb/db/skiplist.h @@ -33,8 +33,8 @@ #pragma once #include #include -#include "port/port.h" -#include "util/random.h" +#include "../port/port.h" +#include "../util/random.h" namespace rocksdb { diff --git a/src/ripple/rocksdb/rocksdb/db/snapshot.h b/src/ripple/rocksdb/rocksdb/db/snapshot.h index 2c2e3eac8..2250e335d 100644 --- a/src/ripple/rocksdb/rocksdb/db/snapshot.h +++ b/src/ripple/rocksdb/rocksdb/db/snapshot.h @@ -8,7 +8,7 @@ // found in the LICENSE file. See the AUTHORS file for names of contributors. #pragma once -#include "rocksdb/db.h" +#include "../include/rocksdb/db.h" namespace rocksdb { diff --git a/src/ripple/rocksdb/rocksdb/db/table_cache.cc b/src/ripple/rocksdb/rocksdb/db/table_cache.cc index a1f466b5a..7211c8769 100644 --- a/src/ripple/rocksdb/rocksdb/db/table_cache.cc +++ b/src/ripple/rocksdb/rocksdb/db/table_cache.cc @@ -7,14 +7,14 @@ // 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 "db/table_cache.h" +#include "table_cache.h" -#include "db/filename.h" +#include "filename.h" -#include "rocksdb/statistics.h" -#include "rocksdb/table.h" -#include "util/coding.h" -#include "util/stop_watch.h" +#include "../include/rocksdb/statistics.h" +#include "../include/rocksdb/table.h" +#include "../util/coding.h" +#include "../util/stop_watch.h" namespace rocksdb { diff --git a/src/ripple/rocksdb/rocksdb/db/table_cache.h b/src/ripple/rocksdb/rocksdb/db/table_cache.h index 4b225af9b..69d026d1a 100644 --- a/src/ripple/rocksdb/rocksdb/db/table_cache.h +++ b/src/ripple/rocksdb/rocksdb/db/table_cache.h @@ -12,11 +12,11 @@ #pragma once #include #include -#include "db/dbformat.h" -#include "rocksdb/env.h" -#include "rocksdb/cache.h" -#include "port/port.h" -#include "rocksdb/table.h" +#include "dbformat.h" +#include "../include/rocksdb/env.h" +#include "../include/rocksdb/cache.h" +#include "../port/port.h" +#include "../include/rocksdb/table.h" namespace rocksdb { diff --git a/src/ripple/rocksdb/rocksdb/db/table_properties_collector.cc b/src/ripple/rocksdb/rocksdb/db/table_properties_collector.cc index d0cd1520d..e8ddc2f4a 100644 --- a/src/ripple/rocksdb/rocksdb/db/table_properties_collector.cc +++ b/src/ripple/rocksdb/rocksdb/db/table_properties_collector.cc @@ -3,10 +3,10 @@ // LICENSE file in the root directory of this source tree. An additional grant // of patent rights can be found in the PATENTS file in the same directory. -#include "db/table_properties_collector.h" +#include "table_properties_collector.h" -#include "db/dbformat.h" -#include "util/coding.h" +#include "dbformat.h" +#include "../util/coding.h" namespace rocksdb { diff --git a/src/ripple/rocksdb/rocksdb/db/table_properties_collector.h b/src/ripple/rocksdb/rocksdb/db/table_properties_collector.h index 533130db7..b502f80e4 100644 --- a/src/ripple/rocksdb/rocksdb/db/table_properties_collector.h +++ b/src/ripple/rocksdb/rocksdb/db/table_properties_collector.h @@ -6,7 +6,7 @@ // This file defines a collection of statistics collectors. #pragma once -#include "rocksdb/table_properties.h" +#include "../include/rocksdb/table_properties.h" #include #include diff --git a/src/ripple/rocksdb/rocksdb/db/transaction_log_impl.cc b/src/ripple/rocksdb/rocksdb/db/transaction_log_impl.cc index 092d88caa..be2f581c2 100644 --- a/src/ripple/rocksdb/rocksdb/db/transaction_log_impl.cc +++ b/src/ripple/rocksdb/rocksdb/db/transaction_log_impl.cc @@ -3,8 +3,8 @@ // LICENSE file in the root directory of this source tree. An additional grant // of patent rights can be found in the PATENTS file in the same directory. // -#include "db/transaction_log_impl.h" -#include "db/write_batch_internal.h" +#include "transaction_log_impl.h" +#include "write_batch_internal.h" namespace rocksdb { diff --git a/src/ripple/rocksdb/rocksdb/db/transaction_log_impl.h b/src/ripple/rocksdb/rocksdb/db/transaction_log_impl.h index f3f4ce224..e5303eafa 100644 --- a/src/ripple/rocksdb/rocksdb/db/transaction_log_impl.h +++ b/src/ripple/rocksdb/rocksdb/db/transaction_log_impl.h @@ -6,13 +6,13 @@ #pragma once #include -#include "rocksdb/env.h" -#include "rocksdb/options.h" -#include "rocksdb/types.h" -#include "rocksdb/transaction_log.h" -#include "db/db_impl.h" -#include "db/log_reader.h" -#include "db/filename.h" +#include "../include/rocksdb/env.h" +#include "../include/rocksdb/options.h" +#include "../include/rocksdb/types.h" +#include "../include/rocksdb/transaction_log.h" +#include "db_impl.h" +#include "log_reader.h" +#include "filename.h" namespace rocksdb { diff --git a/src/ripple/rocksdb/rocksdb/db/version_edit.cc b/src/ripple/rocksdb/rocksdb/db/version_edit.cc index 9f23faba7..47e907a0a 100644 --- a/src/ripple/rocksdb/rocksdb/db/version_edit.cc +++ b/src/ripple/rocksdb/rocksdb/db/version_edit.cc @@ -7,10 +7,10 @@ // 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 "db/version_edit.h" +#include "version_edit.h" -#include "db/version_set.h" -#include "util/coding.h" +#include "version_set.h" +#include "../util/coding.h" namespace rocksdb { diff --git a/src/ripple/rocksdb/rocksdb/db/version_edit.h b/src/ripple/rocksdb/rocksdb/db/version_edit.h index 196914e2b..bee43160f 100644 --- a/src/ripple/rocksdb/rocksdb/db/version_edit.h +++ b/src/ripple/rocksdb/rocksdb/db/version_edit.h @@ -11,7 +11,7 @@ #include #include #include -#include "db/dbformat.h" +#include "dbformat.h" namespace rocksdb { diff --git a/src/ripple/rocksdb/rocksdb/db/version_set.cc b/src/ripple/rocksdb/rocksdb/db/version_set.cc index d554657b4..5af44e512 100644 --- a/src/ripple/rocksdb/rocksdb/db/version_set.cc +++ b/src/ripple/rocksdb/rocksdb/db/version_set.cc @@ -7,24 +7,24 @@ // 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 "db/version_set.h" +#include "version_set.h" #include #include #include -#include "db/filename.h" -#include "db/log_reader.h" -#include "db/log_writer.h" -#include "db/memtable.h" -#include "db/table_cache.h" -#include "rocksdb/env.h" -#include "rocksdb/merge_operator.h" -#include "rocksdb/table.h" +#include "filename.h" +#include "log_reader.h" +#include "log_writer.h" +#include "memtable.h" +#include "table_cache.h" +#include "../include/rocksdb/env.h" +#include "../include/rocksdb/merge_operator.h" +#include "../include/rocksdb/table.h" #include "table/merger.h" #include "table/two_level_iterator.h" -#include "util/coding.h" -#include "util/logging.h" -#include "util/stop_watch.h" +#include "../util/coding.h" +#include "../util/logging.h" +#include "../util/stop_watch.h" namespace rocksdb { diff --git a/src/ripple/rocksdb/rocksdb/db/version_set.h b/src/ripple/rocksdb/rocksdb/db/version_set.h index 38415173c..7bdacfa70 100644 --- a/src/ripple/rocksdb/rocksdb/db/version_set.h +++ b/src/ripple/rocksdb/rocksdb/db/version_set.h @@ -23,10 +23,10 @@ #include #include #include -#include "db/dbformat.h" -#include "db/version_edit.h" -#include "port/port.h" -#include "db/table_cache.h" +#include "dbformat.h" +#include "version_edit.h" +#include "../port/port.h" +#include "table_cache.h" namespace rocksdb { diff --git a/src/ripple/rocksdb/rocksdb/db/version_set_reduce_num_levels.cc b/src/ripple/rocksdb/rocksdb/db/version_set_reduce_num_levels.cc index d13a4aed9..ca1b6aa3f 100644 --- a/src/ripple/rocksdb/rocksdb/db/version_set_reduce_num_levels.cc +++ b/src/ripple/rocksdb/rocksdb/db/version_set_reduce_num_levels.cc @@ -7,13 +7,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "db/version_set.h" +#include "version_set.h" #include #include -#include "db/log_reader.h" -#include "db/log_writer.h" -#include "util/logging.h" +#include "log_reader.h" +#include "log_writer.h" +#include "../util/logging.h" namespace rocksdb { diff --git a/src/ripple/rocksdb/rocksdb/db/write_batch.cc b/src/ripple/rocksdb/rocksdb/db/write_batch.cc index 134cfb63c..826b151f6 100644 --- a/src/ripple/rocksdb/rocksdb/db/write_batch.cc +++ b/src/ripple/rocksdb/rocksdb/db/write_batch.cc @@ -19,16 +19,16 @@ // len: varint32 // data: uint8[len] -#include "rocksdb/write_batch.h" +#include "../include/rocksdb/write_batch.h" -#include "rocksdb/options.h" -#include "rocksdb/statistics.h" -#include "db/dbformat.h" -#include "db/db_impl.h" -#include "db/memtable.h" -#include "db/snapshot.h" -#include "db/write_batch_internal.h" -#include "util/coding.h" +#include "../include/rocksdb/options.h" +#include "../include/rocksdb/statistics.h" +#include "dbformat.h" +#include "db_impl.h" +#include "memtable.h" +#include "snapshot.h" +#include "write_batch_internal.h" +#include "../util/coding.h" #include namespace rocksdb { diff --git a/src/ripple/rocksdb/rocksdb/db/write_batch_internal.h b/src/ripple/rocksdb/rocksdb/db/write_batch_internal.h index b8991732f..287a13b94 100644 --- a/src/ripple/rocksdb/rocksdb/db/write_batch_internal.h +++ b/src/ripple/rocksdb/rocksdb/db/write_batch_internal.h @@ -8,10 +8,10 @@ // found in the LICENSE file. See the AUTHORS file for names of contributors. #pragma once -#include "rocksdb/types.h" -#include "rocksdb/write_batch.h" -#include "rocksdb/db.h" -#include "rocksdb/options.h" +#include "../include/rocksdb/types.h" +#include "../include/rocksdb/write_batch.h" +#include "../include/rocksdb/db.h" +#include "../include/rocksdb/options.h" namespace rocksdb { diff --git a/src/ripple/rocksdb/rocksdb/helpers/memenv/memenv.cc b/src/ripple/rocksdb/rocksdb/helpers/memenv/memenv.cc index 15f1383a6..854551a26 100644 --- a/src/ripple/rocksdb/rocksdb/helpers/memenv/memenv.cc +++ b/src/ripple/rocksdb/rocksdb/helpers/memenv/memenv.cc @@ -4,10 +4,10 @@ #include "helpers/memenv/memenv.h" -#include "rocksdb/env.h" -#include "rocksdb/status.h" -#include "port/port.h" -#include "util/mutexlock.h" +#include "../include/rocksdb/env.h" +#include "../include/rocksdb/status.h" +#include "../port/port.h" +#include "../util/mutexlock.h" #include #include #include diff --git a/src/ripple/rocksdb/rocksdb/include/rocksdb/cache.h b/src/ripple/rocksdb/rocksdb/include/rocksdb/cache.h index 3e0e5c1cd..14ea78c93 100644 --- a/src/ripple/rocksdb/rocksdb/include/rocksdb/cache.h +++ b/src/ripple/rocksdb/rocksdb/include/rocksdb/cache.h @@ -24,7 +24,7 @@ #include #include -#include "rocksdb/slice.h" +#include "slice.h" namespace rocksdb { diff --git a/src/ripple/rocksdb/rocksdb/include/rocksdb/db.h b/src/ripple/rocksdb/rocksdb/include/rocksdb/db.h index 260202091..b6f6390d0 100644 --- a/src/ripple/rocksdb/rocksdb/include/rocksdb/db.h +++ b/src/ripple/rocksdb/rocksdb/include/rocksdb/db.h @@ -13,10 +13,10 @@ #include #include #include -#include "rocksdb/iterator.h" -#include "rocksdb/options.h" -#include "rocksdb/types.h" -#include "rocksdb/transaction_log.h" +#include "iterator.h" +#include "options.h" +#include "types.h" +#include "transaction_log.h" namespace rocksdb { diff --git a/src/ripple/rocksdb/rocksdb/include/rocksdb/env.h b/src/ripple/rocksdb/rocksdb/include/rocksdb/env.h index 73acbfabe..637452ed1 100644 --- a/src/ripple/rocksdb/rocksdb/include/rocksdb/env.h +++ b/src/ripple/rocksdb/rocksdb/include/rocksdb/env.h @@ -22,7 +22,7 @@ #include #include #include -#include "rocksdb/status.h" +#include "status.h" namespace rocksdb { diff --git a/src/ripple/rocksdb/rocksdb/include/rocksdb/iterator.h b/src/ripple/rocksdb/rocksdb/include/rocksdb/iterator.h index 7538e9cfb..34e5a7bc3 100644 --- a/src/ripple/rocksdb/rocksdb/include/rocksdb/iterator.h +++ b/src/ripple/rocksdb/rocksdb/include/rocksdb/iterator.h @@ -19,8 +19,8 @@ #ifndef STORAGE_ROCKSDB_INCLUDE_ITERATOR_H_ #define STORAGE_ROCKSDB_INCLUDE_ITERATOR_H_ -#include "rocksdb/slice.h" -#include "rocksdb/status.h" +#include "slice.h" +#include "status.h" namespace rocksdb { diff --git a/src/ripple/rocksdb/rocksdb/include/rocksdb/ldb_tool.h b/src/ripple/rocksdb/rocksdb/include/rocksdb/ldb_tool.h index a46b6a758..56485af57 100644 --- a/src/ripple/rocksdb/rocksdb/include/rocksdb/ldb_tool.h +++ b/src/ripple/rocksdb/rocksdb/include/rocksdb/ldb_tool.h @@ -4,7 +4,7 @@ // of patent rights can be found in the PATENTS file in the same directory. #ifndef STORAGE_ROCKSDB_INCLUDE_LDB_TOOL_H #define STORAGE_ROCKSDB_INCLUDE_LDB_TOOL_H -#include "rocksdb/options.h" +#include "options.h" namespace rocksdb { diff --git a/src/ripple/rocksdb/rocksdb/include/rocksdb/memtablerep.h b/src/ripple/rocksdb/rocksdb/include/rocksdb/memtablerep.h index 4147e5f3a..3d8ad88e6 100644 --- a/src/ripple/rocksdb/rocksdb/include/rocksdb/memtablerep.h +++ b/src/ripple/rocksdb/rocksdb/include/rocksdb/memtablerep.h @@ -45,9 +45,9 @@ #define STORAGE_ROCKSDB_DB_MEMTABLEREP_H_ #include -#include "rocksdb/arena.h" -#include "rocksdb/slice.h" -#include "rocksdb/slice_transform.h" +#include "arena.h" +#include "slice.h" +#include "slice_transform.h" namespace rocksdb { diff --git a/src/ripple/rocksdb/rocksdb/include/rocksdb/merge_operator.h b/src/ripple/rocksdb/rocksdb/include/rocksdb/merge_operator.h index ddb3102e3..f98537b85 100644 --- a/src/ripple/rocksdb/rocksdb/include/rocksdb/merge_operator.h +++ b/src/ripple/rocksdb/rocksdb/include/rocksdb/merge_operator.h @@ -8,7 +8,7 @@ #include #include -#include "rocksdb/slice.h" +#include "slice.h" namespace rocksdb { diff --git a/src/ripple/rocksdb/rocksdb/include/rocksdb/options.h b/src/ripple/rocksdb/rocksdb/include/rocksdb/options.h index 0cc33be68..9a1120250 100644 --- a/src/ripple/rocksdb/rocksdb/include/rocksdb/options.h +++ b/src/ripple/rocksdb/rocksdb/include/rocksdb/options.h @@ -15,14 +15,14 @@ #include #include -#include "rocksdb/memtablerep.h" -#include "rocksdb/memtablerep.h" -#include "rocksdb/slice.h" -#include "rocksdb/slice_transform.h" -#include "rocksdb/slice_transform.h" -#include "rocksdb/statistics.h" -#include "rocksdb/table_properties.h" -#include "rocksdb/universal_compaction.h" +#include "memtablerep.h" +#include "memtablerep.h" +#include "slice.h" +#include "slice_transform.h" +#include "slice_transform.h" +#include "statistics.h" +#include "table_properties.h" +#include "universal_compaction.h" namespace rocksdb { diff --git a/src/ripple/rocksdb/rocksdb/include/rocksdb/status.h b/src/ripple/rocksdb/rocksdb/include/rocksdb/status.h index b118e3db4..5f2bbbf4b 100644 --- a/src/ripple/rocksdb/rocksdb/include/rocksdb/status.h +++ b/src/ripple/rocksdb/rocksdb/include/rocksdb/status.h @@ -18,7 +18,7 @@ #define STORAGE_ROCKSDB_INCLUDE_STATUS_H_ #include -#include "rocksdb/slice.h" +#include "slice.h" namespace rocksdb { diff --git a/src/ripple/rocksdb/rocksdb/include/rocksdb/table.h b/src/ripple/rocksdb/rocksdb/include/rocksdb/table.h index 2d2bfacc4..74538fad5 100644 --- a/src/ripple/rocksdb/rocksdb/include/rocksdb/table.h +++ b/src/ripple/rocksdb/rocksdb/include/rocksdb/table.h @@ -10,10 +10,10 @@ #pragma once #include #include -#include "rocksdb/env.h" -#include "rocksdb/iterator.h" -#include "rocksdb/table_properties.h" -#include "rocksdb/options.h" +#include "env.h" +#include "iterator.h" +#include "table_properties.h" +#include "options.h" namespace rocksdb { diff --git a/src/ripple/rocksdb/rocksdb/include/rocksdb/table_properties.h b/src/ripple/rocksdb/rocksdb/include/rocksdb/table_properties.h index 8824ca13c..e807b47b8 100644 --- a/src/ripple/rocksdb/rocksdb/include/rocksdb/table_properties.h +++ b/src/ripple/rocksdb/rocksdb/include/rocksdb/table_properties.h @@ -7,7 +7,7 @@ #include #include -#include "rocksdb/status.h" +#include "status.h" namespace rocksdb { diff --git a/src/ripple/rocksdb/rocksdb/include/rocksdb/transaction_log.h b/src/ripple/rocksdb/rocksdb/include/rocksdb/transaction_log.h index abf072574..2039cbbb5 100644 --- a/src/ripple/rocksdb/rocksdb/include/rocksdb/transaction_log.h +++ b/src/ripple/rocksdb/rocksdb/include/rocksdb/transaction_log.h @@ -6,9 +6,9 @@ #ifndef STORAGE_ROCKSDB_INCLUDE_TRANSACTION_LOG_ITERATOR_H_ #define STORAGE_ROCKSDB_INCLUDE_TRANSACTION_LOG_ITERATOR_H_ -#include "rocksdb/status.h" -#include "rocksdb/types.h" -#include "rocksdb/write_batch.h" +#include "status.h" +#include "types.h" +#include "write_batch.h" #include #include diff --git a/src/ripple/rocksdb/rocksdb/include/rocksdb/universal_compaction.h b/src/ripple/rocksdb/rocksdb/include/rocksdb/universal_compaction.h index ec862b95f..5dccc2a3b 100644 --- a/src/ripple/rocksdb/rocksdb/include/rocksdb/universal_compaction.h +++ b/src/ripple/rocksdb/rocksdb/include/rocksdb/universal_compaction.h @@ -12,8 +12,8 @@ #include #include #include -#include "rocksdb/slice.h" -#include "rocksdb/statistics.h" +#include "slice.h" +#include "statistics.h" namespace rocksdb { diff --git a/src/ripple/rocksdb/rocksdb/include/rocksdb/write_batch.h b/src/ripple/rocksdb/rocksdb/include/rocksdb/write_batch.h index 798807045..c6bcea175 100644 --- a/src/ripple/rocksdb/rocksdb/include/rocksdb/write_batch.h +++ b/src/ripple/rocksdb/rocksdb/include/rocksdb/write_batch.h @@ -26,7 +26,7 @@ #define STORAGE_ROCKSDB_INCLUDE_WRITE_BATCH_H_ #include -#include "rocksdb/status.h" +#include "status.h" namespace rocksdb { diff --git a/src/ripple/rocksdb/rocksdb/include/utilities/stackable_db.h b/src/ripple/rocksdb/rocksdb/include/utilities/stackable_db.h index f15a22e12..1ffc5eba2 100644 --- a/src/ripple/rocksdb/rocksdb/include/utilities/stackable_db.h +++ b/src/ripple/rocksdb/rocksdb/include/utilities/stackable_db.h @@ -3,7 +3,7 @@ // found in the LICENSE file. See the AUTHORS file for names of contributors. #pragma once -#include "rocksdb/db.h" +#include "../include/rocksdb/db.h" namespace rocksdb { diff --git a/src/ripple/rocksdb/rocksdb/port/port.h b/src/ripple/rocksdb/rocksdb/port/port.h index 2dc9a0fa6..cce6f6752 100644 --- a/src/ripple/rocksdb/rocksdb/port/port.h +++ b/src/ripple/rocksdb/rocksdb/port/port.h @@ -16,7 +16,7 @@ // porting to a new platform, see "port_example.h" for documentation // of what the new port_.h file must provide. #if defined(ROCKSDB_PLATFORM_POSIX) -# include "port/port_posix.h" +# include "port_posix.h" #endif #endif // STORAGE_LEVELDB_PORT_PORT_H_ diff --git a/src/ripple/rocksdb/rocksdb/port/port_posix.cc b/src/ripple/rocksdb/rocksdb/port/port_posix.cc index f7025f461..23967aa53 100644 --- a/src/ripple/rocksdb/rocksdb/port/port_posix.cc +++ b/src/ripple/rocksdb/rocksdb/port/port_posix.cc @@ -7,12 +7,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. -#include "port/port_posix.h" +#include "port_posix.h" #include #include #include -#include "util/logging.h" +#include "../util/logging.h" namespace rocksdb { namespace port { diff --git a/src/ripple/rocksdb/rocksdb/port/port_posix.h b/src/ripple/rocksdb/rocksdb/port/port_posix.h index 15ab0dc5b..663733216 100644 --- a/src/ripple/rocksdb/rocksdb/port/port_posix.h +++ b/src/ripple/rocksdb/rocksdb/port/port_posix.h @@ -49,8 +49,8 @@ #include #include #include -#include "rocksdb/options.h" -#include "port/atomic_pointer.h" +#include "../include/rocksdb/options.h" +#include "atomic_pointer.h" #ifndef PLATFORM_IS_LITTLE_ENDIAN #define PLATFORM_IS_LITTLE_ENDIAN (__BYTE_ORDER == __LITTLE_ENDIAN) diff --git a/src/ripple/rocksdb/rocksdb/port/stack_trace.cc b/src/ripple/rocksdb/rocksdb/port/stack_trace.cc index a98f26eac..d52dba54f 100644 --- a/src/ripple/rocksdb/rocksdb/port/stack_trace.cc +++ b/src/ripple/rocksdb/rocksdb/port/stack_trace.cc @@ -3,7 +3,7 @@ // LICENSE file in the root directory of this source tree. An additional grant // of patent rights can be found in the PATENTS file in the same directory. // -#include "util/stack_trace.h" +#include "../util/stack_trace.h" #ifdef OS_LINUX diff --git a/src/ripple/rocksdb/rocksdb/table/block.cc b/src/ripple/rocksdb/rocksdb/table/block.cc index 3f969fe2a..b5586b65c 100644 --- a/src/ripple/rocksdb/rocksdb/table/block.cc +++ b/src/ripple/rocksdb/rocksdb/table/block.cc @@ -9,14 +9,14 @@ // // Decodes the blocks generated by block_builder.cc. -#include "table/block.h" +#include "block.h" #include #include -#include "rocksdb/comparator.h" -#include "table/format.h" -#include "util/coding.h" -#include "util/logging.h" +#include "../include/rocksdb/comparator.h" +#include "format.h" +#include "../util/coding.h" +#include "../util/logging.h" namespace rocksdb { diff --git a/src/ripple/rocksdb/rocksdb/table/block.h b/src/ripple/rocksdb/rocksdb/table/block.h index 7fac00657..b2e4cd915 100644 --- a/src/ripple/rocksdb/rocksdb/table/block.h +++ b/src/ripple/rocksdb/rocksdb/table/block.h @@ -10,8 +10,8 @@ #pragma once #include #include -#include "rocksdb/iterator.h" -#include "rocksdb/options.h" +#include "../include/rocksdb/iterator.h" +#include "../include/rocksdb/options.h" namespace rocksdb { diff --git a/src/ripple/rocksdb/rocksdb/table/block_based_table_builder.cc b/src/ripple/rocksdb/rocksdb/table/block_based_table_builder.cc index a5bf216dc..3131a1bc4 100644 --- a/src/ripple/rocksdb/rocksdb/table/block_based_table_builder.cc +++ b/src/ripple/rocksdb/rocksdb/table/block_based_table_builder.cc @@ -7,28 +7,28 @@ // 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 "table/block_based_table_builder.h" +#include "block_based_table_builder.h" #include #include #include #include -#include "rocksdb/flush_block_policy.h" -#include "rocksdb/cache.h" -#include "rocksdb/comparator.h" -#include "rocksdb/table.h" -#include "rocksdb/env.h" -#include "rocksdb/filter_policy.h" -#include "rocksdb/options.h" -#include "table/block_based_table_reader.h" -#include "table/block.h" -#include "table/block_builder.h" -#include "table/filter_block.h" -#include "table/format.h" -#include "util/coding.h" -#include "util/crc32c.h" -#include "util/stop_watch.h" +#include "../include/rocksdb/flush_block_policy.h" +#include "../include/rocksdb/cache.h" +#include "../include/rocksdb/comparator.h" +#include "../include/rocksdb/table.h" +#include "../include/rocksdb/env.h" +#include "../include/rocksdb/filter_policy.h" +#include "../include/rocksdb/options.h" +#include "block_based_table_reader.h" +#include "block.h" +#include "block_builder.h" +#include "filter_block.h" +#include "format.h" +#include "../util/coding.h" +#include "../util/crc32c.h" +#include "../util/stop_watch.h" namespace rocksdb { diff --git a/src/ripple/rocksdb/rocksdb/table/block_based_table_builder.h b/src/ripple/rocksdb/rocksdb/table/block_based_table_builder.h index 517f8e785..8b4e8921a 100644 --- a/src/ripple/rocksdb/rocksdb/table/block_based_table_builder.h +++ b/src/ripple/rocksdb/rocksdb/table/block_based_table_builder.h @@ -9,10 +9,10 @@ #pragma once #include -#include "rocksdb/flush_block_policy.h" -#include "rocksdb/options.h" -#include "rocksdb/status.h" -#include "rocksdb/table.h" +#include "../include/rocksdb/flush_block_policy.h" +#include "../include/rocksdb/options.h" +#include "../include/rocksdb/status.h" +#include "../include/rocksdb/table.h" namespace rocksdb { diff --git a/src/ripple/rocksdb/rocksdb/table/block_based_table_factory.cc b/src/ripple/rocksdb/rocksdb/table/block_based_table_factory.cc index 836f6edf6..087c0d1bf 100644 --- a/src/ripple/rocksdb/rocksdb/table/block_based_table_factory.cc +++ b/src/ripple/rocksdb/rocksdb/table/block_based_table_factory.cc @@ -8,12 +8,12 @@ // found in the LICENSE file. See the AUTHORS file for names of contributors. -#include "table/block_based_table_factory.h" +#include "block_based_table_factory.h" #include #include -#include "table/block_based_table_builder.h" -#include "table/block_based_table_reader.h" +#include "block_based_table_builder.h" +#include "block_based_table_reader.h" #include "port/port.h" namespace rocksdb { diff --git a/src/ripple/rocksdb/rocksdb/table/block_based_table_factory.h b/src/ripple/rocksdb/rocksdb/table/block_based_table_factory.h index ee525816f..6fe136031 100644 --- a/src/ripple/rocksdb/rocksdb/table/block_based_table_factory.h +++ b/src/ripple/rocksdb/rocksdb/table/block_based_table_factory.h @@ -11,9 +11,9 @@ #include #include -#include "rocksdb/flush_block_policy.h" -#include "rocksdb/options.h" -#include "rocksdb/table.h" +#include "../include/rocksdb/flush_block_policy.h" +#include "../include/rocksdb/options.h" +#include "../include/rocksdb/table.h" namespace rocksdb { diff --git a/src/ripple/rocksdb/rocksdb/table/block_based_table_reader.cc b/src/ripple/rocksdb/rocksdb/table/block_based_table_reader.cc index 5a2690103..e1082825a 100644 --- a/src/ripple/rocksdb/rocksdb/table/block_based_table_reader.cc +++ b/src/ripple/rocksdb/rocksdb/table/block_based_table_reader.cc @@ -7,25 +7,25 @@ // 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 "table/block_based_table_reader.h" +#include "block_based_table_reader.h" -#include "db/dbformat.h" +#include "../db/dbformat.h" -#include "rocksdb/comparator.h" -#include "rocksdb/env.h" -#include "rocksdb/filter_policy.h" -#include "rocksdb/options.h" -#include "rocksdb/statistics.h" -#include "rocksdb/table.h" +#include "../include/rocksdb/comparator.h" +#include "../include/rocksdb/env.h" +#include "../include/rocksdb/filter_policy.h" +#include "../include/rocksdb/options.h" +#include "../include/rocksdb/statistics.h" +#include "../include/rocksdb/table.h" -#include "table/block.h" -#include "table/filter_block.h" -#include "table/format.h" -#include "table/two_level_iterator.h" +#include "block.h" +#include "filter_block.h" +#include "format.h" +#include "two_level_iterator.h" -#include "util/coding.h" -#include "util/perf_context_imp.h" -#include "util/stop_watch.h" +#include "../util/coding.h" +#include "../util/perf_context_imp.h" +#include "../util/stop_watch.h" namespace rocksdb { diff --git a/src/ripple/rocksdb/rocksdb/table/block_based_table_reader.h b/src/ripple/rocksdb/rocksdb/table/block_based_table_reader.h index 02bbfd74c..9137ca735 100644 --- a/src/ripple/rocksdb/rocksdb/table/block_based_table_reader.h +++ b/src/ripple/rocksdb/rocksdb/table/block_based_table_reader.h @@ -10,13 +10,13 @@ #pragma once #include #include -#include "rocksdb/cache.h" -#include "rocksdb/env.h" -#include "rocksdb/iterator.h" -#include "rocksdb/statistics.h" -#include "rocksdb/table_properties.h" -#include "rocksdb/table.h" -#include "util/coding.h" +#include "../include/rocksdb/cache.h" +#include "../include/rocksdb/env.h" +#include "../include/rocksdb/iterator.h" +#include "../include/rocksdb/statistics.h" +#include "../include/rocksdb/table_properties.h" +#include "../include/rocksdb/table.h" +#include "../util/coding.h" namespace rocksdb { diff --git a/src/ripple/rocksdb/rocksdb/table/block_builder.cc b/src/ripple/rocksdb/rocksdb/table/block_builder.cc index 917601865..4334ecdb8 100644 --- a/src/ripple/rocksdb/rocksdb/table/block_builder.cc +++ b/src/ripple/rocksdb/rocksdb/table/block_builder.cc @@ -31,12 +31,12 @@ // num_restarts: uint32 // restarts[i] contains the offset within the block of the ith restart point. -#include "table/block_builder.h" +#include "block_builder.h" #include #include -#include "rocksdb/comparator.h" -#include "util/coding.h" +#include "../include/rocksdb/comparator.h" +#include "../util/coding.h" namespace rocksdb { diff --git a/src/ripple/rocksdb/rocksdb/table/block_builder.h b/src/ripple/rocksdb/rocksdb/table/block_builder.h index 31faf19b8..5c2a17ee3 100644 --- a/src/ripple/rocksdb/rocksdb/table/block_builder.h +++ b/src/ripple/rocksdb/rocksdb/table/block_builder.h @@ -11,7 +11,7 @@ #include #include -#include "rocksdb/slice.h" +#include "../include/rocksdb/slice.h" namespace rocksdb { diff --git a/src/ripple/rocksdb/rocksdb/table/block_test.cc b/src/ripple/rocksdb/rocksdb/table/block_test.cc index 7f33e3a90..692cd3cb1 100644 --- a/src/ripple/rocksdb/rocksdb/table/block_test.cc +++ b/src/ripple/rocksdb/rocksdb/table/block_test.cc @@ -4,19 +4,19 @@ // of patent rights can be found in the PATENTS file in the same directory. // #include -#include "db/dbformat.h" -#include "db/memtable.h" -#include "db/write_batch_internal.h" -#include "rocksdb/db.h" -#include "rocksdb/env.h" -#include "rocksdb/iterator.h" -#include "rocksdb/table.h" -#include "table/block.h" -#include "table/block_builder.h" -#include "table/format.h" -#include "util/random.h" -#include "util/testharness.h" -#include "util/testutil.h" +#include "../db/dbformat.h" +#include "../db/memtable.h" +#include "../db/write_batch_internal.h" +#include "../include/rocksdb/db.h" +#include "../include/rocksdb/env.h" +#include "../include/rocksdb/iterator.h" +#include "../include/rocksdb/table.h" +#include "block.h" +#include "block_builder.h" +#include "format.h" +#include "../util/random.h" +#include "../util/testharness.h" +#include "../util/testutil.h" namespace rocksdb { diff --git a/src/ripple/rocksdb/rocksdb/table/filter_block.cc b/src/ripple/rocksdb/rocksdb/table/filter_block.cc index 82b6c6ee1..d56ba05d2 100644 --- a/src/ripple/rocksdb/rocksdb/table/filter_block.cc +++ b/src/ripple/rocksdb/rocksdb/table/filter_block.cc @@ -7,11 +7,11 @@ // 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 "table/filter_block.h" +#include "filter_block.h" -#include "db/dbformat.h" -#include "rocksdb/filter_policy.h" -#include "util/coding.h" +#include "../db/dbformat.h" +#include "../include/rocksdb/filter_policy.h" +#include "../util/coding.h" namespace rocksdb { diff --git a/src/ripple/rocksdb/rocksdb/table/filter_block.h b/src/ripple/rocksdb/rocksdb/table/filter_block.h index e47f94653..2ef57f254 100644 --- a/src/ripple/rocksdb/rocksdb/table/filter_block.h +++ b/src/ripple/rocksdb/rocksdb/table/filter_block.h @@ -18,10 +18,10 @@ #include #include #include -#include "rocksdb/options.h" -#include "rocksdb/slice.h" -#include "rocksdb/slice_transform.h" -#include "util/hash.h" +#include "../include/rocksdb/options.h" +#include "../include/rocksdb/slice.h" +#include "../include/rocksdb/slice_transform.h" +#include "../util/hash.h" namespace rocksdb { diff --git a/src/ripple/rocksdb/rocksdb/table/filter_block_test.cc b/src/ripple/rocksdb/rocksdb/table/filter_block_test.cc index bc1a0d0ab..fccb188eb 100644 --- a/src/ripple/rocksdb/rocksdb/table/filter_block_test.cc +++ b/src/ripple/rocksdb/rocksdb/table/filter_block_test.cc @@ -7,14 +7,14 @@ // 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 "table/filter_block.h" +#include "filter_block.h" -#include "rocksdb/filter_policy.h" -#include "util/coding.h" -#include "util/hash.h" -#include "util/logging.h" -#include "util/testharness.h" -#include "util/testutil.h" +#include "../include/rocksdb/filter_policy.h" +#include "../util/coding.h" +#include "../util/hash.h" +#include "../util/logging.h" +#include "../util/testharness.h" +#include "../util/testutil.h" namespace rocksdb { diff --git a/src/ripple/rocksdb/rocksdb/table/flush_block_policy.cc b/src/ripple/rocksdb/rocksdb/table/flush_block_policy.cc index a953a78a7..91c3aaee1 100644 --- a/src/ripple/rocksdb/rocksdb/table/flush_block_policy.cc +++ b/src/ripple/rocksdb/rocksdb/table/flush_block_policy.cc @@ -3,9 +3,9 @@ // LICENSE file in the root directory of this source tree. An additional grant // of patent rights can be found in the PATENTS file in the same directory. -#include "rocksdb/flush_block_policy.h" -#include "rocksdb/slice.h" -#include "table/block_builder.h" +#include "../include/rocksdb/flush_block_policy.h" +#include "../include/rocksdb/slice.h" +#include "block_builder.h" #include diff --git a/src/ripple/rocksdb/rocksdb/table/format.cc b/src/ripple/rocksdb/rocksdb/table/format.cc index ff6d8fa24..0f4ed93f0 100644 --- a/src/ripple/rocksdb/rocksdb/table/format.cc +++ b/src/ripple/rocksdb/rocksdb/table/format.cc @@ -7,14 +7,14 @@ // 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 "table/format.h" +#include "format.h" #include "port/port.h" -#include "rocksdb/env.h" -#include "table/block.h" -#include "util/coding.h" -#include "util/crc32c.h" -#include "util/perf_context_imp.h" +#include "../include/rocksdb/env.h" +#include "block.h" +#include "../util/coding.h" +#include "../util/crc32c.h" +#include "../util/perf_context_imp.h" namespace rocksdb { diff --git a/src/ripple/rocksdb/rocksdb/table/format.h b/src/ripple/rocksdb/rocksdb/table/format.h index 2f1c1e8dc..b19200fb7 100644 --- a/src/ripple/rocksdb/rocksdb/table/format.h +++ b/src/ripple/rocksdb/rocksdb/table/format.h @@ -10,10 +10,10 @@ #pragma once #include #include -#include "rocksdb/slice.h" -#include "rocksdb/status.h" -#include "rocksdb/options.h" -#include "rocksdb/table.h" +#include "../include/rocksdb/slice.h" +#include "../include/rocksdb/status.h" +#include "../include/rocksdb/options.h" +#include "../include/rocksdb/table.h" namespace rocksdb { diff --git a/src/ripple/rocksdb/rocksdb/table/iter_heap.h b/src/ripple/rocksdb/rocksdb/table/iter_heap.h index af8834e38..4b633d3aa 100644 --- a/src/ripple/rocksdb/rocksdb/table/iter_heap.h +++ b/src/ripple/rocksdb/rocksdb/table/iter_heap.h @@ -7,8 +7,8 @@ #pragma once #include -#include "rocksdb/comparator.h" -#include "table/iterator_wrapper.h" +#include "../include/rocksdb/comparator.h" +#include "iterator_wrapper.h" namespace rocksdb { diff --git a/src/ripple/rocksdb/rocksdb/table/iterator.cc b/src/ripple/rocksdb/rocksdb/table/iterator.cc index a3d4f638d..f46872052 100644 --- a/src/ripple/rocksdb/rocksdb/table/iterator.cc +++ b/src/ripple/rocksdb/rocksdb/table/iterator.cc @@ -7,7 +7,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 "rocksdb/iterator.h" +#include "../include/rocksdb/iterator.h" namespace rocksdb { diff --git a/src/ripple/rocksdb/rocksdb/table/merger.cc b/src/ripple/rocksdb/rocksdb/table/merger.cc index f5ce7440c..d07d1e613 100644 --- a/src/ripple/rocksdb/rocksdb/table/merger.cc +++ b/src/ripple/rocksdb/rocksdb/table/merger.cc @@ -7,12 +7,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. -#include "table/merger.h" +#include "merger.h" -#include "rocksdb/comparator.h" -#include "rocksdb/iterator.h" -#include "table/iter_heap.h" -#include "table/iterator_wrapper.h" +#include "../include/rocksdb/comparator.h" +#include "../include/rocksdb/iterator.h" +#include "iter_heap.h" +#include "iterator_wrapper.h" #include diff --git a/src/ripple/rocksdb/rocksdb/table/two_level_iterator.cc b/src/ripple/rocksdb/rocksdb/table/two_level_iterator.cc index ac2d8d3d9..ee7beda85 100644 --- a/src/ripple/rocksdb/rocksdb/table/two_level_iterator.cc +++ b/src/ripple/rocksdb/rocksdb/table/two_level_iterator.cc @@ -7,13 +7,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 "table/two_level_iterator.h" +#include "two_level_iterator.h" -#include "rocksdb/options.h" -#include "rocksdb/table.h" -#include "table/block.h" -#include "table/format.h" -#include "table/iterator_wrapper.h" +#include "../include/rocksdb/options.h" +#include "../include/rocksdb/table.h" +#include "block.h" +#include "format.h" +#include "iterator_wrapper.h" namespace rocksdb { diff --git a/src/ripple/rocksdb/rocksdb/table/two_level_iterator.h b/src/ripple/rocksdb/rocksdb/table/two_level_iterator.h index 85aed3f14..9000c9604 100644 --- a/src/ripple/rocksdb/rocksdb/table/two_level_iterator.h +++ b/src/ripple/rocksdb/rocksdb/table/two_level_iterator.h @@ -8,8 +8,8 @@ // found in the LICENSE file. See the AUTHORS file for names of contributors. #pragma once -#include "rocksdb/iterator.h" -#include "rocksdb/env.h" +#include "../include/rocksdb/iterator.h" +#include "../include/rocksdb/env.h" namespace rocksdb { diff --git a/src/ripple/rocksdb/rocksdb/util/arena_impl.cc b/src/ripple/rocksdb/rocksdb/util/arena_impl.cc index d5c2a537e..3782ecdd3 100644 --- a/src/ripple/rocksdb/rocksdb/util/arena_impl.cc +++ b/src/ripple/rocksdb/rocksdb/util/arena_impl.cc @@ -7,7 +7,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 "util/arena_impl.h" +#include "arena_impl.h" namespace rocksdb { diff --git a/src/ripple/rocksdb/rocksdb/util/arena_impl.h b/src/ripple/rocksdb/rocksdb/util/arena_impl.h index b5a684247..d0dd1dcd4 100644 --- a/src/ripple/rocksdb/rocksdb/util/arena_impl.h +++ b/src/ripple/rocksdb/rocksdb/util/arena_impl.h @@ -16,7 +16,7 @@ #include #include #include -#include "rocksdb/arena.h" +#include "../include/rocksdb/arena.h" namespace rocksdb { diff --git a/src/ripple/rocksdb/rocksdb/util/auto_roll_logger.cc b/src/ripple/rocksdb/rocksdb/util/auto_roll_logger.cc index 95f2fae0d..cf2cf473c 100644 --- a/src/ripple/rocksdb/rocksdb/util/auto_roll_logger.cc +++ b/src/ripple/rocksdb/rocksdb/util/auto_roll_logger.cc @@ -3,8 +3,8 @@ // LICENSE file in the root directory of this source tree. An additional grant // of patent rights can be found in the PATENTS file in the same directory. // -#include "util/auto_roll_logger.h" -#include "util/mutexlock.h" +#include "auto_roll_logger.h" +#include "mutexlock.h" using namespace std; diff --git a/src/ripple/rocksdb/rocksdb/util/auto_roll_logger.h b/src/ripple/rocksdb/rocksdb/util/auto_roll_logger.h index db70f1586..2216662fe 100644 --- a/src/ripple/rocksdb/rocksdb/util/auto_roll_logger.h +++ b/src/ripple/rocksdb/rocksdb/util/auto_roll_logger.h @@ -7,9 +7,9 @@ // where enough posix functionality is available. #pragma once -#include "db/filename.h" -#include "port/port.h" -#include "util/posix_logger.h" +#include "../db/filename.h" +#include "../port/port.h" +#include "posix_logger.h" namespace rocksdb { diff --git a/src/ripple/rocksdb/rocksdb/util/blob_store.cc b/src/ripple/rocksdb/rocksdb/util/blob_store.cc index 9f0671281..b45480752 100644 --- a/src/ripple/rocksdb/rocksdb/util/blob_store.cc +++ b/src/ripple/rocksdb/rocksdb/util/blob_store.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 "util/blob_store.h" +#include "blob_store.h" namespace rocksdb { diff --git a/src/ripple/rocksdb/rocksdb/util/blob_store.h b/src/ripple/rocksdb/rocksdb/util/blob_store.h index 0a81d01df..d4c999320 100644 --- a/src/ripple/rocksdb/rocksdb/util/blob_store.h +++ b/src/ripple/rocksdb/rocksdb/util/blob_store.h @@ -3,11 +3,11 @@ // found in the LICENSE file. See the AUTHORS file for names of contributors. #pragma once -#include "rocksdb/env.h" -#include "rocksdb/status.h" -#include "port/port.h" -#include "util/mutexlock.h" -#include "util/coding.h" +#include "../include/rocksdb/env.h" +#include "../include/rocksdb/status.h" +#include "../port/port.h" +#include "mutexlock.h" +#include "coding.h" #include #include diff --git a/src/ripple/rocksdb/rocksdb/util/bloom.cc b/src/ripple/rocksdb/rocksdb/util/bloom.cc index 78ae04a26..e7da7e8d4 100644 --- a/src/ripple/rocksdb/rocksdb/util/bloom.cc +++ b/src/ripple/rocksdb/rocksdb/util/bloom.cc @@ -7,10 +7,10 @@ // 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 "rocksdb/filter_policy.h" +#include "../include/rocksdb/filter_policy.h" -#include "rocksdb/slice.h" -#include "util/hash.h" +#include "../include/rocksdb/slice.h" +#include "hash.h" namespace rocksdb { diff --git a/src/ripple/rocksdb/rocksdb/util/cache.cc b/src/ripple/rocksdb/rocksdb/util/cache.cc index deec52864..aef70d0a0 100644 --- a/src/ripple/rocksdb/rocksdb/util/cache.cc +++ b/src/ripple/rocksdb/rocksdb/util/cache.cc @@ -12,10 +12,10 @@ #include #include -#include "rocksdb/cache.h" -#include "port/port.h" -#include "util/hash.h" -#include "util/mutexlock.h" +#include "../include/rocksdb/cache.h" +#include "../port/port.h" +#include "hash.h" +#include "mutexlock.h" namespace rocksdb { diff --git a/src/ripple/rocksdb/rocksdb/util/coding.cc b/src/ripple/rocksdb/rocksdb/util/coding.cc index 2d70647fb..8bc77e32b 100644 --- a/src/ripple/rocksdb/rocksdb/util/coding.cc +++ b/src/ripple/rocksdb/rocksdb/util/coding.cc @@ -7,7 +7,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 "util/coding.h" +#include "coding.h" #include diff --git a/src/ripple/rocksdb/rocksdb/util/coding.h b/src/ripple/rocksdb/rocksdb/util/coding.h index 3fd892f79..8ffd8311a 100644 --- a/src/ripple/rocksdb/rocksdb/util/coding.h +++ b/src/ripple/rocksdb/rocksdb/util/coding.h @@ -16,7 +16,7 @@ #include #include #include -#include "port/port.h" +#include "../port/port.h" namespace rocksdb { diff --git a/src/ripple/rocksdb/rocksdb/util/comparator.cc b/src/ripple/rocksdb/rocksdb/util/comparator.cc index adeacac0a..c5833846f 100644 --- a/src/ripple/rocksdb/rocksdb/util/comparator.cc +++ b/src/ripple/rocksdb/rocksdb/util/comparator.cc @@ -9,10 +9,10 @@ #include #include -#include "rocksdb/comparator.h" -#include "rocksdb/slice.h" -#include "port/port.h" -#include "util/logging.h" +#include "../include/rocksdb/comparator.h" +#include "../include/rocksdb/slice.h" +#include "../port/port.h" +#include "logging.h" namespace rocksdb { diff --git a/src/ripple/rocksdb/rocksdb/util/crc32c.cc b/src/ripple/rocksdb/rocksdb/util/crc32c.cc index bca955a09..84d93e77b 100644 --- a/src/ripple/rocksdb/rocksdb/util/crc32c.cc +++ b/src/ripple/rocksdb/rocksdb/util/crc32c.cc @@ -10,13 +10,13 @@ // A portable implementation of crc32c, optimized to handle // four bytes at a time. -#include "util/crc32c.h" +#include "crc32c.h" #include #ifdef __SSE4_2__ #include #endif -#include "util/coding.h" +#include "coding.h" namespace rocksdb { namespace crc32c { diff --git a/src/ripple/rocksdb/rocksdb/util/env.cc b/src/ripple/rocksdb/rocksdb/util/env.cc index bd19d48eb..c49afe802 100644 --- a/src/ripple/rocksdb/rocksdb/util/env.cc +++ b/src/ripple/rocksdb/rocksdb/util/env.cc @@ -7,8 +7,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 "rocksdb/env.h" -#include "rocksdb/options.h" +#include "../include/rocksdb/env.h" +#include "../include/rocksdb/options.h" namespace rocksdb { diff --git a/src/ripple/rocksdb/rocksdb/util/env_hdfs.cc b/src/ripple/rocksdb/rocksdb/util/env_hdfs.cc index 0f8fe0d11..eed98b936 100644 --- a/src/ripple/rocksdb/rocksdb/util/env_hdfs.cc +++ b/src/ripple/rocksdb/rocksdb/util/env_hdfs.cc @@ -13,8 +13,8 @@ #include #include #include -#include "rocksdb/env.h" -#include "rocksdb/status.h" +#include "../include/rocksdb/env.h" +#include "../include/rocksdb/status.h" #include "hdfs/hdfs.h" #include "hdfs/env_hdfs.h" @@ -504,7 +504,7 @@ Status HdfsEnv::NewLogger(const std::string& fname, #else // USE_HDFS // dummy placeholders used when HDFS is not available -#include "rocksdb/env.h" +#include "../include/rocksdb/env.h" #include "hdfs/env_hdfs.h" namespace rocksdb { Status HdfsEnv::NewSequentialFile(const std::string& fname, diff --git a/src/ripple/rocksdb/rocksdb/util/env_posix.cc b/src/ripple/rocksdb/rocksdb/util/env_posix.cc index 356008225..a69025c30 100644 --- a/src/ripple/rocksdb/rocksdb/util/env_posix.cc +++ b/src/ripple/rocksdb/rocksdb/util/env_posix.cc @@ -33,13 +33,13 @@ #if defined(LEVELDB_PLATFORM_ANDROID) #include #endif -#include "rocksdb/env.h" -#include "rocksdb/slice.h" -#include "port/port.h" -#include "util/coding.h" -#include "util/logging.h" -#include "util/posix_logger.h" -#include "util/random.h" +#include "../include/rocksdb/env.h" +#include "../include/rocksdb/slice.h" +#include "../port/port.h" +#include "coding.h" +#include "logging.h" +#include "posix_logger.h" +#include "random.h" #include // Get nano time for mach systems diff --git a/src/ripple/rocksdb/rocksdb/util/env_test.cc b/src/ripple/rocksdb/rocksdb/util/env_test.cc index 828b49a0b..01dc9997e 100644 --- a/src/ripple/rocksdb/rocksdb/util/env_test.cc +++ b/src/ripple/rocksdb/rocksdb/util/env_test.cc @@ -11,11 +11,11 @@ #include #include -#include "rocksdb/env.h" -#include "port/port.h" -#include "util/coding.h" -#include "util/mutexlock.h" -#include "util/testharness.h" +#include "../include/rocksdb/env.h" +#include "../port/port.h" +#include "coding.h" +#include "mutexlock.h" +#include "testharness.h" namespace rocksdb { diff --git a/src/ripple/rocksdb/rocksdb/util/filelock_test.cc b/src/ripple/rocksdb/rocksdb/util/filelock_test.cc index a9e30a5d3..bfd2f9462 100644 --- a/src/ripple/rocksdb/rocksdb/util/filelock_test.cc +++ b/src/ripple/rocksdb/rocksdb/util/filelock_test.cc @@ -3,12 +3,12 @@ // LICENSE file in the root directory of this source tree. An additional grant // of patent rights can be found in the PATENTS file in the same directory. // -#include "rocksdb/status.h" -#include "rocksdb/env.h" +#include "../include/rocksdb/status.h" +#include "../include/rocksdb/env.h" #include -#include "util/coding.h" -#include "util/testharness.h" +#include "coding.h" +#include "testharness.h" namespace rocksdb { diff --git a/src/ripple/rocksdb/rocksdb/util/filter_policy.cc b/src/ripple/rocksdb/rocksdb/util/filter_policy.cc index e950b75f7..c4a9a5378 100644 --- a/src/ripple/rocksdb/rocksdb/util/filter_policy.cc +++ b/src/ripple/rocksdb/rocksdb/util/filter_policy.cc @@ -7,7 +7,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 "rocksdb/filter_policy.h" +#include "../include/rocksdb/filter_policy.h" namespace rocksdb { diff --git a/src/ripple/rocksdb/rocksdb/util/hash.cc b/src/ripple/rocksdb/rocksdb/util/hash.cc index 6f0e9cc92..0bfd1a739 100644 --- a/src/ripple/rocksdb/rocksdb/util/hash.cc +++ b/src/ripple/rocksdb/rocksdb/util/hash.cc @@ -8,8 +8,8 @@ // found in the LICENSE file. See the AUTHORS file for names of contributors. #include -#include "util/coding.h" -#include "util/hash.h" +#include "coding.h" +#include "hash.h" namespace rocksdb { diff --git a/src/ripple/rocksdb/rocksdb/util/hash_skiplist_rep.cc b/src/ripple/rocksdb/rocksdb/util/hash_skiplist_rep.cc index b67911f93..d0ec6cc05 100644 --- a/src/ripple/rocksdb/rocksdb/util/hash_skiplist_rep.cc +++ b/src/ripple/rocksdb/rocksdb/util/hash_skiplist_rep.cc @@ -4,14 +4,14 @@ // of patent rights can be found in the PATENTS file in the same directory. // -#include "rocksdb/memtablerep.h" -#include "rocksdb/arena.h" -#include "rocksdb/slice.h" -#include "rocksdb/slice_transform.h" -#include "port/port.h" -#include "port/atomic_pointer.h" -#include "util/murmurhash.h" -#include "db/skiplist.h" +#include "../include/rocksdb/memtablerep.h" +#include "../include/rocksdb/arena.h" +#include "../include/rocksdb/slice.h" +#include "../include/rocksdb/slice_transform.h" +#include "../port/port.h" +#include "../port/atomic_pointer.h" +#include "murmurhash.h" +#include "../db/skiplist.h" namespace rocksdb { namespace { diff --git a/src/ripple/rocksdb/rocksdb/util/histogram.cc b/src/ripple/rocksdb/rocksdb/util/histogram.cc index e83998014..ee5bd9ea1 100644 --- a/src/ripple/rocksdb/rocksdb/util/histogram.cc +++ b/src/ripple/rocksdb/rocksdb/util/histogram.cc @@ -7,12 +7,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. -#include "util/histogram.h" +#include "histogram.h" #include #include #include -#include "port/port.h" +#include "../port/port.h" namespace rocksdb { diff --git a/src/ripple/rocksdb/rocksdb/util/histogram.h b/src/ripple/rocksdb/rocksdb/util/histogram.h index c01594da7..6fc791f9f 100644 --- a/src/ripple/rocksdb/rocksdb/util/histogram.h +++ b/src/ripple/rocksdb/rocksdb/util/histogram.h @@ -8,7 +8,7 @@ // found in the LICENSE file. See the AUTHORS file for names of contributors. #pragma once -#include "rocksdb/statistics.h" +#include "../include/rocksdb/statistics.h" #include #include diff --git a/src/ripple/rocksdb/rocksdb/util/ldb_cmd.cc b/src/ripple/rocksdb/rocksdb/util/ldb_cmd.cc index e255f8196..2153a0699 100644 --- a/src/ripple/rocksdb/rocksdb/util/ldb_cmd.cc +++ b/src/ripple/rocksdb/rocksdb/util/ldb_cmd.cc @@ -3,15 +3,15 @@ // LICENSE file in the root directory of this source tree. An additional grant // of patent rights can be found in the PATENTS file in the same directory. // -#include "util/ldb_cmd.h" +#include "ldb_cmd.h" -#include "db/dbformat.h" -#include "db/db_impl.h" -#include "db/log_reader.h" -#include "db/filename.h" -#include "db/write_batch_internal.h" -#include "rocksdb/write_batch.h" -#include "util/coding.h" +#include "../db/dbformat.h" +#include "../db/db_impl.h" +#include "../db/log_reader.h" +#include "../db/filename.h" +#include "../db/write_batch_internal.h" +#include "../include/rocksdb/write_batch.h" +#include "coding.h" #include #include diff --git a/src/ripple/rocksdb/rocksdb/util/ldb_cmd.h b/src/ripple/rocksdb/rocksdb/util/ldb_cmd.h index 022f5fadc..61769ec3e 100644 --- a/src/ripple/rocksdb/rocksdb/util/ldb_cmd.h +++ b/src/ripple/rocksdb/rocksdb/util/ldb_cmd.h @@ -11,14 +11,14 @@ #include #include -#include "db/version_set.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" +#include "../db/version_set.h" +#include "../include/rocksdb/env.h" +#include "../include/rocksdb/options.h" +#include "../include/rocksdb/iterator.h" +#include "../include/rocksdb/slice.h" +#include "logging.h" +#include "ldb_cmd_execute_result.h" +#include "string_util.h" #include "utilities/utility_db.h" #include "utilities/ttl/db_ttl.h" diff --git a/src/ripple/rocksdb/rocksdb/util/ldb_tool.cc b/src/ripple/rocksdb/rocksdb/util/ldb_tool.cc index 2dbbbf8e0..b9e80cbf1 100644 --- a/src/ripple/rocksdb/rocksdb/util/ldb_tool.cc +++ b/src/ripple/rocksdb/rocksdb/util/ldb_tool.cc @@ -3,8 +3,8 @@ // LICENSE file in the root directory of this source tree. An additional grant // of patent rights can be found in the PATENTS file in the same directory. // -#include "rocksdb/ldb_tool.h" -#include "util/ldb_cmd.h" +#include "../include/rocksdb/ldb_tool.h" +#include "ldb_cmd.h" namespace rocksdb { diff --git a/src/ripple/rocksdb/rocksdb/util/logging.cc b/src/ripple/rocksdb/rocksdb/util/logging.cc index 697341349..93b24c24d 100644 --- a/src/ripple/rocksdb/rocksdb/util/logging.cc +++ b/src/ripple/rocksdb/rocksdb/util/logging.cc @@ -7,14 +7,14 @@ // 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 "util/logging.h" +#include "logging.h" #include #include #include #include -#include "rocksdb/env.h" -#include "rocksdb/slice.h" +#include "../include/rocksdb/env.h" +#include "../include/rocksdb/slice.h" namespace rocksdb { diff --git a/src/ripple/rocksdb/rocksdb/util/logging.h b/src/ripple/rocksdb/rocksdb/util/logging.h index 411c83beb..b7d74fbfa 100644 --- a/src/ripple/rocksdb/rocksdb/util/logging.h +++ b/src/ripple/rocksdb/rocksdb/util/logging.h @@ -14,7 +14,7 @@ #include #include #include -#include "port/port.h" +#include "../port/port.h" namespace rocksdb { diff --git a/src/ripple/rocksdb/rocksdb/util/mutexlock.h b/src/ripple/rocksdb/rocksdb/util/mutexlock.h index 0f4e5c8b7..bd7959a88 100644 --- a/src/ripple/rocksdb/rocksdb/util/mutexlock.h +++ b/src/ripple/rocksdb/rocksdb/util/mutexlock.h @@ -8,7 +8,7 @@ // found in the LICENSE file. See the AUTHORS file for names of contributors. #pragma once -#include "port/port.h" +#include "../port/port.h" namespace rocksdb { diff --git a/src/ripple/rocksdb/rocksdb/util/options.cc b/src/ripple/rocksdb/rocksdb/util/options.cc index 7fa7586e3..79ae90eab 100644 --- a/src/ripple/rocksdb/rocksdb/util/options.cc +++ b/src/ripple/rocksdb/rocksdb/util/options.cc @@ -7,16 +7,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 "rocksdb/options.h" +#include "../include/rocksdb/options.h" #include -#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" +#include "../include/rocksdb/cache.h" +#include "../include/rocksdb/compaction_filter.h" +#include "../include/rocksdb/comparator.h" +#include "../include/rocksdb/env.h" +#include "../include/rocksdb/filter_policy.h" +#include "../include/rocksdb/merge_operator.h" #include "table/block_based_table_factory.h" namespace rocksdb { diff --git a/src/ripple/rocksdb/rocksdb/util/perf_context.cc b/src/ripple/rocksdb/rocksdb/util/perf_context.cc index 1e8ddfb5e..08723e4f0 100644 --- a/src/ripple/rocksdb/rocksdb/util/perf_context.cc +++ b/src/ripple/rocksdb/rocksdb/util/perf_context.cc @@ -3,7 +3,7 @@ // LICENSE file in the root directory of this source tree. An additional grant // of patent rights can be found in the PATENTS file in the same directory. // -#include "util/perf_context_imp.h" +#include "perf_context_imp.h" namespace rocksdb { diff --git a/src/ripple/rocksdb/rocksdb/util/perf_context_imp.h b/src/ripple/rocksdb/rocksdb/util/perf_context_imp.h index f7818e69c..b1074c80c 100644 --- a/src/ripple/rocksdb/rocksdb/util/perf_context_imp.h +++ b/src/ripple/rocksdb/rocksdb/util/perf_context_imp.h @@ -4,8 +4,8 @@ // of patent rights can be found in the PATENTS file in the same directory. // #pragma once -#include "rocksdb/perf_context.h" -#include "util/stop_watch.h" +#include "../include/rocksdb/perf_context.h" +#include "stop_watch.h" namespace rocksdb { diff --git a/src/ripple/rocksdb/rocksdb/util/posix_logger.h b/src/ripple/rocksdb/rocksdb/util/posix_logger.h index 0a09bd1eb..b60ba8cf2 100644 --- a/src/ripple/rocksdb/rocksdb/util/posix_logger.h +++ b/src/ripple/rocksdb/rocksdb/util/posix_logger.h @@ -20,7 +20,7 @@ #ifdef OS_LINUX #include #endif -#include "rocksdb/env.h" +#include "../include/rocksdb/env.h" #include namespace rocksdb { diff --git a/src/ripple/rocksdb/rocksdb/util/signal_test.cc b/src/ripple/rocksdb/rocksdb/util/signal_test.cc index bffc298d3..1380e40ed 100644 --- a/src/ripple/rocksdb/rocksdb/util/signal_test.cc +++ b/src/ripple/rocksdb/rocksdb/util/signal_test.cc @@ -3,7 +3,7 @@ // LICENSE file in the root directory of this source tree. An additional grant // of patent rights can be found in the PATENTS file in the same directory. // -#include "util/stack_trace.h" +#include "stack_trace.h" #include void f0() { diff --git a/src/ripple/rocksdb/rocksdb/util/skiplistrep.cc b/src/ripple/rocksdb/rocksdb/util/skiplistrep.cc index 955d754b1..2d0ccafb6 100644 --- a/src/ripple/rocksdb/rocksdb/util/skiplistrep.cc +++ b/src/ripple/rocksdb/rocksdb/util/skiplistrep.cc @@ -3,9 +3,9 @@ // LICENSE file in the root directory of this source tree. An additional grant // of patent rights can be found in the PATENTS file in the same directory. // -#include "rocksdb/memtablerep.h" -#include "db/memtable.h" -#include "db/skiplist.h" +#include "../include/rocksdb/memtablerep.h" +#include "../db/memtable.h" +#include "../db/skiplist.h" namespace rocksdb { namespace { diff --git a/src/ripple/rocksdb/rocksdb/util/slice.cc b/src/ripple/rocksdb/rocksdb/util/slice.cc index 55f561f0c..d084f7526 100644 --- a/src/ripple/rocksdb/rocksdb/util/slice.cc +++ b/src/ripple/rocksdb/rocksdb/util/slice.cc @@ -7,8 +7,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 "rocksdb/slice_transform.h" -#include "rocksdb/slice.h" +#include "../include/rocksdb/slice_transform.h" +#include "../include/rocksdb/slice.h" namespace rocksdb { diff --git a/src/ripple/rocksdb/rocksdb/util/statistics.cc b/src/ripple/rocksdb/rocksdb/util/statistics.cc index 5f7a5ba46..a2e32dad0 100644 --- a/src/ripple/rocksdb/rocksdb/util/statistics.cc +++ b/src/ripple/rocksdb/rocksdb/util/statistics.cc @@ -3,7 +3,7 @@ // LICENSE file in the root directory of this source tree. An additional grant // of patent rights can be found in the PATENTS file in the same directory. // -#include "rocksdb/statistics.h" +#include "../include/rocksdb/statistics.h" #include namespace rocksdb { diff --git a/src/ripple/rocksdb/rocksdb/util/status.cc b/src/ripple/rocksdb/rocksdb/util/status.cc index f7c40e952..71beb3b1b 100644 --- a/src/ripple/rocksdb/rocksdb/util/status.cc +++ b/src/ripple/rocksdb/rocksdb/util/status.cc @@ -8,8 +8,8 @@ // found in the LICENSE file. See the AUTHORS file for names of contributors. #include -#include "port/port.h" -#include "rocksdb/status.h" +#include "../port/port.h" +#include "../include/rocksdb/status.h" namespace rocksdb { diff --git a/src/ripple/rocksdb/rocksdb/util/stl_wrappers.h b/src/ripple/rocksdb/rocksdb/util/stl_wrappers.h index b42a58427..8454071ef 100644 --- a/src/ripple/rocksdb/rocksdb/util/stl_wrappers.h +++ b/src/ripple/rocksdb/rocksdb/util/stl_wrappers.h @@ -5,11 +5,11 @@ // #pragma once -#include "util/murmurhash.h" -#include "util/coding.h" +#include "murmurhash.h" +#include "coding.h" -#include "rocksdb/memtablerep.h" -#include "rocksdb/slice.h" +#include "../include/rocksdb/memtablerep.h" +#include "../include/rocksdb/slice.h" namespace rocksdb { namespace stl_wrappers { diff --git a/src/ripple/rocksdb/rocksdb/util/stop_watch.h b/src/ripple/rocksdb/rocksdb/util/stop_watch.h index f251b6bc1..257b0d3bc 100644 --- a/src/ripple/rocksdb/rocksdb/util/stop_watch.h +++ b/src/ripple/rocksdb/rocksdb/util/stop_watch.h @@ -4,8 +4,8 @@ // of patent rights can be found in the PATENTS file in the same directory. // #pragma once -#include "rocksdb/env.h" -#include "rocksdb/statistics.h" +#include "../include/rocksdb/env.h" +#include "../include/rocksdb/statistics.h" namespace rocksdb { // Auto-scoped. diff --git a/src/ripple/rocksdb/rocksdb/util/testharness.cc b/src/ripple/rocksdb/rocksdb/util/testharness.cc index 85716cdae..0d704b8d6 100644 --- a/src/ripple/rocksdb/rocksdb/util/testharness.cc +++ b/src/ripple/rocksdb/rocksdb/util/testharness.cc @@ -7,7 +7,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 "util/testharness.h" +#include "testharness.h" #include #include diff --git a/src/ripple/rocksdb/rocksdb/util/testharness.h b/src/ripple/rocksdb/rocksdb/util/testharness.h index 936ee8b6c..b3a40a429 100644 --- a/src/ripple/rocksdb/rocksdb/util/testharness.h +++ b/src/ripple/rocksdb/rocksdb/util/testharness.h @@ -12,9 +12,9 @@ #include #include #include -#include "rocksdb/env.h" -#include "rocksdb/slice.h" -#include "util/random.h" +#include "../include/rocksdb/env.h" +#include "../include/rocksdb/slice.h" +#include "random.h" namespace rocksdb { namespace test { diff --git a/src/ripple/rocksdb/rocksdb/util/testutil.cc b/src/ripple/rocksdb/rocksdb/util/testutil.cc index 13e781e64..2f6f1985a 100644 --- a/src/ripple/rocksdb/rocksdb/util/testutil.cc +++ b/src/ripple/rocksdb/rocksdb/util/testutil.cc @@ -7,9 +7,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 "util/testutil.h" +#include "testutil.h" -#include "util/random.h" +#include "random.h" namespace rocksdb { namespace test { diff --git a/src/ripple/rocksdb/rocksdb/util/testutil.h b/src/ripple/rocksdb/rocksdb/util/testutil.h index c73210fec..3027b662b 100644 --- a/src/ripple/rocksdb/rocksdb/util/testutil.h +++ b/src/ripple/rocksdb/rocksdb/util/testutil.h @@ -8,9 +8,9 @@ // found in the LICENSE file. See the AUTHORS file for names of contributors. #pragma once -#include "rocksdb/env.h" -#include "rocksdb/slice.h" -#include "util/random.h" +#include "../include/rocksdb/env.h" +#include "../include/rocksdb/slice.h" +#include "random.h" namespace rocksdb { namespace test { diff --git a/src/ripple/rocksdb/rocksdb/util/transformrep.cc b/src/ripple/rocksdb/rocksdb/util/transformrep.cc index 4c7df1321..9831c54ad 100644 --- a/src/ripple/rocksdb/rocksdb/util/transformrep.cc +++ b/src/ripple/rocksdb/rocksdb/util/transformrep.cc @@ -9,14 +9,14 @@ #include #include -#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" -#include "util/stl_wrappers.h" +#include "../include/rocksdb/memtablerep.h" +#include "../include/rocksdb/arena.h" +#include "../include/rocksdb/slice.h" +#include "../include/rocksdb/slice_transform.h" +#include "../port/port.h" +#include "mutexlock.h" +#include "murmurhash.h" +#include "stl_wrappers.h" namespace std { template <> diff --git a/src/ripple/rocksdb/rocksdb/util/vectorrep.cc b/src/ripple/rocksdb/rocksdb/util/vectorrep.cc index 8d3ccc9df..20b08f815 100644 --- a/src/ripple/rocksdb/rocksdb/util/vectorrep.cc +++ b/src/ripple/rocksdb/rocksdb/util/vectorrep.cc @@ -3,7 +3,7 @@ // LICENSE file in the root directory of this source tree. An additional grant // of patent rights can be found in the PATENTS file in the same directory. // -#include "rocksdb/memtablerep.h" +#include "../include/rocksdb/memtablerep.h" #include #include @@ -11,10 +11,10 @@ #include #include -#include "rocksdb/arena.h" -#include "port/port.h" -#include "util/mutexlock.h" -#include "util/stl_wrappers.h" +#include "../include/rocksdb/arena.h" +#include "../port/port.h" +#include "mutexlock.h" +#include "stl_wrappers.h" namespace rocksdb { namespace {