perf: remove unused cached ids and avoid unnecessarily setting a coup…

…le of document properties Re: #11541
Automattic · Apr 12, 2022 · 63af194 · 63af194
1 parent caf821d
commit 63af194
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 30 deletions.
diff --git a/lib/document.js b/lib/document.js
@@ -94,7 +94,7 @@ function Document(obj, fields, skipId, options) {
   this.$__ = new InternalCache();
   this.$isNew = 'isNew' in options ? options.isNew : true;
 
-  if ('priorDoc' in options) {
+  if (options.priorDoc != null) {
     this.$__.priorDoc = options.priorDoc;
   }
 
@@ -119,7 +119,7 @@ function Document(obj, fields, skipId, options) {
     fields = undefined;
   } else {
     this.$__.strictMode = schema.options.strict;
-    if (fields !== undefined) {
+    if (fields != null) {
       this.$__.selected = fields;
     }
   }
@@ -177,8 +177,6 @@ function Document(obj, fields, skipId, options) {
     $__applyDefaults(this, fields, exclude, hasIncludedChildren, false, options.skipDefaults);
   }
 
-  this.$__._id = this._id;
-
   if (!this.$__.strictMode && obj) {
     const _this = this;
     const keys = Object.keys(this._doc);
@@ -743,8 +741,6 @@ Document.prototype.$__init = function(doc, opts) {
   this.$emit('init', this);
   this.constructor.emit('init', this);
 
-  this.$__._id = this._id;
-
   const hasIncludedChildren = this.$__.exclude === false && this.$__.fields ?
     $__hasIncludedChildren(this.$__.fields) :
     null;

diff --git a/lib/schema/SubdocumentPath.js b/lib/schema/SubdocumentPath.js
@@ -167,10 +167,11 @@ SubdocumentPath.prototype.cast = function(val, doc, init, priorVal, options) {
   const path = this.path;
   const selected = Object.keys(parentSelected).reduce((obj, key) => {
     if (key.startsWith(path + '.')) {
+      obj = obj || {};
       obj[key.substring(path.length + 1)] = parentSelected[key];
     }
     return obj;
-  }, {});
+  }, null);
   options = Object.assign({}, options, { priorDoc: priorVal });
   if (init) {
     subdoc = new Constructor(void 0, selected, doc);

diff --git a/lib/schema/objectid.js b/lib/schema/objectid.js
@@ -282,11 +282,8 @@ function resetId(v) {
   if (this instanceof Document) {
     if (v === void 0) {
       const _v = new oid();
-      this.$__._id = _v;
       return _v;
     }
-
-    this.$__._id = v;
   }
 
   return v;

diff --git a/lib/schematype.js b/lib/schematype.js
@@ -1128,7 +1128,6 @@ SchemaType.prototype.getDefault = function(scope, init) {
     ret = this.defaultValue;
   }
 
-
   if (ret !== null && ret !== undefined) {
     if (typeof ret === 'object' && (!this.options || !this.options.shared)) {
       ret = utils.clone(ret);

diff --git a/test/types.document.test.js b/test/types.document.test.js
@@ -105,25 +105,6 @@ describe('types.document', function() {
     assert.equal(b.work, 'good flam');
   });
 
-  it('cached _ids', function() {
-    const Movie = db.model('Movie', MovieSchema);
-    const m = new Movie();
-
-    assert.equal(m.id, m.$__._id);
-    const old = m.id;
-    m._id = new mongoose.Types.ObjectId();
-    assert.equal(m.id, m.$__._id);
-    assert.strictEqual(true, old !== m.$__._id);
-
-    const m2 = new Movie();
-    delete m2._doc._id;
-    m2.init({ _id: new mongoose.Types.ObjectId() });
-    assert.equal(m2.id, m2.$__._id);
-    assert.strictEqual(true, m.$__._id !== m2.$__._id);
-    assert.strictEqual(true, m.id !== m2.id);
-    assert.strictEqual(true, m.$__._id !== m2.$__._id);
-  });
-
   it('Subdocument#remove (gh-531)', async function() {
     const Movie = db.model('Movie', MovieSchema);