Refactor source file structure (#989)

apache · Oct 17, 2022 · 17d5fd7 · 17d5fd7
1 parent e79871a
commit 17d5fd7
Show file tree

Hide file tree

Showing 131 changed files with 160 additions and 160 deletions.
diff --git 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 → src/cluster/cluster.cc b/src/cluster.cc → src/cluster/cluster.cc
@@ -25,10 +25,10 @@
 #include <cstring>
 #include <memory>
 
+#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 → src/cluster/cluster.h b/src/cluster.h → src/cluster/cluster.h
@@ -29,10 +29,10 @@
 #include <unordered_map>
 #include <vector>
 
-#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 → src/cluster/redis_slot.cc b/src/redis_slot.cc → src/cluster/redis_slot.cc
diff --git a/src/redis_slot.h → src/cluster/redis_slot.h b/src/redis_slot.h → src/cluster/redis_slot.h
diff --git a/src/replication.cc → src/cluster/replication.cc b/src/replication.cc → 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 → src/cluster/replication.h b/src/replication.h → src/cluster/replication.h
@@ -30,9 +30,9 @@
 #include <utility>
 #include <vector>
 
-#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 → src/cluster/slot_import.cc b/src/slot_import.cc → src/cluster/slot_import.cc
diff --git a/src/slot_import.h → src/cluster/slot_import.h b/src/slot_import.h → src/cluster/slot_import.h
@@ -26,9 +26,9 @@
 #include <string>
 #include <vector>
 
-#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 → src/cluster/slot_migrate.cc b/src/slot_migrate.cc → src/cluster/slot_migrate.cc
@@ -23,8 +23,8 @@
 #include <memory>
 #include <utility>
 
-#include "batch_extractor.h"
 #include "event_util.h"
+#include "storage/batch_extractor.h"
 
 static std::map<RedisType, std::string> type_to_cmd = {
     {kRedisString, "set"}, {kRedisList, "rpush"},    {kRedisHash, "hmset"},      {kRedisSet, "sadd"},

diff --git a/src/slot_migrate.h → src/cluster/slot_migrate.h b/src/slot_migrate.h → 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 → src/commands/redis_cmd.cc b/src/redis_cmd.cc → src/commands/redis_cmd.cc
@@ -32,30 +32,30 @@
 #include <unordered_map>
 #include <utility>
 
-#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 → src/commands/redis_cmd.h b/src/redis_cmd.h → src/commands/redis_cmd.h
@@ -34,7 +34,7 @@
 #include <utility>
 #include <vector>
 
-#include "redis_reply.h"
+#include "server/redis_reply.h"
 #include "status.h"
 
 class Server;

diff --git a/src/cron.cc → src/common/cron.cc b/src/cron.cc → src/common/cron.cc
diff --git a/src/cron.h → src/common/cron.h b/src/cron.h → src/common/cron.h
diff --git a/src/db_util.h → src/common/db_util.h b/src/db_util.h → src/common/db_util.h
diff --git a/src/encoding.cc → src/common/encoding.cc b/src/encoding.cc → src/common/encoding.cc
diff --git a/src/encoding.h → src/common/encoding.h b/src/encoding.h → src/common/encoding.h
diff --git a/src/event_util.h → src/common/event_util.h b/src/event_util.h → src/common/event_util.h
diff --git a/src/fd_util.h → src/common/fd_util.h b/src/fd_util.h → src/common/fd_util.h
diff --git a/src/parse_util.h → src/common/parse_util.h b/src/parse_util.h → src/common/parse_util.h
diff --git a/src/rand.cc → src/common/rand.cc b/src/rand.cc → src/common/rand.cc
diff --git a/src/rand.h → src/common/rand.h b/src/rand.h → src/common/rand.h
diff --git a/src/rocksdb_crc32c.h → src/common/rocksdb_crc32c.h b/src/rocksdb_crc32c.h → src/common/rocksdb_crc32c.h
diff --git a/src/rw_lock.h → src/common/rw_lock.h b/src/rw_lock.h → src/common/rw_lock.h
diff --git a/src/scope_exit.h → src/common/scope_exit.h b/src/scope_exit.h → src/common/scope_exit.h
diff --git a/src/sha1.cc → src/common/sha1.cc b/src/sha1.cc → src/common/sha1.cc
diff --git a/src/sha1.h → src/common/sha1.h b/src/sha1.h → src/common/sha1.h
diff --git a/src/status.h → src/common/status.h b/src/status.h → src/common/status.h
diff --git a/src/task_runner.cc → src/common/task_runner.cc b/src/task_runner.cc → src/common/task_runner.cc
diff --git a/src/task_runner.h → src/common/task_runner.h b/src/task_runner.h → src/common/task_runner.h
diff --git a/src/util.cc → src/common/util.cc b/src/util.cc → src/common/util.cc
diff --git a/src/util.h → src/common/util.h b/src/util.h → src/common/util.h
diff --git a/src/config.cc → src/config/config.cc b/src/config.cc → 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 → src/config/config.h b/src/config.h → src/config/config.h
diff --git a/src/config_type.h → src/config/config_type.h b/src/config_type.h → src/config/config_type.h
diff --git a/src/config_util.cc → src/config/config_util.cc b/src/config_util.cc → src/config/config_util.cc
diff --git a/src/config_util.h → src/config/config_util.h b/src/config_util.h → src/config/config_util.h
diff --git 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 → src/server/redis_connection.cc b/src/redis_connection.cc → src/server/redis_connection.cc
diff --git a/src/redis_connection.h → src/server/redis_connection.h b/src/redis_connection.h → src/server/redis_connection.h
@@ -28,7 +28,7 @@
 #include <utility>
 #include <vector>
 
-#include "redis_cmd.h"
+#include "commands/redis_cmd.h"
 #include "redis_request.h"
 
 class Worker;

diff --git a/src/redis_reply.cc → src/server/redis_reply.cc b/src/redis_reply.cc → src/server/redis_reply.cc
diff --git a/src/redis_reply.h → src/server/redis_reply.h b/src/redis_reply.h → src/server/redis_reply.h
diff --git a/src/redis_request.cc → src/server/redis_request.cc b/src/redis_request.cc → src/server/redis_request.cc
@@ -27,11 +27,11 @@
 #include <memory>
 #include <utility>
 
+#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 → src/server/redis_request.h b/src/redis_request.h → src/server/redis_request.h
diff --git a/src/server.cc → src/server/server.cc b/src/server.cc → src/server/server.cc
@@ -30,12 +30,12 @@
 #include <memory>
 #include <utility>
 
-#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 → src/server/server.h b/src/server.h → src/server/server.h
@@ -32,16 +32,16 @@
 #include <utility>
 #include <vector>
 
-#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 → src/server/tls_util.cc b/src/tls_util.cc → src/server/tls_util.cc
diff --git a/src/tls_util.h → src/server/tls_util.h b/src/tls_util.h → src/server/tls_util.h
@@ -26,7 +26,7 @@
 
 #include <memory>
 
-#include "config.h"
+#include "config/config.h"
 #include "event_util.h"
 
 void InitSSL();

diff --git a/src/worker.cc → src/server/worker.cc b/src/worker.cc → 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 → src/server/worker.h b/src/worker.h → src/server/worker.h
@@ -37,7 +37,7 @@
 #include <vector>
 
 #include "redis_connection.h"
-#include "storage.h"
+#include "storage/storage.h"
 
 class Server;
 

diff --git a/src/redis_disk.cc → src/stats/disk_stats.cc b/src/redis_disk.cc → src/stats/disk_stats.cc
@@ -18,7 +18,7 @@
  *
  */
 
-#include "redis_disk.h"
+#include "disk_stats.h"
 
 #include <algorithm>
 #include <memory>
@@ -27,12 +27,12 @@
 #include <vector>
 
 #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 → src/stats/disk_stats.h b/src/redis_disk.h → src/stats/disk_stats.h
@@ -22,8 +22,8 @@
 
 #include <string>
 
-#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 → src/stats/log_collector.cc b/src/log_collector.cc → src/stats/log_collector.cc
@@ -22,7 +22,7 @@
 
 #include <algorithm>
 
-#include "redis_reply.h"
+#include "server/redis_reply.h"
 
 std::string SlowEntry::ToRedisString() {
   std::string output;

diff --git a/src/log_collector.h → src/stats/log_collector.h b/src/log_collector.h → src/stats/log_collector.h
diff --git a/src/stats.cc → src/stats/stats.cc b/src/stats.cc → src/stats/stats.cc
diff --git a/src/stats.h → src/stats/stats.h b/src/stats.h → src/stats/stats.h
diff --git a/src/batch_extractor.cc → src/storage/batch_extractor.cc b/src/batch_extractor.cc → src/storage/batch_extractor.cc
@@ -23,11 +23,11 @@
 #include <glog/logging.h>
 #include <rocksdb/write_batch.h>
 
+#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 → src/storage/batch_extractor.h b/src/batch_extractor.h → src/storage/batch_extractor.h
diff --git a/src/compact_filter.cc → src/storage/compact_filter.cc b/src/compact_filter.cc → src/storage/compact_filter.cc
@@ -25,7 +25,7 @@
 #include <string>
 #include <utility>
 
-#include "redis_bitmap.h"
+#include "types/redis_bitmap.h"
 
 namespace Engine {
 using rocksdb::Slice;

diff --git a/src/compact_filter.h → src/storage/compact_filter.h b/src/compact_filter.h → src/storage/compact_filter.h
diff --git a/src/compaction_checker.cc → src/storage/compaction_checker.cc b/src/compaction_checker.cc → src/storage/compaction_checker.cc
diff --git a/src/compaction_checker.h → src/storage/compaction_checker.h b/src/compaction_checker.h → src/storage/compaction_checker.h
diff --git a/src/event_listener.cc → src/storage/event_listener.cc b/src/event_listener.cc → src/storage/event_listener.cc
diff --git a/src/event_listener.h → src/storage/event_listener.h b/src/event_listener.h → src/storage/event_listener.h
diff --git a/src/lock_manager.cc → src/storage/lock_manager.cc b/src/lock_manager.cc → src/storage/lock_manager.cc
diff --git a/src/lock_manager.h → src/storage/lock_manager.h b/src/lock_manager.h → src/storage/lock_manager.h
diff --git a/src/redis_db.cc → src/storage/redis_db.cc b/src/redis_db.cc → src/storage/redis_db.cc
@@ -23,11 +23,11 @@
 #include <ctime>
 #include <map>
 
+#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 → src/storage/redis_db.h b/src/redis_db.h → src/storage/redis_db.h
diff --git a/src/redis_metadata.cc → src/storage/redis_metadata.cc b/src/redis_metadata.cc → src/storage/redis_metadata.cc
@@ -28,7 +28,7 @@
 #include <ctime>
 #include <vector>
 
-#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 → src/storage/redis_metadata.h b/src/redis_metadata.h → src/storage/redis_metadata.h
@@ -27,7 +27,7 @@
 #include <vector>
 
 #include "encoding.h"
-#include "redis_stream_base.h"
+#include "types/redis_stream_base.h"
 
 enum RedisType {
   kRedisNone,

diff --git a/src/redis_pubsub.cc → src/storage/redis_pubsub.cc b/src/redis_pubsub.cc → src/storage/redis_pubsub.cc
diff --git a/src/redis_pubsub.h → src/storage/redis_pubsub.h b/src/redis_pubsub.h → src/storage/redis_pubsub.h
diff --git a/src/scripting.cc → src/storage/scripting.cc b/src/scripting.cc → src/storage/scripting.cc
@@ -56,10 +56,10 @@
 
 #include <string>
 
+#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"