From 5abda3bb8b66eafc7cfa1f84efcf0ceb323414be Mon Sep 17 00:00:00 2001 From: Levi Tamasi Date: Tue, 9 Jun 2020 15:12:59 -0700 Subject: [PATCH] Move blob_log_{format,reader,writer}.{cc,h} to db/blob/ (#6960) Summary: Pull Request resolved: https://github.com/facebook/rocksdb/pull/6960 Test Plan: `make check` Reviewed By: zhichao-cao Differential Revision: D21958416 Pulled By: ltamasi fbshipit-source-id: 97cf05027b7363014b07836e7f158c23827bd661 --- CMakeLists.txt | 6 +++--- TARGETS | 6 +++--- {utilities/blob_db => db/blob}/blob_log_format.cc | 2 +- {utilities/blob_db => db/blob}/blob_log_format.h | 0 {utilities/blob_db => db/blob}/blob_log_reader.cc | 2 +- {utilities/blob_db => db/blob}/blob_log_reader.h | 2 +- {utilities/blob_db => db/blob}/blob_log_writer.cc | 4 ++-- {utilities/blob_db => db/blob}/blob_log_writer.h | 2 +- src.mk | 6 +++--- utilities/blob_db/blob_db_impl.h | 6 +++--- utilities/blob_db/blob_dump_tool.h | 3 ++- utilities/blob_db/blob_file.h | 6 +++--- 12 files changed, 23 insertions(+), 22 deletions(-) rename {utilities/blob_db => db/blob}/blob_log_format.cc (99%) rename {utilities/blob_db => db/blob}/blob_log_format.h (100%) rename {utilities/blob_db => db/blob}/blob_log_reader.cc (98%) rename {utilities/blob_db => db/blob}/blob_log_reader.h (98%) rename {utilities/blob_db => db/blob}/blob_log_writer.cc (97%) rename {utilities/blob_db => db/blob}/blob_log_writer.h (98%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9ea39e5e1..f9c8f3346 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -539,6 +539,9 @@ set(SOURCES db/blob/blob_file_addition.cc db/blob/blob_file_garbage.cc db/blob/blob_file_meta.cc + db/blob/blob_log_format.cc + db/blob/blob_log_reader.cc + db/blob/blob_log_writer.cc db/builder.cc db/c.cc db/column_family.cc @@ -730,9 +733,6 @@ set(SOURCES utilities/blob_db/blob_db_impl_filesnapshot.cc utilities/blob_db/blob_dump_tool.cc utilities/blob_db/blob_file.cc - utilities/blob_db/blob_log_reader.cc - utilities/blob_db/blob_log_writer.cc - utilities/blob_db/blob_log_format.cc utilities/cassandra/cassandra_compaction_filter.cc utilities/cassandra/format.cc utilities/cassandra/merge_operator.cc diff --git a/TARGETS b/TARGETS index 2b8615c5c..b20fa774b 100644 --- a/TARGETS +++ b/TARGETS @@ -124,6 +124,9 @@ cpp_library( "db/blob/blob_file_addition.cc", "db/blob/blob_file_garbage.cc", "db/blob/blob_file_meta.cc", + "db/blob/blob_log_format.cc", + "db/blob/blob_log_reader.cc", + "db/blob/blob_log_writer.cc", "db/builder.cc", "db/c.cc", "db/column_family.cc", @@ -318,9 +321,6 @@ cpp_library( "utilities/blob_db/blob_db_impl_filesnapshot.cc", "utilities/blob_db/blob_dump_tool.cc", "utilities/blob_db/blob_file.cc", - "utilities/blob_db/blob_log_format.cc", - "utilities/blob_db/blob_log_reader.cc", - "utilities/blob_db/blob_log_writer.cc", "utilities/cassandra/cassandra_compaction_filter.cc", "utilities/cassandra/format.cc", "utilities/cassandra/merge_operator.cc", diff --git a/utilities/blob_db/blob_log_format.cc b/db/blob/blob_log_format.cc similarity index 99% rename from utilities/blob_db/blob_log_format.cc rename to db/blob/blob_log_format.cc index 64894ca7b..efab39478 100644 --- a/utilities/blob_db/blob_log_format.cc +++ b/db/blob/blob_log_format.cc @@ -5,7 +5,7 @@ // #ifndef ROCKSDB_LITE -#include "utilities/blob_db/blob_log_format.h" +#include "db/blob/blob_log_format.h" #include "util/coding.h" #include "util/crc32c.h" diff --git a/utilities/blob_db/blob_log_format.h b/db/blob/blob_log_format.h similarity index 100% rename from utilities/blob_db/blob_log_format.h rename to db/blob/blob_log_format.h diff --git a/utilities/blob_db/blob_log_reader.cc b/db/blob/blob_log_reader.cc similarity index 98% rename from utilities/blob_db/blob_log_reader.cc rename to db/blob/blob_log_reader.cc index 31be72d76..8f075bb2e 100644 --- a/utilities/blob_db/blob_log_reader.cc +++ b/db/blob/blob_log_reader.cc @@ -5,7 +5,7 @@ // #ifndef ROCKSDB_LITE -#include "utilities/blob_db/blob_log_reader.h" +#include "db/blob/blob_log_reader.h" #include diff --git a/utilities/blob_db/blob_log_reader.h b/db/blob/blob_log_reader.h similarity index 98% rename from utilities/blob_db/blob_log_reader.h rename to db/blob/blob_log_reader.h index 45fda284a..1cbda4e64 100644 --- a/utilities/blob_db/blob_log_reader.h +++ b/db/blob/blob_log_reader.h @@ -10,12 +10,12 @@ #include #include +#include "db/blob/blob_log_format.h" #include "file/random_access_file_reader.h" #include "rocksdb/env.h" #include "rocksdb/slice.h" #include "rocksdb/statistics.h" #include "rocksdb/status.h" -#include "utilities/blob_db/blob_log_format.h" namespace ROCKSDB_NAMESPACE { diff --git a/utilities/blob_db/blob_log_writer.cc b/db/blob/blob_log_writer.cc similarity index 97% rename from utilities/blob_db/blob_log_writer.cc rename to db/blob/blob_log_writer.cc index 2fe92263b..a7b3201c4 100644 --- a/utilities/blob_db/blob_log_writer.cc +++ b/db/blob/blob_log_writer.cc @@ -4,17 +4,17 @@ // (found in the LICENSE.Apache file in the root directory). #ifndef ROCKSDB_LITE -#include "utilities/blob_db/blob_log_writer.h" +#include "db/blob/blob_log_writer.h" #include #include +#include "db/blob/blob_log_format.h" #include "file/writable_file_writer.h" #include "monitoring/statistics.h" #include "rocksdb/env.h" #include "util/coding.h" #include "util/stop_watch.h" -#include "utilities/blob_db/blob_log_format.h" namespace ROCKSDB_NAMESPACE { namespace blob_db { diff --git a/utilities/blob_db/blob_log_writer.h b/db/blob/blob_log_writer.h similarity index 98% rename from utilities/blob_db/blob_log_writer.h rename to db/blob/blob_log_writer.h index 29dbd00f1..85eb72436 100644 --- a/utilities/blob_db/blob_log_writer.h +++ b/db/blob/blob_log_writer.h @@ -10,12 +10,12 @@ #include #include +#include "db/blob/blob_log_format.h" #include "rocksdb/env.h" #include "rocksdb/slice.h" #include "rocksdb/statistics.h" #include "rocksdb/status.h" #include "rocksdb/types.h" -#include "utilities/blob_db/blob_log_format.h" namespace ROCKSDB_NAMESPACE { diff --git a/src.mk b/src.mk index c5f77dfcb..81c1039e4 100644 --- a/src.mk +++ b/src.mk @@ -8,6 +8,9 @@ LIB_SOURCES = \ db/blob/blob_file_addition.cc \ db/blob/blob_file_garbage.cc \ db/blob/blob_file_meta.cc \ + db/blob/blob_log_format.cc \ + db/blob/blob_log_reader.cc \ + db/blob/blob_log_writer.cc \ db/builder.cc \ db/c.cc \ db/column_family.cc \ @@ -198,9 +201,6 @@ LIB_SOURCES = \ utilities/blob_db/blob_db_impl.cc \ utilities/blob_db/blob_db_impl_filesnapshot.cc \ utilities/blob_db/blob_file.cc \ - utilities/blob_db/blob_log_format.cc \ - utilities/blob_db/blob_log_reader.cc \ - utilities/blob_db/blob_log_writer.cc \ utilities/cassandra/cassandra_compaction_filter.cc \ utilities/cassandra/format.cc \ utilities/cassandra/merge_operator.cc \ diff --git a/utilities/blob_db/blob_db_impl.h b/utilities/blob_db/blob_db_impl.h index c1e649cc5..c3633985f 100644 --- a/utilities/blob_db/blob_db_impl.h +++ b/utilities/blob_db/blob_db_impl.h @@ -19,6 +19,9 @@ #include #include +#include "db/blob/blob_log_format.h" +#include "db/blob/blob_log_reader.h" +#include "db/blob/blob_log_writer.h" #include "db/db_iter.h" #include "rocksdb/compaction_filter.h" #include "rocksdb/db.h" @@ -30,9 +33,6 @@ #include "util/timer_queue.h" #include "utilities/blob_db/blob_db.h" #include "utilities/blob_db/blob_file.h" -#include "utilities/blob_db/blob_log_format.h" -#include "utilities/blob_db/blob_log_reader.h" -#include "utilities/blob_db/blob_log_writer.h" namespace ROCKSDB_NAMESPACE { diff --git a/utilities/blob_db/blob_dump_tool.h b/utilities/blob_db/blob_dump_tool.h index 498543ada..bece564e1 100644 --- a/utilities/blob_db/blob_dump_tool.h +++ b/utilities/blob_db/blob_dump_tool.h @@ -8,10 +8,11 @@ #include #include #include + +#include "db/blob/blob_log_format.h" #include "file/random_access_file_reader.h" #include "rocksdb/slice.h" #include "rocksdb/status.h" -#include "utilities/blob_db/blob_log_format.h" namespace ROCKSDB_NAMESPACE { namespace blob_db { diff --git a/utilities/blob_db/blob_file.h b/utilities/blob_db/blob_file.h index 17d39b542..0a5d9539c 100644 --- a/utilities/blob_db/blob_file.h +++ b/utilities/blob_db/blob_file.h @@ -10,13 +10,13 @@ #include #include +#include "db/blob/blob_log_format.h" +#include "db/blob/blob_log_reader.h" +#include "db/blob/blob_log_writer.h" #include "file/random_access_file_reader.h" #include "port/port.h" #include "rocksdb/env.h" #include "rocksdb/options.h" -#include "utilities/blob_db/blob_log_format.h" -#include "utilities/blob_db/blob_log_reader.h" -#include "utilities/blob_db/blob_log_writer.h" namespace ROCKSDB_NAMESPACE { namespace blob_db {