change: move http redis mysql to their own folder

kedixa · kedixa · commit 8de574816bb9 · 2024-10-20T21:47:51.000+08:00
diff --git a/BUILD b/BUILD
@@ -2,12 +2,12 @@ package(default_visibility = ["//visibility:public"])
 
 cc_library(
     name = "detail_hdrs",
-    hdrs = glob(["include/coke/detail/*"])
+    hdrs = glob(["include/coke/detail/*.h"])
 )
 
 cc_library(
     name = "compatible_hdrs",
-    hdrs = glob(["include/coke/compatible/*"])
+    hdrs = glob(["include/coke/compatible/*.h"])
 )
 
 cc_library(
@@ -34,7 +34,6 @@ cc_library(
     ],
     hdrs = [
         "include/coke/basic_awaiter.h",
-        "include/coke/basic_server.h",
         "include/coke/coke.h",
         "include/coke/condition.h",
         "include/coke/dag.h",
@@ -46,7 +45,6 @@ cc_library(
         "include/coke/latch.h",
         "include/coke/make_task.h",
         "include/coke/mutex.h",
-        "include/coke/network.h",
         "include/coke/qps_pool.h",
         "include/coke/queue_common.h",
         "include/coke/queue.h",
@@ -67,19 +65,25 @@ cc_library(
     ]
 )
 
+cc_library(
+    name = "net",
+    srcs = [],
+    hdrs = glob(["include/coke/net/*.h"]),
+    includes = ["include"],
+    deps = [
+        "//:common",
+    ],
+)
+
 cc_library(
     name = "http",
     srcs = [
         "src/http_impl.cpp"
     ],
-    hdrs = [
-        "include/coke/http_client.h",
-        "include/coke/http_server.h",
-        "include/coke/http_utils.h",
-    ],
+    hdrs = glob(["include/coke/http/*.h"]),
     includes = ["include"],
     deps = [
-        "//:common",
+        "//:net",
         "@workflow//:http",
     ],
 )
@@ -89,14 +93,10 @@ cc_library(
     srcs = [
         "src/redis_impl.cpp"
     ],
-    hdrs = [
-        "include/coke/redis_client.h",
-        "include/coke/redis_server.h",
-        "include/coke/redis_utils.h",
-    ],
+    hdrs = glob(["include/coke/redis/*.h"]),
     includes = ["include"],
     deps = [
-        "//:common",
+        "//:net",
         "@workflow//:redis",
     ],
 )
@@ -106,13 +106,10 @@ cc_library(
     srcs = [
         "src/mysql_impl.cpp"
     ],
-    hdrs = [
-        "include/coke/mysql_client.h",
-        "include/coke/mysql_utils.h",
-    ],
+    hdrs = glob(["include/coke/mysql/*.h"]),
     includes = ["include"],
     deps = [
-        "//:common",
+        "//:net",
         "@workflow//:mysql",
     ],
 )
diff --git a/example/ex002-http_get.cpp b/example/ex002-http_get.cpp
@@ -1,9 +1,9 @@
 #include <iostream>
 #include <string>
 
-#include "coke/coke.h"
-#include "coke/http_client.h"
-#include "coke/http_utils.h"
+#include "coke/wait.h"
+#include "coke/http/http_client.h"
+#include "coke/http/http_utils.h"
 
 /**
  * This example uses coke::HttpClient to send an Http Get request
diff --git a/example/ex003-http_hello_server.cpp b/example/ex003-http_hello_server.cpp
@@ -2,8 +2,8 @@
 #include <string>
 #include <cerrno>
 
-#include "coke/coke.h"
-#include "coke/http_server.h"
+#include "coke/task.h"
+#include "coke/http/http_server.h"
 
 /**
  * This example start an http server on port 8888, the server replies a simple
diff --git a/example/ex006-http_proxy.cpp b/example/ex006-http_proxy.cpp
@@ -3,8 +3,8 @@
 #include <string>
 
 #include "coke/global.h"
-#include "coke/http_server.h"
-#include "coke/http_client.h"
+#include "coke/http/http_server.h"
+#include "coke/http/http_client.h"
 #include "workflow/URIParser.h"
 
 coke::HttpClientParams cli_params {
diff --git a/example/ex007-redis_cli.cpp b/example/ex007-redis_cli.cpp
@@ -6,10 +6,10 @@
 #include <cstring>
 #include <cmath>
 
-#include "coke/coke.h"
+#include "coke/wait.h"
 #include "coke/tools/option_parser.h"
-#include "coke/redis_client.h"
-#include "coke/redis_utils.h"
+#include "coke/redis/redis_client.h"
+#include "coke/redis/redis_utils.h"
 #include "readline_helper.h"
 
 std::string prompt_str;
diff --git a/example/ex008-parallel_http_get.cpp b/example/ex008-parallel_http_get.cpp
@@ -2,9 +2,9 @@
 #include <string>
 #include <vector>
 
-#include "coke/coke.h"
-#include "coke/http_client.h"
-#include "coke/http_utils.h"
+#include "coke/wait.h"
+#include "coke/http/http_client.h"
+#include "coke/http/http_utils.h"
 
 /**
  * This example send multiple http requests, waits for the results
diff --git a/example/ex009-mysql_cli.cpp b/example/ex009-mysql_cli.cpp
@@ -3,10 +3,11 @@
 #include <string>
 #include <vector>
 
-#include "coke/coke.h"
+#include "coke/wait.h"
+#include "coke/go.h"
 #include "coke/tools/option_parser.h"
-#include "coke/mysql_client.h"
-#include "coke/mysql_utils.h"
+#include "coke/mysql/mysql_client.h"
+#include "coke/mysql/mysql_utils.h"
 
 #include "readline_helper.h"
 
diff --git a/example/ex011-redis_server.cpp b/example/ex011-redis_server.cpp
@@ -6,8 +6,9 @@
 #include <cctype>
 #include <shared_mutex>
 
-#include "coke/coke.h"
-#include "coke/redis_server.h"
+#include "coke/task.h"
+#include "coke/sleep.h"
+#include "coke/redis/redis_server.h"
 
 /**
  * This example start a redis server on port 8379, shows how to use
diff --git a/include/coke/http/http_client.h b/include/coke/http/http_client.h
@@ -23,7 +23,7 @@
 #include <utility>
 #include <string>
 
-#include "coke/network.h"
+#include "coke/net/network.h"
 
 #include "workflow/HttpMessage.h"
 
diff --git a/include/coke/http/http_server.h b/include/coke/http/http_server.h
@@ -19,7 +19,7 @@
 #ifndef COKE_HTTP_SERVER_H
 #define COKE_HTTP_SERVER_H
 
-#include "coke/basic_server.h"
+#include "coke/net/basic_server.h"
 
 #include "workflow/WFHttpServer.h"
 #include "workflow/HttpMessage.h"
diff --git a/include/coke/http/http_utils.h b/include/coke/http/http_utils.h
diff --git a/include/coke/mysql/mysql_client.h b/include/coke/mysql/mysql_client.h
@@ -21,7 +21,7 @@
 
 #include <string>
 
-#include "coke/network.h"
+#include "coke/net/network.h"
 
 #include "workflow/MySQLMessage.h"
 #include "workflow/URIParser.h"
diff --git a/include/coke/mysql/mysql_utils.h b/include/coke/mysql/mysql_utils.h
diff --git a/include/coke/net/basic_server.h b/include/coke/net/basic_server.h
@@ -20,7 +20,7 @@
 #define COKE_BASIC_SERVER_H
 
 #include "coke/task.h"
-#include "coke/network.h"
+#include "coke/net/network.h"
 #include "workflow/WFServer.h"
 
 namespace coke {
diff --git a/include/coke/net/network.h b/include/coke/net/network.h
diff --git a/include/coke/redis/redis_client.h b/include/coke/redis/redis_client.h
@@ -23,7 +23,7 @@
 #include <utility>
 #include <string>
 
-#include "coke/network.h"
+#include "coke/net/network.h"
 
 #include "workflow/RedisMessage.h"
 #include "workflow/URIParser.h"
diff --git a/include/coke/redis/redis_server.h b/include/coke/redis/redis_server.h
@@ -19,7 +19,7 @@
 #ifndef COKE_REDIS_SERVER_H
 #define COKE_REDIS_SERVER_H
 
-#include "coke/basic_server.h"
+#include "coke/net/basic_server.h"
 
 #include "workflow/WFRedisServer.h"
 #include "workflow/RedisMessage.h"
diff --git a/include/coke/redis/redis_utils.h b/include/coke/redis/redis_utils.h
diff --git a/src/http_impl.cpp b/src/http_impl.cpp
@@ -22,8 +22,8 @@
 #include <strings.h>
 #include <openssl/evp.h>
 
-#include "coke/http_client.h"
-#include "coke/http_utils.h"
+#include "coke/http/http_client.h"
+#include "coke/http/http_utils.h"
 
 #include "workflow/WFTaskFactory.h"
 
diff --git a/src/mysql_impl.cpp b/src/mysql_impl.cpp
@@ -20,8 +20,8 @@
 #include <mutex>
 #include <queue>
 
-#include "coke/mysql_client.h"
-#include "coke/mysql_utils.h"
+#include "coke/mysql/mysql_client.h"
+#include "coke/mysql/mysql_utils.h"
 
 #include "workflow/StringUtil.h"
 #include "workflow/WFTaskFactory.h"
diff --git a/src/redis_impl.cpp b/src/redis_impl.cpp
@@ -19,8 +19,8 @@
 #include <string>
 #include <cctype>
 
-#include "coke/redis_client.h"
-#include "coke/redis_utils.h"
+#include "coke/redis/redis_client.h"
+#include "coke/redis/redis_utils.h"
 
 #include "workflow/WFTaskFactory.h"
 #include "workflow/StringUtil.h"
diff --git a/test/test_http.cpp b/test/test_http.cpp
@@ -20,8 +20,8 @@
 #include <gtest/gtest.h>
 
 #include "coke/coke.h"
-#include "coke/http_client.h"
-#include "coke/http_server.h"
+#include "coke/http/http_client.h"
+#include "coke/http/http_server.h"
 
 #include "workflow/WFTaskFactory.h"
 
