Performance improvements. Bump to 1.2.7

jagi · Dec 16, 2015 · 1c1fe3a · 1c1fe3a
1 parent 66ac688
commit 1c1fe3a
Show file tree

Hide file tree

Showing 10 changed files with 240 additions and 15 deletions.
diff --git a/HISTORY.md b/HISTORY.md
@@ -1,3 +1,7 @@
+# 1.2.7 (2015-12-16)
+
+- Performance improvements
+
 # 1.2.6 (2015-12-02)
 
 - Fix a bug with modifiers when setting object using a reference

diff --git a/lib/modules/core/base_class.js b/lib/modules/core/base_class.js
@@ -5,9 +5,6 @@ var BaseClass = Astro.BaseClass = function BaseClass(attrs) {
 
   // Add the private "_modifiers" property to track changes made on the document.
   doc._modifiers = {};
-  // Add the private "_original" property to store the original document before
-  // modifications.
-  doc._original = {};
 
   // Trigger the "beforeInit" event handlers.
   event = new Astro.Event('beforeInit', attrs);
@@ -43,3 +40,22 @@ var BaseClass = Astro.BaseClass = function BaseClass(attrs) {
   event.target = doc;
   Class.emitEvent(event);
 };
+
+// Add the "_original" property for backward compatibility that will be lazy
+// executed.
+Object.defineProperty(BaseClass.prototype, '_original', {
+  get: function() {
+    var doc = this;
+    var Class = doc.constructor;
+
+    if (doc._id) {
+      var originalDoc = Class.findOne(doc._id);
+    } else {
+      var originalDoc = new Class();
+    }
+
+    return originalDoc;
+  },
+  enumerable: false,
+  configurable: false
+});
diff --git a/lib/modules/core/config.js b/lib/modules/core/config.js
@@ -1,4 +1,5 @@
 Astro.config = {
   verbose: true,
-  disableTransform: false
+  disableTransform: false,
+  triggerEvents: true
 };
diff --git a/lib/modules/events/init_class.js b/lib/modules/events/init_class.js
@@ -9,6 +9,10 @@ classMethods.hasEvent = function(eventName, eventHandler) {
 };
 
 classMethods.emitEvent = function(event) {
+  if (!Astro.config.triggerEvents) {
+    return;
+  }
+
   if (!event) {
     return;
   }

diff --git a/lib/modules/fields/ejson.js b/lib/modules/fields/ejson.js
@@ -10,7 +10,6 @@ events.toJSONValue = function(e) {
   });
 
   var json = {
-    original: EJSON.stringify(doc._original),
     modifiers: EJSON.stringify(doc._modifiers),
     values: EJSON.stringify(values)
   };
@@ -22,7 +21,6 @@ events.fromJSONValue = function(e) {
   var doc = this;
   var json = e.data;
 
-  doc._original = EJSON.parse(json.original);
   doc._modifiers = EJSON.parse(json.modifiers);
   _.extend(doc, EJSON.parse(json.values));
 };

diff --git a/lib/modules/fields/modified.js b/lib/modules/fields/modified.js
@@ -18,7 +18,7 @@ proto.getModified = function(old) {
     if (field.transient) {
       return;
     }
-    // If a value differs from the value in the "_original" object then it means
+    // If a value differs from the value in the original object then it means
     // that fields was modified from the last save.
     if (!EJSON.equals(originalDoc[fieldName], doc[fieldName])) {
       // Take a value before or after modification.

diff --git a/lib/modules/fields/modifiers.js b/lib/modules/fields/modifiers.js
@@ -175,6 +175,13 @@ proto._hasModifier = function(modifier, fieldName) {
 
 proto._getModifier = function(modifierName, fieldName) {
   var doc = this;
+  var Class = doc.constructor;
+
+  if (doc._id) {
+    var originalDoc = Class.findOne(doc._id);
+  } else {
+    var originalDoc = new Class();
+  }
 
   var result = {};
 
@@ -187,7 +194,7 @@ proto._getModifier = function(modifierName, fieldName) {
       // Get an original value of the field.
       var originalValue;
       Astro.utils.fields.traverseNestedDocs(
-        doc._original,
+        originalDoc,
         fieldName,
         function(nestedField, nestedFieldName, Class, field, index) {
           originalValue = _.isUndefined(index) ?

diff --git a/lib/modules/storage/init_definition.js b/lib/modules/storage/init_definition.js
@@ -114,10 +114,6 @@ prototypeMethods.save = function(fieldsNames, callback) {
   event.target = doc;
   Class.emitEvent(event);
 
-  // Copy values to the "_original" property.
-  _.each(fieldsNames, function(fieldName) {
-    doc._original[fieldName] = EJSON.clone(doc[fieldName]);
-  });
   // Clear a modifier.
   doc._clearModifiers();
 
@@ -203,7 +199,6 @@ prototypeMethods.copy = function(save) {
   // Remove the "_id" value and set the "_isNew" flag to false so that it will
   // save the object as a new document instead updating the old one.
   copy._id = null;
-  copy._original._id = null;
   copy._isNew = true;
 
   if (save) {

diff --git a/package.js b/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: 'Model layer for Meteor',
-  version: '1.2.6',
+  version: '1.2.7',
   name: 'jagi:astronomy',
   git: 'https://github.com/jagi/meteor-astronomy.git'
 });

diff --git a/test/events/events_order.js b/test/events/events_order.js
@@ -128,7 +128,107 @@ Tinytest.add('Events - Order', function(test) {
     'beforeSave',
     'beforeSave global',
     'beforeUpdate',
-    'beforeUpdate global'
+    'beforeUpdate global',
+    'beforeInit',
+    'beforeInit global',
+    'beforeChange (_id)',
+    'beforeChange global (_id)',
+    'beforeSet (_id)',
+    'beforeSet global (_id)',
+    'afterSet (_id)',
+    'afterSet global (_id)',
+    'afterChange (_id)',
+    'afterChange global (_id)',
+    'beforeChange (childField)',
+    'beforeChange global (childField)',
+    'beforeSet (childField)',
+    'beforeSet global (childField)',
+    'afterSet (childField)',
+    'afterSet global (childField)',
+    'afterChange (childField)',
+    'afterChange global (childField)',
+    'afterInit',
+    'afterInit global',
+    'beforeInit',
+    'beforeInit global',
+    'beforeChange (_id)',
+    'beforeChange global (_id)',
+    'beforeSet (_id)',
+    'beforeSet global (_id)',
+    'afterSet (_id)',
+    'afterSet global (_id)',
+    'afterChange (_id)',
+    'afterChange global (_id)',
+    'beforeChange (childField)',
+    'beforeChange global (childField)',
+    'beforeSet (childField)',
+    'beforeSet global (childField)',
+    'afterSet (childField)',
+    'afterSet global (childField)',
+    'afterChange (childField)',
+    'afterChange global (childField)',
+    'afterInit',
+    'afterInit global',
+    'beforeInit',
+    'beforeInit global',
+    'beforeChange (_id)',
+    'beforeChange global (_id)',
+    'beforeSet (_id)',
+    'beforeSet global (_id)',
+    'afterSet (_id)',
+    'afterSet global (_id)',
+    'afterChange (_id)',
+    'afterChange global (_id)',
+    'beforeChange (childField)',
+    'beforeChange global (childField)',
+    'beforeSet (childField)',
+    'beforeSet global (childField)',
+    'afterSet (childField)',
+    'afterSet global (childField)',
+    'afterChange (childField)',
+    'afterChange global (childField)',
+    'afterInit',
+    'afterInit global',
+    'beforeInit',
+    'beforeInit global',
+    'beforeChange (_id)',
+    'beforeChange global (_id)',
+    'beforeSet (_id)',
+    'beforeSet global (_id)',
+    'afterSet (_id)',
+    'afterSet global (_id)',
+    'afterChange (_id)',
+    'afterChange global (_id)',
+    'beforeChange (childField)',
+    'beforeChange global (childField)',
+    'beforeSet (childField)',
+    'beforeSet global (childField)',
+    'afterSet (childField)',
+    'afterSet global (childField)',
+    'afterChange (childField)',
+    'afterChange global (childField)',
+    'afterInit',
+    'afterInit global',
+    'beforeInit',
+    'beforeInit global',
+    'beforeChange (_id)',
+    'beforeChange global (_id)',
+    'beforeSet (_id)',
+    'beforeSet global (_id)',
+    'afterSet (_id)',
+    'afterSet global (_id)',
+    'afterChange (_id)',
+    'afterChange global (_id)',
+    'beforeChange (childField)',
+    'beforeChange global (childField)',
+    'beforeSet (childField)',
+    'beforeSet global (childField)',
+    'afterSet (childField)',
+    'afterSet global (childField)',
+    'afterChange (childField)',
+    'afterChange global (childField)',
+    'afterInit',
+    'afterInit global'
   ];
   event.save();
   test.equal(actualEventsList, expectedEventsList,
@@ -153,6 +253,106 @@ Tinytest.add('Events - Order', function(test) {
     'beforeSave global',
     'beforeUpdate',
     'beforeUpdate global',
+    'beforeInit',
+    'beforeInit global',
+    'beforeChange (_id)',
+    'beforeChange global (_id)',
+    'beforeSet (_id)',
+    'beforeSet global (_id)',
+    'afterSet (_id)',
+    'afterSet global (_id)',
+    'afterChange (_id)',
+    'afterChange global (_id)',
+    'beforeChange (childField)',
+    'beforeChange global (childField)',
+    'beforeSet (childField)',
+    'beforeSet global (childField)',
+    'afterSet (childField)',
+    'afterSet global (childField)',
+    'afterChange (childField)',
+    'afterChange global (childField)',
+    'afterInit',
+    'afterInit global',
+    'beforeInit',
+    'beforeInit global',
+    'beforeChange (_id)',
+    'beforeChange global (_id)',
+    'beforeSet (_id)',
+    'beforeSet global (_id)',
+    'afterSet (_id)',
+    'afterSet global (_id)',
+    'afterChange (_id)',
+    'afterChange global (_id)',
+    'beforeChange (childField)',
+    'beforeChange global (childField)',
+    'beforeSet (childField)',
+    'beforeSet global (childField)',
+    'afterSet (childField)',
+    'afterSet global (childField)',
+    'afterChange (childField)',
+    'afterChange global (childField)',
+    'afterInit',
+    'afterInit global',
+    'beforeInit',
+    'beforeInit global',
+    'beforeChange (_id)',
+    'beforeChange global (_id)',
+    'beforeSet (_id)',
+    'beforeSet global (_id)',
+    'afterSet (_id)',
+    'afterSet global (_id)',
+    'afterChange (_id)',
+    'afterChange global (_id)',
+    'beforeChange (childField)',
+    'beforeChange global (childField)',
+    'beforeSet (childField)',
+    'beforeSet global (childField)',
+    'afterSet (childField)',
+    'afterSet global (childField)',
+    'afterChange (childField)',
+    'afterChange global (childField)',
+    'afterInit',
+    'afterInit global',
+    'beforeInit',
+    'beforeInit global',
+    'beforeChange (_id)',
+    'beforeChange global (_id)',
+    'beforeSet (_id)',
+    'beforeSet global (_id)',
+    'afterSet (_id)',
+    'afterSet global (_id)',
+    'afterChange (_id)',
+    'afterChange global (_id)',
+    'beforeChange (childField)',
+    'beforeChange global (childField)',
+    'beforeSet (childField)',
+    'beforeSet global (childField)',
+    'afterSet (childField)',
+    'afterSet global (childField)',
+    'afterChange (childField)',
+    'afterChange global (childField)',
+    'afterInit',
+    'afterInit global',
+    'beforeInit',
+    'beforeInit global',
+    'beforeChange (_id)',
+    'beforeChange global (_id)',
+    'beforeSet (_id)',
+    'beforeSet global (_id)',
+    'afterSet (_id)',
+    'afterSet global (_id)',
+    'afterChange (_id)',
+    'afterChange global (_id)',
+    'beforeChange (childField)',
+    'beforeChange global (childField)',
+    'beforeSet (childField)',
+    'beforeSet global (childField)',
+    'afterSet (childField)',
+    'afterSet global (childField)',
+    'afterChange (childField)',
+    'afterChange global (childField)',
+    'afterInit',
+    'afterInit global',
     'afterUpdate',
     'afterUpdate global',
     'afterSave',
-Original file line number
+Diff line change
@@ Expand Up / @@ -9,6 +9,10 @@ classMethods.hasEvent = function(eventName, eventHandler) { @@
     };
     classMethods.emitEvent = function(event) {
+      if (!Astro.config.triggerEvents) {
+        return;
+      }
       if (!event) {
         return;
       }
@@ Expand Down @@