optimize caching CPU utilization dramatically

jclem · Apr 30, 2015 · 57303bd · 57303bd
1 parent cb76798
commit 57303bd
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 5 deletions.
diff --git a/dist/rest-model.js b/dist/rest-model.js
@@ -823,7 +823,13 @@ var RestModel = module.exports = Ember.Object.extend({
         var cachedModel = utils.findMatching(newModel, self, cachedResponse);
 
         if (cachedModel) {
-          return cachedModel.setProperties(newModel);
+          // we only want to update properties that we actually track
+          var attrs = cachedModel.get('attrs');
+          var properties = attrs.reduce(function(properties, attr) {
+            properties[attr] = newModel.get(attr);
+            return properties;
+          }, {});
+          return cachedModel.setProperties(properties);
         } else {
           return cachedResponse.pushObject(newModel);
         }
@@ -2345,7 +2351,7 @@ exports.findMatching = function(toMatch, klass, data) {
   var primaryStorageKey = klass.primaryKeys[0];
 
   return data.find(function(datum) {
-    return Ember.get(toMatch, primaryStorageKey) === Ember.get(datum, primaryStorageKey);
+    return toMatch[primaryStorageKey] === datum[primaryStorageKey];
   });
 };
 

diff --git a/dist/rest-model.min.js b/dist/rest-model.min.js
diff --git a/index.js b/index.js
@@ -822,7 +822,13 @@ var RestModel = module.exports = Ember.Object.extend({
         var cachedModel = utils.findMatching(newModel, self, cachedResponse);
 
         if (cachedModel) {
-          return cachedModel.setProperties(newModel);
+          // we only want to update properties that we actually track
+          var attrs = cachedModel.get('attrs');
+          var properties = attrs.reduce(function(properties, attr) {
+            properties[attr] = newModel.get(attr);
+            return properties;
+          }, {});
+          return cachedModel.setProperties(properties);
         } else {
           return cachedResponse.pushObject(newModel);
         }

diff --git a/lib/utils.js b/lib/utils.js
@@ -51,7 +51,7 @@ exports.findMatching = function(toMatch, klass, data) {
   var primaryStorageKey = klass.primaryKeys[0];
 
   return data.find(function(datum) {
-    return Ember.get(toMatch, primaryStorageKey) === Ember.get(datum, primaryStorageKey);
+    return toMatch[primaryStorageKey] === datum[primaryStorageKey];
   });
 };