twitter · thinkingfish · Jul 24, 2019 · Jul 24, 2019
diff --git a/src/client/README.md b/src/client/README.md
@@ -1,4 +1,4 @@
-The idea of a CLI client comes from Redis, which builds `redis-cli` for easy
+The idea of a CLI client comes from Redis, which builds `resp-cli` for easy
 testing and interactive play. This is particularly useful for Redis because
 the RESP protocol is more verbose than Memcached's ASCII protocol.
 

diff --git a/src/client/resp_cli/CMakeLists.txt b/src/client/resp_cli/CMakeLists.txt
@@ -6,7 +6,7 @@ set(SOURCE
 
 set(MODULES
     client-network
-    protocol_redis
+    protocol_resp
     util)
 
 set(LIBS

diff --git a/src/client/resp_cli/setting.h b/src/client/resp_cli/setting.h
@@ -2,7 +2,7 @@
 
 #include "core/data/server.h"
 
-#include "protocol/data/redis_include.h"
+#include "protocol/data/resp_include.h"
 
 #include <buffer/cc_buf.h>
 #include <buffer/cc_dbuf.h>

diff --git a/src/protocol/data/CMakeLists.txt b/src/protocol/data/CMakeLists.txt
@@ -1,3 +1,3 @@
 add_subdirectory(memcache)
 add_subdirectory(ping)
-add_subdirectory(redis)
+add_subdirectory(resp)
diff --git a/src/protocol/data/redis_include.h b/src/protocol/data/redis_include.h
diff --git a/src/protocol/data/redis/CMakeLists.txt → src/protocol/data/resp/CMakeLists.txt b/src/protocol/data/redis/CMakeLists.txt → src/protocol/data/resp/CMakeLists.txt
@@ -5,4 +5,4 @@ set(SOURCE
     response.c
     token.c)
 
-add_library(protocol_redis ${SOURCE})
+add_library(protocol_resp ${SOURCE})
diff --git a/src/protocol/data/redis/cmd_bitmap.h → src/protocol/data/resp/cmd_bitmap.h b/src/protocol/data/redis/cmd_bitmap.h → src/protocol/data/resp/cmd_bitmap.h
diff --git a/src/protocol/data/redis/cmd_hash.h → src/protocol/data/resp/cmd_hash.h b/src/protocol/data/redis/cmd_hash.h → src/protocol/data/resp/cmd_hash.h
diff --git a/src/protocol/data/redis/cmd_list.h → src/protocol/data/resp/cmd_list.h b/src/protocol/data/redis/cmd_list.h → src/protocol/data/resp/cmd_list.h
diff --git a/src/protocol/data/redis/cmd_misc.h → src/protocol/data/resp/cmd_misc.h b/src/protocol/data/redis/cmd_misc.h → src/protocol/data/resp/cmd_misc.h
diff --git a/src/protocol/data/redis/cmd_zset.h → src/protocol/data/resp/cmd_zset.h b/src/protocol/data/redis/cmd_zset.h → src/protocol/data/resp/cmd_zset.h
diff --git a/src/protocol/data/redis/compose.c → src/protocol/data/resp/compose.c b/src/protocol/data/redis/compose.c → src/protocol/data/resp/compose.c
@@ -7,7 +7,7 @@
 #include <cc_debug.h>
 #include <cc_print.h>
 
-#define COMPOSE_MODULE_NAME "protocol::redis::compose"
+#define COMPOSE_MODULE_NAME "protocol::resp::compose"
 
 static bool compose_init = false;
 static compose_req_metrics_st *compose_req_metrics = NULL;

diff --git a/src/protocol/data/redis/compose.h → src/protocol/data/resp/compose.h b/src/protocol/data/redis/compose.h → src/protocol/data/resp/compose.h
diff --git a/src/protocol/data/redis/parse.c → src/protocol/data/resp/parse.c b/src/protocol/data/redis/parse.c → src/protocol/data/resp/parse.c
@@ -11,7 +11,7 @@
 
 #include <ctype.h>
 
-#define PARSE_MODULE_NAME "protocol::redis::parse"
+#define PARSE_MODULE_NAME "protocol::resp::parse"
 
 static bool parse_init = false;
 static parse_req_metrics_st *parse_req_metrics = NULL;

diff --git a/src/protocol/data/redis/parse.h → src/protocol/data/resp/parse.h b/src/protocol/data/redis/parse.h → src/protocol/data/resp/parse.h
diff --git a/src/protocol/data/redis/process.h → src/protocol/data/resp/process.h b/src/protocol/data/redis/process.h → src/protocol/data/resp/process.h
diff --git a/src/protocol/data/redis/request.c → src/protocol/data/resp/request.c b/src/protocol/data/redis/request.c → src/protocol/data/resp/request.c
@@ -6,7 +6,7 @@
 #include <cc_mm.h>
 #include <cc_pool.h>
 
-#define REQUEST_MODULE_NAME "protocol::redis::request"
+#define REQUEST_MODULE_NAME "protocol::resp::request"
 
 static bool request_init = false;
 static request_metrics_st *request_metrics = NULL;

diff --git a/src/protocol/data/redis/request.h → src/protocol/data/resp/request.h b/src/protocol/data/redis/request.h → src/protocol/data/resp/request.h
diff --git a/src/protocol/data/redis/response.c → src/protocol/data/resp/response.c b/src/protocol/data/redis/response.c → src/protocol/data/resp/response.c
@@ -6,7 +6,7 @@
 #include <cc_mm.h>
 #include <cc_pool.h>
 
-#define RESPONSE_MODULE_NAME "protocol::redis::response"
+#define RESPONSE_MODULE_NAME "protocol::resp::response"
 
 static bool response_init = false;
 static response_metrics_st *response_metrics = NULL;

diff --git a/src/protocol/data/redis/response.h → src/protocol/data/resp/response.h b/src/protocol/data/redis/response.h → src/protocol/data/resp/response.h
diff --git a/src/protocol/data/redis/token.c → src/protocol/data/resp/token.c b/src/protocol/data/redis/token.c → src/protocol/data/resp/token.c
diff --git a/src/protocol/data/redis/token.h → src/protocol/data/resp/token.h b/src/protocol/data/redis/token.h → src/protocol/data/resp/token.h
diff --git a/src/protocol/data/resp_include.h b/src/protocol/data/resp_include.h
@@ -0,0 +1,6 @@
+#include "resp/compose.h"
+#include "resp/token.h"
+#include "resp/parse.h"
+#include "resp/process.h"
+#include "resp/request.h"
+#include "resp/response.h"
diff --git a/src/server/ds/CMakeLists.txt b/src/server/ds/CMakeLists.txt
@@ -11,7 +11,7 @@ set(MODULES
     core
     ds_ziplist
     protocol_admin
-    protocol_redis
+    protocol_resp
     slab
     time
     util)

diff --git a/src/server/ds/data/cmd_list.c b/src/server/ds/data/cmd_list.c
@@ -1,7 +1,7 @@
 #include "process.h"
 
 #include "data_structure/ziplist/ziplist.h"
-#include "protocol/data/redis_include.h"
+#include "protocol/data/resp_include.h"
 #include "storage/slab/item.h"
 #include "storage/slab/slab.h"
 

diff --git a/src/server/ds/data/cmd_misc.c b/src/server/ds/data/cmd_misc.c
@@ -1,6 +1,6 @@
 #include "process.h"
 
-#include "protocol/data/redis_include.h"
+#include "protocol/data/resp_include.h"
 #include <cc_array.h>
 #include <cc_debug.h>
 

diff --git a/src/server/ds/data/process.c b/src/server/ds/data/process.c
@@ -1,6 +1,6 @@
 #include "process.h"
 
-#include "protocol/data/redis_include.h"
+#include "protocol/data/resp_include.h"
 
 #include <buffer/cc_dbuf.h>
 #include <cc_debug.h>

diff --git a/src/server/ds/setting.h b/src/server/ds/setting.h
@@ -5,7 +5,7 @@
 #include "core/core.h"
 #include "storage/slab/item.h"
 #include "storage/slab/slab.h"
-#include "protocol/data/redis_include.h"
+#include "protocol/data/resp_include.h"
 #include "time/time.h"
 
 #include <buffer/cc_buf.h>

diff --git a/src/server/ds/stats.h b/src/server/ds/stats.h
@@ -3,7 +3,7 @@
 #include "data/process.h"
 
 #include "core/core.h"
-#include "protocol/data/redis_include.h"
+#include "protocol/data/resp_include.h"
 #include "storage/slab/item.h"
 #include "storage/slab/slab.h"
 #include "util/procinfo.h"

diff --git a/src/server/slimds/CMakeLists.txt b/src/server/slimds/CMakeLists.txt
@@ -12,7 +12,7 @@ set(MODULES
     cuckoo
     ds_bitmap
     protocol_admin
-    protocol_redis
+    protocol_resp
     time
     util)
 

diff --git a/src/server/slimds/data/cmd_bitmap.c b/src/server/slimds/data/cmd_bitmap.c
@@ -1,7 +1,7 @@
 #include "process.h"
 
 #include "data_structure/bitmap/bitset.h"
-#include "protocol/data/redis_include.h"
+#include "protocol/data/resp_include.h"
 #include "storage/cuckoo/cuckoo.h"
 #include "time/time.h"
 

diff --git a/src/server/slimds/data/cmd_misc.c b/src/server/slimds/data/cmd_misc.c
@@ -1,6 +1,6 @@
 #include "process.h"
 
-#include "protocol/data/redis_include.h"
+#include "protocol/data/resp_include.h"
 #include <cc_array.h>
 #include <cc_debug.h>
 

diff --git a/src/server/slimds/data/process.c b/src/server/slimds/data/process.c
@@ -1,6 +1,6 @@
 #include "process.h"
 
-#include "protocol/data/redis_include.h"
+#include "protocol/data/resp_include.h"
 
 #include <buffer/cc_dbuf.h>
 #include <cc_debug.h>

diff --git a/src/server/slimds/setting.h b/src/server/slimds/setting.h
@@ -4,7 +4,7 @@
 
 #include "core/core.h"
 #include "storage/cuckoo/cuckoo.h"
-#include "protocol/data/redis_include.h"
+#include "protocol/data/resp_include.h"
 #include "time/time.h"
 
 #include <buffer/cc_buf.h>

diff --git a/src/server/slimds/stats.h b/src/server/slimds/stats.h
@@ -3,7 +3,7 @@
 #include "data/process.h"
 
 #include "core/core.h"
-#include "protocol/data/redis_include.h"
+#include "protocol/data/resp_include.h"
 #include "storage/cuckoo/cuckoo.h"
 #include "util/procinfo.h"
 

diff --git a/test/protocol/data/CMakeLists.txt b/test/protocol/data/CMakeLists.txt
@@ -1,2 +1,2 @@
 add_subdirectory(memcache)
-add_subdirectory(redis)
+add_subdirectory(resp)
diff --git a/test/protocol/data/redis/CMakeLists.txt → test/protocol/data/resp/CMakeLists.txt b/test/protocol/data/redis/CMakeLists.txt → test/protocol/data/resp/CMakeLists.txt
@@ -1,4 +1,4 @@
-set(suite redis)
+set(suite resp)
 set(test_name check_${suite})
 
 set(source check_${suite}.c)

diff --git a/test/protocol/data/redis/check_redis.c → test/protocol/data/resp/check_resp.c b/test/protocol/data/redis/check_redis.c → test/protocol/data/resp/check_resp.c
@@ -1,4 +1,4 @@
-#include <protocol/data/redis_include.h>
+#include <protocol/data/resp_include.h>
 
 #include <buffer/cc_buf.h>
 #include <cc_array.h>
@@ -11,7 +11,7 @@
 #include <stdlib.h>
 
 /* define for each suite, local scope due to macro visibility rule */
-#define SUITE_NAME "redis"
+#define SUITE_NAME "resp"
 #define DEBUG_LOG  SUITE_NAME ".log"
 
 struct request *req;
@@ -561,7 +561,7 @@ END_TEST
  * test suite
  */
 static Suite *
-redis_suite(void)
+resp_suite(void)
 {
     Suite *s = suite_create(SUITE_NAME);
 
@@ -616,7 +616,7 @@ main(void)
     /* setup */
     test_setup();
 
-    Suite *suite = redis_suite();
+    Suite *suite = resp_suite();
     SRunner *srunner = srunner_create(suite);
     srunner_set_log(srunner, DEBUG_LOG);
     srunner_run_all(srunner, CK_ENV); /* set CK_VEBOSITY in ENV to customize */