NextGraph
/
rocksdb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Organizing rocksdb/db directory

Browse Source 
Summary: Pull Request resolved: https://github.com/facebook/rocksdb/pull/5390

Differential Revision: D15579388

Pulled By: vjnadimpalli

fbshipit-source-id: 5bfc95e31554b8ff05b97b76d6534113f527f366
main
Vijay Nadimpalli 6 years ago committed by Facebook Github Bot
parent a3609b7dde
commit 49c5a12dbe
105 changed files with 186 additions and 184 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 42
      CMakeLists.txt
  2. 10
      Makefile
  3. 42
      TARGETS
  4. 2
      db/builder.cc
  5. 10
      db/column_family.cc
  6. 2
      db/column_family_test.cc
  7. 2
      db/compact_files_test.cc
  8. 2
      db/compacted_db_impl.cc
  9. 2
      db/compacted_db_impl.h
  10. 3
      db/compaction/compaction.cc
  11. 0
      db/compaction/compaction.h
  12. 0
      db/compaction/compaction_iteration_stats.h
  13. 3
      db/compaction/compaction_iterator.cc
  14. 4
      db/compaction/compaction_iterator.h
  15. 2
      db/compaction/compaction_iterator_test.cc
  16. 4
      db/compaction/compaction_job.cc
  17. 2
      db/compaction/compaction_job.h
  18. 2
      db/compaction/compaction_job_stats_test.cc
  19. 2
      db/compaction/compaction_job_test.cc
  20. 2
      db/compaction/compaction_picker.cc
  21. 2
      db/compaction/compaction_picker.h
  22. 2
      db/compaction/compaction_picker_fifo.cc
  23. 2
      db/compaction/compaction_picker_fifo.h
  24. 3
      db/compaction/compaction_picker_level.cc
  25. 2
      db/compaction/compaction_picker_level.h
  26. 9
      db/compaction/compaction_picker_test.cc
  27. 2
      db/compaction/compaction_picker_universal.cc
  28. 2
      db/compaction/compaction_picker_universal.h
  29. 2
      db/convenience.cc
  30. 2
      db/corruption_test.cc
  31. 2
      db/cuckoo_table_db_test.cc
  32. 2
      db/db_filesnapshot.cc
  33. 4
      db/db_impl/db_impl.cc
  34. 4
      db/db_impl/db_impl.h
  35. 2
      db/db_impl/db_impl_compaction_flush.cc
  36. 2
      db/db_impl/db_impl_debug.cc
  37. 2
      db/db_impl/db_impl_experimental.cc
  38. 2
      db/db_impl/db_impl_files.cc
  39. 2
      db/db_impl/db_impl_open.cc
  40. 4
      db/db_impl/db_impl_readonly.cc
  41. 2
      db/db_impl/db_impl_readonly.h
  42. 2
      db/db_impl/db_impl_secondary.cc
  43. 2
      db/db_impl/db_impl_secondary.h
  44. 2
      db/db_impl/db_impl_write.cc
  45. 2
      db/db_impl/db_secondary_test.cc
  46. 2
      db/db_iter.h
  47. 2
      db/db_options_test.cc
  48. 2
      db/db_test.cc
  49. 2
      db/db_test_util.h
  50. 2
      db/deletefile_test.cc
  51. 2
      db/error_handler.cc
  52. 2
      db/experimental.cc
  53. 2
      db/fault_injection_test.cc
  54. 2
      db/forward_iterator.cc
  55. 2
      db/in_memory_stats_history.cc
  56. 2
      db/internal_stats.cc
  57. 2
      db/listener_test.cc
  58. 2
      db/memtable_list.cc
  59. 5
      db/merge_test.cc
  60. 2
      db/obsolete_files_test.cc
  61. 2
      db/options_file_test.cc
  62. 2
      db/plain_table_db_test.cc
  63. 2
      db/prefix_test.cc
  64. 2
      db/range_del_aggregator.cc
  65. 2
      db/range_del_aggregator.h
  66. 2
      db/repair.cc
  67. 2
      db/repair_test.cc
  68. 2
      db/table_properties_collector_test.cc
  69. 2
      db/version_set.cc
  70. 4
      db/version_set.h
  71. 2
      db/wal_manager_test.cc
  72. 2
      db/write_batch.cc
  73. 2
      db/write_callback_test.cc
  74. 2
      file/sst_file_manager_impl.cc
  75. 2
      file/sst_file_manager_impl.h
  76. 42
      src.mk
  77. 2
      table/table_reader_bench.cc
  78. 2
      tools/db_bench_tool.cc
  79. 2
      tools/db_stress.cc
  80. 3
      tools/ldb_cmd.cc
  81. 2
      tools/reduce_levels_test.cc
  82. 2
      tools/trace_analyzer_tool.cc
  83. 3
      util/trace_replay.cc
  84. 2
      utilities/backupable/backupable_db_test.cc
  85. 2
      utilities/blob_db/blob_db_impl.cc
  86. 3
      utilities/blob_db/blob_file.cc
  87. 2
      utilities/cassandra/cassandra_functional_test.cc
  88. 2
      utilities/checkpoint/checkpoint_test.cc
  89. 2
      utilities/debug.cc
  90. 2
      utilities/memory/memory_test.cc
  91. 2
      utilities/memory/memory_util.cc
  92. 2
      utilities/transactions/optimistic_transaction.cc
  93. 2
      utilities/transactions/optimistic_transaction_db_impl.cc
  94. 2
      utilities/transactions/pessimistic_transaction.cc
  95. 2
      utilities/transactions/pessimistic_transaction_db.cc
  96. 2
      utilities/transactions/transaction_base.cc
  97. 2
      utilities/transactions/transaction_test.cc
  98. 2
      utilities/transactions/transaction_test.h
  99. 2
      utilities/transactions/transaction_util.cc
  100. 2
      utilities/transactions/write_prepared_transaction_test.cc
  101. Some files were not shown because too many files have changed in this diff Show More

42
CMakeLists.txt
Unescape View File

@ -486,24 +486,24 @@ set(SOURCES
db/c.cc db/c.cc
db/column_family.cc db/column_family.cc
db/compacted_db_impl.cc db/compacted_db_impl.cc
db/compaction.cc db/compaction/compaction.cc
db/compaction_iterator.cc db/compaction/compaction_iterator.cc
db/compaction_job.cc db/compaction/compaction_picker.cc
db/compaction_picker.cc db/compaction/compaction_job.cc
db/compaction_picker_fifo.cc db/compaction/compaction_picker_fifo.cc
db/compaction_picker_level.cc db/compaction/compaction_picker_level.cc
db/compaction_picker_universal.cc db/compaction/compaction_picker_universal.cc
db/convenience.cc db/convenience.cc
db/db_filesnapshot.cc db/db_filesnapshot.cc
db/db_impl.cc db/db_impl/db_impl.cc
db/db_impl_write.cc db/db_impl/db_impl_write.cc
db/db_impl_compaction_flush.cc db/db_impl/db_impl_compaction_flush.cc
db/db_impl_files.cc db/db_impl/db_impl_files.cc
db/db_impl_open.cc db/db_impl/db_impl_open.cc
db/db_impl_debug.cc db/db_impl/db_impl_debug.cc
db/db_impl_experimental.cc db/db_impl/db_impl_experimental.cc
db/db_impl_readonly.cc db/db_impl/db_impl_readonly.cc
db/db_impl_secondary.cc db/db_impl/db_impl_secondary.cc
db/db_info_dumper.cc db/db_info_dumper.cc
db/db_iter.cc db/db_iter.cc
db/dbformat.cc db/dbformat.cc
@ -868,10 +868,10 @@ if(WITH_TESTS)
cache/lru_cache_test.cc cache/lru_cache_test.cc
db/column_family_test.cc db/column_family_test.cc
db/compact_files_test.cc db/compact_files_test.cc
db/compaction_iterator_test.cc db/compaction/compaction_job_stats_test.cc
db/compaction_job_stats_test.cc db/compaction/compaction_job_test.cc
db/compaction_job_test.cc db/compaction/compaction_iterator_test.cc
db/compaction_picker_test.cc db/compaction/compaction_picker_test.cc
db/comparator_db_test.cc db/comparator_db_test.cc
db/corruption_test.cc db/corruption_test.cc
db/cuckoo_table_db_test.cc db/cuckoo_table_db_test.cc
@ -894,7 +894,7 @@ if(WITH_TESTS)
db/db_options_test.cc db/db_options_test.cc
db/db_properties_test.cc db/db_properties_test.cc
db/db_range_del_test.cc db/db_range_del_test.cc
db/db_secondary_test.cc db/db_impl/db_secondary_test.cc
db/db_sst_test.cc db/db_sst_test.cc
db/db_statistics_test.cc db/db_statistics_test.cc
db/db_table_properties_test.cc db/db_table_properties_test.cc

10
Makefile
Unescape View File

@ -1339,13 +1339,13 @@ write_batch_with_index_test: utilities/write_batch_with_index/write_batch_with_i
flush_job_test: db/flush_job_test.o $(LIBOBJECTS) $(TESTHARNESS) flush_job_test: db/flush_job_test.o $(LIBOBJECTS) $(TESTHARNESS)
$(AM_LINK) $(AM_LINK)
compaction_iterator_test: db/compaction_iterator_test.o $(LIBOBJECTS) $(TESTHARNESS) compaction_iterator_test: db/compaction/compaction_iterator_test.o $(LIBOBJECTS) $(TESTHARNESS)
$(AM_LINK) $(AM_LINK)
compaction_job_test: db/compaction_job_test.o $(LIBOBJECTS) $(TESTHARNESS) compaction_job_test: db/compaction/compaction_job_test.o $(LIBOBJECTS) $(TESTHARNESS)
$(AM_LINK) $(AM_LINK)
compaction_job_stats_test: db/compaction_job_stats_test.o $(LIBOBJECTS) $(TESTHARNESS) compaction_job_stats_test: db/compaction/compaction_job_stats_test.o $(LIBOBJECTS) $(TESTHARNESS)
$(AM_LINK) $(AM_LINK)
compact_on_deletion_collector_test: utilities/table_properties_collectors/compact_on_deletion_collector_test.o $(LIBOBJECTS) $(TESTHARNESS) compact_on_deletion_collector_test: utilities/table_properties_collectors/compact_on_deletion_collector_test.o $(LIBOBJECTS) $(TESTHARNESS)
@ -1417,7 +1417,7 @@ version_edit_test: db/version_edit_test.o $(LIBOBJECTS) $(TESTHARNESS)
version_set_test: db/version_set_test.o $(LIBOBJECTS) $(TESTHARNESS) version_set_test: db/version_set_test.o $(LIBOBJECTS) $(TESTHARNESS)
$(AM_LINK) $(AM_LINK)
compaction_picker_test: db/compaction_picker_test.o $(LIBOBJECTS) $(TESTHARNESS) compaction_picker_test: db/compaction/compaction_picker_test.o $(LIBOBJECTS) $(TESTHARNESS)
$(AM_LINK) $(AM_LINK)
version_builder_test: db/version_builder_test.o $(LIBOBJECTS) $(TESTHARNESS) version_builder_test: db/version_builder_test.o $(LIBOBJECTS) $(TESTHARNESS)
@ -1585,7 +1585,7 @@ range_tombstone_fragmenter_test: db/range_tombstone_fragmenter_test.o db/db_test
sst_file_reader_test: table/sst_file_reader_test.o $(LIBOBJECTS) $(TESTHARNESS) sst_file_reader_test: table/sst_file_reader_test.o $(LIBOBJECTS) $(TESTHARNESS)
$(AM_LINK) $(AM_LINK)
db_secondary_test: db/db_secondary_test.o db/db_test_util.o $(LIBOBJECTS) $(TESTHARNESS) db_secondary_test: db/db_impl/db_secondary_test.o db/db_test_util.o $(LIBOBJECTS) $(TESTHARNESS)
$(AM_LINK) $(AM_LINK)
#------------------------------------------------- #-------------------------------------------------

42
TARGETS
Unescape View File

@ -83,24 +83,24 @@ cpp_library(
"db/c.cc", "db/c.cc",
"db/column_family.cc", "db/column_family.cc",
"db/compacted_db_impl.cc", "db/compacted_db_impl.cc",
"db/compaction.cc", "db/compaction/compaction.cc",
"db/compaction_iterator.cc", "db/compaction/compaction_iterator.cc",
"db/compaction_job.cc", "db/compaction/compaction_job.cc",
"db/compaction_picker.cc", "db/compaction/compaction_picker.cc",
"db/compaction_picker_fifo.cc", "db/compaction/compaction_picker_fifo.cc",
"db/compaction_picker_level.cc", "db/compaction/compaction_picker_level.cc",
"db/compaction_picker_universal.cc", "db/compaction/compaction_picker_universal.cc",
"db/convenience.cc", "db/convenience.cc",
"db/db_filesnapshot.cc", "db/db_filesnapshot.cc",
"db/db_impl.cc", "db/db_impl/db_impl.cc",
"db/db_impl_compaction_flush.cc", "db/db_impl/db_impl_compaction_flush.cc",
"db/db_impl_debug.cc", "db/db_impl/db_impl_debug.cc",
"db/db_impl_experimental.cc", "db/db_impl/db_impl_experimental.cc",
"db/db_impl_files.cc", "db/db_impl/db_impl_files.cc",
"db/db_impl_open.cc", "db/db_impl/db_impl_open.cc",
"db/db_impl_readonly.cc", "db/db_impl/db_impl_readonly.cc",
"db/db_impl_secondary.cc", "db/db_impl/db_impl_secondary.cc",
"db/db_impl_write.cc", "db/db_impl/db_impl_write.cc",
"db/db_info_dumper.cc", "db/db_info_dumper.cc",
"db/db_iter.cc", "db/db_iter.cc",
"db/dbformat.cc", "db/dbformat.cc",
@ -454,22 +454,22 @@ ROCKS_TESTS = [
], ],
[ [
"compaction_iterator_test", "compaction_iterator_test",
"db/compaction_iterator_test.cc", "db/compaction/compaction_iterator_test.cc",
"serial", "serial",
], ],
[ [
"compaction_job_stats_test", "compaction_job_stats_test",
"db/compaction_job_stats_test.cc", "db/compaction/compaction_job_stats_test.cc",
"serial", "serial",
], ],
[ [
"compaction_job_test", "compaction_job_test",
"db/compaction_job_test.cc", "db/compaction/compaction_job_test.cc",
"serial", "serial",
], ],
[ [
"compaction_picker_test", "compaction_picker_test",
"db/compaction_picker_test.cc", "db/compaction/compaction_picker_test.cc",
"serial", "serial",
], ],
[ [
@ -609,7 +609,7 @@ ROCKS_TESTS = [
], ],
[ [
"db_secondary_test", "db_secondary_test",
"db/db_secondary_test.cc", "db/db_impl/db_secondary_test.cc",
"serial", "serial",
], ],
[ [

2
db/builder.cc
Unescape View File

@ -13,7 +13,7 @@
#include <deque> #include <deque>
#include <vector> #include <vector>
#include "db/compaction_iterator.h" #include "db/compaction/compaction_iterator.h"
#include "db/dbformat.h" #include "db/dbformat.h"
#include "db/event_helpers.h" #include "db/event_helpers.h"
#include "db/internal_stats.h" #include "db/internal_stats.h"

10
db/column_family.cc
Unescape View File

@ -19,11 +19,11 @@
#include <algorithm> #include <algorithm>
#include <limits> #include <limits>
#include "db/compaction_picker.h" #include "db/compaction/compaction_picker.h"
#include "db/compaction_picker_fifo.h" #include "db/compaction/compaction_picker_fifo.h"
#include "db/compaction_picker_level.h" #include "db/compaction/compaction_picker_level.h"
#include "db/compaction_picker_universal.h" #include "db/compaction/compaction_picker_universal.h"
#include "db/db_impl.h" #include "db/db_impl/db_impl.h"
#include "db/internal_stats.h" #include "db/internal_stats.h"
#include "db/job_context.h" #include "db/job_context.h"
#include "db/range_del_aggregator.h" #include "db/range_del_aggregator.h"

2
db/column_family_test.cc
Unescape View File

@ -12,8 +12,8 @@
#include <string> #include <string>
#include <thread> #include <thread>
#include "db/db_impl.h"
#include "db/db_test_util.h" #include "db/db_test_util.h"
#include "db/db_impl/db_impl.h"
#include "memtable/hash_skiplist_rep.h" #include "memtable/hash_skiplist_rep.h"
#include "options/options_parser.h" #include "options/options_parser.h"
#include "port/port.h" #include "port/port.h"

2
db/compact_files_test.cc
Unescape View File

@ -10,7 +10,7 @@
#include <thread> #include <thread>
#include <vector> #include <vector>
#include "db/db_impl.h" #include "db/db_impl/db_impl.h"
#include "port/port.h" #include "port/port.h"
#include "rocksdb/db.h" #include "rocksdb/db.h"
#include "rocksdb/env.h" #include "rocksdb/env.h"

2
db/compacted_db_impl.cc
Unescape View File

@ -5,7 +5,7 @@
#ifndef ROCKSDB_LITE #ifndef ROCKSDB_LITE
#include "db/compacted_db_impl.h" #include "db/compacted_db_impl.h"
#include "db/db_impl.h" #include "db/db_impl/db_impl.h"
#include "db/version_set.h" #include "db/version_set.h"
#include "table/get_context.h" #include "table/get_context.h"

2
db/compacted_db_impl.h
Unescape View File

@ -5,7 +5,7 @@
#pragma once #pragma once
#ifndef ROCKSDB_LITE #ifndef ROCKSDB_LITE
#include "db/db_impl.h" #include "db/db_impl/db_impl.h"
#include <vector> #include <vector>
#include <string> #include <string>

3
db/compaction.cc → db/compaction/compaction.cc
Unescape View File

@ -7,8 +7,6 @@
// Use of this source code is governed by a BSD-style license that can be // 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. // found in the LICENSE file. See the AUTHORS file for names of contributors.
#include "db/compaction.h"
#ifndef __STDC_FORMAT_MACROS #ifndef __STDC_FORMAT_MACROS
#define __STDC_FORMAT_MACROS #define __STDC_FORMAT_MACROS
#endif #endif
@ -17,6 +15,7 @@
#include <vector> #include <vector>
#include "db/column_family.h" #include "db/column_family.h"
#include "db/compaction/compaction.h"
#include "rocksdb/compaction_filter.h" #include "rocksdb/compaction_filter.h"
#include "test_util/sync_point.h" #include "test_util/sync_point.h"
#include "util/string_util.h" #include "util/string_util.h"

0
db/compaction.h → db/compaction/compaction.h
Unescape View File

0
db/compaction_iteration_stats.h → db/compaction/compaction_iteration_stats.h
Unescape View File

3
db/compaction_iterator.cc → db/compaction/compaction_iterator.cc
Unescape View File

@ -3,8 +3,7 @@
// COPYING file in the root directory) and Apache 2.0 License // COPYING file in the root directory) and Apache 2.0 License
// (found in the LICENSE.Apache file in the root directory). // (found in the LICENSE.Apache file in the root directory).
#include "db/compaction_iterator.h" #include "db/compaction/compaction_iterator.h"
#include "db/snapshot_checker.h" #include "db/snapshot_checker.h"
#include "port/likely.h" #include "port/likely.h"
#include "rocksdb/listener.h" #include "rocksdb/listener.h"

4
db/compaction_iterator.h → db/compaction/compaction_iterator.h
Unescape View File

@ -10,8 +10,8 @@
#include <unordered_set> #include <unordered_set>
#include <vector> #include <vector>
#include "db/compaction.h" #include "db/compaction/compaction_iteration_stats.h"
#include "db/compaction_iteration_stats.h" #include "db/compaction/compaction.h"
#include "db/merge_helper.h" #include "db/merge_helper.h"
#include "db/pinned_iterators_manager.h" #include "db/pinned_iterators_manager.h"
#include "db/range_del_aggregator.h" #include "db/range_del_aggregator.h"

2
db/compaction_iterator_test.cc → db/compaction/compaction_iterator_test.cc
Unescape View File

@ -3,11 +3,11 @@
// COPYING file in the root directory) and Apache 2.0 License // COPYING file in the root directory) and Apache 2.0 License
// (found in the LICENSE.Apache file in the root directory). // (found in the LICENSE.Apache file in the root directory).
#include "db/compaction_iterator.h"
#include <string> #include <string>
#include <vector> #include <vector>
#include "db/compaction/compaction_iterator.h"
#include "port/port.h" #include "port/port.h"
#include "test_util/testharness.h" #include "test_util/testharness.h"
#include "test_util/testutil.h" #include "test_util/testutil.h"

4
db/compaction_job.cc → db/compaction/compaction_job.cc
Unescape View File

@ -7,7 +7,6 @@
// Use of this source code is governed by a BSD-style license that can be // 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. // found in the LICENSE file. See the AUTHORS file for names of contributors.
#include "db/compaction_job.h"
#ifndef __STDC_FORMAT_MACROS #ifndef __STDC_FORMAT_MACROS
#define __STDC_FORMAT_MACROS #define __STDC_FORMAT_MACROS
@ -24,8 +23,9 @@
#include <utility> #include <utility>
#include <vector> #include <vector>
#include "db/compaction/compaction_job.h"
#include "db/builder.h" #include "db/builder.h"
#include "db/db_impl.h" #include "db/db_impl/db_impl.h"
#include "db/db_iter.h" #include "db/db_iter.h"
#include "db/dbformat.h" #include "db/dbformat.h"
#include "db/error_handler.h" #include "db/error_handler.h"

2
db/compaction_job.h → db/compaction/compaction_job.h
Unescape View File

@ -18,7 +18,7 @@
#include <vector> #include <vector>
#include "db/column_family.h" #include "db/column_family.h"
#include "db/compaction_iterator.h" #include "db/compaction/compaction_iterator.h"
#include "db/dbformat.h" #include "db/dbformat.h"
#include "db/flush_scheduler.h" #include "db/flush_scheduler.h"
#include "db/internal_stats.h" #include "db/internal_stats.h"

2
db/compaction_job_stats_test.cc → db/compaction/compaction_job_stats_test.cc
Unescape View File

@ -21,7 +21,7 @@
#include <unordered_set> #include <unordered_set>
#include <utility> #include <utility>
#include "db/db_impl.h" #include "db/db_impl/db_impl.h"
#include "db/dbformat.h" #include "db/dbformat.h"
#include "db/job_context.h" #include "db/job_context.h"
#include "db/version_set.h" #include "db/version_set.h"

2
db/compaction_job_test.cc → db/compaction/compaction_job_test.cc
Unescape View File

@ -17,7 +17,7 @@
#include <tuple> #include <tuple>
#include "db/column_family.h" #include "db/column_family.h"
#include "db/compaction_job.h" #include "db/compaction/compaction_job.h"
#include "db/error_handler.h" #include "db/error_handler.h"
#include "db/version_set.h" #include "db/version_set.h"
#include "rocksdb/cache.h" #include "rocksdb/cache.h"

2
db/compaction_picker.cc → db/compaction/compaction_picker.cc
Unescape View File

@ -7,7 +7,7 @@
// Use of this source code is governed by a BSD-style license that can be // 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. // found in the LICENSE file. See the AUTHORS file for names of contributors.
#include "db/compaction_picker.h" #include "db/compaction/compaction_picker.h"
#ifndef __STDC_FORMAT_MACROS #ifndef __STDC_FORMAT_MACROS
#define __STDC_FORMAT_MACROS #define __STDC_FORMAT_MACROS

2
db/compaction_picker.h → db/compaction/compaction_picker.h
Unescape View File

@ -15,7 +15,7 @@
#include <unordered_set> #include <unordered_set>
#include <vector> #include <vector>
#include "db/compaction.h" #include "db/compaction/compaction.h"
#include "db/version_set.h" #include "db/version_set.h"
#include "options/cf_options.h" #include "options/cf_options.h"
#include "rocksdb/env.h" #include "rocksdb/env.h"

2
db/compaction_picker_fifo.cc → db/compaction/compaction_picker_fifo.cc
Unescape View File

@ -7,7 +7,7 @@
// Use of this source code is governed by a BSD-style license that can be // 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. // found in the LICENSE file. See the AUTHORS file for names of contributors.
#include "db/compaction_picker_fifo.h" #include "db/compaction/compaction_picker_fifo.h"
#ifndef ROCKSDB_LITE #ifndef ROCKSDB_LITE
#ifndef __STDC_FORMAT_MACROS #ifndef __STDC_FORMAT_MACROS

2
db/compaction_picker_fifo.h → db/compaction/compaction_picker_fifo.h
Unescape View File

@ -10,7 +10,7 @@
#pragma once #pragma once
#ifndef ROCKSDB_LITE #ifndef ROCKSDB_LITE
#include "db/compaction_picker.h" #include "db/compaction/compaction_picker.h"
namespace rocksdb { namespace rocksdb {
class FIFOCompactionPicker : public CompactionPicker { class FIFOCompactionPicker : public CompactionPicker {

3
db/compaction_picker_level.cc → db/compaction/compaction_picker_level.cc
Unescape View File

@ -7,8 +7,6 @@
// Use of this source code is governed by a BSD-style license that can be // 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. // found in the LICENSE file. See the AUTHORS file for names of contributors.
#include "db/compaction_picker_level.h"
#ifndef __STDC_FORMAT_MACROS #ifndef __STDC_FORMAT_MACROS
#define __STDC_FORMAT_MACROS #define __STDC_FORMAT_MACROS
#endif #endif
@ -17,6 +15,7 @@
#include <utility> #include <utility>
#include <vector> #include <vector>
#include "db/compaction/compaction_picker_level.h"
#include "test_util/sync_point.h" #include "test_util/sync_point.h"
#include "util/log_buffer.h" #include "util/log_buffer.h"

2
db/compaction_picker_level.h → db/compaction/compaction_picker_level.h
Unescape View File

@ -9,7 +9,7 @@
#pragma once #pragma once
#include "db/compaction_picker.h" #include "db/compaction/compaction_picker.h"
namespace rocksdb { namespace rocksdb {
// Picking compactions for leveled compaction. See wiki page // Picking compactions for leveled compaction. See wiki page

9
db/compaction_picker_test.cc → db/compaction/compaction_picker_test.cc
Unescape View File

@ -3,15 +3,14 @@
// COPYING file in the root directory) and Apache 2.0 License // COPYING file in the root directory) and Apache 2.0 License
// (found in the LICENSE.Apache file in the root directory). // (found in the LICENSE.Apache file in the root directory).
#include "db/compaction_picker.h"
#include <limits> #include <limits>
#include <string> #include <string>
#include <utility> #include <utility>
#include "db/compaction.h" #include "db/compaction/compaction.h"
#include "db/compaction_picker_fifo.h" #include "db/compaction/compaction_picker_fifo.h"
#include "db/compaction_picker_level.h" #include "db/compaction/compaction_picker_level.h"
#include "db/compaction_picker_universal.h" #include "db/compaction/compaction_picker_universal.h"
#include "test_util/testharness.h" #include "test_util/testharness.h"
#include "test_util/testutil.h" #include "test_util/testutil.h"

2
db/compaction_picker_universal.cc → db/compaction/compaction_picker_universal.cc
Unescape View File

@ -7,7 +7,7 @@
// Use of this source code is governed by a BSD-style license that can be // 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. // found in the LICENSE file. See the AUTHORS file for names of contributors.
#include "db/compaction_picker_universal.h" #include "db/compaction/compaction_picker_universal.h"
#ifndef ROCKSDB_LITE #ifndef ROCKSDB_LITE
#ifndef __STDC_FORMAT_MACROS #ifndef __STDC_FORMAT_MACROS

2
db/compaction_picker_universal.h → db/compaction/compaction_picker_universal.h
Unescape View File

@ -10,7 +10,7 @@
#pragma once #pragma once
#ifndef ROCKSDB_LITE #ifndef ROCKSDB_LITE
#include "db/compaction_picker.h" #include "db/compaction/compaction_picker.h"
namespace rocksdb { namespace rocksdb {
class UniversalCompactionPicker : public CompactionPicker { class UniversalCompactionPicker : public CompactionPicker {

2
db/convenience.cc
Unescape View File

@ -8,7 +8,7 @@
#include "rocksdb/convenience.h" #include "rocksdb/convenience.h"
#include "db/db_impl.h" #include "db/db_impl/db_impl.h"
#include "util/cast_util.h" #include "util/cast_util.h"
namespace rocksdb { namespace rocksdb {

2
db/corruption_test.cc
Unescape View File

@ -16,7 +16,7 @@
#include <inttypes.h> #include <inttypes.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <sys/types.h> #include <sys/types.h>
#include "db/db_impl.h" #include "db/db_impl/db_impl.h"
#include "db/log_format.h" #include "db/log_format.h"
#include "db/version_set.h" #include "db/version_set.h"
#include "file/filename.h" #include "file/filename.h"

2
db/cuckoo_table_db_test.cc
Unescape View File

@ -5,7 +5,7 @@
#ifndef ROCKSDB_LITE #ifndef ROCKSDB_LITE
#include "db/db_impl.h" #include "db/db_impl/db_impl.h"
#include "rocksdb/db.h" #include "rocksdb/db.h"
#include "rocksdb/env.h" #include "rocksdb/env.h"
#include "table/cuckoo/cuckoo_table_factory.h" #include "table/cuckoo/cuckoo_table_factory.h"

2
db/db_filesnapshot.cc
Unescape View File

@ -14,7 +14,7 @@
#include <stdint.h> #include <stdint.h>
#include <algorithm> #include <algorithm>
#include <string> #include <string>
#include "db/db_impl.h" #include "db/db_impl/db_impl.h"
#include "db/job_context.h" #include "db/job_context.h"
#include "db/version_set.h" #include "db/version_set.h"
#include "file/file_util.h" #include "file/file_util.h"

4
db/db_impl.cc → db/db_impl/db_impl.cc
Unescape View File

@ -6,7 +6,7 @@
// Copyright (c) 2011 The LevelDB Authors. All rights reserved. // Copyright (c) 2011 The LevelDB Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be // 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. // found in the LICENSE file. See the AUTHORS file for names of contributors.
#include "db/db_impl.h" #include "db/db_impl/db_impl.h"
#ifndef __STDC_FORMAT_MACROS #ifndef __STDC_FORMAT_MACROS
#define __STDC_FORMAT_MACROS #define __STDC_FORMAT_MACROS
@ -28,7 +28,7 @@
#include <vector> #include <vector>
#include "db/builder.h" #include "db/builder.h"
#include "db/compaction_job.h" #include "db/compaction/compaction_job.h"
#include "db/db_info_dumper.h" #include "db/db_info_dumper.h"
#include "db/db_iter.h" #include "db/db_iter.h"
#include "db/dbformat.h" #include "db/dbformat.h"

4
db/db_impl.h → db/db_impl/db_impl.h
Unescape View File

@ -20,7 +20,7 @@
#include <vector> #include <vector>
#include "db/column_family.h" #include "db/column_family.h"
#include "db/compaction_job.h" #include "db/compaction/compaction_job.h"
#include "db/dbformat.h" #include "db/dbformat.h"
#include "db/error_handler.h" #include "db/error_handler.h"
#include "db/event_helpers.h" #include "db/event_helpers.h"
@ -39,7 +39,7 @@
#include "db/wal_manager.h" #include "db/wal_manager.h"
#include "db/write_controller.h" #include "db/write_controller.h"
#include "db/write_thread.h" #include "db/write_thread.h"
#include "memtable_list.h" #include "db/memtable_list.h"
#include "monitoring/instrumented_mutex.h" #include "monitoring/instrumented_mutex.h"
#include "options/db_options.h" #include "options/db_options.h"
#include "port/port.h" #include "port/port.h"

2
db/db_impl_compaction_flush.cc → db/db_impl/db_impl_compaction_flush.cc
Unescape View File

@ -6,7 +6,7 @@
// Copyright (c) 2011 The LevelDB Authors. All rights reserved. // Copyright (c) 2011 The LevelDB Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be // 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. // found in the LICENSE file. See the AUTHORS file for names of contributors.
#include "db/db_impl.h" #include "db/db_impl/db_impl.h"
#ifndef __STDC_FORMAT_MACROS #ifndef __STDC_FORMAT_MACROS
#define __STDC_FORMAT_MACROS #define __STDC_FORMAT_MACROS

2
db/db_impl_debug.cc → db/db_impl/db_impl_debug.cc
Unescape View File

@ -9,7 +9,7 @@
#ifndef NDEBUG #ifndef NDEBUG
#include "db/db_impl.h" #include "db/db_impl/db_impl.h"
#include "db/error_handler.h" #include "db/error_handler.h"
#include "monitoring/thread_status_updater.h" #include "monitoring/thread_status_updater.h"

2
db/db_impl_experimental.cc → db/db_impl/db_impl_experimental.cc
Unescape View File

@ -7,7 +7,7 @@
// Use of this source code is governed by a BSD-style license that can be // 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. // found in the LICENSE file. See the AUTHORS file for names of contributors.
#include "db/db_impl.h" #include "db/db_impl/db_impl.h"
#ifndef __STDC_FORMAT_MACROS #ifndef __STDC_FORMAT_MACROS
#define __STDC_FORMAT_MACROS #define __STDC_FORMAT_MACROS

2
db/db_impl_files.cc → db/db_impl/db_impl_files.cc
Unescape View File

@ -6,7 +6,7 @@
// Copyright (c) 2011 The LevelDB Authors. All rights reserved. // Copyright (c) 2011 The LevelDB Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be // 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. // found in the LICENSE file. See the AUTHORS file for names of contributors.
#include "db/db_impl.h" #include "db/db_impl/db_impl.h"
#ifndef __STDC_FORMAT_MACROS #ifndef __STDC_FORMAT_MACROS
#define __STDC_FORMAT_MACROS #define __STDC_FORMAT_MACROS

2
db/db_impl_open.cc → db/db_impl/db_impl_open.cc
Unescape View File

@ -6,7 +6,7 @@
// Copyright (c) 2011 The LevelDB Authors. All rights reserved. // Copyright (c) 2011 The LevelDB Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be // 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. // found in the LICENSE file. See the AUTHORS file for names of contributors.
#include "db/db_impl.h" #include "db/db_impl/db_impl.h"
#ifndef __STDC_FORMAT_MACROS #ifndef __STDC_FORMAT_MACROS
#define __STDC_FORMAT_MACROS #define __STDC_FORMAT_MACROS

4
db/db_impl_readonly.cc → db/db_impl/db_impl_readonly.cc
Unescape View File

@ -3,12 +3,12 @@
// COPYING file in the root directory) and Apache 2.0 License // COPYING file in the root directory) and Apache 2.0 License
// (found in the LICENSE.Apache file in the root directory). // (found in the LICENSE.Apache file in the root directory).
#include "db/db_impl_readonly.h" #include "db/db_impl/db_impl_readonly.h"
#include "db/compacted_db_impl.h" #include "db/compacted_db_impl.h"
#include "db/db_impl.h"
#include "db/db_iter.h" #include "db/db_iter.h"
#include "db/merge_context.h" #include "db/merge_context.h"
#include "db/db_impl/db_impl.h"
#include "monitoring/perf_context_imp.h" #include "monitoring/perf_context_imp.h"
namespace rocksdb { namespace rocksdb {

2
db/db_impl_readonly.h → db/db_impl/db_impl_readonly.h
Unescape View File

@ -9,7 +9,7 @@
#include <string> #include <string>
#include <vector> #include <vector>
#include "db/db_impl.h" #include "db/db_impl/db_impl.h"
namespace rocksdb { namespace rocksdb {

2
db/db_impl_secondary.cc → db/db_impl/db_impl_secondary.cc
Unescape View File

@ -3,7 +3,7 @@
// COPYING file in the root directory) and Apache 2.0 License // COPYING file in the root directory) and Apache 2.0 License
// (found in the LICENSE.Apache file in the root directory). // (found in the LICENSE.Apache file in the root directory).
#include "db/db_impl_secondary.h" #include "db/db_impl/db_impl_secondary.h"
#ifndef __STDC_FORMAT_MACROS #ifndef __STDC_FORMAT_MACROS
#define __STDC_FORMAT_MACROS #define __STDC_FORMAT_MACROS

2
db/db_impl_secondary.h → db/db_impl/db_impl_secondary.h
Unescape View File

@ -9,7 +9,7 @@
#include <string> #include <string>
#include <vector> #include <vector>
#include "db/db_impl.h" #include "db/db_impl/db_impl.h"
namespace rocksdb { namespace rocksdb {

2
db/db_impl_write.cc → db/db_impl/db_impl_write.cc
Unescape View File

@ -6,7 +6,7 @@
// Copyright (c) 2011 The LevelDB Authors. All rights reserved. // Copyright (c) 2011 The LevelDB Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be // 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. // found in the LICENSE file. See the AUTHORS file for names of contributors.
#include "db/db_impl.h" #include "db/db_impl/db_impl.h"
#ifndef __STDC_FORMAT_MACROS #ifndef __STDC_FORMAT_MACROS
#define __STDC_FORMAT_MACROS #define __STDC_FORMAT_MACROS

2
db/db_secondary_test.cc → db/db_impl/db_secondary_test.cc
Unescape View File

@ -7,8 +7,8 @@
// Use of this source code is governed by a BSD-style license that can be // 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. // found in the LICENSE file. See the AUTHORS file for names of contributors.
#include "db/db_impl_secondary.h"
#include "db/db_test_util.h" #include "db/db_test_util.h"
#include "db/db_impl/db_impl_secondary.h"
#include "port/stack_trace.h" #include "port/stack_trace.h"
#include "test_util/fault_injection_test_env.h" #include "test_util/fault_injection_test_env.h"
#include "test_util/sync_point.h" #include "test_util/sync_point.h"

2
db/db_iter.h
Unescape View File

@ -10,10 +10,10 @@
#pragma once #pragma once
#include <stdint.h> #include <stdint.h>
#include <string> #include <string>
#include "db/db_impl.h"
#include "db/dbformat.h" #include "db/dbformat.h"
#include "db/range_del_aggregator.h" #include "db/range_del_aggregator.h"
#include "memory/arena.h" #include "memory/arena.h"
#include "db/db_impl/db_impl.h"
#include "options/cf_options.h" #include "options/cf_options.h"
#include "rocksdb/db.h" #include "rocksdb/db.h"
#include "rocksdb/iterator.h" #include "rocksdb/iterator.h"

2
db/db_options_test.cc
Unescape View File

@ -11,8 +11,8 @@
#include <unordered_map> #include <unordered_map>
#include "db/column_family.h" #include "db/column_family.h"
#include "db/db_impl.h"
#include "db/db_test_util.h" #include "db/db_test_util.h"
#include "db/db_impl/db_impl.h"
#include "options/options_helper.h" #include "options/options_helper.h"
#include "port/stack_trace.h" #include "port/stack_trace.h"
#include "rocksdb/cache.h" #include "rocksdb/cache.h"

2
db/db_test.cc
Unescape View File

@ -24,7 +24,7 @@
#endif #endif
#include "cache/lru_cache.h" #include "cache/lru_cache.h"
#include "db/db_impl.h" #include "db/db_impl/db_impl.h"
#include "db/db_test_util.h" #include "db/db_test_util.h"
#include "db/dbformat.h" #include "db/dbformat.h"
#include "db/job_context.h" #include "db/job_context.h"

2
db/db_test_util.h
Unescape View File

@ -25,7 +25,7 @@
#include <utility> #include <utility>
#include <vector> #include <vector>
#include "db/db_impl.h" #include "db/db_impl/db_impl.h"
#include "db/dbformat.h" #include "db/dbformat.h"
#include "env/mock_env.h" #include "env/mock_env.h"
#include "file/filename.h" #include "file/filename.h"

2
db/deletefile_test.cc
Unescape View File

@ -13,7 +13,7 @@
#include <map> #include <map>
#include <string> #include <string>
#include <vector> #include <vector>
#include "db/db_impl.h" #include "db/db_impl/db_impl.h"
#include "db/version_set.h" #include "db/version_set.h"
#include "db/write_batch_internal.h" #include "db/write_batch_internal.h"
#include "file/filename.h" #include "file/filename.h"

2
db/error_handler.cc
Unescape View File

@ -4,8 +4,8 @@
// (found in the LICENSE.Apache file in the root directory). // (found in the LICENSE.Apache file in the root directory).
// //
#include "db/error_handler.h" #include "db/error_handler.h"
#include "db/db_impl.h"
#include "db/event_helpers.h" #include "db/event_helpers.h"
#include "db/db_impl/db_impl.h"
#include "file/sst_file_manager_impl.h" #include "file/sst_file_manager_impl.h"
namespace rocksdb { namespace rocksdb {

2
db/experimental.cc
Unescape View File

@ -5,7 +5,7 @@
#include "rocksdb/experimental.h" #include "rocksdb/experimental.h"
#include "db/db_impl.h" #include "db/db_impl/db_impl.h"
namespace rocksdb { namespace rocksdb {
namespace experimental { namespace experimental {

2
db/fault_injection_test.cc
Unescape View File

@ -11,9 +11,9 @@
// the last "sync". It then checks for data loss errors by purposely dropping // the last "sync". It then checks for data loss errors by purposely dropping
// file data (or entire files) not protected by a "sync". // file data (or entire files) not protected by a "sync".
#include "db/db_impl.h"
#include "db/log_format.h" #include "db/log_format.h"
#include "db/version_set.h" #include "db/version_set.h"
#include "db/db_impl/db_impl.h"
#include "env/mock_env.h" #include "env/mock_env.h"
#include "file/filename.h" #include "file/filename.h"
#include "rocksdb/cache.h" #include "rocksdb/cache.h"

2
db/forward_iterator.cc
Unescape View File

@ -11,7 +11,7 @@
#include <utility> #include <utility>
#include "db/column_family.h" #include "db/column_family.h"
#include "db/db_impl.h" #include "db/db_impl/db_impl.h"
#include "db/db_iter.h" #include "db/db_iter.h"
#include "db/dbformat.h" #include "db/dbformat.h"
#include "db/job_context.h" #include "db/job_context.h"

2
db/in_memory_stats_history.cc
Unescape View File

@ -6,8 +6,8 @@
// Use of this source code is governed by a BSD-style license that can be // 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. // found in the LICENSE file. See the AUTHORS file for names of contributors.
#include "db/db_impl.h"
#include "db/in_memory_stats_history.h" #include "db/in_memory_stats_history.h"
#include "db/db_impl/db_impl.h"
namespace rocksdb { namespace rocksdb {

2
db/internal_stats.cc
Unescape View File

@ -22,7 +22,7 @@
#include <vector> #include <vector>
#include "db/column_family.h" #include "db/column_family.h"
#include "db/db_impl.h" #include "db/db_impl/db_impl.h"
#include "table/block_based/block_based_table_factory.h" #include "table/block_based/block_based_table_factory.h"
#include "util/string_util.h" #include "util/string_util.h"

2
db/listener_test.cc
Unescape View File

@ -3,11 +3,11 @@
// COPYING file in the root directory) and Apache 2.0 License // COPYING file in the root directory) and Apache 2.0 License
// (found in the LICENSE.Apache file in the root directory). // (found in the LICENSE.Apache file in the root directory).
#include "db/db_impl.h"
#include "db/db_test_util.h" #include "db/db_test_util.h"
#include "db/dbformat.h" #include "db/dbformat.h"
#include "db/version_set.h" #include "db/version_set.h"
#include "db/write_batch_internal.h" #include "db/write_batch_internal.h"
#include "db/db_impl/db_impl.h"
#include "file/filename.h" #include "file/filename.h"
#include "memtable/hash_linklist_rep.h" #include "memtable/hash_linklist_rep.h"
#include "monitoring/statistics.h" #include "monitoring/statistics.h"

2
db/memtable_list.cc
Unescape View File

@ -13,7 +13,7 @@
#include <limits> #include <limits>
#include <queue> #include <queue>
#include <string> #include <string>
#include "db/db_impl.h" #include "db/db_impl/db_impl.h"
#include "db/memtable.h" #include "db/memtable.h"
#include "db/range_tombstone_fragmenter.h" #include "db/range_tombstone_fragmenter.h"
#include "db/version_set.h" #include "db/version_set.h"

5
db/merge_test.cc
Unescape View File

@ -7,8 +7,8 @@
#include <memory> #include <memory>
#include <iostream> #include <iostream>
#include "db/db_impl.h"
#include "db/dbformat.h" #include "db/dbformat.h"
#include "db/db_impl/db_impl.h"
#include "db/write_batch_internal.h" #include "db/write_batch_internal.h"
#include "port/stack_trace.h" #include "port/stack_trace.h"
#include "rocksdb/cache.h" #include "rocksdb/cache.h"
@ -18,6 +18,9 @@
#include "rocksdb/merge_operator.h" #include "rocksdb/merge_operator.h"
#include "rocksdb/utilities/db_ttl.h" #include "rocksdb/utilities/db_ttl.h"
#include "test_util/testharness.h" #include "test_util/testharness.h"
#include "db/dbformat.h"
#include "db/write_batch_internal.h"
#include "db/db_impl/db_impl.h"
#include "utilities/merge_operators.h" #include "utilities/merge_operators.h"
namespace rocksdb { namespace rocksdb {

2
db/obsolete_files_test.cc
Unescape View File

@ -13,7 +13,7 @@
#include <map> #include <map>
#include <string> #include <string>
#include <vector> #include <vector>
#include "db/db_impl.h" #include "db/db_impl/db_impl.h"
#include "db/version_set.h" #include "db/version_set.h"
#include "db/write_batch_internal.h" #include "db/write_batch_internal.h"
#include "file/filename.h" #include "file/filename.h"

2
db/options_file_test.cc
Unescape View File

@ -6,7 +6,7 @@
#ifndef ROCKSDB_LITE #ifndef ROCKSDB_LITE
#include <string> #include <string>
#include "db/db_impl.h" #include "db/db_impl/db_impl.h"
#include "db/db_test_util.h" #include "db/db_test_util.h"
#include "rocksdb/options.h" #include "rocksdb/options.h"
#include "rocksdb/table.h" #include "rocksdb/table.h"

2
db/plain_table_db_test.cc
Unescape View File

@ -12,7 +12,7 @@
#include <algorithm> #include <algorithm>
#include <set> #include <set>
#include "db/db_impl.h" #include "db/db_impl/db_impl.h"
#include "db/version_set.h" #include "db/version_set.h"
#include "db/write_batch_internal.h" #include "db/write_batch_internal.h"
#include "file/filename.h" #include "file/filename.h"

2
db/prefix_test.cc
Unescape View File

@ -17,7 +17,7 @@ int main() {
#include <iostream> #include <iostream>
#include <vector> #include <vector>
#include "db/db_impl.h" #include "db/db_impl/db_impl.h"
#include "monitoring/histogram.h" #include "monitoring/histogram.h"
#include "rocksdb/comparator.h" #include "rocksdb/comparator.h"
#include "rocksdb/db.h" #include "rocksdb/db.h"

2
db/range_del_aggregator.cc
Unescape View File

@ -5,7 +5,7 @@
#include "db/range_del_aggregator.h" #include "db/range_del_aggregator.h"
#include "db/compaction_iteration_stats.h" #include "db/compaction/compaction_iteration_stats.h"
#include "db/dbformat.h" #include "db/dbformat.h"
#include "db/pinned_iterators_manager.h" #include "db/pinned_iterators_manager.h"
#include "db/range_del_aggregator.h" #include "db/range_del_aggregator.h"

2
db/range_del_aggregator.h
Unescape View File

@ -13,7 +13,7 @@
#include <string> #include <string>
#include <vector> #include <vector>
#include "db/compaction_iteration_stats.h" #include "db/compaction/compaction_iteration_stats.h"
#include "db/dbformat.h" #include "db/dbformat.h"
#include "db/pinned_iterators_manager.h" #include "db/pinned_iterators_manager.h"
#include "db/range_del_aggregator.h" #include "db/range_del_aggregator.h"

2
db/repair.cc
Unescape View File

@ -66,7 +66,7 @@
#include <inttypes.h> #include <inttypes.h>
#include "db/builder.h" #include "db/builder.h"
#include "db/db_impl.h" #include "db/db_impl/db_impl.h"
#include "db/dbformat.h" #include "db/dbformat.h"
#include "db/log_reader.h" #include "db/log_reader.h"
#include "db/log_writer.h" #include "db/log_writer.h"

2
db/repair_test.cc
Unescape View File

@ -9,7 +9,7 @@
#include <string> #include <string>
#include <vector> #include <vector>
#include "db/db_impl.h" #include "db/db_impl/db_impl.h"
#include "db/db_test_util.h" #include "db/db_test_util.h"
#include "file/file_util.h" #include "file/file_util.h"
#include "rocksdb/comparator.h" #include "rocksdb/comparator.h"

2
db/table_properties_collector_test.cc
Unescape View File

@ -9,10 +9,10 @@
#include <utility> #include <utility>
#include <vector> #include <vector>
#include "db/db_impl.h"
#include "db/dbformat.h" #include "db/dbformat.h"
#include "db/table_properties_collector.h" #include "db/table_properties_collector.h"
#include "db/db_impl/db_impl.h"
#include "options/cf_options.h" #include "options/cf_options.h"
#include "rocksdb/table.h" #include "rocksdb/table.h"
#include "table/block_based/block_based_table_factory.h" #include "table/block_based/block_based_table_factory.h"

2
db/version_set.cc
Unescape View File

@ -23,7 +23,7 @@
#include <string> #include <string>
#include <unordered_map> #include <unordered_map>
#include <vector> #include <vector>
#include "db/compaction.h" #include "compaction/compaction.h"
#include "db/internal_stats.h" #include "db/internal_stats.h"
#include "db/log_reader.h" #include "db/log_reader.h"
#include "db/log_writer.h" #include "db/log_writer.h"

4
db/version_set.h
Unescape View File

@ -29,8 +29,8 @@
#include <vector> #include <vector>
#include "db/column_family.h" #include "db/column_family.h"
#include "db/compaction.h" #include "db/compaction/compaction.h"
#include "db/compaction_picker.h" #include "db/compaction/compaction_picker.h"
#include "db/dbformat.h" #include "db/dbformat.h"
#include "db/file_indexer.h" #include "db/file_indexer.h"
#include "db/log_reader.h" #include "db/log_reader.h"

2
db/wal_manager_test.cc
Unescape View File

@ -13,7 +13,7 @@
#include "rocksdb/write_buffer_manager.h" #include "rocksdb/write_buffer_manager.h"
#include "db/column_family.h" #include "db/column_family.h"
#include "db/db_impl.h" #include "db/db_impl/db_impl.h"
#include "db/log_writer.h" #include "db/log_writer.h"
#include "db/version_set.h" #include "db/version_set.h"
#include "db/wal_manager.h" #include "db/wal_manager.h"

2
db/write_batch.cc
Unescape View File

@ -42,13 +42,13 @@
#include <vector> #include <vector>
#include "db/column_family.h" #include "db/column_family.h"
#include "db/db_impl.h"
#include "db/dbformat.h" #include "db/dbformat.h"
#include "db/flush_scheduler.h" #include "db/flush_scheduler.h"
#include "db/memtable.h" #include "db/memtable.h"
#include "db/merge_context.h" #include "db/merge_context.h"
#include "db/snapshot_impl.h" #include "db/snapshot_impl.h"
#include "db/write_batch_internal.h" #include "db/write_batch_internal.h"
#include "db/db_impl/db_impl.h"
#include "monitoring/perf_context_imp.h" #include "monitoring/perf_context_imp.h"
#include "monitoring/statistics.h" #include "monitoring/statistics.h"
#include "rocksdb/merge_operator.h" #include "rocksdb/merge_operator.h"

2
db/write_callback_test.cc
Unescape View File

@ -11,7 +11,7 @@
#include <utility> #include <utility>
#include <vector> #include <vector>
#include "db/db_impl.h" #include "db/db_impl/db_impl.h"
#include "db/write_callback.h" #include "db/write_callback.h"
#include "port/port.h" #include "port/port.h"
#include "rocksdb/db.h" #include "rocksdb/db.h"

2
file/sst_file_manager_impl.cc
Unescape View File

@ -12,7 +12,7 @@
#include <inttypes.h> #include <inttypes.h>
#include <vector> #include <vector>
#include "db/db_impl.h" #include "db/db_impl/db_impl.h"
#include "port/port.h" #include "port/port.h"
#include "rocksdb/env.h" #include "rocksdb/env.h"
#include "rocksdb/sst_file_manager.h" #include "rocksdb/sst_file_manager.h"

2
file/sst_file_manager_impl.h
Unescape View File

@ -11,7 +11,7 @@
#include "port/port.h" #include "port/port.h"
#include "db/compaction.h" #include "db/compaction/compaction.h"
#include "db/error_handler.h" #include "db/error_handler.h"
#include "file/delete_scheduler.h" #include "file/delete_scheduler.h"
#include "rocksdb/sst_file_manager.h" #include "rocksdb/sst_file_manager.h"

42
src.mk
Unescape View File

@ -7,24 +7,24 @@ LIB_SOURCES = \
db/c.cc \ db/c.cc \
db/column_family.cc \ db/column_family.cc \
db/compacted_db_impl.cc \ db/compacted_db_impl.cc \
db/compaction.cc \ db/compaction/compaction.cc \
db/compaction_iterator.cc \ db/compaction/compaction_iterator.cc \
db/compaction_job.cc \ db/compaction/compaction_job.cc \
db/compaction_picker.cc \ db/compaction/compaction_picker.cc \
db/compaction_picker_fifo.cc \ db/compaction/compaction_picker_fifo.cc \
db/compaction_picker_level.cc \ db/compaction/compaction_picker_level.cc \
db/compaction_picker_universal.cc \ db/compaction/compaction_picker_universal.cc \
db/convenience.cc \ db/convenience.cc \
db/db_filesnapshot.cc \ db/db_filesnapshot.cc \
db/db_impl.cc \ db/db_impl/db_impl.cc \
db/db_impl_compaction_flush.cc \ db/db_impl/db_impl_compaction_flush.cc \
db/db_impl_debug.cc \ db/db_impl/db_impl_debug.cc \
db/db_impl_experimental.cc \ db/db_impl/db_impl_experimental.cc \
db/db_impl_files.cc \ db/db_impl/db_impl_files.cc \
db/db_impl_open.cc \ db/db_impl/db_impl_open.cc \
db/db_impl_readonly.cc \ db/db_impl/db_impl_readonly.cc \
db/db_impl_secondary.cc \ db/db_impl/db_impl_secondary.cc \
db/db_impl_write.cc \ db/db_impl/db_impl_write.cc \
db/db_info_dumper.cc \ db/db_info_dumper.cc \
db/db_iter.cc \ db/db_iter.cc \
db/dbformat.cc \ db/dbformat.cc \
@ -259,10 +259,10 @@ MAIN_SOURCES = \
cache/cache_test.cc \ cache/cache_test.cc \
db/column_family_test.cc \ db/column_family_test.cc \
db/compact_files_test.cc \ db/compact_files_test.cc \
db/compaction_iterator_test.cc \ db/compaction/compaction_iterator_test.cc \
db/compaction_job_stats_test.cc \ db/compaction/compaction_job_test.cc \
db/compaction_job_test.cc \ db/compaction/compaction_job_stats_test.cc \
db/compaction_picker_test.cc \ db/compaction/compaction_picker_test.cc \
db/comparator_db_test.cc \ db/comparator_db_test.cc \
db/corruption_test.cc \ db/corruption_test.cc \
db/cuckoo_table_db_test.cc \ db/cuckoo_table_db_test.cc \
@ -286,7 +286,7 @@ MAIN_SOURCES = \
db/db_options_test.cc \ db/db_options_test.cc \
db/db_properties_test.cc \ db/db_properties_test.cc \
db/db_range_del_test.cc \ db/db_range_del_test.cc \
db/db_secondary_test.cc \ db/db_impl/db_secondary_test.cc \
db/db_sst_test.cc \ db/db_sst_test.cc \
db/db_statistics_test.cc \ db/db_statistics_test.cc \
db/db_table_properties_test.cc \ db/db_table_properties_test.cc \

2
table/table_reader_bench.cc
Unescape View File

@ -11,7 +11,7 @@ int main() {
} }
#else #else
#include "db/db_impl.h" #include "db/db_impl/db_impl.h"
#include "db/dbformat.h" #include "db/dbformat.h"
#include "monitoring/histogram.h" #include "monitoring/histogram.h"
#include "rocksdb/db.h" #include "rocksdb/db.h"

2
tools/db_bench_tool.cc
Unescape View File

@ -33,7 +33,7 @@
#include <thread> #include <thread>
#include <unordered_map> #include <unordered_map>
#include "db/db_impl.h" #include "db/db_impl/db_impl.h"
#include "db/malloc_stats.h" #include "db/malloc_stats.h"
#include "db/version_set.h" #include "db/version_set.h"
#include "hdfs/env_hdfs.h" #include "hdfs/env_hdfs.h"

2
tools/db_stress.cc
Unescape View File

@ -44,7 +44,7 @@ int main() {
#include <queue> #include <queue>
#include <thread> #include <thread>
#include "db/db_impl.h" #include "db/db_impl/db_impl.h"
#include "db/version_set.h" #include "db/version_set.h"
#include "hdfs/env_hdfs.h" #include "hdfs/env_hdfs.h"
#include "monitoring/histogram.h" #include "monitoring/histogram.h"

3
tools/ldb_cmd.cc
Unescape View File

@ -1,3 +1,4 @@
// Copyright (c) 2011-present, Facebook, Inc. All rights reserved. // Copyright (c) 2011-present, Facebook, Inc. All rights reserved.
// This source code is licensed under both the GPLv2 (found in the // This source code is licensed under both the GPLv2 (found in the
// COPYING file in the root directory) and Apache 2.0 License // COPYING file in the root directory) and Apache 2.0 License
@ -12,7 +13,7 @@
#include <inttypes.h> #include <inttypes.h>
#include "db/db_impl.h" #include "db/db_impl/db_impl.h"
#include "db/dbformat.h" #include "db/dbformat.h"
#include "db/log_reader.h" #include "db/log_reader.h"
#include "db/write_batch_internal.h" #include "db/write_batch_internal.h"

2
tools/reduce_levels_test.cc
Unescape View File

@ -6,7 +6,7 @@
#ifndef ROCKSDB_LITE #ifndef ROCKSDB_LITE
#include "db/db_impl.h" #include "db/db_impl/db_impl.h"
#include "db/version_set.h" #include "db/version_set.h"
#include "rocksdb/db.h" #include "rocksdb/db.h"
#include "rocksdb/utilities/ldb_cmd.h" #include "rocksdb/utilities/ldb_cmd.h"

2
tools/trace_analyzer_tool.cc
Unescape View File

@ -27,7 +27,7 @@
#include <sstream> #include <sstream>
#include <stdexcept> #include <stdexcept>
#include "db/db_impl.h" #include "db/db_impl/db_impl.h"
#include "db/memtable.h" #include "db/memtable.h"
#include "db/write_batch_internal.h" #include "db/write_batch_internal.h"
#include "options/cf_options.h" #include "options/cf_options.h"

3
util/trace_replay.cc
Unescape View File

@ -8,7 +8,8 @@
#include <chrono> #include <chrono>
#include <sstream> #include <sstream>
#include <thread> #include <thread>
#include "db/db_impl.h"
#include "db/db_impl/db_impl.h"
#include "rocksdb/slice.h" #include "rocksdb/slice.h"
#include "rocksdb/write_batch.h" #include "rocksdb/write_batch.h"
#include "util/coding.h" #include "util/coding.h"

2
utilities/backupable/backupable_db_test.cc
Unescape View File

@ -12,7 +12,7 @@
#include <algorithm> #include <algorithm>
#include <string> #include <string>
#include "db/db_impl.h" #include "db/db_impl/db_impl.h"
#include "env/env_chroot.h" #include "env/env_chroot.h"
#include "file/filename.h" #include "file/filename.h"
#include "port/port.h" #include "port/port.h"

2
utilities/blob_db/blob_db_impl.cc
Unescape View File

@ -11,7 +11,7 @@
#include <iomanip> #include <iomanip>
#include <memory> #include <memory>
#include "db/db_impl.h" #include "db/db_impl/db_impl.h"
#include "db/write_batch_internal.h" #include "db/write_batch_internal.h"
#include "file/file_util.h" #include "file/file_util.h"
#include "file/filename.h" #include "file/filename.h"

3
utilities/blob_db/blob_file.cc
Unescape View File

@ -1,3 +1,4 @@
// Copyright (c) 2011-present, Facebook, Inc. All rights reserved. // Copyright (c) 2011-present, Facebook, Inc. All rights reserved.
// This source code is licensed under both the GPLv2 (found in the // This source code is licensed under both the GPLv2 (found in the
// COPYING file in the root directory) and Apache 2.0 License // COPYING file in the root directory) and Apache 2.0 License
@ -17,7 +18,7 @@
#include <memory> #include <memory>
#include "db/column_family.h" #include "db/column_family.h"
#include "db/db_impl.h" #include "db/db_impl/db_impl.h"
#include "db/dbformat.h" #include "db/dbformat.h"
#include "file/filename.h" #include "file/filename.h"
#include "util/logging.h" #include "util/logging.h"

2
utilities/cassandra/cassandra_functional_test.cc
Unescape View File

@ -4,7 +4,7 @@
// (found in the LICENSE.Apache file in the root directory). // (found in the LICENSE.Apache file in the root directory).
#include <iostream> #include <iostream>
#include "db/db_impl.h" #include "db/db_impl/db_impl.h"
#include "rocksdb/db.h" #include "rocksdb/db.h"
#include "rocksdb/merge_operator.h" #include "rocksdb/merge_operator.h"
#include "rocksdb/utilities/db_ttl.h" #include "rocksdb/utilities/db_ttl.h"

2
utilities/checkpoint/checkpoint_test.cc
Unescape View File

@ -16,7 +16,7 @@
#include <iostream> #include <iostream>
#include <thread> #include <thread>
#include <utility> #include <utility>
#include "db/db_impl.h" #include "db/db_impl/db_impl.h"
#include "port/port.h" #include "port/port.h"
#include "port/stack_trace.h" #include "port/stack_trace.h"
#include "rocksdb/db.h" #include "rocksdb/db.h"

2
utilities/debug.cc
Unescape View File

@ -7,7 +7,7 @@
#include "rocksdb/utilities/debug.h" #include "rocksdb/utilities/debug.h"
#include "db/db_impl.h" #include "db/db_impl/db_impl.h"
namespace rocksdb { namespace rocksdb {

2
utilities/memory/memory_test.cc
Unescape View File

@ -5,7 +5,7 @@
#ifndef ROCKSDB_LITE #ifndef ROCKSDB_LITE
#include "db/db_impl.h" #include "db/db_impl/db_impl.h"
#include "rocksdb/cache.h" #include "rocksdb/cache.h"
#include "rocksdb/table.h" #include "rocksdb/table.h"
#include "rocksdb/utilities/memory_util.h" #include "rocksdb/utilities/memory_util.h"

2
utilities/memory/memory_util.cc
Unescape View File

@ -7,7 +7,7 @@
#include "rocksdb/utilities/memory_util.h" #include "rocksdb/utilities/memory_util.h"
#include "db/db_impl.h" #include "db/db_impl/db_impl.h"
namespace rocksdb { namespace rocksdb {

2
utilities/transactions/optimistic_transaction.cc
Unescape View File

@ -10,7 +10,7 @@
#include <string> #include <string>
#include "db/column_family.h" #include "db/column_family.h"
#include "db/db_impl.h" #include "db/db_impl/db_impl.h"
#include "rocksdb/comparator.h" #include "rocksdb/comparator.h"
#include "rocksdb/db.h" #include "rocksdb/db.h"
#include "rocksdb/status.h" #include "rocksdb/status.h"

2
utilities/transactions/optimistic_transaction_db_impl.cc
Unescape View File

@ -10,7 +10,7 @@
#include <string> #include <string>
#include <vector> #include <vector>
#include "db/db_impl.h" #include "db/db_impl/db_impl.h"
#include "rocksdb/db.h" #include "rocksdb/db.h"
#include "rocksdb/options.h" #include "rocksdb/options.h"
#include "rocksdb/utilities/optimistic_transaction_db.h" #include "rocksdb/utilities/optimistic_transaction_db.h"

2
utilities/transactions/pessimistic_transaction.cc
Unescape View File

@ -13,7 +13,7 @@
#include <vector> #include <vector>
#include "db/column_family.h" #include "db/column_family.h"
#include "db/db_impl.h" #include "db/db_impl/db_impl.h"
#include "rocksdb/comparator.h" #include "rocksdb/comparator.h"
#include "rocksdb/db.h" #include "rocksdb/db.h"
#include "rocksdb/snapshot.h" #include "rocksdb/snapshot.h"

2
utilities/transactions/pessimistic_transaction_db.cc
Unescape View File

@ -16,7 +16,7 @@
#include <unordered_set> #include <unordered_set>
#include <vector> #include <vector>
#include "db/db_impl.h" #include "db/db_impl/db_impl.h"
#include "rocksdb/db.h" #include "rocksdb/db.h"
#include "rocksdb/options.h" #include "rocksdb/options.h"
#include "rocksdb/utilities/transaction_db.h" #include "rocksdb/utilities/transaction_db.h"

2
utilities/transactions/transaction_base.cc
Unescape View File

@ -13,7 +13,7 @@
#include <inttypes.h> #include <inttypes.h>
#include "db/db_impl.h" #include "db/db_impl/db_impl.h"
#include "db/column_family.h" #include "db/column_family.h"
#include "rocksdb/comparator.h" #include "rocksdb/comparator.h"
#include "rocksdb/db.h" #include "rocksdb/db.h"

2
utilities/transactions/transaction_test.cc
Unescape View File

@ -16,7 +16,7 @@
#include <string> #include <string>
#include <thread> #include <thread>
#include "db/db_impl.h" #include "db/db_impl/db_impl.h"
#include "rocksdb/db.h" #include "rocksdb/db.h"
#include "rocksdb/options.h" #include "rocksdb/options.h"
#include "rocksdb/perf_context.h" #include "rocksdb/perf_context.h"

2
utilities/transactions/transaction_test.h
Unescape View File

@ -15,7 +15,7 @@
#include <string> #include <string>
#include <thread> #include <thread>
#include "db/db_impl.h" #include "db/db_impl/db_impl.h"
#include "rocksdb/db.h" #include "rocksdb/db.h"
#include "rocksdb/options.h" #include "rocksdb/options.h"
#include "rocksdb/utilities/transaction.h" #include "rocksdb/utilities/transaction.h"

2
utilities/transactions/transaction_util.cc
Unescape View File

@ -15,7 +15,7 @@
#include <string> #include <string>
#include <vector> #include <vector>
#include "db/db_impl.h" #include "db/db_impl/db_impl.h"
#include "rocksdb/status.h" #include "rocksdb/status.h"
#include "rocksdb/utilities/write_batch_with_index.h" #include "rocksdb/utilities/write_batch_with_index.h"
#include "util/string_util.h" #include "util/string_util.h"

2
utilities/transactions/write_prepared_transaction_test.cc
Unescape View File

@ -18,7 +18,7 @@
#include <string> #include <string>
#include <thread> #include <thread>
#include "db/db_impl.h" #include "db/db_impl/db_impl.h"
#include "db/dbformat.h" #include "db/dbformat.h"
#include "rocksdb/db.h" #include "rocksdb/db.h"
#include "rocksdb/options.h" #include "rocksdb/options.h"

Some files were not shown because too many files have changed in this diff Show More

Write Preview
Loading…
Cancel
Save