durable_rules 0.34.32 → 0.34.34

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: df480880781f625f6d6c574922212f450018587e
-  data.tar.gz: 3bfca807e9d3749a23fb7da99ca813fe902ddcda
+  metadata.gz: d23a2b69698c386b592b25d31c9047e011bafa47
+  data.tar.gz: 82c5f1f4a37e88c0e4a6ff60364bb93cb735a812
 SHA512:
-  metadata.gz: 9aa3ce726b7b4505293a64a05e793b707b94534c282f1d151f68a512bc9f76c41108e26884dd1d5df236e54466e45cd17e4a6f30d20620b24e950836eea26b82
-  data.tar.gz: b650ece290ba8e7135f55a2e7fb175f171a47a47f09b34204746eaa9cd113ef877ad7e947de134d09fcf2c146b73a221fea88e81deebbc1f51af92375454c876
+  metadata.gz: 6d2156f08e81ac88bbc2ed931780e0d7f558af066484e8c2f7c1d1dac143b770ef2b4d4da8bcd0f7a6119b9dfa1e80e8c14ad6ff8b471bb520924973ae66a759
+  data.tar.gz: 4ddda7262500bd9f504766f62f1880e14380612718c43243ae88416a8d5d8eef5b9a63e99ac905252c8c9a44214daf62bea8c24a36c3aa59e7b483cdb71f26df

data/librb/durable.rb

@@ -145,9 +145,6 @@ module Durable
       return Expression.new(@name, @left).imatches(other)
     end
 
-    def ref_id(sid)
-      Arithmetic.new @name, @left, sid
-    end
 
     private 
 
@@ -188,6 +185,7 @@ module Durable
     
     def definition(parent_name=nil)
       new_definition = nil
+
       if @__op == :$or || @__op == :$and
         new_definition = {@__op => @definitions}
       else
@@ -202,7 +200,11 @@ module Durable
         if @__op == :$eq
           new_definition = {@left => righ_definition}
         else
-          new_definition = {@__op => {@left => righ_definition}}
+          if not @right
+            new_definition = {@__type => @left}
+          else
+            new_definition = {@__op => {@left => righ_definition}}
+          end
         end
       end
 
@@ -283,6 +285,22 @@ module Durable
       self
     end
 
+    def +(other)
+      return Arithmetic.new(@__type, @left, nil, :$add, other)
+    end
+
+    def -(other)
+      return Arithmetic.new(@__type, @left, nil, :$sub, other)
+    end
+
+    def *(other)
+      return Arithmetic.new(@__type, @left, nil, :$mul, other)
+    end
+
+    def /(other)
+      return Arithmetic.new(@__type, @left, nil, :$div, other)
+    end
+
     private 
 
     def default(name, value=nil)
@@ -415,7 +433,7 @@ module Durable
     end
 
     def s
-      Arithmetic.new(:$s)
+      Expression.new(:$s)
     end
     
     def m
@@ -443,6 +461,10 @@ module Durable
       expression == name
     end
     
+    def sref(sid = nil)
+      Arithmetic.new :$s, nil, sid
+    end
+
     protected
 
     def get_options(*args)

data/src/rules/events.c

@@ -37,8 +37,8 @@
 #define OP_STRING_DOUBLE 0x0103
 #define OP_STRING_STRING 0x0101
 #define OP_STRING_NIL 0x0107
-#define OP_STRING_REGEX 0x010C
-#define OP_STRING_IREGEX 0x010D
+#define OP_STRING_REGEX 0x010E
+#define OP_STRING_IREGEX 0x010F
 #define OP_NIL_BOOL 0x0704
 #define OP_NIL_INT 0x0702
 #define OP_NIL_DOUBLE 0x0703
@@ -68,12 +68,14 @@ static unsigned int handleMessage(ruleset *tree,
                                   unsigned int *commandCount,
                                   void **rulesBinding);
 
-static unsigned int reduceStateIdiom(ruleset *tree, 
-                                     char *sid,
-                                     unsigned int idiomOffset,
-                                     char **state,
-                                     unsigned char *releaseState,
-                                     jsonProperty **targetValue);
+static unsigned int reduceIdiom(ruleset *tree, 
+                                char *sid,
+                                char *message,
+                                jsonObject *messageObject,
+                                unsigned int idiomOffset,
+                                char **state,
+                                unsigned char *releaseState,
+                                jsonProperty **targetValue);
 
 static unsigned char compareBool(unsigned char left, 
                                  unsigned char right, 
@@ -418,6 +420,8 @@ static unsigned int handleBeta(ruleset *tree,
 
 static unsigned int valueToProperty(ruleset *tree,
                                     char *sid,
+                                    char *message,
+                                    jsonObject *messageObject,
                                     jsonValue *sourceValue, 
                                     char **state,
                                     unsigned char *releaseState,
@@ -426,22 +430,35 @@ static unsigned int valueToProperty(ruleset *tree,
     unsigned int result = RULES_OK;
     *releaseState = 0;
     switch(sourceValue->type) {
+        case JSON_EVENT_LOCAL_IDIOM:
         case JSON_STATE_IDIOM:
-            result = reduceStateIdiom(tree, 
-                                    sid, 
-                                    sourceValue->value.idiomOffset,
-                                    state,
-                                    releaseState,
-                                    targetProperty);
+            result = reduceIdiom(tree, 
+                                 sid, 
+                                 message,
+                                 messageObject,
+                                 sourceValue->value.idiomOffset,
+                                 state,
+                                 releaseState,
+                                 targetProperty);
 
             return result;
+        case JSON_EVENT_LOCAL_PROPERTY:
+            for (unsigned short i = 0; i < messageObject->propertiesLength; ++i) {
+                if (sourceValue->value.property.nameHash == messageObject->properties[i].hash) {
+                    *targetProperty = &messageObject->properties[i];
+                    rehydrateProperty(*targetProperty, message);
+                    return RULES_OK;
+                } 
+            }
+
+            return ERR_PROPERTY_NOT_FOUND;
         case JSON_STATE_PROPERTY:
             if (sourceValue->value.property.idOffset) {
                 sid = &tree->stringPool[sourceValue->value.property.idOffset];
             }
             result = fetchStateProperty(tree, 
                                         sid, 
-                                        sourceValue->value.property.hash, 
+                                        sourceValue->value.property.nameHash, 
                                         MAX_STATE_PROPERTY_TIME, 
                                         0,
                                         state,
@@ -455,7 +472,7 @@ static unsigned int valueToProperty(ruleset *tree,
 
                 result = fetchStateProperty(tree, 
                                             sid, 
-                                            sourceValue->value.property.hash, 
+                                            sourceValue->value.property.nameHash, 
                                             MAX_STATE_PROPERTY_TIME, 
                                             0,
                                             state,
@@ -498,7 +515,7 @@ static unsigned int reduceProperties(unsigned char operator,
     char rightTemp = 0;
     if (leftProperty->type == JSON_STRING || rightProperty->type == JSON_STRING) {
         if (operator != OP_ADD) {
-            *state = (char*)calloc(1, sizeof(char));
+            *state = (char *)calloc(1, sizeof(char));
             if (!*state) {
                 return ERR_OUT_OF_MEMORY;
             }
@@ -629,12 +646,14 @@ static unsigned int reduceProperties(unsigned char operator,
     return RULES_OK;
 }
 
-static unsigned int reduceStateIdiom(ruleset *tree, 
-                                     char *sid,
-                                     unsigned int idiomOffset,
-                                     char **state,
-                                     unsigned char *releaseState,
-                                     jsonProperty **targetValue) {
+static unsigned int reduceIdiom(ruleset *tree, 
+                                char *sid,
+                                char *message,
+                                jsonObject *messageObject,
+                                unsigned int idiomOffset,
+                                char **state,
+                                unsigned char *releaseState,
+                                jsonProperty **targetValue) {
     unsigned int result = RULES_OK;
     *releaseState = 0;
     idiom *currentIdiom = &tree->idiomPool[idiomOffset];
@@ -644,6 +663,8 @@ static unsigned int reduceStateIdiom(ruleset *tree,
     char *leftState = NULL;
     result = valueToProperty(tree,
                              sid,
+                             message,
+                             messageObject,
                              &currentIdiom->left,
                              &leftState,
                              &releaseLeftState,
@@ -658,6 +679,8 @@ static unsigned int reduceStateIdiom(ruleset *tree,
     char *rightState = NULL;
     result = valueToProperty(tree,
                              sid,
+                             message,
+                             messageObject,
                              &currentIdiom->right,
                              &rightState,
                              &releaseRightState,
@@ -696,6 +719,7 @@ static unsigned int reduceStateIdiom(ruleset *tree,
 static unsigned int isMatch(ruleset *tree,
                             char *sid,
                             char *message,
+                            jsonObject *messageObject,
                             jsonProperty *currentProperty, 
                             alpha *currentAlpha,
                             unsigned char *propertyMatch,
@@ -717,6 +741,8 @@ static unsigned int isMatch(ruleset *tree,
     char *rightState = NULL;
     result = valueToProperty(tree,
                              sid,
+                             message,
+                             messageObject,
                              &currentAlpha->right,
                              &rightState,
                              &releaseRightState,
@@ -939,6 +965,7 @@ static unsigned int handleAlpha(ruleset *tree,
 
                 if (!exists) {
                     if (top == MAX_STACK_SIZE) {
+                        printf("exiting 1\n");
                         return ERR_MAX_STACK_SIZE;
                     }
                     
@@ -959,7 +986,6 @@ static unsigned int handleAlpha(ruleset *tree,
                             if (top == MAX_STACK_SIZE) {
                                 return ERR_MAX_STACK_SIZE;
                             }
-
                             stack[top] = &hashNode->value.a; 
                             ++top;
                         } else {
@@ -967,6 +993,7 @@ static unsigned int handleAlpha(ruleset *tree,
                             unsigned int mresult = isMatch(tree, 
                                                            sid, 
                                                            message,
+                                                           jo,
                                                            currentProperty, 
                                                            &hashNode->value.a,
                                                            &match,
@@ -974,6 +1001,7 @@ static unsigned int handleAlpha(ruleset *tree,
                             if (mresult != RULES_OK){
                                 return mresult;
                             }
+
                             if (match) {
                                 if (top == MAX_STACK_SIZE) {
                                     return ERR_MAX_STACK_SIZE;

data/src/rules/json.h

@@ -12,10 +12,12 @@
 #define JSON_NIL 0x07
 #define JSON_STATE_PROPERTY 0x08
 #define JSON_EVENT_PROPERTY 0x09
-#define JSON_STATE_IDIOM 0x0A
-#define JSON_EVENT_IDIOM 0x0B
-#define JSON_REGEX 0x0C
-#define JSON_IREGEX 0x0D
+#define JSON_EVENT_LOCAL_PROPERTY 0x0A
+#define JSON_STATE_IDIOM 0x0B
+#define JSON_EVENT_IDIOM 0x0C
+#define JSON_EVENT_LOCAL_IDIOM 0x0D
+#define JSON_REGEX 0x0E
+#define JSON_IREGEX 0x0F
 
 #define FNV_32_OFFSET_BASIS 0x811c9dc5
 #define FNV_32_PRIME 16777619

data/src/rules/net.c

@@ -104,6 +104,13 @@ static unsigned int createIdiom(ruleset *tree, jsonValue *newValue, char **idiom
                 return ERR_OUT_OF_MEMORY;
             }
             break;
+        case JSON_EVENT_LOCAL_PROPERTY:
+            rightProperty = &tree->stringPool[newValue->value.property.nameOffset];
+            if (asprintf(idiomString, "message[\"%s\"]", rightProperty) == -1) {
+                return ERR_OUT_OF_MEMORY;
+            }
+            break;
+        case JSON_EVENT_LOCAL_IDIOM:
         case JSON_EVENT_IDIOM:
             newIdiom = &tree->idiomPool[newValue->value.idiomOffset];
             char *op = "";
@@ -577,6 +584,7 @@ static unsigned int loadDeleteSessionCommand(ruleset *tree, binding *rulesBindin
 "        redis.call(\"del\", all_keys[i])\n"
 "    end\n"
 "end\n"
+"redis.call(\"hdel\", \"%s!p\", ARGV[2])\n"
 "redis.call(\"hdel\", \"%s!c\", sid)\n"
 "redis.call(\"hdel\", \"%s!s\", sid)\n"
 "redis.call(\"hdel\", \"%s!s!v\", sid)\n"
@@ -589,6 +597,7 @@ static unsigned int loadDeleteSessionCommand(ruleset *tree, binding *rulesBindin
                 name,
                 name,
                 name,
+                name,
                 name, 
                 name,
                 name, 
@@ -2136,6 +2145,7 @@ static unsigned int loadEvalMessageCommand(ruleset *tree, binding *rulesBinding)
                  lua)  == -1) {
         return ERR_OUT_OF_MEMORY;
     }
+    
     free(oldLua);
     unsigned int result = redisAppendCommand(reContext, "SCRIPT LOAD %s", lua);
     GET_REPLY(result, "loadEvalMessageCommand", reply);
@@ -2183,6 +2193,17 @@ static unsigned int setNames(ruleset *tree, binding *rulesBinding) {
     eventsHashset[nameLength + 2] = '\0';
     rulesBinding->eventsHashset = eventsHashset;
 
+    char *partitionHashset = malloc((nameLength + 3) * sizeof(char));
+    if (!partitionHashset) {
+        return ERR_OUT_OF_MEMORY;
+    }
+
+    strncpy(partitionHashset, name, nameLength);
+    partitionHashset[nameLength] = '!';
+    partitionHashset[nameLength + 1] = 'p';
+    partitionHashset[nameLength + 2] = '\0';
+    rulesBinding->partitionHashset = partitionHashset;
+
     char *timersSortedset = malloc((nameLength + 3) * sizeof(char));
     if (!timersSortedset) {
         return ERR_OUT_OF_MEMORY;
@@ -2352,7 +2373,7 @@ unsigned int getBindingIndex(ruleset *tree, unsigned int sidHash, unsigned int *
     redisContext *reContext = firstBinding->reContext;
 
     int result = redisAppendCommand(reContext, 
-                                    "evalsha %s 0 %d %d", 
+                                    "evalsha %s 0 %u %d", 
                                     firstBinding->partitionHash, 
                                     sidHash, 
                                     list->bindingsLength);
@@ -3018,15 +3039,28 @@ unsigned int getSessionVersion(void *rulesBinding, char *sid, unsigned long *sta
     return REDIS_OK;
 }
 
-unsigned int deleteSession(void *rulesBinding, char *sid) {
+unsigned int deleteSession(ruleset *tree, void *rulesBinding, char *sid, unsigned int sidHash) {
     binding *currentBinding = (binding*)rulesBinding;
     redisContext *reContext = currentBinding->reContext; 
 
     int result = redisAppendCommand(reContext, 
-                                    "evalsha %s 0 %s", 
+                                    "evalsha %s 0 %s %u", 
                                     currentBinding->deleteSessionHash,
-                                    sid); 
+                                    sid,
+                                    sidHash); 
     VERIFY(result, "deleteSession");  
+
+    bindingsList *list = tree->bindingsList;
+    binding *firstBinding = &list->bindings[0];
+    if (firstBinding != currentBinding) {
+        reContext = firstBinding->reContext;
+        result = redisAppendCommand(reContext, 
+                                    "hdel %s %u", 
+                                    firstBinding->partitionHashset,
+                                    sidHash);
+        VERIFY(result, "deleteSession");
+    }
+
     return REDIS_OK;
 }
 

data/src/rules/net.h

@@ -33,6 +33,7 @@ typedef struct binding {
     functionHash removeTimerHash;
     functionHash updateActionHash;
     functionHash deleteSessionHash;
+    char *partitionHashset;
     char *sessionHashset;
     char *factsHashset;
     char *eventsHashset;
@@ -153,8 +154,10 @@ unsigned int getSessionVersion(void *rulesBinding,
                                char *sid, 
                                unsigned long *stateVersion);
 
-unsigned int deleteSession(void *rulesBinding, 
-                           char *sid);
+unsigned int deleteSession(ruleset *tree,
+                           void *rulesBinding, 
+                           char *sid,
+                           unsigned int sidHash);
 
 unsigned int updateAction(void *rulesBinding, 
                           char *sid);

data/src/rules/rete.c

@@ -26,6 +26,7 @@
 #define HASH_OR 340911698 // $or
 #define HASH_AND 3746487396 // $and
 #define HASH_S 1186729920 // $s
+#define HASH_M 1690058490 // $m
 #define HASH_NAME 2369371622 // name 
 #define HASH_ADD 4081054038 // $add
 #define HASH_SUB 1040718071 // $sub
@@ -304,13 +305,15 @@ static unsigned int copyValue(ruleset *tree,
     char temp;
     switch(type) {
         case JSON_EVENT_PROPERTY:
+        case JSON_EVENT_LOCAL_PROPERTY:
         case JSON_STATE_PROPERTY:
-            right->value.property.hash = ref->hash;
+            right->value.property.nameHash = ref->nameHash;
             right->value.property.nameOffset = ref->nameOffset;
             right->value.property.idOffset = ref->idOffset;
             break;
         case JSON_STATE_IDIOM:
         case JSON_EVENT_IDIOM:
+        case JSON_EVENT_LOCAL_IDIOM:
             right->value.idiomOffset = idiomOffset;
             break;
         case JSON_STRING:
@@ -373,8 +376,9 @@ static unsigned char compareValue(ruleset *tree,
     char temp;
     switch(type) {
         case JSON_EVENT_PROPERTY:
+        case JSON_EVENT_LOCAL_PROPERTY:
         case JSON_STATE_PROPERTY:
-            if (right->value.property.hash == ref->hash &&
+            if (right->value.property.nameHash == ref->nameHash &&
                 right->value.property.nameOffset == ref->nameOffset &&
                 right->value.property.idOffset == ref->idOffset)
                 return 1;
@@ -382,6 +386,7 @@ static unsigned char compareValue(ruleset *tree,
             return 0;
         case JSON_STATE_IDIOM:
         case JSON_EVENT_IDIOM:
+        case JSON_EVENT_LOCAL_IDIOM:
             return 0;
         case JSON_STRING:
             {
@@ -456,6 +461,11 @@ static unsigned int validateReference(char *rule, unsigned char *referenceType)
 
     if (hash != HASH_S) {
         *referenceType = JSON_EVENT_PROPERTY;
+
+        if (hash == HASH_M) {
+             *referenceType = JSON_EVENT_LOCAL_PROPERTY;
+        }
+
         result = readNextString(last, &first, &last, &hash);
         if (result != PARSE_OK) {
             return result;
@@ -531,7 +541,8 @@ static unsigned int validateIdiom(char *rule, unsigned char *idiomType) {
             }
 
             if (newIdiomType == JSON_EVENT_PROPERTY || newIdiomType == JSON_EVENT_IDIOM) {
-                if (*idiomType == JSON_STATE_PROPERTY || *idiomType == JSON_STATE_IDIOM) {
+                if (*idiomType == JSON_STATE_PROPERTY || *idiomType == JSON_STATE_IDIOM ||
+                    *idiomType == JSON_EVENT_LOCAL_PROPERTY || *idiomType == JSON_EVENT_LOCAL_PROPERTY) {
                     return ERR_UNEXPECTED_TYPE;
                 }
 
@@ -539,13 +550,23 @@ static unsigned int validateIdiom(char *rule, unsigned char *idiomType) {
             } 
 
             if (newIdiomType == JSON_STATE_PROPERTY || newIdiomType == JSON_STATE_IDIOM) {
-                if (*idiomType == JSON_EVENT_PROPERTY || *idiomType == JSON_EVENT_IDIOM) {
+                if (*idiomType == JSON_EVENT_PROPERTY || *idiomType == JSON_EVENT_IDIOM ||
+                    *idiomType == JSON_EVENT_LOCAL_PROPERTY || *idiomType == JSON_EVENT_LOCAL_IDIOM) {
                     return ERR_UNEXPECTED_TYPE;
                 }
 
                 *idiomType = JSON_STATE_IDIOM;
             }                    
 
+            if (newIdiomType == JSON_EVENT_LOCAL_PROPERTY || newIdiomType == JSON_EVENT_LOCAL_IDIOM) {
+                if (*idiomType == JSON_STATE_PROPERTY || *idiomType == JSON_STATE_IDIOM ||
+                    *idiomType == JSON_EVENT_PROPERTY || *idiomType == JSON_EVENT_PROPERTY) {
+                    return ERR_UNEXPECTED_TYPE;
+                }
+
+                *idiomType = JSON_EVENT_IDIOM;
+            }
+
             if (hash != HASH_L && hash != HASH_R) {
                 return ERR_UNEXPECTED_NAME;
             }
@@ -857,8 +878,12 @@ static unsigned int readReference(ruleset *tree, char *rule, unsigned char *idio
             return result;
         }  
 
+        if (hash == HASH_M) {
+            *idiomType = JSON_EVENT_LOCAL_PROPERTY;
+        }
+
         readNextString(last, &first, &last, &hash);
-        ref->hash = hash;
+        ref->nameHash = hash;
         result = storeString(tree, first, &ref->nameOffset, last - first);
         if (result != RULES_OK) {
             return result;
@@ -866,7 +891,7 @@ static unsigned int readReference(ruleset *tree, char *rule, unsigned char *idio
     } else {
         *idiomType = JSON_STATE_PROPERTY;
         if (readNextString(last, &first, &last, &hash) == PARSE_OK) {
-            ref->hash = hash;
+            ref->nameHash = hash;
             result = storeString(tree, first, &ref->nameOffset, last - first);
             if (result != RULES_OK) {
                 return result;
@@ -879,7 +904,7 @@ static unsigned int readReference(ruleset *tree, char *rule, unsigned char *idio
                 switch (hash) {
                     case HASH_NAME:
                         readNextString(last, &first, &last, &hash);
-                        ref->hash = hash;
+                        ref->nameHash = hash;
                         result = storeString(tree, first, &ref->nameOffset, last - first);
                         if (result != RULES_OK) {
                             return result;
@@ -898,7 +923,7 @@ static unsigned int readReference(ruleset *tree, char *rule, unsigned char *idio
                                 return result;
                             } 
                         }
-
+                        
                         break;
                     default:
                         readNextValue(last, &first, &last, &type);
@@ -968,6 +993,10 @@ static unsigned int readIdiom(ruleset *tree, char *rule, unsigned char *idiomTyp
                 *idiomType = JSON_EVENT_IDIOM;  
             }
 
+            if (*idiomType != JSON_EVENT_IDIOM && (type == JSON_EVENT_LOCAL_PROPERTY || type == JSON_EVENT_LOCAL_IDIOM)) {
+                *idiomType = JSON_EVENT_LOCAL_IDIOM;  
+            }
+
             // newIdiom address might have changed after readIdiom
             newIdiom = &tree->idiomPool[*idiomOffset];
             switch (hash) {

data/src/rules/rete.h

@@ -29,7 +29,7 @@
 #define NODE_M_OFFSET 0
 
 typedef struct reference {
-    unsigned int hash;
+    unsigned int nameHash;
     unsigned int nameOffset;
     unsigned int idOffset;
 } reference;

data/src/rules/state.c

@@ -175,7 +175,9 @@ static void insertSortProperties(jsonObject *jo, jsonProperty **properties) {
 }
 
 static void radixSortProperties(jsonObject *jo, jsonProperty **properties) {
-    unsigned char counts[43] = {};
+    unsigned char counts[43];
+    memset(counts, 0, 43 * sizeof(char));
+
     for (unsigned char i = 0; i < jo->propertiesLength; ++i) {
         unsigned char mostSignificant = jo->properties[i].hash / 100000000;
         ++counts[mostSignificant];
@@ -615,5 +617,6 @@ unsigned int deleteState(void *handle, char *sid) {
       return result;
     }
 
-    return deleteSession(rulesBinding, sid);
+    unsigned int sidHash = fnv1Hash32(sid, strlen(sid));
+    return deleteSession(handle, rulesBinding, sid, sidHash);
 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: durable_rules
 version: !ruby/object:Gem::Version
-  version: 0.34.32
+  version: 0.34.34
 platform: ruby
 authors:
 - Jesus Ruiz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-28 00:00:00.000000000 Z
+date: 2017-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake