diff --git a/CMakeLists.txt b/CMakeLists.txt index 0de0e2507d..d7d0aed4f9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -510,8 +510,8 @@ set(SOURCES cache/lru_cache.cc cache/sharded_cache.cc db/arena_wrapped_db_iter.cc - db/blob_file_addition.cc - db/blob_file_garbage.cc + db/blob/blob_file_addition.cc + db/blob/blob_file_garbage.cc db/builder.cc db/c.cc db/column_family.cc @@ -935,8 +935,9 @@ if(WITH_TESTS) set(TESTS cache/cache_test.cc cache/lru_cache_test.cc - db/blob_file_addition_test.cc - db/blob_file_garbage_test.cc + db/blob/blob_file_addition_test.cc + db/blob/blob_file_garbage_test.cc + db/blob/db_blob_index_test.cc db/column_family_test.cc db/compact_files_test.cc db/compaction/compaction_job_stats_test.cc @@ -947,7 +948,6 @@ if(WITH_TESTS) db/corruption_test.cc db/cuckoo_table_db_test.cc db/db_basic_test.cc - db/db_blob_index_test.cc db/db_block_cache_test.cc db/db_bloom_filter_test.cc db/db_compaction_filter_test.cc diff --git a/Makefile b/Makefile index 07ecd429de..92541174b0 100644 --- a/Makefile +++ b/Makefile @@ -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) $(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) 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) $(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) -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) #------------------------------------------------- diff --git a/TARGETS b/TARGETS index 32c5c1423f..60eec57cd2 100644 --- a/TARGETS +++ b/TARGETS @@ -116,8 +116,8 @@ cpp_library( "cache/lru_cache.cc", "cache/sharded_cache.cc", "db/arena_wrapped_db_iter.cc", - "db/blob_file_addition.cc", - "db/blob_file_garbage.cc", + "db/blob/blob_file_addition.cc", + "db/blob/blob_file_garbage.cc", "db/builder.cc", "db/c.cc", "db/column_family.cc", @@ -482,14 +482,14 @@ ROCKS_TESTS = [ ], [ "blob_file_addition_test", - "db/blob_file_addition_test.cc", + "db/blob/blob_file_addition_test.cc", "serial", [], [], ], [ "blob_file_garbage_test", - "db/blob_file_garbage_test.cc", + "db/blob/blob_file_garbage_test.cc", "serial", [], [], @@ -706,7 +706,7 @@ ROCKS_TESTS = [ ], [ "db_blob_index_test", - "db/db_blob_index_test.cc", + "db/blob/db_blob_index_test.cc", "serial", [], [], diff --git a/db/blob_constants.h b/db/blob/blob_constants.h similarity index 100% rename from db/blob_constants.h rename to db/blob/blob_constants.h diff --git a/db/blob_file_addition.cc b/db/blob/blob_file_addition.cc similarity index 99% rename from db/blob_file_addition.cc rename to db/blob/blob_file_addition.cc index a346cf66b4..cf3b6817c0 100644 --- a/db/blob_file_addition.cc +++ b/db/blob/blob_file_addition.cc @@ -3,7 +3,7 @@ // COPYING file in the root directory) and Apache 2.0 License // (found in the LICENSE.Apache file in the root directory). -#include "db/blob_file_addition.h" +#include "db/blob/blob_file_addition.h" #include #include diff --git a/db/blob_file_addition.h b/db/blob/blob_file_addition.h similarity index 98% rename from db/blob_file_addition.h rename to db/blob/blob_file_addition.h index fab50160da..43b1a0bcbe 100644 --- a/db/blob_file_addition.h +++ b/db/blob/blob_file_addition.h @@ -10,7 +10,7 @@ #include #include -#include "db/blob_constants.h" +#include "db/blob/blob_constants.h" #include "rocksdb/rocksdb_namespace.h" namespace ROCKSDB_NAMESPACE { diff --git a/db/blob_file_addition_test.cc b/db/blob/blob_file_addition_test.cc similarity index 99% rename from db/blob_file_addition_test.cc rename to db/blob/blob_file_addition_test.cc index 60eb756b23..587123b0b4 100644 --- a/db/blob_file_addition_test.cc +++ b/db/blob/blob_file_addition_test.cc @@ -3,7 +3,7 @@ // COPYING file in the root directory) and Apache 2.0 License // (found in the LICENSE.Apache file in the root directory). -#include "db/blob_file_addition.h" +#include "db/blob/blob_file_addition.h" #include #include diff --git a/db/blob_file_garbage.cc b/db/blob/blob_file_garbage.cc similarity index 99% rename from db/blob_file_garbage.cc rename to db/blob/blob_file_garbage.cc index e4dde6c09c..52c336f499 100644 --- a/db/blob_file_garbage.cc +++ b/db/blob/blob_file_garbage.cc @@ -3,7 +3,7 @@ // COPYING file in the root directory) and Apache 2.0 License // (found in the LICENSE.Apache file in the root directory). -#include "db/blob_file_garbage.h" +#include "db/blob/blob_file_garbage.h" #include #include diff --git a/db/blob_file_garbage.h b/db/blob/blob_file_garbage.h similarity index 97% rename from db/blob_file_garbage.h rename to db/blob/blob_file_garbage.h index 4b61fb9c08..6dc14ddcae 100644 --- a/db/blob_file_garbage.h +++ b/db/blob/blob_file_garbage.h @@ -9,7 +9,7 @@ #include #include -#include "db/blob_constants.h" +#include "db/blob/blob_constants.h" #include "rocksdb/rocksdb_namespace.h" namespace ROCKSDB_NAMESPACE { diff --git a/db/blob_file_garbage_test.cc b/db/blob/blob_file_garbage_test.cc similarity index 99% rename from db/blob_file_garbage_test.cc rename to db/blob/blob_file_garbage_test.cc index c5f4c022dc..31eeff4bad 100644 --- a/db/blob_file_garbage_test.cc +++ b/db/blob/blob_file_garbage_test.cc @@ -3,7 +3,7 @@ // COPYING file in the root directory) and Apache 2.0 License // (found in the LICENSE.Apache file in the root directory). -#include "db/blob_file_garbage.h" +#include "db/blob/blob_file_garbage.h" #include #include diff --git a/db/blob_index.h b/db/blob/blob_index.h similarity index 100% rename from db/blob_index.h rename to db/blob/blob_index.h diff --git a/db/db_blob_index_test.cc b/db/blob/db_blob_index_test.cc similarity index 100% rename from db/db_blob_index_test.cc rename to db/blob/db_blob_index_test.cc diff --git a/db/compaction/compaction_job_test.cc b/db/compaction/compaction_job_test.cc index e7b46ef97b..be68c9db87 100644 --- a/db/compaction/compaction_job_test.cc +++ b/db/compaction/compaction_job_test.cc @@ -12,7 +12,7 @@ #include #include -#include "db/blob_index.h" +#include "db/blob/blob_index.h" #include "db/column_family.h" #include "db/compaction/compaction_job.h" #include "db/db_impl/db_impl.h" diff --git a/db/db_test.cc b/db/db_test.cc index b52f551d11..334586b986 100644 --- a/db/db_test.cc +++ b/db/db_test.cc @@ -24,7 +24,7 @@ #endif #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_test_util.h" #include "db/dbformat.h" diff --git a/db/flush_job_test.cc b/db/flush_job_test.cc index b77a4a2a9f..319330e708 100644 --- a/db/flush_job_test.cc +++ b/db/flush_job_test.cc @@ -8,7 +8,7 @@ #include #include -#include "db/blob_index.h" +#include "db/blob/blob_index.h" #include "db/column_family.h" #include "db/db_impl/db_impl.h" #include "db/flush_job.h" diff --git a/db/listener_test.cc b/db/listener_test.cc index eb1a08a354..de5eb58c60 100644 --- a/db/listener_test.cc +++ b/db/listener_test.cc @@ -3,7 +3,7 @@ // COPYING file in the root directory) and Apache 2.0 License // (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_test_util.h" #include "db/dbformat.h" diff --git a/db/version_edit.cc b/db/version_edit.cc index f597aa8d4d..c463f06c86 100644 --- a/db/version_edit.cc +++ b/db/version_edit.cc @@ -9,7 +9,7 @@ #include "db/version_edit.h" -#include "db/blob_index.h" +#include "db/blob/blob_index.h" #include "db/version_set.h" #include "logging/event_logger.h" #include "rocksdb/slice.h" diff --git a/db/version_edit.h b/db/version_edit.h index d08dc4f6a5..e8cab5c98d 100644 --- a/db/version_edit.h +++ b/db/version_edit.h @@ -13,8 +13,8 @@ #include #include #include -#include "db/blob_file_addition.h" -#include "db/blob_file_garbage.h" +#include "db/blob/blob_file_addition.h" +#include "db/blob/blob_file_garbage.h" #include "db/dbformat.h" #include "memory/arena.h" #include "rocksdb/cache.h" diff --git a/src.mk b/src.mk index 52412fae65..50431e6692 100644 --- a/src.mk +++ b/src.mk @@ -4,8 +4,8 @@ LIB_SOURCES = \ cache/lru_cache.cc \ cache/sharded_cache.cc \ db/arena_wrapped_db_iter.cc \ - db/blob_file_addition.cc \ - db/blob_file_garbage.cc \ + db/blob/blob_file_addition.cc \ + db/blob/blob_file_garbage.cc \ db/builder.cc \ db/c.cc \ db/column_family.cc \ @@ -298,8 +298,9 @@ MAIN_SOURCES = \ cache/cache_bench.cc \ cache/cache_test.cc \ db_stress_tool/db_stress.cc \ - db/blob_file_addition_test.cc \ - db/blob_file_garbage_test.cc \ + db/blob/blob_file_addition_test.cc \ + db/blob/blob_file_garbage_test.cc \ + db/blob/db_blob_index_test.cc \ db/column_family_test.cc \ db/compact_files_test.cc \ db/compaction/compaction_iterator_test.cc \ @@ -310,7 +311,6 @@ MAIN_SOURCES = \ db/corruption_test.cc \ db/cuckoo_table_db_test.cc \ db/db_basic_test.cc \ - db/db_blob_index_test.cc \ db/db_block_cache_test.cc \ db/db_bloom_filter_test.cc \ db/db_compaction_filter_test.cc \ diff --git a/tools/sst_dump_tool.cc b/tools/sst_dump_tool.cc index be4dc961da..79dfd37523 100644 --- a/tools/sst_dump_tool.cc +++ b/tools/sst_dump_tool.cc @@ -15,7 +15,7 @@ #include #include -#include "db/blob_index.h" +#include "db/blob/blob_index.h" #include "db/memtable.h" #include "db/write_batch_internal.h" #include "env/composite_env_wrapper.h" diff --git a/utilities/blob_db/blob_compaction_filter.h b/utilities/blob_db/blob_compaction_filter.h index 409df26ac8..c10913326c 100644 --- a/utilities/blob_db/blob_compaction_filter.h +++ b/utilities/blob_db/blob_compaction_filter.h @@ -7,7 +7,7 @@ #include -#include "db/blob_index.h" +#include "db/blob/blob_index.h" #include "monitoring/statistics.h" #include "rocksdb/compaction_filter.h" #include "rocksdb/env.h" diff --git a/utilities/blob_db/blob_db_impl.cc b/utilities/blob_db/blob_db_impl.cc index 3f093e305c..61ced1bffa 100644 --- a/utilities/blob_db/blob_db_impl.cc +++ b/utilities/blob_db/blob_db_impl.cc @@ -12,7 +12,7 @@ #include #include -#include "db/blob_index.h" +#include "db/blob/blob_index.h" #include "db/db_impl/db_impl.h" #include "db/write_batch_internal.h" #include "env/composite_env_wrapper.h" diff --git a/utilities/blob_db/blob_db_test.cc b/utilities/blob_db/blob_db_test.cc index 9fee52e8cd..e3136419e9 100644 --- a/utilities/blob_db/blob_db_test.cc +++ b/utilities/blob_db/blob_db_test.cc @@ -15,7 +15,7 @@ #include #include -#include "db/blob_index.h" +#include "db/blob/blob_index.h" #include "db/db_test_util.h" #include "env/composite_env_wrapper.h" #include "file/file_util.h"