durable_rules 0.34.52 → 0.34.53

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 72027204669b6fba94f9092c272f05e27e6d7b1f
-  data.tar.gz: 377a4eb20f2ae9fb966380bdcfb1f91e72b85de4
+  metadata.gz: a01733997ce444fcb2910a67668c5e10b8893161
+  data.tar.gz: 50ee1913a41d48dcd28d7315a32ef8dffa5fb075
 SHA512:
-  metadata.gz: 2b61ad9e9c4343ec0edaa7ebd0cc5d68c9613b206331c1d64eb31c5bde6b5f617d6a7f38ea0181a83e956edebcaa82aab5ad4ecd3d66da1bbba9202f24c621a9
-  data.tar.gz: bd8b882feea47d4ba40f40301e310499c37f3828fb3400a9e766432faf311ca184d936099da9b424c14b073c0c3311d0b6e26f5031f1f1159e455b17962620c3
+  metadata.gz: '077958cc68110cfa8bf9e6354019281d112f0f1ee63b8cc295b95e85af9c9ed22dba29b8c80edb866be8c3d6f37c70bd1151257f7fe492fc49a6fdd930f31574'
+  data.tar.gz: 87f14ddb90146ce93cfed1eaafce9bd720e650c1d121695a324010a7b3a08e28f1d1cfd843b527e0a49b96a39e6fa856d900f00aac6dbfb0803595e3d7fbb2fb

data/src/rules/events.c

@@ -981,6 +981,7 @@ static unsigned int isArrayMatch(ruleset *tree,
         while (top) {
             --top;
             currentAlpha = stack[top];
+            // add all disjunctive nodes to stack
             if (currentAlpha->nextListOffset) {
                 unsigned int *nextList = &tree->nextPool[currentAlpha->nextListOffset];
                 for (unsigned int entry = 0; nextList[entry] != 0; ++entry) {
@@ -1004,6 +1005,7 @@ static unsigned int isArrayMatch(ruleset *tree,
                 }
             }
 
+            // calculate conjunctive nodes
             if (currentAlpha->nextOffset) {
                 unsigned int *nextHashset = &tree->nextPool[currentAlpha->nextOffset];
                 for(unsigned int propertyIndex = 0; propertyIndex < jo.propertiesLength; ++propertyIndex) {
@@ -1013,13 +1015,14 @@ static unsigned int isArrayMatch(ruleset *tree,
                         if (currentProperty->hash == hashNode->value.a.hash) {
                             unsigned char match = 0;
                             if (hashNode->value.a.operator == OP_IALL || hashNode->value.a.operator == OP_IANY) {
+                                // isArrayMatch finds a valid path, thus use propertyMatch
                                 result = isArrayMatch(tree, 
                                                       sid, 
                                                       message,
                                                       messageObject,
                                                       currentProperty, 
                                                       &hashNode->value.a,
-                                                      &match,
+                                                      propertyMatch,
                                                       rulesBinding);
                             } else {
                                 result = isMatch(tree,
@@ -1030,31 +1033,34 @@ static unsigned int isArrayMatch(ruleset *tree,
                                                  &hashNode->value.a,
                                                  &match,
                                                  rulesBinding);
-                            }
 
-                            if (result != RULES_OK) {
-                                return result;
-                            }
+                                if (match) {
+                                    if (top == MAX_STACK_SIZE) {
+                                        return ERR_MAX_STACK_SIZE;
+                                    }
 
-                            if (match) {
-                                if (top == MAX_STACK_SIZE) {
-                                    return ERR_MAX_STACK_SIZE;
+                                    stack[top] = &hashNode->value.a; 
+                                    ++top;
                                 }
+                            }
 
-                                stack[top] = &hashNode->value.a; 
-                                ++top;
+                            if (result != RULES_OK) {
+                                return result;
                             }
                         }
                     }               
                 }
             }
 
-            if ((currentAlpha->betaListOffset || !currentAlpha->nextOffset) && currentAlpha != arrayAlpha) {
+            // no next offset means we found a valid path
+            if (!currentAlpha->nextOffset) {
                 *propertyMatch = 1;
                 break;
             } 
         }
         
+        // OP_IANY, one element led a a valid path
+        // OP_IALL, all elements led to a valid path
         if ((arrayAlpha->operator == OP_IALL && !*propertyMatch) ||
             (arrayAlpha->operator == OP_IANY && *propertyMatch)) {
             break;
@@ -1458,10 +1464,14 @@ static unsigned int handleMessages(ruleset *tree,
                            &jo,
                            &last) == RULES_OK) {
 
-        while (*last != ',' && *last != ']' ) {
+        while (*last != ',' && *last != '\0' ) {
             ++last;
         }
 
+        if (*last == '\0') {
+            --last;
+        }
+
         lastTemp = *last;
         *last = '\0';
         result = handleMessageCore(tree,

data/src/rules/net.c

@@ -2909,6 +2909,7 @@ unsigned int startNonBlockingBatch(void *rulesBinding,
         free(commands[i]);
     }
 
+    sdsfree(reContext->obuf);
     reContext->obuf = newbuf;
     int wdone = 0;
     do {
@@ -2985,6 +2986,7 @@ unsigned int executeBatchWithReply(void *rulesBinding,
         free(commands[i]);
     }
 
+    sdsfree(reContext->obuf);
     reContext->obuf = newbuf;
     redisReply *reply;
     for (unsigned int i = 0; i < replyCount; ++i) {

data/src/rules/rete.c

@@ -816,7 +816,6 @@ static unsigned int validateRuleset(char *rules) {
                     return result;
                 }
             } else if (hash != HASH_COUNT && hash != HASH_PRI && hash != HASH_CAP && hash != HASH_DIST) {
-                printf("%d\n", hash);
                 return ERR_UNEXPECTED_NAME;
             }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: durable_rules
 version: !ruby/object:Gem::Version
-  version: 0.34.52
+  version: 0.34.53
 platform: ruby
 authors:
 - Jesus Ruiz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-08 00:00:00.000000000 Z
+date: 2018-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -44,28 +44,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.1
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.1
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.6
+        version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.6
+        version: '1.4'
 description: A lightweight library for real-time, consistent and scalable coordination
   of events.
 email: jr3791@live.com