From 17d5fd799814f55a748ed41b956b1075cf2f9af6 Mon Sep 17 00:00:00 2001 From: Twice Date: Mon, 17 Oct 2022 08:00:17 +0800 Subject: [PATCH] Refactor source file structure (#989) --- CMakeLists.txt | 4 +- src/{ => cluster}/cluster.cc | 4 +- src/{ => cluster}/cluster.h | 4 +- src/{ => cluster}/redis_slot.cc | 0 src/{ => cluster}/redis_slot.h | 0 src/{ => cluster}/replication.cc | 4 +- src/{ => cluster}/replication.h | 4 +- src/{ => cluster}/slot_import.cc | 0 src/{ => cluster}/slot_import.h | 6 +-- src/{ => cluster}/slot_migrate.cc | 2 +- src/{ => cluster}/slot_migrate.h | 6 +-- src/{ => commands}/redis_cmd.cc | 44 +++++++++---------- src/{ => commands}/redis_cmd.h | 2 +- src/{ => common}/cron.cc | 0 src/{ => common}/cron.h | 0 src/{ => common}/db_util.h | 0 src/{ => common}/encoding.cc | 0 src/{ => common}/encoding.h | 0 src/{ => common}/event_util.h | 0 src/{ => common}/fd_util.h | 0 src/{ => common}/parse_util.h | 0 src/{ => common}/rand.cc | 0 src/{ => common}/rand.h | 0 src/{ => common}/rocksdb_crc32c.h | 0 src/{ => common}/rw_lock.h | 0 src/{ => common}/scope_exit.h | 0 src/{ => common}/sha1.cc | 0 src/{ => common}/sha1.h | 0 src/{ => common}/status.h | 0 src/{ => common}/task_runner.cc | 0 src/{ => common}/task_runner.h | 0 src/{ => common}/util.cc | 0 src/{ => common}/util.h | 0 src/{ => config}/config.cc | 4 +- src/{ => config}/config.h | 0 src/{ => config}/config_type.h | 0 src/{ => config}/config_util.cc | 0 src/{ => config}/config_util.h | 0 src/main.cc | 4 +- src/{ => server}/redis_connection.cc | 0 src/{ => server}/redis_connection.h | 2 +- src/{ => server}/redis_reply.cc | 0 src/{ => server}/redis_reply.h | 0 src/{ => server}/redis_request.cc | 2 +- src/{ => server}/redis_request.h | 0 src/{ => server}/server.cc | 6 +-- src/{ => server}/server.h | 16 +++---- src/{ => server}/tls_util.cc | 0 src/{ => server}/tls_util.h | 2 +- src/{ => server}/worker.cc | 2 +- src/{ => server}/worker.h | 2 +- src/{redis_disk.cc => stats/disk_stats.cc} | 10 ++--- src/{redis_disk.h => stats/disk_stats.h} | 4 +- src/{ => stats}/log_collector.cc | 2 +- src/{ => stats}/log_collector.h | 0 src/{ => stats}/stats.cc | 0 src/{ => stats}/stats.h | 0 src/{ => storage}/batch_extractor.cc | 8 ++-- src/{ => storage}/batch_extractor.h | 0 src/{ => storage}/compact_filter.cc | 2 +- src/{ => storage}/compact_filter.h | 0 src/{ => storage}/compaction_checker.cc | 0 src/{ => storage}/compaction_checker.h | 0 src/{ => storage}/event_listener.cc | 0 src/{ => storage}/event_listener.h | 0 src/{ => storage}/lock_manager.cc | 0 src/{ => storage}/lock_manager.h | 0 src/{ => storage}/redis_db.cc | 4 +- src/{ => storage}/redis_db.h | 0 src/{ => storage}/redis_metadata.cc | 2 +- src/{ => storage}/redis_metadata.h | 2 +- src/{ => storage}/redis_pubsub.cc | 0 src/{ => storage}/redis_pubsub.h | 0 src/{ => storage}/scripting.cc | 6 +-- src/{ => storage}/scripting.h | 2 +- src/{ => storage}/storage.cc | 2 +- src/{ => storage}/storage.h | 2 +- .../table_properties_collector.cc | 2 +- .../table_properties_collector.h | 0 src/{ => types}/geohash.cc | 0 src/{ => types}/geohash.h | 0 src/{ => types}/redis_bitmap.cc | 0 src/{ => types}/redis_bitmap.h | 4 +- src/{ => types}/redis_bitmap_string.cc | 0 src/{ => types}/redis_bitmap_string.h | 4 +- src/{ => types}/redis_geo.cc | 0 src/{ => types}/redis_geo.h | 6 +-- src/{ => types}/redis_hash.cc | 0 src/{ => types}/redis_hash.h | 4 +- src/{ => types}/redis_list.cc | 0 src/{ => types}/redis_list.h | 4 +- src/{ => types}/redis_set.cc | 0 src/{ => types}/redis_set.h | 4 +- src/{ => types}/redis_sortedint.cc | 0 src/{ => types}/redis_sortedint.h | 4 +- src/{ => types}/redis_stream.cc | 0 src/{ => types}/redis_stream.h | 4 +- src/{ => types}/redis_stream_base.cc | 0 src/{ => types}/redis_stream_base.h | 0 src/{ => types}/redis_string.cc | 0 src/{ => types}/redis_string.h | 4 +- src/{ => types}/redis_zset.cc | 0 src/{ => types}/redis_zset.h | 4 +- tests/cppunit/cluster_test.cc | 4 +- tests/cppunit/compact_test.cc | 8 ++-- tests/cppunit/config_test.cc | 4 +- tests/cppunit/disk_test.cc | 18 ++++---- tests/cppunit/log_collector_test.cc | 2 +- tests/cppunit/main.cc | 2 +- tests/cppunit/rwlock_test.cc | 2 +- tests/cppunit/string_reply_test.cc | 2 +- tests/cppunit/t_bitmap_test.cc | 2 +- tests/cppunit/t_geo_test.cc | 2 +- tests/cppunit/t_hash_test.cc | 2 +- tests/cppunit/t_list_test.cc | 2 +- tests/cppunit/t_metadata_test.cc | 4 +- tests/cppunit/t_set_test.cc | 2 +- tests/cppunit/t_sortedint_test.cc | 2 +- tests/cppunit/t_stream_test.cc | 2 +- tests/cppunit/t_string_test.cc | 2 +- tests/cppunit/t_zset_test.cc | 2 +- tests/cppunit/test_base.h | 4 +- tools/kvrocks2redis/config.cc | 4 +- tools/kvrocks2redis/config.h | 2 +- tools/kvrocks2redis/main.cc | 4 +- tools/kvrocks2redis/parser.cc | 4 +- tools/kvrocks2redis/parser.h | 10 ++--- tools/kvrocks2redis/redis_writer.cc | 4 +- tools/kvrocks2redis/sync.cc | 4 +- tools/kvrocks2redis/sync.h | 8 ++-- tools/kvrocks2redis/writer.h | 2 +- 131 files changed, 160 insertions(+), 160 deletions(-) rename src/{ => cluster}/cluster.cc (99%) rename src/{ => cluster}/cluster.h (98%) rename src/{ => cluster}/redis_slot.cc (100%) rename src/{ => cluster}/redis_slot.h (100%) rename src/{ => cluster}/replication.cc (99%) rename src/{ => cluster}/replication.h (99%) rename src/{ => cluster}/slot_import.cc (100%) rename src/{ => cluster}/slot_import.h (94%) rename src/{ => cluster}/slot_migrate.cc (99%) rename src/{ => cluster}/slot_migrate.h (98%) rename src/{ => commands}/redis_cmd.cc (99%) rename src/{ => commands}/redis_cmd.h (99%) rename src/{ => common}/cron.cc (100%) rename src/{ => common}/cron.h (100%) rename src/{ => common}/db_util.h (100%) rename src/{ => common}/encoding.cc (100%) rename src/{ => common}/encoding.h (100%) rename src/{ => common}/event_util.h (100%) rename src/{ => common}/fd_util.h (100%) rename src/{ => common}/parse_util.h (100%) rename src/{ => common}/rand.cc (100%) rename src/{ => common}/rand.h (100%) rename src/{ => common}/rocksdb_crc32c.h (100%) rename src/{ => common}/rw_lock.h (100%) rename src/{ => common}/scope_exit.h (100%) rename src/{ => common}/sha1.cc (100%) rename src/{ => common}/sha1.h (100%) rename src/{ => common}/status.h (100%) rename src/{ => common}/task_runner.cc (100%) rename src/{ => common}/task_runner.h (100%) rename src/{ => common}/util.cc (100%) rename src/{ => common}/util.h (100%) rename src/{ => config}/config.cc (99%) rename src/{ => config}/config.h (100%) rename src/{ => config}/config_type.h (100%) rename src/{ => config}/config_util.cc (100%) rename src/{ => config}/config_util.h (100%) rename src/{ => server}/redis_connection.cc (100%) rename src/{ => server}/redis_connection.h (99%) rename src/{ => server}/redis_reply.cc (100%) rename src/{ => server}/redis_reply.h (100%) rename src/{ => server}/redis_request.cc (99%) rename src/{ => server}/redis_request.h (100%) rename src/{ => server}/server.cc (99%) rename src/{ => server}/server.h (97%) rename src/{ => server}/tls_util.cc (100%) rename src/{ => server}/tls_util.h (98%) rename src/{ => server}/worker.cc (99%) rename src/{ => server}/worker.h (99%) rename src/{redis_disk.cc => stats/disk_stats.cc} (97%) rename src/{redis_disk.h => stats/disk_stats.h} (96%) rename src/{ => stats}/log_collector.cc (98%) rename src/{ => stats}/log_collector.h (100%) rename src/{ => stats}/stats.cc (100%) rename src/{ => stats}/stats.h (100%) rename src/{ => storage}/batch_extractor.cc (98%) rename src/{ => storage}/batch_extractor.h (100%) rename src/{ => storage}/compact_filter.cc (99%) rename src/{ => storage}/compact_filter.h (100%) rename src/{ => storage}/compaction_checker.cc (100%) rename src/{ => storage}/compaction_checker.h (100%) rename src/{ => storage}/event_listener.cc (100%) rename src/{ => storage}/event_listener.h (100%) rename src/{ => storage}/lock_manager.cc (100%) rename src/{ => storage}/lock_manager.h (100%) rename src/{ => storage}/redis_db.cc (99%) rename src/{ => storage}/redis_db.h (100%) rename src/{ => storage}/redis_metadata.cc (99%) rename src/{ => storage}/redis_metadata.h (99%) rename src/{ => storage}/redis_pubsub.cc (100%) rename src/{ => storage}/redis_pubsub.h (100%) rename src/{ => storage}/scripting.cc (99%) rename src/{ => storage}/scripting.h (98%) rename src/{ => storage}/storage.cc (99%) rename src/{ => storage}/storage.h (99%) rename src/{ => storage}/table_properties_collector.cc (99%) rename src/{ => storage}/table_properties_collector.h (100%) rename src/{ => types}/geohash.cc (100%) rename src/{ => types}/geohash.h (100%) rename src/{ => types}/redis_bitmap.cc (100%) rename src/{ => types}/redis_bitmap.h (96%) rename src/{ => types}/redis_bitmap_string.cc (100%) rename src/{ => types}/redis_bitmap_string.h (96%) rename src/{ => types}/redis_geo.cc (100%) rename src/{ => types}/redis_geo.h (97%) rename src/{ => types}/redis_hash.cc (100%) rename src/{ => types}/redis_hash.h (97%) rename src/{ => types}/redis_list.cc (100%) rename src/{ => types}/redis_list.h (97%) rename src/{ => types}/redis_set.cc (100%) rename src/{ => types}/redis_set.h (97%) rename src/{ => types}/redis_sortedint.cc (100%) rename src/{ => types}/redis_sortedint.h (97%) rename src/{ => types}/redis_stream.cc (100%) rename src/{ => types}/redis_stream.h (97%) rename src/{ => types}/redis_stream_base.cc (100%) rename src/{ => types}/redis_stream_base.h (100%) rename src/{ => types}/redis_string.cc (100%) rename src/{ => types}/redis_string.h (97%) rename src/{ => types}/redis_zset.cc (100%) rename src/{ => types}/redis_zset.h (98%) diff --git a/CMakeLists.txt b/CMakeLists.txt index b009a099b5d..848d6b112ae 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -148,12 +148,12 @@ find_library(FOUND_UNWIND_LIB unwind) set(WARNING_FLAGS -Wall -Wpedantic -Wsign-compare -Wreturn-type) # kvrocks objects target -file(GLOB KVROCKS_SRCS src/*.cc) +file(GLOB_RECURSE KVROCKS_SRCS src/*.cc) list(FILTER KVROCKS_SRCS EXCLUDE REGEX src/main.cc) add_library(kvrocks_objs OBJECT ${KVROCKS_SRCS}) -target_include_directories(kvrocks_objs PUBLIC src ${PROJECT_BINARY_DIR}) +target_include_directories(kvrocks_objs PUBLIC src src/common ${PROJECT_BINARY_DIR}) target_compile_features(kvrocks_objs PUBLIC cxx_std_11) target_compile_options(kvrocks_objs PUBLIC ${WARNING_FLAGS} -fno-omit-frame-pointer) target_link_libraries(kvrocks_objs PUBLIC -fno-omit-frame-pointer) diff --git a/src/cluster.cc b/src/cluster/cluster.cc similarity index 99% rename from src/cluster.cc rename to src/cluster/cluster.cc index ffcaa1fe3a7..e1152f31d75 100644 --- a/src/cluster.cc +++ b/src/cluster/cluster.cc @@ -25,10 +25,10 @@ #include #include +#include "commands/redis_cmd.h" #include "parse_util.h" -#include "redis_cmd.h" #include "replication.h" -#include "server.h" +#include "server/server.h" #include "util.h" const char *errInvalidNodeID = "Invalid cluster node id"; diff --git a/src/cluster.h b/src/cluster/cluster.h similarity index 98% rename from src/cluster.h rename to src/cluster/cluster.h index 1c45b41e814..695fdfb123c 100644 --- a/src/cluster.h +++ b/src/cluster/cluster.h @@ -29,10 +29,10 @@ #include #include -#include "redis_cmd.h" -#include "redis_connection.h" +#include "commands/redis_cmd.h" #include "redis_slot.h" #include "rw_lock.h" +#include "server/redis_connection.h" #include "status.h" enum { diff --git a/src/redis_slot.cc b/src/cluster/redis_slot.cc similarity index 100% rename from src/redis_slot.cc rename to src/cluster/redis_slot.cc diff --git a/src/redis_slot.h b/src/cluster/redis_slot.h similarity index 100% rename from src/redis_slot.h rename to src/cluster/redis_slot.h diff --git a/src/replication.cc b/src/cluster/replication.cc similarity index 99% rename from src/replication.cc rename to src/cluster/replication.cc index ced1cbb648f..31bd5958800 100644 --- a/src/replication.cc +++ b/src/cluster/replication.cc @@ -34,9 +34,9 @@ #include "event_util.h" #include "fd_util.h" -#include "redis_reply.h" #include "rocksdb_crc32c.h" -#include "server.h" +#include "server/redis_reply.h" +#include "server/server.h" #include "status.h" #include "util.h" diff --git a/src/replication.h b/src/cluster/replication.h similarity index 99% rename from src/replication.h rename to src/cluster/replication.h index 75159f408bb..0c1457b6043 100644 --- a/src/replication.h +++ b/src/cluster/replication.h @@ -30,9 +30,9 @@ #include #include -#include "redis_connection.h" +#include "server/redis_connection.h" #include "status.h" -#include "storage.h" +#include "storage/storage.h" class Server; diff --git a/src/slot_import.cc b/src/cluster/slot_import.cc similarity index 100% rename from src/slot_import.cc rename to src/cluster/slot_import.cc diff --git a/src/slot_import.h b/src/cluster/slot_import.h similarity index 94% rename from src/slot_import.h rename to src/cluster/slot_import.h index 609021e33f9..c5d24b25a49 100644 --- a/src/slot_import.h +++ b/src/cluster/slot_import.h @@ -26,9 +26,9 @@ #include #include -#include "config.h" -#include "redis_db.h" -#include "server.h" +#include "config/config.h" +#include "server/server.h" +#include "storage/redis_db.h" enum ImportStatus { kImportStart, diff --git a/src/slot_migrate.cc b/src/cluster/slot_migrate.cc similarity index 99% rename from src/slot_migrate.cc rename to src/cluster/slot_migrate.cc index 2ebc85ebf50..12c273bf17a 100644 --- a/src/slot_migrate.cc +++ b/src/cluster/slot_migrate.cc @@ -23,8 +23,8 @@ #include #include -#include "batch_extractor.h" #include "event_util.h" +#include "storage/batch_extractor.h" static std::map type_to_cmd = { {kRedisString, "set"}, {kRedisList, "rpush"}, {kRedisHash, "hmset"}, {kRedisSet, "sadd"}, diff --git a/src/slot_migrate.h b/src/cluster/slot_migrate.h similarity index 98% rename from src/slot_migrate.h rename to src/cluster/slot_migrate.h index cbe4e1bcf36..08f3ead1ea3 100644 --- a/src/slot_migrate.h +++ b/src/cluster/slot_migrate.h @@ -36,12 +36,12 @@ #include "config.h" #include "encoding.h" #include "parse_util.h" -#include "redis_db.h" #include "redis_slot.h" -#include "server.h" +#include "server/server.h" #include "slot_import.h" -#include "stats.h" +#include "stats/stats.h" #include "status.h" +#include "storage/redis_db.h" #include "util.h" constexpr const auto CLUSTER_SLOTS = HASH_SLOTS_SIZE; diff --git a/src/redis_cmd.cc b/src/commands/redis_cmd.cc similarity index 99% rename from src/redis_cmd.cc rename to src/commands/redis_cmd.cc index 774840b8e8d..7bc0b0a8373 100644 --- a/src/redis_cmd.cc +++ b/src/commands/redis_cmd.cc @@ -32,30 +32,30 @@ #include #include -#include "cluster.h" +#include "cluster/cluster.h" +#include "cluster/redis_slot.h" +#include "cluster/slot_import.h" +#include "cluster/slot_migrate.h" #include "fd_util.h" -#include "log_collector.h" #include "parse_util.h" -#include "redis_bitmap.h" -#include "redis_connection.h" -#include "redis_db.h" -#include "redis_disk.h" -#include "redis_geo.h" -#include "redis_hash.h" -#include "redis_list.h" -#include "redis_pubsub.h" -#include "redis_reply.h" -#include "redis_set.h" -#include "redis_slot.h" -#include "redis_sortedint.h" -#include "redis_stream.h" -#include "redis_string.h" -#include "redis_zset.h" -#include "scripting.h" -#include "server.h" -#include "slot_import.h" -#include "slot_migrate.h" -#include "storage.h" +#include "server/redis_connection.h" +#include "server/redis_reply.h" +#include "server/server.h" +#include "stats/disk_stats.h" +#include "stats/log_collector.h" +#include "storage/redis_db.h" +#include "storage/redis_pubsub.h" +#include "storage/scripting.h" +#include "storage/storage.h" +#include "types/redis_bitmap.h" +#include "types/redis_geo.h" +#include "types/redis_hash.h" +#include "types/redis_list.h" +#include "types/redis_set.h" +#include "types/redis_sortedint.h" +#include "types/redis_stream.h" +#include "types/redis_string.h" +#include "types/redis_zset.h" #include "util.h" namespace Redis { diff --git a/src/redis_cmd.h b/src/commands/redis_cmd.h similarity index 99% rename from src/redis_cmd.h rename to src/commands/redis_cmd.h index 857e1117acb..b1fb649cdda 100644 --- a/src/redis_cmd.h +++ b/src/commands/redis_cmd.h @@ -34,7 +34,7 @@ #include #include -#include "redis_reply.h" +#include "server/redis_reply.h" #include "status.h" class Server; diff --git a/src/cron.cc b/src/common/cron.cc similarity index 100% rename from src/cron.cc rename to src/common/cron.cc diff --git a/src/cron.h b/src/common/cron.h similarity index 100% rename from src/cron.h rename to src/common/cron.h diff --git a/src/db_util.h b/src/common/db_util.h similarity index 100% rename from src/db_util.h rename to src/common/db_util.h diff --git a/src/encoding.cc b/src/common/encoding.cc similarity index 100% rename from src/encoding.cc rename to src/common/encoding.cc diff --git a/src/encoding.h b/src/common/encoding.h similarity index 100% rename from src/encoding.h rename to src/common/encoding.h diff --git a/src/event_util.h b/src/common/event_util.h similarity index 100% rename from src/event_util.h rename to src/common/event_util.h diff --git a/src/fd_util.h b/src/common/fd_util.h similarity index 100% rename from src/fd_util.h rename to src/common/fd_util.h diff --git a/src/parse_util.h b/src/common/parse_util.h similarity index 100% rename from src/parse_util.h rename to src/common/parse_util.h diff --git a/src/rand.cc b/src/common/rand.cc similarity index 100% rename from src/rand.cc rename to src/common/rand.cc diff --git a/src/rand.h b/src/common/rand.h similarity index 100% rename from src/rand.h rename to src/common/rand.h diff --git a/src/rocksdb_crc32c.h b/src/common/rocksdb_crc32c.h similarity index 100% rename from src/rocksdb_crc32c.h rename to src/common/rocksdb_crc32c.h diff --git a/src/rw_lock.h b/src/common/rw_lock.h similarity index 100% rename from src/rw_lock.h rename to src/common/rw_lock.h diff --git a/src/scope_exit.h b/src/common/scope_exit.h similarity index 100% rename from src/scope_exit.h rename to src/common/scope_exit.h diff --git a/src/sha1.cc b/src/common/sha1.cc similarity index 100% rename from src/sha1.cc rename to src/common/sha1.cc diff --git a/src/sha1.h b/src/common/sha1.h similarity index 100% rename from src/sha1.h rename to src/common/sha1.h diff --git a/src/status.h b/src/common/status.h similarity index 100% rename from src/status.h rename to src/common/status.h diff --git a/src/task_runner.cc b/src/common/task_runner.cc similarity index 100% rename from src/task_runner.cc rename to src/common/task_runner.cc diff --git a/src/task_runner.h b/src/common/task_runner.h similarity index 100% rename from src/task_runner.h rename to src/common/task_runner.h diff --git a/src/util.cc b/src/common/util.cc similarity index 100% rename from src/util.cc rename to src/common/util.cc diff --git a/src/util.h b/src/common/util.h similarity index 100% rename from src/util.h rename to src/common/util.h diff --git a/src/config.cc b/src/config/config.cc similarity index 99% rename from src/config.cc rename to src/config/config.cc index 7fa6dd8b8af..d7fa509c649 100644 --- a/src/config.cc +++ b/src/config/config.cc @@ -37,9 +37,9 @@ #include "config_type.h" #include "config_util.h" #include "parse_util.h" -#include "server.h" +#include "server/server.h" +#include "server/tls_util.h" #include "status.h" -#include "tls_util.h" #include "util.h" const char *kDefaultNamespace = "__namespace"; diff --git a/src/config.h b/src/config/config.h similarity index 100% rename from src/config.h rename to src/config/config.h diff --git a/src/config_type.h b/src/config/config_type.h similarity index 100% rename from src/config_type.h rename to src/config/config_type.h diff --git a/src/config_util.cc b/src/config/config_util.cc similarity index 100% rename from src/config_util.cc rename to src/config/config_util.cc diff --git a/src/config_util.h b/src/config/config_util.h similarity index 100% rename from src/config_util.h rename to src/config/config_util.h diff --git a/src/main.cc b/src/main.cc index eda6666b36c..4a28673ee83 100644 --- a/src/main.cc +++ b/src/main.cc @@ -38,8 +38,8 @@ #include "config.h" #include "fd_util.h" -#include "server.h" -#include "storage.h" +#include "server/server.h" +#include "storage/storage.h" #include "util.h" #include "version.h" diff --git a/src/redis_connection.cc b/src/server/redis_connection.cc similarity index 100% rename from src/redis_connection.cc rename to src/server/redis_connection.cc diff --git a/src/redis_connection.h b/src/server/redis_connection.h similarity index 99% rename from src/redis_connection.h rename to src/server/redis_connection.h index 0bc024bea0c..f57911283db 100644 --- a/src/redis_connection.h +++ b/src/server/redis_connection.h @@ -28,7 +28,7 @@ #include #include -#include "redis_cmd.h" +#include "commands/redis_cmd.h" #include "redis_request.h" class Worker; diff --git a/src/redis_reply.cc b/src/server/redis_reply.cc similarity index 100% rename from src/redis_reply.cc rename to src/server/redis_reply.cc diff --git a/src/redis_reply.h b/src/server/redis_reply.h similarity index 100% rename from src/redis_reply.h rename to src/server/redis_reply.h diff --git a/src/redis_request.cc b/src/server/redis_request.cc similarity index 99% rename from src/redis_request.cc rename to src/server/redis_request.cc index 55226577d81..0b74c7c05e6 100644 --- a/src/redis_request.cc +++ b/src/server/redis_request.cc @@ -27,11 +27,11 @@ #include #include +#include "cluster/redis_slot.h" #include "event_util.h" #include "parse_util.h" #include "redis_connection.h" #include "redis_reply.h" -#include "redis_slot.h" #include "server.h" #include "util.h" diff --git a/src/redis_request.h b/src/server/redis_request.h similarity index 100% rename from src/redis_request.h rename to src/server/redis_request.h diff --git a/src/server.cc b/src/server/server.cc similarity index 99% rename from src/server.cc rename to src/server/server.cc index 809487a57ad..c447c836a3a 100644 --- a/src/server.cc +++ b/src/server/server.cc @@ -30,12 +30,12 @@ #include #include -#include "compaction_checker.h" #include "config.h" #include "redis_connection.h" -#include "redis_db.h" #include "redis_request.h" -#include "scripting.h" +#include "storage/compaction_checker.h" +#include "storage/redis_db.h" +#include "storage/scripting.h" #include "tls_util.h" #include "util.h" #include "version.h" diff --git a/src/server.h b/src/server/server.h similarity index 97% rename from src/server.h rename to src/server/server.h index ddd4086cae2..715edc96671 100644 --- a/src/server.h +++ b/src/server/server.h @@ -32,16 +32,16 @@ #include #include -#include "cluster.h" -#include "log_collector.h" +#include "cluster/cluster.h" +#include "cluster/replication.h" +#include "cluster/slot_import.h" +#include "cluster/slot_migrate.h" #include "lua.hpp" -#include "redis_metadata.h" -#include "replication.h" #include "rw_lock.h" -#include "slot_import.h" -#include "slot_migrate.h" -#include "stats.h" -#include "storage.h" +#include "stats/log_collector.h" +#include "stats/stats.h" +#include "storage/redis_metadata.h" +#include "storage/storage.h" #include "task_runner.h" #include "tls_util.h" #include "worker.h" diff --git a/src/tls_util.cc b/src/server/tls_util.cc similarity index 100% rename from src/tls_util.cc rename to src/server/tls_util.cc diff --git a/src/tls_util.h b/src/server/tls_util.h similarity index 98% rename from src/tls_util.h rename to src/server/tls_util.h index 8ac1393fd90..d7521ecdbc8 100644 --- a/src/tls_util.h +++ b/src/server/tls_util.h @@ -26,7 +26,7 @@ #include -#include "config.h" +#include "config/config.h" #include "event_util.h" void InitSSL(); diff --git a/src/worker.cc b/src/server/worker.cc similarity index 99% rename from src/worker.cc rename to src/server/worker.cc index b83c9222aa9..be5bf131c61 100644 --- a/src/worker.cc +++ b/src/server/worker.cc @@ -42,8 +42,8 @@ #include "redis_connection.h" #include "redis_request.h" -#include "scripting.h" #include "server.h" +#include "storage/scripting.h" #include "util.h" Worker::Worker(Server *svr, Config *config, bool repl) : svr_(svr) { diff --git a/src/worker.h b/src/server/worker.h similarity index 99% rename from src/worker.h rename to src/server/worker.h index e518fa53596..6ae484ed7d6 100644 --- a/src/worker.h +++ b/src/server/worker.h @@ -37,7 +37,7 @@ #include #include "redis_connection.h" -#include "storage.h" +#include "storage/storage.h" class Server; diff --git a/src/redis_disk.cc b/src/stats/disk_stats.cc similarity index 97% rename from src/redis_disk.cc rename to src/stats/disk_stats.cc index b4d8873a4bb..d0e87c687b9 100644 --- a/src/redis_disk.cc +++ b/src/stats/disk_stats.cc @@ -18,7 +18,7 @@ * */ -#include "redis_disk.h" +#include "disk_stats.h" #include #include @@ -27,12 +27,12 @@ #include #include "db_util.h" -#include "redis_bitmap.h" -#include "redis_metadata.h" -#include "redis_sortedint.h" -#include "redis_zset.h" #include "rocksdb/status.h" #include "status.h" +#include "storage/redis_metadata.h" +#include "types/redis_bitmap.h" +#include "types/redis_sortedint.h" +#include "types/redis_zset.h" namespace Redis { diff --git a/src/redis_disk.h b/src/stats/disk_stats.h similarity index 96% rename from src/redis_disk.h rename to src/stats/disk_stats.h index ed05c3bf18e..5890640a6cd 100644 --- a/src/redis_disk.h +++ b/src/stats/disk_stats.h @@ -22,8 +22,8 @@ #include -#include "redis_db.h" -#include "redis_metadata.h" +#include "storage/redis_db.h" +#include "storage/redis_metadata.h" namespace Redis { diff --git a/src/log_collector.cc b/src/stats/log_collector.cc similarity index 98% rename from src/log_collector.cc rename to src/stats/log_collector.cc index e85ced686a6..f828ed6adee 100644 --- a/src/log_collector.cc +++ b/src/stats/log_collector.cc @@ -22,7 +22,7 @@ #include -#include "redis_reply.h" +#include "server/redis_reply.h" std::string SlowEntry::ToRedisString() { std::string output; diff --git a/src/log_collector.h b/src/stats/log_collector.h similarity index 100% rename from src/log_collector.h rename to src/stats/log_collector.h diff --git a/src/stats.cc b/src/stats/stats.cc similarity index 100% rename from src/stats.cc rename to src/stats/stats.cc diff --git a/src/stats.h b/src/stats/stats.h similarity index 100% rename from src/stats.h rename to src/stats/stats.h diff --git a/src/batch_extractor.cc b/src/storage/batch_extractor.cc similarity index 98% rename from src/batch_extractor.cc rename to src/storage/batch_extractor.cc index a48768cff72..833617eb26a 100644 --- a/src/batch_extractor.cc +++ b/src/storage/batch_extractor.cc @@ -23,11 +23,11 @@ #include #include +#include "cluster/redis_slot.h" #include "parse_util.h" -#include "redis_bitmap.h" -#include "redis_reply.h" -#include "redis_slot.h" -#include "server.h" +#include "server/redis_reply.h" +#include "server/server.h" +#include "types/redis_bitmap.h" void WriteBatchExtractor::LogData(const rocksdb::Slice &blob) { // Currently, we only have two kinds of log data diff --git a/src/batch_extractor.h b/src/storage/batch_extractor.h similarity index 100% rename from src/batch_extractor.h rename to src/storage/batch_extractor.h diff --git a/src/compact_filter.cc b/src/storage/compact_filter.cc similarity index 99% rename from src/compact_filter.cc rename to src/storage/compact_filter.cc index 67bdafb36b4..46bdc00d627 100644 --- a/src/compact_filter.cc +++ b/src/storage/compact_filter.cc @@ -25,7 +25,7 @@ #include #include -#include "redis_bitmap.h" +#include "types/redis_bitmap.h" namespace Engine { using rocksdb::Slice; diff --git a/src/compact_filter.h b/src/storage/compact_filter.h similarity index 100% rename from src/compact_filter.h rename to src/storage/compact_filter.h diff --git a/src/compaction_checker.cc b/src/storage/compaction_checker.cc similarity index 100% rename from src/compaction_checker.cc rename to src/storage/compaction_checker.cc diff --git a/src/compaction_checker.h b/src/storage/compaction_checker.h similarity index 100% rename from src/compaction_checker.h rename to src/storage/compaction_checker.h diff --git a/src/event_listener.cc b/src/storage/event_listener.cc similarity index 100% rename from src/event_listener.cc rename to src/storage/event_listener.cc diff --git a/src/event_listener.h b/src/storage/event_listener.h similarity index 100% rename from src/event_listener.h rename to src/storage/event_listener.h diff --git a/src/lock_manager.cc b/src/storage/lock_manager.cc similarity index 100% rename from src/lock_manager.cc rename to src/storage/lock_manager.cc diff --git a/src/lock_manager.h b/src/storage/lock_manager.h similarity index 100% rename from src/lock_manager.h rename to src/storage/lock_manager.h diff --git a/src/redis_db.cc b/src/storage/redis_db.cc similarity index 99% rename from src/redis_db.cc rename to src/storage/redis_db.cc index 6e004a26a8f..d43b7925959 100644 --- a/src/redis_db.cc +++ b/src/storage/redis_db.cc @@ -23,11 +23,11 @@ #include #include +#include "cluster/redis_slot.h" #include "db_util.h" #include "parse_util.h" -#include "redis_slot.h" #include "rocksdb/iterator.h" -#include "server.h" +#include "server/server.h" #include "util.h" namespace Redis { diff --git a/src/redis_db.h b/src/storage/redis_db.h similarity index 100% rename from src/redis_db.h rename to src/storage/redis_db.h diff --git a/src/redis_metadata.cc b/src/storage/redis_metadata.cc similarity index 99% rename from src/redis_metadata.cc rename to src/storage/redis_metadata.cc index f16c2dfd005..87a5f64e598 100644 --- a/src/redis_metadata.cc +++ b/src/storage/redis_metadata.cc @@ -28,7 +28,7 @@ #include #include -#include "redis_slot.h" +#include "cluster/redis_slot.h" // 52 bit for microseconds and 11 bit for counter const int VersionCounterBits = 11; diff --git a/src/redis_metadata.h b/src/storage/redis_metadata.h similarity index 99% rename from src/redis_metadata.h rename to src/storage/redis_metadata.h index 3c72395f515..801949249e7 100644 --- a/src/redis_metadata.h +++ b/src/storage/redis_metadata.h @@ -27,7 +27,7 @@ #include #include "encoding.h" -#include "redis_stream_base.h" +#include "types/redis_stream_base.h" enum RedisType { kRedisNone, diff --git a/src/redis_pubsub.cc b/src/storage/redis_pubsub.cc similarity index 100% rename from src/redis_pubsub.cc rename to src/storage/redis_pubsub.cc diff --git a/src/redis_pubsub.h b/src/storage/redis_pubsub.h similarity index 100% rename from src/redis_pubsub.h rename to src/storage/redis_pubsub.h diff --git a/src/scripting.cc b/src/storage/scripting.cc similarity index 99% rename from src/scripting.cc rename to src/storage/scripting.cc index e09dcd1ebdf..36f7a845c04 100644 --- a/src/scripting.cc +++ b/src/storage/scripting.cc @@ -56,10 +56,10 @@ #include +#include "commands/redis_cmd.h" #include "rand.h" -#include "redis_cmd.h" -#include "redis_connection.h" -#include "server.h" +#include "server/redis_connection.h" +#include "server/server.h" #include "sha1.h" #include "util.h" diff --git a/src/scripting.h b/src/storage/scripting.h similarity index 98% rename from src/scripting.h rename to src/storage/scripting.h index e67466c7c4a..0f850a15b16 100644 --- a/src/scripting.h +++ b/src/storage/scripting.h @@ -24,7 +24,7 @@ #include #include "lua.hpp" -#include "redis_connection.h" +#include "server/redis_connection.h" #include "status.h" namespace Lua { diff --git a/src/storage.cc b/src/storage/storage.cc similarity index 99% rename from src/storage.cc rename to src/storage/storage.cc index fb4f850fdc5..e2fc881e1e6 100644 --- a/src/storage.cc +++ b/src/storage/storage.cc @@ -45,7 +45,7 @@ #include "redis_db.h" #include "redis_metadata.h" #include "rocksdb_crc32c.h" -#include "server.h" +#include "server/server.h" #include "table_properties_collector.h" namespace Engine { diff --git a/src/storage.h b/src/storage/storage.h similarity index 99% rename from src/storage.h rename to src/storage/storage.h index f5f49572751..b1f092459ad 100644 --- a/src/storage.h +++ b/src/storage/storage.h @@ -33,7 +33,7 @@ #include #include -#include "config.h" +#include "config/config.h" #include "lock_manager.h" #include "rw_lock.h" #include "status.h" diff --git a/src/table_properties_collector.cc b/src/storage/table_properties_collector.cc similarity index 99% rename from src/table_properties_collector.cc rename to src/storage/table_properties_collector.cc index b2315960ac2..d046cff255e 100644 --- a/src/table_properties_collector.cc +++ b/src/storage/table_properties_collector.cc @@ -25,7 +25,7 @@ #include "encoding.h" #include "redis_metadata.h" -#include "server.h" +#include "server/server.h" rocksdb::Status CompactOnExpiredCollector::AddUserKey(const rocksdb::Slice &key, const rocksdb::Slice &value, rocksdb::EntryType entry_type, rocksdb::SequenceNumber, diff --git a/src/table_properties_collector.h b/src/storage/table_properties_collector.h similarity index 100% rename from src/table_properties_collector.h rename to src/storage/table_properties_collector.h diff --git a/src/geohash.cc b/src/types/geohash.cc similarity index 100% rename from src/geohash.cc rename to src/types/geohash.cc diff --git a/src/geohash.h b/src/types/geohash.h similarity index 100% rename from src/geohash.h rename to src/types/geohash.h diff --git a/src/redis_bitmap.cc b/src/types/redis_bitmap.cc similarity index 100% rename from src/redis_bitmap.cc rename to src/types/redis_bitmap.cc diff --git a/src/redis_bitmap.h b/src/types/redis_bitmap.h similarity index 96% rename from src/redis_bitmap.h rename to src/types/redis_bitmap.h index 22fcd04d2c3..ccb9f16f6ba 100644 --- a/src/redis_bitmap.h +++ b/src/types/redis_bitmap.h @@ -23,8 +23,8 @@ #include #include -#include "redis_db.h" -#include "redis_metadata.h" +#include "storage/redis_db.h" +#include "storage/redis_metadata.h" #if defined(__sparc__) || defined(__arm__) #define USE_ALIGNED_ACCESS diff --git a/src/redis_bitmap_string.cc b/src/types/redis_bitmap_string.cc similarity index 100% rename from src/redis_bitmap_string.cc rename to src/types/redis_bitmap_string.cc diff --git a/src/redis_bitmap_string.h b/src/types/redis_bitmap_string.h similarity index 96% rename from src/redis_bitmap_string.h rename to src/types/redis_bitmap_string.h index 01d656cd61c..9266a04359f 100644 --- a/src/redis_bitmap_string.h +++ b/src/types/redis_bitmap_string.h @@ -23,8 +23,8 @@ #include #include -#include "redis_db.h" -#include "redis_metadata.h" +#include "storage/redis_db.h" +#include "storage/redis_metadata.h" namespace Redis { diff --git a/src/redis_geo.cc b/src/types/redis_geo.cc similarity index 100% rename from src/redis_geo.cc rename to src/types/redis_geo.cc diff --git a/src/redis_geo.h b/src/types/redis_geo.h similarity index 97% rename from src/redis_geo.h rename to src/types/redis_geo.h index 131f9d7c5a3..1119d51fc87 100644 --- a/src/redis_geo.h +++ b/src/types/redis_geo.h @@ -26,9 +26,9 @@ #include #include "geohash.h" -#include "redis_db.h" -#include "redis_metadata.h" -#include "redis_zset.h" +#include "storage/redis_db.h" +#include "storage/redis_metadata.h" +#include "types/redis_zset.h" enum DistanceUnit { kDistanceMeter, diff --git a/src/redis_hash.cc b/src/types/redis_hash.cc similarity index 100% rename from src/redis_hash.cc rename to src/types/redis_hash.cc diff --git a/src/redis_hash.h b/src/types/redis_hash.h similarity index 97% rename from src/redis_hash.h rename to src/types/redis_hash.h index 7eaa81d63b2..e5075303b77 100644 --- a/src/redis_hash.h +++ b/src/types/redis_hash.h @@ -26,8 +26,8 @@ #include #include "encoding.h" -#include "redis_db.h" -#include "redis_metadata.h" +#include "storage/redis_db.h" +#include "storage/redis_metadata.h" typedef struct FieldValue { std::string field; diff --git a/src/redis_list.cc b/src/types/redis_list.cc similarity index 100% rename from src/redis_list.cc rename to src/types/redis_list.cc diff --git a/src/redis_list.h b/src/types/redis_list.h similarity index 97% rename from src/redis_list.h rename to src/types/redis_list.h index f8969c8fe81..f3a3077a769 100644 --- a/src/redis_list.h +++ b/src/types/redis_list.h @@ -26,8 +26,8 @@ #include #include "encoding.h" -#include "redis_db.h" -#include "redis_metadata.h" +#include "storage/redis_db.h" +#include "storage/redis_metadata.h" namespace Redis { class List : public Database { diff --git a/src/redis_set.cc b/src/types/redis_set.cc similarity index 100% rename from src/redis_set.cc rename to src/types/redis_set.cc diff --git a/src/redis_set.h b/src/types/redis_set.h similarity index 97% rename from src/redis_set.h rename to src/types/redis_set.h index 24a86ed114f..0c4168f8f55 100644 --- a/src/redis_set.h +++ b/src/types/redis_set.h @@ -23,8 +23,8 @@ #include #include -#include "redis_db.h" -#include "redis_metadata.h" +#include "storage/redis_db.h" +#include "storage/redis_metadata.h" namespace Redis { diff --git a/src/redis_sortedint.cc b/src/types/redis_sortedint.cc similarity index 100% rename from src/redis_sortedint.cc rename to src/types/redis_sortedint.cc diff --git a/src/redis_sortedint.h b/src/types/redis_sortedint.h similarity index 97% rename from src/redis_sortedint.h rename to src/types/redis_sortedint.h index 8f9d2adc6f8..0c0f2174c1b 100644 --- a/src/redis_sortedint.h +++ b/src/types/redis_sortedint.h @@ -24,8 +24,8 @@ #include #include -#include "redis_db.h" -#include "redis_metadata.h" +#include "storage/redis_db.h" +#include "storage/redis_metadata.h" typedef struct SortedintRangeSpec { uint64_t min, max; diff --git a/src/redis_stream.cc b/src/types/redis_stream.cc similarity index 100% rename from src/redis_stream.cc rename to src/types/redis_stream.cc diff --git a/src/redis_stream.h b/src/types/redis_stream.h similarity index 97% rename from src/redis_stream.h rename to src/types/redis_stream.h index e777adbd8b2..3eb78e03eea 100644 --- a/src/redis_stream.h +++ b/src/types/redis_stream.h @@ -25,8 +25,8 @@ #include #include -#include "redis_db.h" -#include "redis_metadata.h" +#include "storage/redis_db.h" +#include "storage/redis_metadata.h" using rocksdb::Slice; diff --git a/src/redis_stream_base.cc b/src/types/redis_stream_base.cc similarity index 100% rename from src/redis_stream_base.cc rename to src/types/redis_stream_base.cc diff --git a/src/redis_stream_base.h b/src/types/redis_stream_base.h similarity index 100% rename from src/redis_stream_base.h rename to src/types/redis_stream_base.h diff --git a/src/redis_string.cc b/src/types/redis_string.cc similarity index 100% rename from src/redis_string.cc rename to src/types/redis_string.cc diff --git a/src/redis_string.h b/src/types/redis_string.h similarity index 97% rename from src/redis_string.h rename to src/types/redis_string.h index 90bd575ef92..94e20a59b59 100644 --- a/src/redis_string.h +++ b/src/types/redis_string.h @@ -23,8 +23,8 @@ #include #include -#include "redis_db.h" -#include "redis_metadata.h" +#include "storage/redis_db.h" +#include "storage/redis_metadata.h" typedef struct { Slice key; diff --git a/src/redis_zset.cc b/src/types/redis_zset.cc similarity index 100% rename from src/redis_zset.cc rename to src/types/redis_zset.cc diff --git a/src/redis_zset.h b/src/types/redis_zset.h similarity index 98% rename from src/redis_zset.h rename to src/types/redis_zset.h index 1791d388e00..42b3fd5b50c 100644 --- a/src/redis_zset.h +++ b/src/types/redis_zset.h @@ -25,8 +25,8 @@ #include #include -#include "redis_db.h" -#include "redis_metadata.h" +#include "storage/redis_db.h" +#include "storage/redis_metadata.h" enum AggregateMethod { kAggregateSum, kAggregateMin, kAggregateMax }; diff --git a/tests/cppunit/cluster_test.cc b/tests/cppunit/cluster_test.cc index 2c8f5fa60c3..678ef94dfea 100644 --- a/tests/cppunit/cluster_test.cc +++ b/tests/cppunit/cluster_test.cc @@ -18,14 +18,14 @@ * */ -#include "cluster.h" +#include "cluster/cluster.h" #include #include #include -#include "server.h" +#include "server/server.h" #include "util.h" TEST(Cluster, CluseterSetNodes) { diff --git a/tests/cppunit/compact_test.cc b/tests/cppunit/compact_test.cc index 6a7a950caf9..163417a8a8e 100644 --- a/tests/cppunit/compact_test.cc +++ b/tests/cppunit/compact_test.cc @@ -21,10 +21,10 @@ #include #include "config.h" -#include "redis_hash.h" -#include "redis_metadata.h" -#include "redis_zset.h" -#include "storage.h" +#include "storage/redis_metadata.h" +#include "storage/storage.h" +#include "types/redis_hash.h" +#include "types/redis_zset.h" TEST(Compact, Filter) { Config config; diff --git a/tests/cppunit/config_test.cc b/tests/cppunit/config_test.cc index 9b13464b90b..c9acda853f2 100644 --- a/tests/cppunit/config_test.cc +++ b/tests/cppunit/config_test.cc @@ -20,7 +20,6 @@ #include "config.h" -#include #include #include @@ -28,7 +27,8 @@ #include #include -#include "server.h" +#include "config/config_util.h" +#include "server/server.h" TEST(Config, GetAndSet) { const char *path = "test.conf"; diff --git a/tests/cppunit/disk_test.cc b/tests/cppunit/disk_test.cc index 68b741f3741..d4061c130e4 100644 --- a/tests/cppunit/disk_test.cc +++ b/tests/cppunit/disk_test.cc @@ -25,16 +25,16 @@ #include #include -#include "redis_bitmap.h" -#include "redis_disk.h" -#include "redis_list.h" -#include "redis_metadata.h" -#include "redis_set.h" -#include "redis_sortedint.h" -#include "redis_stream.h" -#include "redis_string.h" -#include "redis_zset.h" +#include "stats/disk_stats.h" +#include "storage/redis_metadata.h" #include "test_base.h" +#include "types/redis_bitmap.h" +#include "types/redis_list.h" +#include "types/redis_set.h" +#include "types/redis_sortedint.h" +#include "types/redis_stream.h" +#include "types/redis_string.h" +#include "types/redis_zset.h" class RedisDiskTest : public TestBase { protected: diff --git a/tests/cppunit/log_collector_test.cc b/tests/cppunit/log_collector_test.cc index 98b633d251f..7626b647c52 100644 --- a/tests/cppunit/log_collector_test.cc +++ b/tests/cppunit/log_collector_test.cc @@ -18,7 +18,7 @@ * */ -#include "log_collector.h" +#include "stats/log_collector.h" #include diff --git a/tests/cppunit/main.cc b/tests/cppunit/main.cc index 35c68aaddbf..ae4c4a3dcc7 100644 --- a/tests/cppunit/main.cc +++ b/tests/cppunit/main.cc @@ -20,7 +20,7 @@ #include -#include "server.h" +#include "server/server.h" Server *GetServer() { return nullptr; } diff --git a/tests/cppunit/rwlock_test.cc b/tests/cppunit/rwlock_test.cc index a97c27158c6..50ad14d2dd8 100644 --- a/tests/cppunit/rwlock_test.cc +++ b/tests/cppunit/rwlock_test.cc @@ -23,8 +23,8 @@ #include #include -#include "lock_manager.h" #include "rw_lock.h" +#include "storage/lock_manager.h" TEST(LockManager, LockKey) { LockManager locks(8); diff --git a/tests/cppunit/string_reply_test.cc b/tests/cppunit/string_reply_test.cc index afe6df4b913..f0455bf3994 100644 --- a/tests/cppunit/string_reply_test.cc +++ b/tests/cppunit/string_reply_test.cc @@ -20,7 +20,7 @@ #include -#include "redis_reply.h" +#include "server/redis_reply.h" class StringReplyTest : public testing::Test { protected: diff --git a/tests/cppunit/t_bitmap_test.cc b/tests/cppunit/t_bitmap_test.cc index f3b595a0f5f..e1d05d84c9e 100644 --- a/tests/cppunit/t_bitmap_test.cc +++ b/tests/cppunit/t_bitmap_test.cc @@ -22,8 +22,8 @@ #include -#include "redis_bitmap.h" #include "test_base.h" +#include "types/redis_bitmap.h" class RedisBitmapTest : public TestBase { protected: diff --git a/tests/cppunit/t_geo_test.cc b/tests/cppunit/t_geo_test.cc index 88b43c9f9fd..a7d067ae821 100644 --- a/tests/cppunit/t_geo_test.cc +++ b/tests/cppunit/t_geo_test.cc @@ -23,8 +23,8 @@ #include -#include "redis_geo.h" #include "test_base.h" +#include "types/redis_geo.h" class RedisGeoTest : public TestBase { protected: diff --git a/tests/cppunit/t_hash_test.cc b/tests/cppunit/t_hash_test.cc index 4348e81dd9a..694ebdeaa9a 100644 --- a/tests/cppunit/t_hash_test.cc +++ b/tests/cppunit/t_hash_test.cc @@ -26,8 +26,8 @@ #include #include "parse_util.h" -#include "redis_hash.h" #include "test_base.h" +#include "types/redis_hash.h" class RedisHashTest : public TestBase { protected: explicit RedisHashTest() : TestBase() { hash = Util::MakeUnique(storage_, "hash_ns"); } diff --git a/tests/cppunit/t_list_test.cc b/tests/cppunit/t_list_test.cc index 3a9db1ad6b1..a8eba4565e1 100644 --- a/tests/cppunit/t_list_test.cc +++ b/tests/cppunit/t_list_test.cc @@ -22,8 +22,8 @@ #include -#include "redis_list.h" #include "test_base.h" +#include "types/redis_list.h" class RedisListTest : public TestBase { protected: diff --git a/tests/cppunit/t_metadata_test.cc b/tests/cppunit/t_metadata_test.cc index c4b34edcaa9..2cfd1aa6aca 100644 --- a/tests/cppunit/t_metadata_test.cc +++ b/tests/cppunit/t_metadata_test.cc @@ -22,9 +22,9 @@ #include -#include "redis_hash.h" -#include "redis_metadata.h" +#include "storage/redis_metadata.h" #include "test_base.h" +#include "types/redis_hash.h" TEST(InternalKey, EncodeAndDecode) { Slice key = "test-metadata-key"; diff --git a/tests/cppunit/t_set_test.cc b/tests/cppunit/t_set_test.cc index 303bc21b474..3756bb22405 100644 --- a/tests/cppunit/t_set_test.cc +++ b/tests/cppunit/t_set_test.cc @@ -22,8 +22,8 @@ #include -#include "redis_set.h" #include "test_base.h" +#include "types/redis_set.h" class RedisSetTest : public TestBase { protected: diff --git a/tests/cppunit/t_sortedint_test.cc b/tests/cppunit/t_sortedint_test.cc index 55a7d33f8a9..b5aae02a618 100644 --- a/tests/cppunit/t_sortedint_test.cc +++ b/tests/cppunit/t_sortedint_test.cc @@ -22,8 +22,8 @@ #include -#include "redis_sortedint.h" #include "test_base.h" +#include "types/redis_sortedint.h" class RedisSortedintTest : public TestBase { protected: diff --git a/tests/cppunit/t_stream_test.cc b/tests/cppunit/t_stream_test.cc index 5e5d991d3a5..ac4cc10d142 100644 --- a/tests/cppunit/t_stream_test.cc +++ b/tests/cppunit/t_stream_test.cc @@ -20,8 +20,8 @@ #include -#include "redis_stream.h" #include "test_base.h" +#include "types/redis_stream.h" class RedisStreamTest : public TestBase { public: diff --git a/tests/cppunit/t_string_test.cc b/tests/cppunit/t_string_test.cc index dceb2b3aa2e..70c73d7db7c 100644 --- a/tests/cppunit/t_string_test.cc +++ b/tests/cppunit/t_string_test.cc @@ -22,8 +22,8 @@ #include -#include "redis_string.h" #include "test_base.h" +#include "types/redis_string.h" class RedisStringTest : public TestBase { protected: diff --git a/tests/cppunit/t_zset_test.cc b/tests/cppunit/t_zset_test.cc index 2e6ca13be19..4b0abdbce4b 100644 --- a/tests/cppunit/t_zset_test.cc +++ b/tests/cppunit/t_zset_test.cc @@ -22,8 +22,8 @@ #include -#include "redis_zset.h" #include "test_base.h" +#include "types/redis_zset.h" class RedisZSetTest : public TestBase { protected: diff --git a/tests/cppunit/test_base.h b/tests/cppunit/test_base.h index 58045319396..538c148455c 100644 --- a/tests/cppunit/test_base.h +++ b/tests/cppunit/test_base.h @@ -22,8 +22,8 @@ #include -#include "redis_db.h" -#include "redis_hash.h" +#include "storage/redis_db.h" +#include "types/redis_hash.h" class TestBase : public testing::Test { protected: diff --git a/tools/kvrocks2redis/config.cc b/tools/kvrocks2redis/config.cc index d638e373a85..197c96d58bb 100644 --- a/tools/kvrocks2redis/config.cc +++ b/tools/kvrocks2redis/config.cc @@ -28,8 +28,8 @@ #include #include -#include "../../src/config.h" -#include "../../src/util.h" +#include "config/config.h" +#include "util.h" namespace Kvrocks2redis { diff --git a/tools/kvrocks2redis/config.h b/tools/kvrocks2redis/config.h index 5de07f6b1d3..8bbae23204d 100644 --- a/tools/kvrocks2redis/config.h +++ b/tools/kvrocks2redis/config.h @@ -24,7 +24,7 @@ #include #include -#include "../../src/status.h" +#include "status.h" namespace Kvrocks2redis { diff --git a/tools/kvrocks2redis/main.cc b/tools/kvrocks2redis/main.cc index 71a364568da..aee73719b6b 100644 --- a/tools/kvrocks2redis/main.cc +++ b/tools/kvrocks2redis/main.cc @@ -26,11 +26,11 @@ #include -#include "../../src/config.h" -#include "../../src/storage.h" #include "config.h" +#include "config/config.h" #include "parser.h" #include "redis_writer.h" +#include "storage/storage.h" #include "sync.h" #include "version.h" diff --git a/tools/kvrocks2redis/parser.cc b/tools/kvrocks2redis/parser.cc index 5bf367b5df9..34349734599 100644 --- a/tools/kvrocks2redis/parser.cc +++ b/tools/kvrocks2redis/parser.cc @@ -25,9 +25,9 @@ #include -#include "../../src/redis_reply.h" -#include "../../src/redis_slot.h" +#include "cluster/redis_slot.h" #include "db_util.h" +#include "server/redis_reply.h" Status Parser::ParseFullDB() { rocksdb::DB *db_ = storage_->GetDB(); diff --git a/tools/kvrocks2redis/parser.h b/tools/kvrocks2redis/parser.h index 56e694dae1d..493d3e00f5c 100644 --- a/tools/kvrocks2redis/parser.h +++ b/tools/kvrocks2redis/parser.h @@ -25,12 +25,12 @@ #include #include -#include "../../src/batch_extractor.h" -#include "../../src/redis_db.h" -#include "../../src/redis_metadata.h" -#include "../../src/status.h" -#include "../../src/storage.h" #include "config.h" +#include "status.h" +#include "storage/batch_extractor.h" +#include "storage/redis_db.h" +#include "storage/redis_metadata.h" +#include "storage/storage.h" #include "writer.h" class LatestSnapShot { diff --git a/tools/kvrocks2redis/redis_writer.cc b/tools/kvrocks2redis/redis_writer.cc index 39488680aa5..48a5ad196df 100644 --- a/tools/kvrocks2redis/redis_writer.cc +++ b/tools/kvrocks2redis/redis_writer.cc @@ -26,8 +26,8 @@ #include -#include "../../src/redis_reply.h" -#include "../../src/util.h" +#include "server/redis_reply.h" +#include "util.h" RedisWriter::RedisWriter(Kvrocks2redis::Config *config) : Writer(config) { try { diff --git a/tools/kvrocks2redis/sync.cc b/tools/kvrocks2redis/sync.cc index 36f0e137770..238ee1e6bef 100644 --- a/tools/kvrocks2redis/sync.cc +++ b/tools/kvrocks2redis/sync.cc @@ -31,8 +31,8 @@ #include #include -#include "../../src/redis_reply.h" -#include "../../src/util.h" +#include "server/redis_reply.h" +#include "util.h" void send_string_to_event(bufferevent *bev, const std::string &data) { auto output = bufferevent_get_output(bev); diff --git a/tools/kvrocks2redis/sync.h b/tools/kvrocks2redis/sync.h index 64adf6e0be0..997aef79d5f 100644 --- a/tools/kvrocks2redis/sync.h +++ b/tools/kvrocks2redis/sync.h @@ -25,12 +25,12 @@ #include -#include "../../src/replication.h" -#include "../../src/server.h" -#include "../../src/status.h" -#include "../../src/storage.h" +#include "cluster/replication.h" #include "config.h" #include "parser.h" +#include "server/server.h" +#include "status.h" +#include "storage/storage.h" #include "writer.h" class Sync { diff --git a/tools/kvrocks2redis/writer.h b/tools/kvrocks2redis/writer.h index 0c26a11a6f3..7e1aacd09bf 100644 --- a/tools/kvrocks2redis/writer.h +++ b/tools/kvrocks2redis/writer.h @@ -25,8 +25,8 @@ #include #include -#include "../../src/status.h" #include "config.h" +#include "status.h" class Writer { public: