includes moved to include, sources moved to src

Author: appkins

CMakeLists.txt

@@ -89,7 +89,7 @@ set(VENDOR_LIBRARY_DIR ${VENDOR_DIR}/lib ${VENDOR_DIR}/lib64)
 
 # find_path(TACOPIE_INCLUDE_DIR tacopie/tacopie PATHS ${PROJECT_SOURCE_DIR}/tacopie/includes/)
 # find_library(TACOPIE_LIBRARY tacopie)
-set(CPP_REDIS_INCLUDES ${PROJECT_SOURCE_DIR}/includes)
+set(CPP_REDIS_INCLUDES ${PROJECT_SOURCE_DIR}/include)
 
 if (NOT USE_CUSTOM_TCP_CLIENT)
 	set(VENDOR_INCLUDES ${VENDOR_INCLUDES} ${TACOPIE_INCLUDE_DIR})
@@ -104,29 +104,43 @@ include_directories(${CPP_REDIS_INCLUDES} ${VENDOR_INCLUDES} /usr/include/c++/6)
 ###
 # sources
 ###
-set(SRC_DIRS "sources"
-	"sources/builders"
-	"sources/core"
-	"sources/misc"
-	"sources/network"
-	"includes/cpp_redis"
-	"includes/cpp_redis/builders"
-	"includes/cpp_redis/core"
-	"includes/cpp_redis/misc"
-	"includes/cpp_redis/network")
-
-foreach (dir ${SRC_DIRS})
+# set(SRC_DIRS "src"
+# 	"src/cpp_redis/builders"
+# 	"src/cpp_redis/core"
+# 	"src/cpp_redis/misc"
+# 	"src/cpp_redis/network"
+# 	)
+
+# set(INCLUDE_DIRS "includes/cpp_redis"
+# 	"includes/cpp_redis/builders"
+# 	"includes/cpp_redis/core"
+# 	"includes/cpp_redis/misc"
+# 	"includes/cpp_redis/network")
+
+
+#foreach (dir ${SRC_DIRS})
 	# get directory sources and headers
-	file(GLOB s_${dir} "${dir}/*.cpp")
-	file(GLOB h_${dir} "${dir}/*.hpp")
-	file(GLOB i_${dir} "${dir}/*.ipp")
+	# file(GLOB s_${dir} "${dir}/*.cpp")
+	# file(GLOB h_${dir} "${dir}/*.hpp")
+	# file(GLOB i_${dir} "${dir}/*.ipp")
 
 	# set sources
-	set(SOURCES ${SOURCES} ${s_${dir}} ${h_${dir}} ${i_${dir}})
-endforeach ()
+	#set(SOURCES ${SOURCES} ${s_${dir}} ${h_${dir}} ${i_${dir}})
+#endforeach ()
+
+file(GLOB_RECURSE INCLUDES
+	 LIST_DIRECTORIES TRUE
+	 RELATIVE "${PROJECT_SOURCE_DIR}" *.hpp *.ipp)
+
+file(GLOB_RECURSE SOURCES 
+	LIST_DIRECTORIES TRUE
+	 RELATIVE "${PROJECT_SOURCE_DIR}" *.cpp)
+
+set(SOURCES ${SOURCES} ${INCLUDES})
+
 # filter tcp_client if no tacopie
 if (USE_CUSTOM_TCP_CLIENT)
-	file(GLOB tacopie_cpp "sources/network/tcp_client.cpp")
+	file(GLOB tacopie_cpp "sources/cpp_redis/network/tcp_client.cpp")
 	file(GLOB tacopie_h "includes/cpp_redis/network/tcp_client.hpp")
 	list(REMOVE_ITEM SOURCES ${tacopie_cpp} ${tacopie_h})
 endif ()

examples/cpp_redis_cluster.cpp

@@ -32,11 +32,13 @@
 #endif //! _WIN32
 
 int main(void) {
-  std::string buffer = "131\r\n07c37dfeb235213a872192d90877d0cd55635b91 127.0.0.1:30004 slave e7d1eecce10fd6bb5eb35b9f99a514335d9ba9ca 0 1426238317239 4 connected\r";
-
- 
+  std::string buffer = "235\r\n07c37dfeb235213a872192d90877d0cd55635b91 127.0.0.1:30004 slave e7d1eecce10fd6bb5eb35b9f99a514335d9ba9ca 0 1426238317239 4 connected";
 
   cpp_redis::builders::bulk_string_builder builder;
+  builder << buffer;
+
+  buffer += "\n67ed2db8d677e59ec4a4cefb06858cf2a1a89fa1 127.0.0.1:30002 master - 0 1426238316232 2 connected 5461-10922\r";
+
   builder << buffer;
 
    buffer += "\n";

includes/cpp_redis/core/client.hpp renamed to include/cpp_redis/core/client.hpp

@@ -33,6 +33,7 @@
 #include <string>
 #include <vector>
 
+#include <cpp_redis/core/reply.hpp>
 #include <cpp_redis/core/sentinel.hpp>
 #include <cpp_redis/core/types.hpp>
 #include <cpp_redis/helpers/variadic_template.hpp>

includes/cpp_redis/core/cluster.hpp renamed to include/cpp_redis/core/cluster.hpp

@@ -54,7 +54,7 @@ enum class link_state_type { CONNECTED = 1, DISCONNECTED = 2 };
 using link_state_t = link_state_type;
 
 class node {
-  private:
+private:
   std::string m_ip;
   std::unique_ptr<client_t> m_client;
   int m_port;
@@ -66,23 +66,21 @@ class node {
   int config_epoch;
   link_state_t link_state;
   std::vector<slot_t> slots;
+
 public:
   node(std::string ip, int port)
       : m_client(new client_t()), m_ip(ip), m_port(port) {}
 
   const void set_address(std::string &address) {
     int sep = address.find_first_of(':');
-    m_ip = address.substr (0,sep);
+    m_ip = address.substr(0, sep);
     std::cout << "ip:  " << m_ip << std::endl;
-    std::string v = address.substr(sep,address.length());
+    std::string v = address.substr(sep, address.length());
     std::cout << "lksdjf " << v << std::endl;
     m_port = 8000;
-    //m_port = std::stoi(address.substr(sep,address.length())); }
-
+    // m_port = std::stoi(address.substr(sep,address.length())); }
   }
-    const int get_port() {
-      return m_port;
-    }
+  const int get_port() { return m_port; }
 };
 
 using node_t = node;
@@ -101,66 +99,66 @@ struct cluster_slot {
 };
 
 std::istream &operator>>(std::istream &is, std::pair<std::string, node_t> &t) {
-    // Read string to space
-    getline( is >> std::ws, t.first, ' ' );
-
-    int i = 1;
-    while ((is.peek()!='\n') && (is>>std::ws)) {
-      std::string temp;
-      getline( is >> std::ws, temp, ' ' );
-      switch (i)
-      {
-        case 1:
-          t.second.set_address(temp);
-          break;
-        case 2: // flags
-          std::cout << temp << std::endl;
-          break;
-        case 3: // master
-        std::cout << temp << std::endl;
-          break;
-        default:
-        std::cout << temp << std::endl;
-          break;
-      }
-      i++;
+  // Read string to space
+  getline(is >> std::ws, t.first, ' ');
+
+  int i = 1;
+  while ((is.peek() != '\n') && (is >> std::ws)) {
+    std::string temp;
+    getline(is >> std::ws, temp, ' ');
+    switch (i) {
+    case 1:
+      t.second.set_address(temp);
+      break;
+    case 2: // flags
+      std::cout << temp << std::endl;
+      break;
+    case 3: // master
+      std::cout << temp << std::endl;
+      break;
+    default:
+      std::cout << temp << std::endl;
+      break;
     }
-    
-    // Read formatted input; ignore everything else to end of line
-    // is >> t.avg;
-    // is.ignore( std::numeric_limits<std::streamsize>::max(), '\n' );
-    
-    return is;
+    i++;
+  }
+
+  // Read formatted input; ignore everything else to end of line
+  // is >> t.avg;
+  // is.ignore( std::numeric_limits<std::streamsize>::max(), '\n' );
+
+  return is;
 }
 
 std::istream &operator>>(std::istream &is, node_map_t &data) {
-    data.clear();
-    std::pair<std::string, node_t> rec = {"", node_t("",0)};
-    while (is >> rec)
-      data.insert({rec.first, std::shared_ptr<node_t>(&rec.second)});
-    return is;
+  data.clear();
+  std::pair<std::string, node_t> rec = {"", node_t("", 0)};
+  while (is >> rec)
+    data.insert({rec.first, std::shared_ptr<node_t>(&rec.second)});
+  return is;
 }
 
 class cluster_client {
 private:
-    node_map_t m_nodes;
-    std::vector<std::string> m_slots;
-    std::pair<std::string, int> m_address;
+  node_map_t m_nodes;
+  std::vector<std::string> m_slots;
+  std::pair<std::string, int> m_address;
+
 public:
   cluster_client(const std::string ip, int port) : m_address({ip, port}) {}
 
   void connect() {
-      client_t rclient;
+    client_t rclient;
 
-      rclient.connect(m_address.first, m_address.second);
+    rclient.connect(m_address.first, m_address.second);
 
-      rclient.cluster_nodes([&](const reply_t &repl) {
-        if (!repl.is_error() && repl.is_bulk_string()) {
-          node_map_t nm;
-          std::istringstream(repl.as_string()) >> nm;
-        }
-      });
-      //m_nodes.emplace()
+    rclient.cluster_nodes([&](const reply_t &repl) {
+      if (!repl.is_error() && repl.is_bulk_string()) {
+        node_map_t nm;
+        std::istringstream(repl.as_string()) >> nm;
+      }
+    });
+    // m_nodes.emplace()
   }
 };
 } // namespace cluster

includes/cpp_redis/core/consumer.hpp renamed to include/cpp_redis/core/consumer.hpp

@@ -116,12 +116,6 @@ class consumer {
   void poll();
 
 private:
-  std::string m_stream;
-  std::string m_name;
-  std::string m_read_id;
-  int m_block_sec;
-  std::size_t m_max_concurrency;
-  int m_read_count;
 
   client_container_ptr_t m_client;
 
@@ -135,6 +129,36 @@ class consumer {
 
   bool is_ready = false;
   std::atomic_bool m_should_read_pending{true};
+  private:
+  //!
+  //!  the name of the stream
+  //!
+  std::string m_stream;
+
+  //!
+  //!  the name of this consumer group
+  //!
+  std::string m_name;
+
+  //!
+  //!  the topic ID
+  //!
+  std::string m_read_id;
+
+  //!
+  //!  number of milliseconds to block when polling
+  //!
+  int m_block_sec;
+
+  //!
+  //!  maximum number of worker threads
+  //!
+  std::size_t m_max_concurrency;
+  
+  //!
+  //!  number of messages read
+  //!
+  int m_read_count;
 };
 
 using consumer_t = consumer;