remove ch_protocol

joshschwartz · Dec 7, 2013 · ad9ad46 · ad9ad46
1 parent c32d0a6
commit ad9ad46
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 213 deletions.
diff --git a/src/Makefile.am b/src/Makefile.am
@@ -2,9 +2,7 @@ chimp_CXXFLAGS = -I$(top_srcdir)/src
 
 bin_PROGRAMS = chimp
 
-chimp_SOURCES = ch_protocol.cc \
-                ch_protocol.h \
-                ch_log.cc \
+chimp_SOURCES = ch_log.cc \
                 ch_log.h \
                 ch_row.cc \
                 ch_row.h \
@@ -21,6 +19,8 @@ chimp_SOURCES = ch_protocol.cc \
                 transport/command/abstract_command.cc \
                 transport/command/ping.h \
                 transport/command/ping.cc \
+                transport/command/dsnew.h \
+                transport/command/dsnew.cc \
                 transport/server.h \
                 transport/server.cc \
                 transport/client.h \

diff --git a/src/ch_protocol.cc b/src/ch_protocol.cc
diff --git a/src/ch_protocol.h b/src/ch_protocol.h
diff --git a/src/transport/command/ping.h b/src/transport/command/ping.h
@@ -23,14 +23,11 @@
 #ifndef CH_INCLUDE_GUARD_B3F7ACA4_559D_45B4_9E0F_B1248AF16E1D
 #define CH_INCLUDE_GUARD_B3F7ACA4_559D_45B4_9E0F_B1248AF16E1D
 
-#include <memory>
-
 #include "transport/client.h"
 #include "transport/abstract_response.h"
 #include "transport/command/abstract_command.h"
 
 namespace chimp {
-
 namespace transport {
 namespace command {
 

diff --git a/src/transport/server.cc b/src/transport/server.cc
@@ -29,6 +29,7 @@
 #include "transport/client.h"
 #include "transport/error_response.h"
 #include "transport/command/ping.h"
+#include "transport/command/dsnew.h"
 
 
 namespace chimp {
@@ -78,20 +79,23 @@ static void _read_cb(uv_stream_t *client_handle, ssize_t nread, uv_buf_t buf)
         } else {
             std::string command_name(msg.data.via.array.ptr[0].via.raw.ptr,
                                      msg.data.via.array.ptr[0].via.raw.size);
-            std::map<std::string, ch_command_t>::iterator iter = client->server->commands.find(command_name);
+            std::map<std::string, chimp::transport::Server::Command>::iterator iter = client->server->commands.find(command_name);
             if (iter == client->server->commands.end()) {
                 std::shared_ptr<AbstractResponse> response(new ErrorResponse(
                                                             chimp::transport::RESPONSE_CODE_SERVER_ERROR,
                                                             "unsupported command"));
                 client->Write(response);
             } else {
-                ch_command_t command = iter->second;
+                chimp::transport::Server::Command command = iter->second;
                 chimp::transport::command::AbstractCommand *cmd = NULL;
 
                 switch (command) {
-                    case CH_COMMAND_PING:
+                    case chimp::transport::Server::PING:
                         cmd = new chimp::transport::command::Ping(client);
                         break;
+                    case chimp::transport::Server::DSNEW:
+                        cmd = new chimp::transport::command::DatasetNew(client);
+                        break;
                     default:
                         {
                         std::shared_ptr<AbstractResponse> response(new ErrorResponse(
@@ -107,6 +111,10 @@ static void _read_cb(uv_stream_t *client_handle, ssize_t nread, uv_buf_t buf)
                         cmd->Execute();
                     } else {
                         CH_LOG_ERROR("failed to unpack message");
+                        std::shared_ptr<AbstractResponse> response(new ErrorResponse(
+                                                                    chimp::transport::RESPONSE_CODE_USER_ERROR,
+                                                                    "failed to unpack message"));
+                        client->Write(response);
                     }
                     delete cmd;
                 }
@@ -144,8 +152,8 @@ Server::Server(ServerSettings settings, uv_loop_t *loop)
 {
     this->loop = loop;
     this->settings_ = settings;
-    this->commands["PING"] = CH_COMMAND_PING;
-    this->commands["DSNEW"] = CH_COMMAND_DSNEW;
+    this->commands["PING"] = chimp::transport::Server::PING;
+    this->commands["DSNEW"] = chimp::transport::Server::DSNEW;
     uv_tcp_init(this->loop, &this->handle);
     this->handle.data = this;
 }

diff --git a/src/transport/server.h b/src/transport/server.h
@@ -25,7 +25,6 @@
 
 #include <uv.h>
 #include <map>
-#include <ch_protocol.h>
 
 
 namespace chimp {
@@ -41,13 +40,18 @@ class Server {
                 int socket_backlog;
         };
 
+        enum Command {
+            PING,
+            DSNEW
+        };
+
         Server(ServerSettings settings, uv_loop_t *loop);
         int Start();
     public:
         uv_loop_t *loop;
         uv_tcp_t handle;
         ServerSettings settings_;
-        std::map<std::string, ch_command_t> commands;
+        std::map<std::string, Command> commands;
 };
 
 }

diff --git a/tests/Makefile.am b/tests/Makefile.am
@@ -1,7 +1,7 @@
 test_core_CXXFLAGS = -I$(top_srcdir)/src
 test_protocol_CXXFLAGS = -I$(top_srcdir)/src
 
-noinst_PROGRAMS = test_core test_protocol
+noinst_PROGRAMS = test_core
 
 test_core_SOURCES = ../src/ch_row.cc \
                     ../src/ch_row.h \
@@ -10,9 +10,4 @@ test_core_SOURCES = ../src/ch_row.cc \
                     test_core.cc
 test_core_LDADD = -lgtest -lpthread
 
-test_protocol_SOURCES = ../src/ch_protocol.h \
-                        ../src/ch_protocol.cc \
-                        test_protocol.cc
-test_protocol_LDADD = -lgtest -lpthread -lmsgpack
-
-TESTS = test_core test_protocol
+TESTS = test_core