Add set and unordered_set reply type templates

Useful based on what kind of data you need.

Add set and unordered_set reply type templates
Useful based on what kind of data you need.
Hayk Martirosyan
1 parent a2138a65
Showing 4 changed files with 112 additions and 32 deletions
examples/data_types.cpp
src/command.cpp
src/redox.cpp
src/redox.hpp
 /**
-* Basic use of Redox to set and get a Redis key.
+* Test special data type templates for multi-element replies using Redox.
 */
 #include <iostream>
 #include "../src/redox.hpp"
+#include <set>
+#include <unordered_set>
+#include <vector>
 using namespace std;
@@ -16,15 +19,40 @@ int main(int argc, char* argv[]) {
   rdx.command_blocking("LPUSH mylist 1 2 3 4 5 6 7 8 9 10");
-  auto c = rdx.command_blocking<vector<string>>("LRANGE mylist -3 -1");
-  if(!c->ok()) cerr << "Error with LRANGE: " << c->status() << endl;
-  for(const string& s : c->reply()) cout << s << endl;
-  c->free();
-
-//  if(!rdx.set("apples", "are great!")) // Set a key, check if succeeded
-//    cerr << "Failed to set key!" << endl;
-//
-//  cout << "key = alaska, value = \"" << rdx.get("apples") << "\"" << endl;
-
-  rdx.stop(); // Shut down the event loop
+  rdx.command<vector<string>>("LRANGE mylist 0 4",
+    [](const string& cmd, const vector<string>& reply){
+      cout << "Last 5 elements as a vector: ";
+      for(const string& s : reply) cout << s << " ";
+      cout << endl;
+    },
+    [](const string& cmd, int status) {
+      cerr << "Error with LRANGE: " << status << endl;
+    }
+  );
+
+  rdx.command<unordered_set<string>>("LRANGE mylist 0 4",
+    [](const string& cmd, const unordered_set<string>& reply){
+      cout << "Last 5 elements as an unordered set: ";
+      for(const string& s : reply) cout << s << " ";
+      cout << endl;
+    },
+    [](const string& cmd, int status) {
+      cerr << "Error with LRANGE: " << status << endl;
+    }
+  );
+
+  rdx.command<set<string>>("LRANGE mylist 0 4",
+    [&rdx](const string& cmd, const set<string>& reply){
+      cout << "Last 5 elements as a set: ";
+      for(const string& s : reply) cout << s << " ";
+      cout << endl;
+      rdx.stop_signal();
+    },
+    [&rdx](const string& cmd, int status) {
+      cerr << "Error with LRANGE: " << status << endl;
+      rdx.stop_signal();
+    }
+  );
+
+  rdx.block(); // Shut down the event loop
 }
@@ -3,7 +3,8 @@
 */
 #include <vector>
-#include <assert.h>
+#include <set>
+#include <unordered_set>
 #include "command.hpp"
@@ -134,4 +135,52 @@ void Command&lt;std::vector&lt;std::string&gt;&gt;::invoke_callback() {
   }
 }
+template<>
+void Command<std::unordered_set<std::string>>::invoke_callback() {
+
+  if(is_error_reply()) invoke_error(REDOX_ERROR_REPLY);
+
+  else if(reply_obj->type != REDIS_REPLY_ARRAY) {
+    std::cerr << "[ERROR] " << cmd << ": Received non-array reply." << std::endl;
+    invoke_error(REDOX_WRONG_TYPE);
+
+  } else {
+    std::unordered_set<std::string> v;
+    size_t count = reply_obj->elements;
+    for(size_t i = 0; i < count; i++) {
+      redisReply* r = *(reply_obj->element + i);
+      if(r->type != REDIS_REPLY_STRING) {
+        std::cerr << "[ERROR] " << cmd << ": Received non-array reply." << std::endl;
+        invoke_error(REDOX_WRONG_TYPE);
+      }
+      v.insert(r->str);
+    }
+    invoke(v);
+  }
+}
+
+template<>
+void Command<std::set<std::string>>::invoke_callback() {
+
+  if(is_error_reply()) invoke_error(REDOX_ERROR_REPLY);
+
+  else if(reply_obj->type != REDIS_REPLY_ARRAY) {
+    std::cerr << "[ERROR] " << cmd << ": Received non-array reply." << std::endl;
+    invoke_error(REDOX_WRONG_TYPE);
+
+  } else {
+    std::set<std::string> v;
+    size_t count = reply_obj->elements;
+    for(size_t i = 0; i < count; i++) {
+      redisReply* r = *(reply_obj->element + i);
+      if(r->type != REDIS_REPLY_STRING) {
+        std::cerr << "[ERROR] " << cmd << ": Received non-array reply." << std::endl;
+        invoke_error(REDOX_WRONG_TYPE);
+      }
+      v.insert(r->str);
+    }
+    invoke(v);
+  }
+}
+
 } // End namespace redox
@@ -308,42 +308,36 @@ void Redox::process_queued_commands(struct ev_loop* loop, ev_async* async, int r
     rdx->command_queue.pop();
     if(rdx->process_queued_command<redisReply*>(id)) {}
-    else if(rdx->process_queued_command<string>(id)) {}
+    else if(rdx->process_queued_command<std::string>(id)) {}
     else if(rdx->process_queued_command<char*>(id)) {}
     else if(rdx->process_queued_command<int>(id)) {}
     else if(rdx->process_queued_command<long long int>(id)) {}
-    else if(rdx->process_queued_command<nullptr_t>(id)) {}
-    else if(rdx->process_queued_command<vector<string>>(id)) {}
+    else if(rdx->process_queued_command<std::nullptr_t>(id)) {}
+    else if(rdx->process_queued_command<std::vector<std::string>>(id)) {}
+    else if(rdx->process_queued_command<std::set<std::string>>(id)) {}
+    else if(rdx->process_queued_command<std::unordered_set<std::string>>(id)) {}
     else throw runtime_error("[FATAL] Command pointer not found in any queue!");
   }
 }
-// ----------------------------
+// ---------------------------------
+// get_command_map specializations
+// ---------------------------------
 template<> unordered_map<long, Command<redisReply*>*>&
-Redox::get_command_map<redisReply*>() {
-//  cout << "redis reply command map at " << &commands_redis_reply << endl;
-  return commands_redis_reply; }
+Redox::get_command_map<redisReply*>() { return commands_redis_reply; }
 template<> unordered_map<long, Command<string>*>&
-Redox::get_command_map<string>() {
-//  cout << "string command map at " << &commands_string_r << endl;
-  return commands_string_r; }
+Redox::get_command_map<string>() { return commands_string_r; }
 template<> unordered_map<long, Command<char*>*>&
-Redox::get_command_map<char*>() {
-//  cout << "char* command map at " << &commands_char_p << endl;
-  return commands_char_p; }
+Redox::get_command_map<char*>() { return commands_char_p; }
 template<> unordered_map<long, Command<int>*>&
-Redox::get_command_map<int>() {
-//  cout << "int command map at " << &commands_int << " has size: " << commands_int.size() << endl;
-  return commands_int; }
+Redox::get_command_map<int>() { return commands_int; }
 template<> unordered_map<long, Command<long long int>*>&
-Redox::get_command_map<long long int>() {
-//  cout << "long long int command map at " << &commands_long_long_int << endl;
-  return commands_long_long_int; }
+Redox::get_command_map<long long int>() { return commands_long_long_int; }
 template<> unordered_map<long, Command<nullptr_t>*>&
 Redox::get_command_map<nullptr_t>() { return commands_null; }
@@ -351,6 +345,12 @@ Redox::get_command_map&lt;nullptr_t&gt;() { return commands_null; }
 template<> unordered_map<long, Command<vector<string>>*>&
 Redox::get_command_map<vector<string>>() { return commands_vector_string; }
+template<> unordered_map<long, Command<set<string>>*>&
+Redox::get_command_map<set<string>>() { return commands_set_string; }
+
+template<> unordered_map<long, Command<unordered_set<string>>*>&
+Redox::get_command_map<unordered_set<string>>() { return commands_unordered_set_string; }
+
 // ----------------------------
 // Helpers
 // ----------------------------
@@ -14,6 +14,7 @@
 #include <string>
 #include <queue>
+#include <set>
 #include <unordered_map>
 #include <unordered_set>
@@ -235,6 +236,8 @@ private:
   std::unordered_map<long, Command<long long int>*> commands_long_long_int;
   std::unordered_map<long, Command<std::nullptr_t>*> commands_null;
   std::unordered_map<long, Command<std::vector<std::string>>*> commands_vector_string;
+  std::unordered_map<long, Command<std::set<std::string>>*> commands_set_string;
+  std::unordered_map<long, Command<std::unordered_set<std::string>>*> commands_unordered_set_string;
   std::mutex command_map_guard; // Guards access to all of the above
   // Return the correct map from the above, based on the template specialization