Improve InternalModel (2x - 3x faster)

packages/ember-data/lib/system/empty-object.js

@@ -0,0 +1,17 @@
+// This exists because `Object.create(null)` is absurdly slow compared
+// to `new EmptyObject()`. In either case, you want a null prototype
+// when you're treating the object instances as arbitrary dictionaries
+// and don't want your keys colliding with build-in methods on the
+// default object prototype.
+var proto = Object.create(null, {
+  // without this, we will always still end up with (new
+  // EmptyObject()).constructor === Object
+  constructor: {
+    value: undefined,
+    enumerable: false,
+    writable: true
+  }
+});
+
+export default function EmptyObject() {}
+EmptyObject.prototype = proto;

packages/ember-data/lib/system/model/internal-model.js

@@ -2,13 +2,14 @@ import merge from "ember-data/system/merge";
 import RootState from "ember-data/system/model/states";
 import Relationships from "ember-data/system/relationships/state/create";
 import Snapshot from "ember-data/system/snapshot";
+import EmptyObject from "ember-data/system/empty-object";
 
 var Promise = Ember.RSVP.Promise;
 var get = Ember.get;
 var set = Ember.set;
 
-var _extractPivotNameCache = Object.create(null);
-var _splitOnDotCache = Object.create(null);
+var _extractPivotNameCache = new EmptyObject();
+var _splitOnDotCache = new EmptyObject();
 
 function splitOnDot(name) {
   return _splitOnDotCache[name] || (
@@ -28,6 +29,7 @@ function retrieveFromCurrentState(key) {
   };
 }
 
+var guid = 0;
 /**
   `InternalModel` is the Model class that we use internally inside Ember Data to represent models.
   Internal ED methods should only deal with `InternalModel` objects. It is a fast, plain Javascript class.
@@ -43,23 +45,25 @@ function retrieveFromCurrentState(key) {
 
   @class InternalModel
 */
+
 export default function InternalModel(type, id, store, container, data) {
   this.type = type;
   this.id = id;
   this.store = store;
   this.container = container;
-  this._data = data || Object.create(null);
+  this._data = data || new EmptyObject();
   this.modelName = type.modelName;
   this.dataHasInitialized = false;
   //Look into making this lazy
   this._deferredTriggers = [];
-  this._attributes = Object.create(null);
-  this._inFlightAttributes = Object.create(null);
+  this._attributes = new EmptyObject();
+  this._inFlightAttributes = new EmptyObject();
   this._relationships = new Relationships(this);
   this.currentState = RootState.empty;
   this.isReloading = false;
   this.isError = false;
   this.error = null;
+  this[Ember.GUID_KEY] = guid++ + 'internal-model';
   /*
     implicit relationships are relationship which have not been declared but the inverse side exists on
     another record somewhere
@@ -87,7 +91,7 @@ export default function InternalModel(type, id, store, container, data) {
     would have a implicit post relationship in order to be do things like remove ourselves from the post
     when we are deleted
   */
-  this._implicitRelationships = Object.create(null);
+  this._implicitRelationships = new EmptyObject();
 }
 
 InternalModel.prototype = {
@@ -263,7 +267,7 @@ InternalModel.prototype = {
 
   flushChangedAttributes: function() {
     this._inFlightAttributes = this._attributes;
-    this._attributes = Object.create(null);
+    this._attributes = new EmptyObject();
   },
 
   /**
@@ -326,10 +330,10 @@ InternalModel.prototype = {
   rollbackAttributes: function() {
     var dirtyKeys = Object.keys(this._attributes);
 
-    this._attributes = Object.create(null);
+    this._attributes = new EmptyObject();
 
     if (get(this, 'isError')) {
-      this._inFlightAttributes = Object.create(null);
+      this._inFlightAttributes = new EmptyObject();
       this.didCleanError();
     }
 
@@ -346,7 +350,7 @@ InternalModel.prototype = {
     }
 
     if (this.isValid()) {
-      this._inFlightAttributes = Object.create(null);
+      this._inFlightAttributes = new EmptyObject();
     }
 
     this.send('rolledBack');
@@ -585,7 +589,7 @@ InternalModel.prototype = {
       merge(this._data, data);
     }
 
-    this._inFlightAttributes = Object.create(null);
+    this._inFlightAttributes = new EmptyObject();
 
     this.send('didCommit');
     this.updateRecordArraysLater();
@@ -656,7 +660,7 @@ InternalModel.prototype = {
         this._attributes[keys[i]] = this._inFlightAttributes[keys[i]];
       }
     }
-    this._inFlightAttributes = Object.create(null);
+    this._inFlightAttributes = new EmptyObject();
   },
 
   /**
@@ -708,7 +712,7 @@ InternalModel.prototype = {
       var keys = Object.keys(updates);
       var length = keys.length;
 
-      original = merge(Object.create(null), this._data);
+      original = merge(new EmptyObject(), this._data);
       original = merge(original, this._inFlightAttributes);
 
       for (i = 0; i < length; i++) {

packages/ember-data/tests/integration/store-test.js

@@ -168,8 +168,8 @@ test("destroying the store correctly cleans everything up", function() {
     filterdPeople = store.filter('person', function() { return true; });
   });
 
-  var filterdPeopleWillDestroy =  tap(filterdPeople.content, 'willDestroy');
-  var adapterPopulatedPeopleWillDestroy = tap(adapterPopulatedPeople.content, 'willDestroy');
+  var filterdPeopleWillDestroy = tap(filterdPeople.get('content'), 'willDestroy');
+  var adapterPopulatedPeopleWillDestroy = tap(adapterPopulatedPeople.get('content'), 'willDestroy');
 
   run(function() {
     store.findRecord('person', 2);