durable_rules 0.34.03 → 0.34.04

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e2140bced1252c9b280451f9fc98d586b88af859
-  data.tar.gz: 28c6962e51f7d51d22f26aaa374c5f079e46a91c
+  metadata.gz: c83fbc15f95b38c2777cd335acae30e82d862919
+  data.tar.gz: c03de9b4e41d27382d1edfe54e7ceb61e9d6c489
 SHA512:
-  metadata.gz: c462a03d557ec58f26df72d5c81b6f3026348fa606f75590882a29ef35a4da226337aebff6315695e27dac7d4251937497a7eac778822972ce70a375cfe868bd
-  data.tar.gz: 229e8f7d619835b4c9902f764798b7099fbf0ebe6c5442c36fd4f5aca136a0be488b65c187273dbf2f18b14e88ff821ef48007499fa41a67e71145f19feb8c3f
+  metadata.gz: 001c07ac0b59a773a2b90028c2fd62d5e048747075e7ec00f08c8d7b2bd6e44f1d85cc052fb5ca6b64414219a970bdc614e2af704d3c267ff1c14cbb3d7c81b2
+  data.tar.gz: cef74ba36f48e2492177f03dc41adad33482b3ebaa5139f0775f7d800241c06d55f8e827a7c4be38769217567a9d9d77991a8c4376b4ee1dfbd4d7a97f3406d8

data/src/rules/events.c

@@ -1076,7 +1076,6 @@ static unsigned int handleMessageCore(ruleset *tree,
         commands[*commandCount] = storeCommand;
         ++*commandCount;
     }
-
     char *removeCommand = NULL;
     char *addKeys[MAX_ADD_COUNT];
     unsigned int addCount = 0;

data/src/rules/net.c

@@ -397,7 +397,7 @@ static unsigned int loadTimerCommand(ruleset *tree, binding *rulesBinding) {
     if (asprintf(&lua,
 "local timer_key = \"%s!t\"\n"
 "local timestamp = tonumber(ARGV[1])\n"
-"local res = redis.call(\"zrangebyscore\", timer_key, 0, timestamp, \"limit\", 0, 10)\n"
+"local res = redis.call(\"zrangebyscore\", timer_key, 0, timestamp, \"limit\", 0, 50)\n"
 "if #res > 0 then\n"
 "  for i = 0, #res, 1 do\n"
 "    redis.call(\"zincrby\", timer_key, 10, res[i])\n"
@@ -1755,6 +1755,10 @@ static unsigned int loadEvalMessageCommand(ruleset *tree, binding *rulesBinding)
 "                end\n"
 "                result = result + count\n"
 "                if not is_pure_fact(frame, index) then\n"
+// the mid list might not be cleaned up if the first mid is always valid.
+"                    if (#new_mids %% 10) == 0 then\n"
+"                        cleanup = true\n"
+"                    end\n"
 "                    break\n"
 "                end\n"
 "            end\n"

data/src/rules/state.c

@@ -40,6 +40,10 @@ static unsigned int evictEntry(ruleset *tree) {
 
                 free(current->sid);
                 current->sid = NULL;
+                current->sidHash = 0;
+                current->bindingIndex = 0;
+                current->lastRefresh = 0;
+                current->propertiesLength = 0;
                 found = 1;
             }
         }
@@ -95,6 +99,7 @@ static unsigned char ensureEntry(ruleset *tree, char *sid, unsigned int sidHash,
     unsigned int offset = tree->stateBuckets[bucket];
     stateEntry *current = NULL;
     unsigned char found = 0;
+    // find state entry by sid in hash table
     while (offset != UNDEFINED_HASH_OFFSET) {
         current = &tree->state[offset];
         if (current->sidHash == sidHash) {
@@ -106,28 +111,38 @@ static unsigned char ensureEntry(ruleset *tree, char *sid, unsigned int sidHash,
 
         offset = current->nextHashOffset;
     }  
+
+    // create entry if not found
     if (offset == UNDEFINED_HASH_OFFSET) {
         offset = addEntry(tree, sid, sidHash);
         current = &tree->state[offset];
     }
 
+    // remove entry from lru double linked list
     if (current->prevLruOffset != UNDEFINED_HASH_OFFSET) {
         tree->state[current->prevLruOffset].nextLruOffset = current->nextLruOffset;
+        if (tree->mruStateOffset == offset) {
+            tree->mruStateOffset = current->prevLruOffset;
+        }
     }
 
     if (current->nextLruOffset != UNDEFINED_HASH_OFFSET) {
         tree->state[current->nextLruOffset].prevLruOffset = current->prevLruOffset;
+        if (tree->lruStateOffset == offset) {
+            tree->lruStateOffset = current->nextLruOffset;
+        }
     }
 
-    current->prevLruOffset = tree->mruStateOffset;
+    // attach entry to end of linked list
     current->nextLruOffset = UNDEFINED_HASH_OFFSET;
+    current->prevLruOffset = tree->mruStateOffset;
     if (tree->mruStateOffset == UNDEFINED_HASH_OFFSET) {
         tree->lruStateOffset = offset;
     } else {
         tree->state[tree->mruStateOffset].nextLruOffset = offset;
     }
-
     tree->mruStateOffset = offset;
+
     *result = current;
     return found;
 }
@@ -317,7 +332,7 @@ static unsigned int resolveBindingAndEntry(ruleset *tree,
 
 unsigned int resolveBinding(void *handle, 
                             char *sid, 
-                            void **rulesBinding) {   
+                            void **rulesBinding) {  
     stateEntry *entry = NULL;
     return resolveBindingAndEntry(handle, sid, &entry, rulesBinding);
 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: durable_rules
 version: !ruby/object:Gem::Version
-  version: 0.34.03
+  version: 0.34.04
 platform: ruby
 authors:
 - Jesus Ruiz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-13 00:00:00.000000000 Z
+date: 2016-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake