better validation of rmr command formatting, and better logging of ti…

…meouts in rmr

src/dep/rmr/rmr.c

@@ -105,7 +105,7 @@ static void freePrivDataCB(void *p) {
 
 static int timeoutHandler(RedisModuleCtx *ctx, RedisModuleString **argv, int argc) {
   // concurrentRequests_g--;
-  fprintf(stderr, "Timeout!\n");
+  RedisModule_Log(ctx, "notice", "Timed out coordination request");
   return RedisModule_ReplyWithError(ctx, "Timeout calling command");
 }
 
@@ -288,7 +288,6 @@ static void uvFanoutRequest(struct MRRequestCtx *mc) {
 }
 
 static void uvMapRequest(struct MRRequestCtx *mc) {
-
   MRCtx *mrctx = mc->ctx;
   mrctx->numReplied = 0;
   mrctx->reducer = mc->f;
@@ -353,6 +352,7 @@ int MR_Map(struct MRCtx *ctx, MRReduceFunc reducer, MRCommandGenerator cmds) {
 
   rc->cb = uvMapRequest;
   RQ_Push(&rq_g, rc);
+
   return REDIS_OK;
 }
 

src/module.c

@@ -301,7 +301,7 @@ int searchResultReducer(struct MRCtx *mc, int count, MRReply **replies) {
 
   // got no replies - this means timeout
   if (count == 0 || req->limit < 0) {
-    return RedisModule_ReplyWithError(ctx, "Could not send query to cluter");
+    return RedisModule_ReplyWithError(ctx, "Could not send query to cluster");
   }
 
   long long total = 0;

src/search_cluster.c

@@ -12,7 +12,7 @@ SearchCluster NewSearchCluster(size_t size, const char **table, size_t tableSize
 
 int SearchCluster_RewriteCommandArg(SearchCluster *sc, MRCommand *cmd, int partitionKey, int arg) {
 
-  if (arg < 0) {
+  if (arg < 0 || arg >= cmd->num || partitionKey >= cmd->num) {
     return 0;
   }
 
@@ -33,6 +33,9 @@ int SearchCluster_RewriteCommand(SearchCluster *sc, MRCommand *cmd, int partitio
 
   int sk = -1;
   if ((sk = MRCommand_GetShardingKey(cmd)) >= 0) {
+    if (partitionKey >= cmd->num || sk >= cmd->num) {
+      return 0;
+    }
     // the partition arg is the arg which we select the partition on
     char *partitionArg = cmd->args[partitionKey];
     // the sharding arg is the arg that we will add the partition tag to