durable_rules 0.34.23 → 0.34.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8768ac62052cef67e35af9093fe01f64f98e12a3
-  data.tar.gz: 433d781a3bca977fd38ff976e676c57eb2e775dd
+  metadata.gz: 6a4ba28ab92f56567a70857c565e48bffc95e8b5
+  data.tar.gz: e1cbe2d01c35bcadd14084b78d1e96ec5037271c
 SHA512:
-  metadata.gz: 4417b48ff669ba7b601b3dcbfdcf50a3e646f7a9808f27bf484068a493bcd919f34288cf9d3d3c727c28ef6ba6c2af3fb59662c9de9596db16fac5b8b18af2c1
-  data.tar.gz: 9a28d775c90f4428349d23640e9825f66c73469c10dcfa5a8b040a1d20056d38ea2fac2ecd986ffbd748a7689ba127e43ca7c567daef1ffb975415c41eddaa2d
+  metadata.gz: e6606fba477f54cc6f76f8cd384aef942c5840ad206380af8c3b00e0edfb8101839278188063f622da768c4597c5be6e0a26e6ca379bcd44de21556eb644aa48
+  data.tar.gz: 6bfd931f12dc5e24b02f5227d9600c5b9b342d44485e1a47e5ed1a39b85c56fd21ebde19f24c4d075c968b1068ce7c7c153c089ff5e6922dca2c1c5372fb2911

data/src/rules/events.c

@@ -46,7 +46,6 @@
 #define OP_NIL_NIL 0x0707
 
 typedef struct actionContext {
-    unsigned long stateVersion;
     void *rulesBinding;
     redisReply *reply;
 } actionContext;
@@ -1052,14 +1051,15 @@ static unsigned int handleMessageCore(ruleset *tree,
                                       char **commands,
                                       unsigned int *commandCount,
                                       void **rulesBinding) {
-    jsonProperty *midProperty;
+    jsonProperty *midProperty = NULL;
     int midLength; 
-    jsonProperty *sidProperty;
+    jsonProperty *sidProperty = NULL;
     int sidLength;
     char *storeCommand;
-    char *versionCommand;
     int result = getId(properties, sidIndex, &sidProperty, &sidLength);
-    if (result != RULES_OK) {
+    if (result == ERR_NO_ID_DEFINED) {
+        sidLength = 1;
+    } else if (result != RULES_OK) {
         return result;
     }
 #ifdef _WIN32
@@ -1067,19 +1067,27 @@ static unsigned int handleMessageCore(ruleset *tree,
 #else
     char sid[sidLength + 1];
 #endif  
-    strncpy(sid, message + sidProperty->valueOffset, sidLength);
+    if (result == ERR_NO_ID_DEFINED) {
+        *sid = '0';
+    } else {
+        strncpy(sid, message + sidProperty->valueOffset, sidLength);
+    }
     sid[sidLength] = '\0';
-
+    
     result = getId(properties, midIndex, &midProperty, &midLength);
-    if (result != RULES_OK) {
+    if (result == ERR_NO_ID_DEFINED) {
+        midLength = 0;
+    } else if (result != RULES_OK) {
         return result;
     }
 #ifdef _WIN32
     char *mid = (char *)_alloca(sizeof(char)*(midLength + 1));
 #else
     char mid[midLength + 1];
-#endif  
-    strncpy(mid, message + midProperty->valueOffset, midLength);
+#endif
+    if (midLength) {  
+        strncpy(mid, message + midProperty->valueOffset, midLength);
+    }
     mid[midLength] = '\0';
     if (*commandCount == MAX_COMMAND_COUNT) {
         return ERR_MAX_COMMAND_COUNT;
@@ -1093,20 +1101,13 @@ static unsigned int handleMessageCore(ruleset *tree,
             }
         }
 
-        result = formatStoreSession(*rulesBinding, sid, state, 0, &storeCommand, &versionCommand);
+        result = formatStoreSession(*rulesBinding, sid, state, 0, &storeCommand);
         if (result != RULES_OK) {
             return result;
         }
 
         commands[*commandCount] = storeCommand;
         ++*commandCount;
-
-        if (*commandCount == MAX_COMMAND_COUNT) {
-            return ERR_MAX_COMMAND_COUNT;
-        }
-
-        commands[*commandCount] = versionCommand;
-        ++*commandCount;
     }
     char *removeCommand = NULL;
     char *addKeys[MAX_ADD_COUNT];
@@ -1156,7 +1157,6 @@ static unsigned int handleMessageCore(ruleset *tree,
                                         addKeys,
                                         addCount,
                                         &addCommand);
-
             for (unsigned int i = 0; i < addCount; ++i) {
                 free(addKeys[i]);
             }
@@ -1185,6 +1185,7 @@ static unsigned int handleMessageCore(ruleset *tree,
                                         evalKeys,
                                         evalCount,
                                         &evalCommand);
+
             for (unsigned int i = 0; i < evalCount; ++i) {
                 free(evalKeys[i]);
             }
@@ -1224,23 +1225,21 @@ static unsigned int handleMessageCore(ruleset *tree,
 #ifdef _WIN32
             char *stateMessage = (char *)_alloca(sizeof(char)*(36 + sidLength));
             char *newState = (char *)_alloca(sizeof(char)*(12 + sidLength));
-            if (sidProperty->type == JSON_STRING) {
-                sprintf_s(stateMessage, sizeof(char)*(36 + sidLength), "{\"id\":\"$s\", \"sid\":\"%s\", \"$s\":1}", sid);
+            if (sidProperty && sidProperty->type == JSON_STRING) {
+                sprintf_s(stateMessage, sizeof(char)*(26 + sidLength), "{\"sid\":\"%s\", \"$s\":1}", sid);
                 sprintf_s(newState, sizeof(char)*(12 + sidLength), "{\"sid\":\"%s\"}", sid);
-            }
-            else {
-                sprintf_s(stateMessage, sizeof(char)*(36 + sidLength), "{\"id\":\"$s\", \"sid\":%s, \"$s\":1}", sid);
+            } else {
+                sprintf_s(stateMessage, sizeof(char)*(26 + sidLength), "{\"sid\":%s, \"$s\":1}", sid);
                 sprintf_s(newState, sizeof(char)*(12 + sidLength), "{\"sid\":%s}", sid);
             }
 #else
             char stateMessage[36 + sidLength];
             char newState[12 + sidLength];
-            if (sidProperty->type == JSON_STRING) {
-                snprintf(stateMessage, sizeof(char)*(36 + sidLength), "{\"id\":\"$s\", \"sid\":\"%s\", \"$s\":1}", sid);
+            if (sidProperty && sidProperty->type == JSON_STRING) {
+                snprintf(stateMessage, sizeof(char)*(26 + sidLength), "{\"sid\":\"%s\", \"$s\":1}", sid);
                 snprintf(newState, sizeof(char)*(12 + sidLength), "{\"sid\":\"%s\"}", sid);
-            }
-            else {
-                snprintf(stateMessage, sizeof(char)*(36 + sidLength), "{\"id\":\"$s\", \"sid\":%s, \"$s\":1}", sid);
+            } else {
+                snprintf(stateMessage, sizeof(char)*(26 + sidLength), "{\"sid\":%s, \"$s\":1}", sid);
                 snprintf(newState, sizeof(char)*(12 + sidLength), "{\"sid\":%s}", sid);
             }
 #endif
@@ -1249,21 +1248,13 @@ static unsigned int handleMessageCore(ruleset *tree,
                 return ERR_MAX_COMMAND_COUNT;
             }
 
-            result = formatStoreSession(*rulesBinding, sid, newState, 1, &storeCommand, &versionCommand);
+            result = formatStoreSession(*rulesBinding, sid, newState, 1, &storeCommand);
             if (result != RULES_OK) {
                 return result;
             }
 
             commands[*commandCount] = storeCommand;
             ++*commandCount;
-
-            if (*commandCount == MAX_COMMAND_COUNT) {
-                return ERR_MAX_COMMAND_COUNT;
-            }
-
-            commands[*commandCount] = versionCommand;
-            ++*commandCount;
-
             result = handleMessage(tree, 
                                    NULL,
                                    stateMessage,  
@@ -1399,7 +1390,6 @@ static unsigned int handleMessages(void *handle,
 
 static unsigned int handleState(ruleset *tree, 
                                 char *state,
-                                unsigned long stateVersion, 
                                 char **commands,
                                 unsigned int *commandCount,
                                 void **rulesBinding) {
@@ -1414,15 +1404,15 @@ static unsigned int handleState(ruleset *tree,
 
     char *stateMessagePostfix = state + 1;
 #ifdef _WIN32
-    char *stateMessage = (char *)_alloca(sizeof(char)*(40 + stateLength - 1));
+    char *stateMessage = (char *)_alloca(sizeof(char)*(24 + stateLength - 1));
 #else
-    char stateMessage[40 + stateLength - 1];
+    char stateMessage[24 + stateLength - 1];
 #endif
     
 #ifdef _WIN32
-    sprintf_s(stateMessage, sizeof(char)*(40 + stateLength - 1), "{\"id\":\"$v-%016lu\", \"$s\":1, %s", stateVersion, stateMessagePostfix);
+    sprintf_s(stateMessage, sizeof(char)*(24 + stateLength - 1), "{\"$s\":1, %s", stateMessagePostfix);
 #else
-    snprintf(stateMessage, sizeof(char)*(40 + stateLength - 1), "{\"id\":\"$v-%016lu\", \"$s\":1, %s", stateVersion, stateMessagePostfix);
+    snprintf(stateMessage, sizeof(char)*(24 + stateLength - 1), "{\"$s\":1, %s", stateMessagePostfix);
 #endif
     unsigned int result = handleMessage(tree, 
                                         state,
@@ -1679,18 +1669,12 @@ unsigned int assertState(void *handle, char *sid, char *state) {
     char *commands[MAX_COMMAND_COUNT];
     unsigned int commandCount = 0;
     void *rulesBinding = NULL;
-    unsigned long stateVersion;
-    unsigned int result = getStateVersion(handle, sid, &stateVersion);
-    if (result != RULES_OK) {
-        return result;
-    }
 
-    result = handleState(handle, 
-                         state,
-                         stateVersion, 
-                         commands,
-                         &commandCount,
-                         &rulesBinding);
+    unsigned int result = handleState(handle, 
+                                      state, 
+                                      commands,
+                                      &commandCount,
+                                      &rulesBinding);
     if (result != RULES_OK && result != ERR_EVENT_NOT_HANDLED) {
         freeCommands(commands, commandCount);
         return result;
@@ -1737,14 +1721,13 @@ unsigned int startAction(void *handle,
         return result;
     }
 
-    *state = reply->element[2]->str;
-    *messages = reply->element[3]->str;
+    *state = reply->element[1]->str;
+    *messages = reply->element[2]->str;
     actionContext *context = malloc(sizeof(actionContext));
     if (!context) {
         return ERR_OUT_OF_MEMORY;
     }
     
-    context->stateVersion = reply->element[1]->integer;
     context->reply = reply;
     context->rulesBinding = rulesBinding;
     *actionHandle = context;
@@ -1760,10 +1743,8 @@ unsigned int startUpdateState(void *handle,
     char *commands[MAX_COMMAND_COUNT];
     unsigned int result = RULES_OK;
     unsigned int commandCount = 0;
-    unsigned long stateVersion = ((actionContext*)actionHandle)->stateVersion;
     result = handleState(handle, 
-                         state, 
-                         stateVersion,
+                         state,
                          commands,
                          &commandCount,
                          rulesBinding);
@@ -1798,7 +1779,6 @@ unsigned int completeAction(void *handle,
     ++commandCount;
     result = handleState(handle, 
                          state,
-                         context->stateVersion, 
                          commands,
                          &commandCount,
                          &rulesBinding);
@@ -1871,8 +1851,7 @@ unsigned int completeAndStartAction(void *handle,
         return ERR_NO_ACTION_AVAILABLE;
     }
 
-    *messages = newReply->element[2]->str;
-    context->stateVersion = newReply->element[1]->integer;
+    *messages = newReply->element[1]->str;
     context->reply = newReply;
     return RULES_OK;
 }

data/src/rules/net.c

@@ -670,6 +670,7 @@ static unsigned int loadAddMessageCommand(ruleset *tree, binding *rulesBinding)
 "local events_hashset = \"%s!e!\" .. sid\n"
 "local facts_hashset = \"%s!f!\" .. sid\n"
 "local visited_hashset = \"%s!v!\" .. sid\n"
+"local mid_count_hashset = \"%s!c\"\n"
 "local message = {}\n"
 "local primary_message_keys = {}\n"
 "local input_keys = {}\n"
@@ -696,14 +697,19 @@ static unsigned int loadAddMessageCommand(ruleset *tree, binding *rulesBinding)
 "    end\n"
 "end\n"
 "local mid = message[\"id\"]\n"
-"if redis.call(\"hsetnx\", visited_hashset, message[\"id\"], 1) == 0 then\n"
-"    if assert_fact == 0 then\n"
-"        if not redis.call(\"hget\", events_hashset, mid) then\n"
-"            return %d\n"
-"        end\n"
-"    else\n"
-"        if not redis.call(\"hget\", facts_hashset, mid) then\n"
-"            return %d\n"
+"if not mid then\n"
+"    mid = \"$m-\" .. redis.call(\"hincrby\", mid_count_hashset, mid, 1)\n"
+"    message[\"id\"] = mid\n"
+"else\n"
+"    if redis.call(\"hsetnx\", visited_hashset, mid, 1) == 0 then\n"
+"        if assert_fact == 0 then\n"
+"            if not redis.call(\"hget\", events_hashset, mid) then\n"
+"                return %d\n"
+"            end\n"
+"        else\n"
+"            if not redis.call(\"hget\", facts_hashset, mid) then\n"
+"                return %d\n"
+"            end\n"
 "        end\n"
 "    end\n"
 "end\n"
@@ -725,6 +731,7 @@ static unsigned int loadAddMessageCommand(ruleset *tree, binding *rulesBinding)
                 name,
                 name,
                 name,
+                name,
                 ERR_EVENT_OBSERVED,
                 ERR_EVENT_OBSERVED,
                 addMessageLua)  == -1) {
@@ -1059,7 +1066,7 @@ static unsigned int loadPeekActionCommand(ruleset *tree, binding *rulesBinding)
 "        end\n"
 "    end\n"
 "    for i = #packed_frames, 1, -1 do\n"
-"        redis.call(\"rpush\", rule_action_key, packed_frames[i])\n"
+"        redis.call(\"lpush\", rule_action_key, packed_frames[i])\n"
 "    end\n"
 "    if #packed_frames == 0 then\n"
 "        return nil, nil\n"
@@ -1189,12 +1196,11 @@ static unsigned int loadPeekActionCommand(ruleset *tree, binding *rulesBinding)
 "end\n"
 "if frame then\n"
 "    redis.call(\"zadd\", action_key, tonumber(ARGV[1]), new_sid)\n"
-"    local state_version = redis.call(\"hget\", state_key .. \"!v\", new_sid)\n"
 "    if #ARGV == 2 then\n"
 "        local state = redis.call(\"hget\", state_key, new_sid)\n"
-"        return {new_sid, tonumber(state_version), state, cjson.encode({[action_name] = fixup_frame(frame)})}\n"
+"        return {new_sid, state, cjson.encode({[action_name] = fixup_frame(frame)})}\n"
 "    else\n"
-"        return {new_sid, tonumber(state_version), cjson.encode({[action_name] = fixup_frame(frame)})}\n"
+"        return {new_sid, cjson.encode({[action_name] = fixup_frame(frame)})}\n"
 "    end\n"
 "end\n",
                 name,
@@ -1707,6 +1713,7 @@ static unsigned int loadEvalMessageCommand(ruleset *tree, binding *rulesBinding)
 "local visited_hashset = \"%s!v!\" .. sid\n"
 "local actions_key = \"%s!a\"\n"
 "local state_key = \"%s!s\"\n"
+"local mid_count_hashset = \"%s!c\"\n"
 "local queue_action = false\n"
 "local facts_message_cache = {}\n"
 "local events_message_cache = {}\n"
@@ -2143,14 +2150,21 @@ static unsigned int loadEvalMessageCommand(ruleset *tree, binding *rulesBinding)
 "        message[\"$f\"] = 1\n"
 "    end\n"
 "end\n"
-"if redis.call(\"hsetnx\", visited_hashset, mid, 1) == 0 then\n"
-"    if assert_fact == 0 then\n"
-"        if message and redis.call(\"hexists\", events_hashset, mid) == 0 then\n"
-"            return %d\n"
-"        end\n"
-"    else\n"
-"        if message and redis.call(\"hexists\", facts_hashset, mid) == 0 then\n"
-"            return %d\n"
+"if mid == \"\" then\n"
+"    mid = \"$m-\" .. redis.call(\"hincrby\", mid_count_hashset, sid, 1)\n"
+"    if message then\n"
+"        message[\"id\"] = mid\n"
+"    end\n"
+"else\n"
+"    if redis.call(\"hsetnx\", visited_hashset, mid, 1) == 0 then\n"
+"        if assert_fact == 0 then\n"
+"            if message and redis.call(\"hexists\", events_hashset, mid) == 0 then\n"
+"                return %d\n"
+"            end\n"
+"        else\n"
+"            if message and redis.call(\"hexists\", facts_hashset, mid) == 0 then\n"
+"                return %d\n"
+"            end\n"
 "        end\n"
 "    end\n"
 "end\n"
@@ -2163,12 +2177,12 @@ static unsigned int loadEvalMessageCommand(ruleset *tree, binding *rulesBinding)
                  name,
                  name,
                  name,
+                 name,
                  ERR_EVENT_OBSERVED,
                  ERR_EVENT_OBSERVED,
                  lua)  == -1) {
         return ERR_OUT_OF_MEMORY;
     }
-
     free(oldLua);
     unsigned int result = redisAppendCommand(reContext, "SCRIPT LOAD %s", lua);
     GET_REPLY(result, "loadEvalMessageCommand", reply);
@@ -2569,8 +2583,7 @@ unsigned int formatStoreSession(void *rulesBinding,
                                 char *sid, 
                                 char *state,
                                 unsigned char tryExists, 
-                                char **storeCommand,
-                                char **versionCommand) {
+                                char **storeCommand) {
     binding *currentBinding = (binding*)rulesBinding;
 
     int result;
@@ -2580,29 +2593,12 @@ unsigned int formatStoreSession(void *rulesBinding,
                                     currentBinding->sessionHashset, 
                                     sid, 
                                     state);
-        if (result == 0) {
-            return ERR_OUT_OF_MEMORY;
-        }
-
-        result = redisFormatCommand(versionCommand,
-                                    "hsetnx %s!v %s 0", 
-                                    currentBinding->sessionHashset, 
-                                    sid);
     } else {
         result = redisFormatCommand(storeCommand,
                                     "hset %s %s %s", 
                                     currentBinding->sessionHashset, 
                                     sid, 
                                     state);
-
-        if (result == 0) {
-            return ERR_OUT_OF_MEMORY;
-        }
-
-        result = redisFormatCommand(versionCommand,
-                                    "hincrby %s!v %s 1", 
-                                    currentBinding->sessionHashset, 
-                                    sid);
     }
 
     if (result == 0) {
@@ -2894,7 +2890,7 @@ unsigned int peekAction(ruleset *tree, void **bindingContext, redisReply **reply
         }
         
         if ((*reply)->type == REDIS_REPLY_ARRAY) {
-            if ((*reply)->elements < 4) {
+            if ((*reply)->elements < 3) {
                 freeReplyObject(*reply);
                 return ERR_REDIS_ERROR;       
             }

data/src/rules/net.h

@@ -74,8 +74,7 @@ unsigned int formatStoreSession(void *rulesBinding,
                                 char *sid, 
                                 char *state, 
                                 unsigned char tryExists,
-                                char **storeCommand,
-                                char **versionCommand);
+                                char **storeCommand);
 
 unsigned int formatStoreSessionFact(void *rulesBinding, 
                                     char *sid, 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: durable_rules
 version: !ruby/object:Gem::Version
-  version: 0.34.23
+  version: 0.34.24
 platform: ruby
 authors:
 - Jesus Ruiz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-05 00:00:00.000000000 Z
+date: 2017-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake