durable_rules 0.34.31 → 0.34.32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 695edb93b0911210ca53350c02bc61c77bf9ccd2
-  data.tar.gz: 425666b29236c98d761f50e43a5494f2d6cce21c
+  metadata.gz: df480880781f625f6d6c574922212f450018587e
+  data.tar.gz: 3bfca807e9d3749a23fb7da99ca813fe902ddcda
 SHA512:
-  metadata.gz: 2624ce379aa4e8986b1800c79b4381eb4d0c94dab5e9b070ca14fff4a5ea0bfac37e87c004729c9b27a683de200fd63e79a9c989c2b55c6a068887b9986dce9e
-  data.tar.gz: d296bc9d28874dc3519d5938d10003880338372d834c0215dcbd4342615547af96dbba834af84f2ba938f05a43078eed7e4eae1fb585bb91cef2391381b6eecb
+  metadata.gz: 9aa3ce726b7b4505293a64a05e793b707b94534c282f1d151f68a512bc9f76c41108e26884dd1d5df236e54466e45cd17e4a6f30d20620b24e950836eea26b82
+  data.tar.gz: b650ece290ba8e7135f55a2e7fb175f171a47a47f09b34204746eaa9cd113ef877ad7e947de134d09fcf2c146b73a221fea88e81deebbc1f51af92375454c876

data/src/rules/events.c

@@ -1135,7 +1135,7 @@ static unsigned int handleMessageCore(ruleset *tree,
                                         mid,
                                         message,
                                         jo,
-                                        actionType,
+                                        actionType == ACTION_REMOVE_FACT ? ACTION_RETRACT_FACT : actionType,
                                         evalKeys,
                                         evalCount,
                                         &evalCommand);
@@ -1234,6 +1234,9 @@ static unsigned int handleMessage(ruleset *tree,
                                  NULL, 
                                  NULL, 
                                  JSON_OBJECT_SEQUENCED, 
+                                 actionType == ACTION_ASSERT_FACT || 
+                                 actionType == ACTION_RETRACT_FACT || 
+                                 actionType == ACTION_REMOVE_FACT,
                                  &jo, 
                                  &next);
     if (result != RULES_OK) {
@@ -1272,6 +1275,9 @@ static unsigned int handleMessages(void *handle,
                            NULL, 
                            NULL, 
                            JSON_OBJECT_SEQUENCED,
+                           actionType == ACTION_ASSERT_FACT || 
+                           actionType == ACTION_RETRACT_FACT || 
+                           actionType == ACTION_REMOVE_FACT,
                            &jo,
                            &last) == RULES_OK) {
 

data/src/rules/json.h

@@ -20,6 +20,9 @@
 #define FNV_32_OFFSET_BASIS 0x811c9dc5
 #define FNV_32_PRIME 16777619
 
+#define FNV_64_OFFSET_BASIS 0xcbf29ce484222325
+#define FNV_64_PRIME 1099511628211
+
 unsigned int readNextName(char *start, char **first, char **last, unsigned int *hash);
 unsigned int readNextValue(char *start, char **first, char **last, unsigned char *type);
 unsigned int readNextArrayValue(char *start, char **first, char **last, unsigned char *type);

data/src/rules/net.c

@@ -2377,7 +2377,7 @@ unsigned int formatEvalMessage(void *rulesBinding,
     if (actionType == ACTION_RETRACT_FACT || actionType == ACTION_RETRACT_EVENT) {
         propertiesLength = 0; 
     }
-
+    
     binding *bindingContext = (binding*)rulesBinding;
     time_t currentTime = time(NULL);
     char score[11];
@@ -2467,6 +2467,7 @@ unsigned int formatStoreMessage(void *rulesBinding,
                                 unsigned int keysLength,
                                 char **command) {
     unsigned int propertiesLength = jo->propertiesLength;
+    
     binding *bindingContext = (binding*)rulesBinding;
     char keysLengthString[5];
 #ifdef _WIN32

data/src/rules/state.c

@@ -162,14 +162,85 @@ static stateEntry *getEntry(ruleset *tree, char *sid, unsigned int sidHash) {
     return NULL;
 }
 
-static unsigned int fixupIds(jsonObject *jo) {
+static void insertSortProperties(jsonObject *jo, jsonProperty **properties) {
+    for (unsigned short i = 1; i < jo->propertiesLength; ++i) {
+        unsigned short ii = i; 
+        while (properties[ii]->hash < properties[ii - 1]->hash) {
+            jsonProperty *temp = properties[ii];
+            properties[ii] = properties[ii - 1];
+            properties[ii - 1] = temp;
+            --ii;
+        }
+    }
+}
+
+static void radixSortProperties(jsonObject *jo, jsonProperty **properties) {
+    unsigned char counts[43] = {};
+    for (unsigned char i = 0; i < jo->propertiesLength; ++i) {
+        unsigned char mostSignificant = jo->properties[i].hash / 100000000;
+        ++counts[mostSignificant];
+    }
+
+    unsigned char previousCount = 0;
+    for (unsigned char i = 0; i < 43; ++i) {
+        unsigned char nextCount = counts[i] + previousCount;
+        counts[i] = previousCount;
+        previousCount = nextCount;
+    }
+
+    for (unsigned char i = 0; i < jo->propertiesLength; ++i) {
+        unsigned char mostSignificant = jo->properties[i].hash / 100000000;
+        properties[counts[mostSignificant]] = &jo->properties[i];
+        ++counts[mostSignificant];
+    }
+}
+
+static void calculateId(jsonObject *jo) {
+
+#ifdef _WIN32
+    jsonProperty **properties = (jsonProperty *)_alloca(sizeof(jsonProperty *) * (jo->propertiesLength));
+#else
+    jsonProperty *properties[jo->propertiesLength];
+#endif
+
+    radixSortProperties(jo, properties);
+    insertSortProperties(jo, properties);
+
+    unsigned long long hash = FNV_64_OFFSET_BASIS;
+    for (unsigned short i = 0; i < jo->propertiesLength; ++i) {
+        jsonProperty *property = properties[i];
+        for (unsigned short ii = 0; ii < property->nameLength; ++ii) {
+            hash ^= property->name[ii];
+            hash *= FNV_64_PRIME;
+        }
+
+        unsigned short valueLength = property->valueLength;
+        if (property->type != JSON_STRING) {
+            ++valueLength;
+        }
+
+        for (unsigned short ii = 0; ii < valueLength; ++ii) {
+            hash ^= property->valueString[ii];
+            hash *= FNV_64_PRIME;
+        }
+    }
+
+#ifdef _WIN32
+    sprintf_s(jo->idBuffer, sizeof(char) * 21, "%020llu", hash); 
+#else
+    snprintf(jo->idBuffer, sizeof(char) * 21, "%020llu", hash);
+#endif
+    jo->properties[jo->idIndex].valueLength = 20;
+}
+
+static unsigned int fixupIds(jsonObject *jo, char generateId) {
     jsonProperty *property;
     // id and sid are coerced to strings
     // to avoid unnecessary conversions
     if (jo->sidIndex != UNDEFINED_INDEX && jo->properties[jo->sidIndex].type != JSON_NIL) {
         //coerce value to string
         property = &jo->properties[jo->sidIndex];
-        if (property->type == JSON_DOUBLE || property->type == JSON_INT) {
+        if (property->type != JSON_STRING) {
             ++property->valueLength;
         }
 
@@ -195,7 +266,7 @@ static unsigned int fixupIds(jsonObject *jo) {
     if (jo->idIndex != UNDEFINED_INDEX && jo->properties[jo->idIndex].type != JSON_NIL) {
         //coerce value to string
         property = &jo->properties[jo->idIndex];
-        if (property->type == JSON_DOUBLE || property->type == JSON_INT) {
+        if (property->type != JSON_STRING) {
             ++property->valueLength;
         }
 
@@ -216,6 +287,9 @@ static unsigned int fixupIds(jsonObject *jo) {
         strncpy(property->name, "id", 2);
         property->nameLength = 2;
         property->type = JSON_STRING;
+        if (generateId) {
+            calculateId(jo);
+        }
     }
 
     return RULES_OK;
@@ -225,6 +299,7 @@ unsigned int constructObject(char *root,
                              char *parentName, 
                              char *object,
                              char layout,
+                             char generateId,
                              jsonObject *jo,
                              char **next) {
     char *firstName;
@@ -304,16 +379,17 @@ unsigned int constructObject(char *root,
             } else {
                 
 #ifdef _WIN32
-				char *newParent = (char *)_alloca(sizeof(char)*(nameLength + 1));
+                char *newParent = (char *)_alloca(sizeof(char)*(nameLength + 1));
 #else
-				char newParent[nameLength + 1];
+                char newParent[nameLength + 1];
 #endif
                 strncpy(newParent, firstName, nameLength);
                 newParent[nameLength] = '\0';
                 result = constructObject(root,
                                          newParent, 
                                          first, 
-                                         layout, 
+                                         layout,
+                                         0, 
                                          jo,
                                          next);
                 if (result != RULES_OK) {
@@ -337,7 +413,7 @@ unsigned int constructObject(char *root,
 #ifdef _WIN32
                 char *fullName = (char *)_alloca(sizeof(char)*(fullNameLength + 1));
 #else
-			    char fullName[fullNameLength + 1];
+                char fullName[fullNameLength + 1];
 #endif
                 strncpy(fullName, parentName, parentNameLength);
                 fullName[parentNameLength] = '.';
@@ -346,7 +422,8 @@ unsigned int constructObject(char *root,
                 result = constructObject(root,
                                          fullName, 
                                          first, 
-                                         layout, 
+                                         layout,
+                                         0, 
                                          jo, 
                                          next);
                 if (result != RULES_OK) {
@@ -360,7 +437,7 @@ unsigned int constructObject(char *root,
     }
  
     if (!parentName) {
-        int idResult = fixupIds(jo);
+        int idResult = fixupIds(jo, generateId);
         if (idResult != RULES_OK) {
             return idResult;
         }
@@ -457,6 +534,7 @@ unsigned int refreshState(void *handle,
                              NULL, 
                              NULL, 
                              JSON_OBJECT_HASHED, 
+                             0,
                              &entry->jo, 
                              &next);
     if (result != RULES_OK) {

data/src/rules/state.h

@@ -10,7 +10,7 @@
 #define JSON_OBJECT_SEQUENCED 1
 #define JSON_OBJECT_HASHED 2
 
-#define MAX_OBJECT_PROPERTIES 64
+#define MAX_OBJECT_PROPERTIES 128
 
 typedef struct jsonProperty {
     unsigned int hash;
@@ -29,7 +29,7 @@ typedef struct jsonProperty {
 
 typedef struct jsonObject {
     jsonProperty properties[MAX_OBJECT_PROPERTIES];
-    unsigned int propertiesLength; 
+    unsigned char propertiesLength; 
     unsigned int idIndex; 
     unsigned int sidIndex;
     char sidBuffer[SID_BUFFER_LENGTH];
@@ -58,6 +58,7 @@ unsigned int constructObject(char *root,
                              char *parentName, 
                              char *object,
                              char layout,
+                             char generateId,
                              jsonObject *jo,
                              char **next);
 

metadata

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