Move BlobDB related files under db/ to db/blob/ (#6519)

Summary: Pull Request resolved: https://github.com/facebook/rocksdb/pull/6519

Test Plan:
```
make all
make check
```

Differential Revision: D20400691

Pulled By: ltamasi

fbshipit-source-id: 20ef911cf1c2c92c7f71ef0b493f9be64f2eef94
main
Levi Tamasi 5 years ago committed by Facebook GitHub Bot
parent 07a3f7f008
commit c15e85bdcb
  1. 10
      CMakeLists.txt
  2. 6
      Makefile
  3. 10
      TARGETS
  4. 0
      db/blob/blob_constants.h
  5. 2
      db/blob/blob_file_addition.cc
  6. 2
      db/blob/blob_file_addition.h
  7. 2
      db/blob/blob_file_addition_test.cc
  8. 2
      db/blob/blob_file_garbage.cc
  9. 2
      db/blob/blob_file_garbage.h
  10. 2
      db/blob/blob_file_garbage_test.cc
  11. 0
      db/blob/blob_index.h
  12. 0
      db/blob/db_blob_index_test.cc
  13. 2
      db/compaction/compaction_job_test.cc
  14. 2
      db/db_test.cc
  15. 2
      db/flush_job_test.cc
  16. 2
      db/listener_test.cc
  17. 2
      db/version_edit.cc
  18. 4
      db/version_edit.h
  19. 10
      src.mk
  20. 2
      tools/sst_dump_tool.cc
  21. 2
      utilities/blob_db/blob_compaction_filter.h
  22. 2
      utilities/blob_db/blob_db_impl.cc
  23. 2
      utilities/blob_db/blob_db_test.cc

@ -510,8 +510,8 @@ set(SOURCES
cache/lru_cache.cc cache/lru_cache.cc
cache/sharded_cache.cc cache/sharded_cache.cc
db/arena_wrapped_db_iter.cc db/arena_wrapped_db_iter.cc
db/blob_file_addition.cc db/blob/blob_file_addition.cc
db/blob_file_garbage.cc db/blob/blob_file_garbage.cc
db/builder.cc db/builder.cc
db/c.cc db/c.cc
db/column_family.cc db/column_family.cc
@ -935,8 +935,9 @@ if(WITH_TESTS)
set(TESTS set(TESTS
cache/cache_test.cc cache/cache_test.cc
cache/lru_cache_test.cc cache/lru_cache_test.cc
db/blob_file_addition_test.cc db/blob/blob_file_addition_test.cc
db/blob_file_garbage_test.cc db/blob/blob_file_garbage_test.cc
db/blob/db_blob_index_test.cc
db/column_family_test.cc db/column_family_test.cc
db/compact_files_test.cc db/compact_files_test.cc
db/compaction/compaction_job_stats_test.cc db/compaction/compaction_job_stats_test.cc
@ -947,7 +948,6 @@ if(WITH_TESTS)
db/corruption_test.cc db/corruption_test.cc
db/cuckoo_table_db_test.cc db/cuckoo_table_db_test.cc
db/db_basic_test.cc db/db_basic_test.cc
db/db_blob_index_test.cc
db/db_block_cache_test.cc db/db_block_cache_test.cc
db/db_bloom_filter_test.cc db/db_bloom_filter_test.cc
db/db_compaction_filter_test.cc db/db_compaction_filter_test.cc

@ -1318,7 +1318,7 @@ db_test2: db/db_test2.o db/db_test_util.o $(LIBOBJECTS) $(TESTHARNESS)
db_logical_block_size_cache_test: db/db_logical_block_size_cache_test.o db/db_test_util.o $(LIBOBJECTS) $(TESTHARNESS) db_logical_block_size_cache_test: db/db_logical_block_size_cache_test.o db/db_test_util.o $(LIBOBJECTS) $(TESTHARNESS)
$(AM_LINK) $(AM_LINK)
db_blob_index_test: db/db_blob_index_test.o db/db_test_util.o $(LIBOBJECTS) $(TESTHARNESS) db_blob_index_test: db/blob/db_blob_index_test.o db/db_test_util.o $(LIBOBJECTS) $(TESTHARNESS)
$(AM_LINK) $(AM_LINK)
db_block_cache_test: db/db_block_cache_test.o db/db_test_util.o $(LIBOBJECTS) $(TESTHARNESS) db_block_cache_test: db/db_block_cache_test.o db/db_test_util.o $(LIBOBJECTS) $(TESTHARNESS)
@ -1728,10 +1728,10 @@ block_cache_trace_analyzer_test: tools/block_cache_analyzer/block_cache_trace_an
defer_test: util/defer_test.o $(LIBOBJECTS) $(TESTHARNESS) defer_test: util/defer_test.o $(LIBOBJECTS) $(TESTHARNESS)
$(AM_LINK) $(AM_LINK)
blob_file_addition_test: db/blob_file_addition_test.o $(LIBOBJECTS) $(TESTHARNESS) blob_file_addition_test: db/blob/blob_file_addition_test.o $(LIBOBJECTS) $(TESTHARNESS)
$(AM_LINK) $(AM_LINK)
blob_file_garbage_test: db/blob_file_garbage_test.o $(LIBOBJECTS) $(TESTHARNESS) blob_file_garbage_test: db/blob/blob_file_garbage_test.o $(LIBOBJECTS) $(TESTHARNESS)
$(AM_LINK) $(AM_LINK)
#------------------------------------------------- #-------------------------------------------------

@ -116,8 +116,8 @@ cpp_library(
"cache/lru_cache.cc", "cache/lru_cache.cc",
"cache/sharded_cache.cc", "cache/sharded_cache.cc",
"db/arena_wrapped_db_iter.cc", "db/arena_wrapped_db_iter.cc",
"db/blob_file_addition.cc", "db/blob/blob_file_addition.cc",
"db/blob_file_garbage.cc", "db/blob/blob_file_garbage.cc",
"db/builder.cc", "db/builder.cc",
"db/c.cc", "db/c.cc",
"db/column_family.cc", "db/column_family.cc",
@ -482,14 +482,14 @@ ROCKS_TESTS = [
], ],
[ [
"blob_file_addition_test", "blob_file_addition_test",
"db/blob_file_addition_test.cc", "db/blob/blob_file_addition_test.cc",
"serial", "serial",
[], [],
[], [],
], ],
[ [
"blob_file_garbage_test", "blob_file_garbage_test",
"db/blob_file_garbage_test.cc", "db/blob/blob_file_garbage_test.cc",
"serial", "serial",
[], [],
[], [],
@ -706,7 +706,7 @@ ROCKS_TESTS = [
], ],
[ [
"db_blob_index_test", "db_blob_index_test",
"db/db_blob_index_test.cc", "db/blob/db_blob_index_test.cc",
"serial", "serial",
[], [],
[], [],

@ -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/blob_file_addition.h" #include "db/blob/blob_file_addition.h"
#include <ostream> #include <ostream>
#include <sstream> #include <sstream>

@ -10,7 +10,7 @@
#include <iosfwd> #include <iosfwd>
#include <string> #include <string>
#include "db/blob_constants.h" #include "db/blob/blob_constants.h"
#include "rocksdb/rocksdb_namespace.h" #include "rocksdb/rocksdb_namespace.h"
namespace ROCKSDB_NAMESPACE { namespace ROCKSDB_NAMESPACE {

@ -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/blob_file_addition.h" #include "db/blob/blob_file_addition.h"
#include <cstdint> #include <cstdint>
#include <cstring> #include <cstring>

@ -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/blob_file_garbage.h" #include "db/blob/blob_file_garbage.h"
#include <ostream> #include <ostream>
#include <sstream> #include <sstream>

@ -9,7 +9,7 @@
#include <iosfwd> #include <iosfwd>
#include <string> #include <string>
#include "db/blob_constants.h" #include "db/blob/blob_constants.h"
#include "rocksdb/rocksdb_namespace.h" #include "rocksdb/rocksdb_namespace.h"
namespace ROCKSDB_NAMESPACE { namespace ROCKSDB_NAMESPACE {

@ -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/blob_file_garbage.h" #include "db/blob/blob_file_garbage.h"
#include <cstdint> #include <cstdint>
#include <cstring> #include <cstring>

@ -12,7 +12,7 @@
#include <string> #include <string>
#include <tuple> #include <tuple>
#include "db/blob_index.h" #include "db/blob/blob_index.h"
#include "db/column_family.h" #include "db/column_family.h"
#include "db/compaction/compaction_job.h" #include "db/compaction/compaction_job.h"
#include "db/db_impl/db_impl.h" #include "db/db_impl/db_impl.h"

@ -24,7 +24,7 @@
#endif #endif
#include "cache/lru_cache.h" #include "cache/lru_cache.h"
#include "db/blob_index.h" #include "db/blob/blob_index.h"
#include "db/db_impl/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"

@ -8,7 +8,7 @@
#include <map> #include <map>
#include <string> #include <string>
#include "db/blob_index.h" #include "db/blob/blob_index.h"
#include "db/column_family.h" #include "db/column_family.h"
#include "db/db_impl/db_impl.h" #include "db/db_impl/db_impl.h"
#include "db/flush_job.h" #include "db/flush_job.h"

@ -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/blob_index.h" #include "db/blob/blob_index.h"
#include "db/db_impl/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"

@ -9,7 +9,7 @@
#include "db/version_edit.h" #include "db/version_edit.h"
#include "db/blob_index.h" #include "db/blob/blob_index.h"
#include "db/version_set.h" #include "db/version_set.h"
#include "logging/event_logger.h" #include "logging/event_logger.h"
#include "rocksdb/slice.h" #include "rocksdb/slice.h"

@ -13,8 +13,8 @@
#include <string> #include <string>
#include <utility> #include <utility>
#include <vector> #include <vector>
#include "db/blob_file_addition.h" #include "db/blob/blob_file_addition.h"
#include "db/blob_file_garbage.h" #include "db/blob/blob_file_garbage.h"
#include "db/dbformat.h" #include "db/dbformat.h"
#include "memory/arena.h" #include "memory/arena.h"
#include "rocksdb/cache.h" #include "rocksdb/cache.h"

@ -4,8 +4,8 @@ LIB_SOURCES = \
cache/lru_cache.cc \ cache/lru_cache.cc \
cache/sharded_cache.cc \ cache/sharded_cache.cc \
db/arena_wrapped_db_iter.cc \ db/arena_wrapped_db_iter.cc \
db/blob_file_addition.cc \ db/blob/blob_file_addition.cc \
db/blob_file_garbage.cc \ db/blob/blob_file_garbage.cc \
db/builder.cc \ db/builder.cc \
db/c.cc \ db/c.cc \
db/column_family.cc \ db/column_family.cc \
@ -298,8 +298,9 @@ MAIN_SOURCES = \
cache/cache_bench.cc \ cache/cache_bench.cc \
cache/cache_test.cc \ cache/cache_test.cc \
db_stress_tool/db_stress.cc \ db_stress_tool/db_stress.cc \
db/blob_file_addition_test.cc \ db/blob/blob_file_addition_test.cc \
db/blob_file_garbage_test.cc \ db/blob/blob_file_garbage_test.cc \
db/blob/db_blob_index_test.cc \
db/column_family_test.cc \ db/column_family_test.cc \
db/compact_files_test.cc \ db/compact_files_test.cc \
db/compaction/compaction_iterator_test.cc \ db/compaction/compaction_iterator_test.cc \
@ -310,7 +311,6 @@ MAIN_SOURCES = \
db/corruption_test.cc \ db/corruption_test.cc \
db/cuckoo_table_db_test.cc \ db/cuckoo_table_db_test.cc \
db/db_basic_test.cc \ db/db_basic_test.cc \
db/db_blob_index_test.cc \
db/db_block_cache_test.cc \ db/db_block_cache_test.cc \
db/db_bloom_filter_test.cc \ db/db_bloom_filter_test.cc \
db/db_compaction_filter_test.cc \ db/db_compaction_filter_test.cc \

@ -15,7 +15,7 @@
#include <sstream> #include <sstream>
#include <vector> #include <vector>
#include "db/blob_index.h" #include "db/blob/blob_index.h"
#include "db/memtable.h" #include "db/memtable.h"
#include "db/write_batch_internal.h" #include "db/write_batch_internal.h"
#include "env/composite_env_wrapper.h" #include "env/composite_env_wrapper.h"

@ -7,7 +7,7 @@
#include <unordered_set> #include <unordered_set>
#include "db/blob_index.h" #include "db/blob/blob_index.h"
#include "monitoring/statistics.h" #include "monitoring/statistics.h"
#include "rocksdb/compaction_filter.h" #include "rocksdb/compaction_filter.h"
#include "rocksdb/env.h" #include "rocksdb/env.h"

@ -12,7 +12,7 @@
#include <memory> #include <memory>
#include <sstream> #include <sstream>
#include "db/blob_index.h" #include "db/blob/blob_index.h"
#include "db/db_impl/db_impl.h" #include "db/db_impl/db_impl.h"
#include "db/write_batch_internal.h" #include "db/write_batch_internal.h"
#include "env/composite_env_wrapper.h" #include "env/composite_env_wrapper.h"

@ -15,7 +15,7 @@
#include <string> #include <string>
#include <vector> #include <vector>
#include "db/blob_index.h" #include "db/blob/blob_index.h"
#include "db/db_test_util.h" #include "db/db_test_util.h"
#include "env/composite_env_wrapper.h" #include "env/composite_env_wrapper.h"
#include "file/file_util.h" #include "file/file_util.h"

Loading…
Cancel
Save