perf(document): avoid creating unnecessary _id for array subdocuments

Re: #10400
Automattic · Feb 27, 2022 · 4c85c70 · 4c85c70
1 parent b62ea22
commit 4c85c70
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/lib/document.js b/lib/document.js
@@ -98,6 +98,10 @@ function Document(obj, fields, skipId, options) {
     this.$__.priorDoc = options.priorDoc;
   }
 
+  if (skipId) {
+    this.$__.skipId = skipId;
+  }
+
   if (obj != null && typeof obj !== 'object') {
     throw new ObjectParameterError(obj, 'obj', 'Document');
   }
@@ -146,7 +150,7 @@ function Document(obj, fields, skipId, options) {
     // By default, defaults get applied **before** setting initial values
     // Re: gh-6155
     if (defaults) {
-      $__applyDefaults(this, fields, exclude, hasIncludedChildren, true, null, skipId);
+      $__applyDefaults(this, fields, exclude, hasIncludedChildren, true, null);
     }
   }
   if (obj) {
@@ -170,7 +174,7 @@ function Document(obj, fields, skipId, options) {
       this.$__.skipDefaults = options.skipDefaults;
     }
   } else if (defaults) {
-    $__applyDefaults(this, fields, exclude, hasIncludedChildren, false, options.skipDefaults, skipId);
+    $__applyDefaults(this, fields, exclude, hasIncludedChildren, false, options.skipDefaults);
   }
 
   this.$__._id = this._id;
@@ -415,7 +419,7 @@ Object.defineProperty(Document.prototype, '$op', {
  * ignore
  */
 
-function $__applyDefaults(doc, fields, exclude, hasIncludedChildren, isBeforeSetters, pathsToSkip, skipId) {
+function $__applyDefaults(doc, fields, exclude, hasIncludedChildren, isBeforeSetters, pathsToSkip) {
   const paths = Object.keys(doc.$__schema.paths);
   const plen = paths.length;
 
@@ -424,7 +428,7 @@ function $__applyDefaults(doc, fields, exclude, hasIncludedChildren, isBeforeSet
     let curPath = '';
     const p = paths[i];
 
-    if (p === '_id' && skipId) {
+    if (p === '_id' && doc.$__.skipId) {
       continue;
     }
 

diff --git a/lib/types/ArraySubdocument.js b/lib/types/ArraySubdocument.js
@@ -31,7 +31,7 @@ function ArraySubdocument(obj, parentArr, skipId, fields, index) {
   this.$setIndex(index);
   this.$__parent = this[documentArrayParent];
 
-  Subdocument.call(this, obj, fields, this[documentArrayParent], void 0, { isNew: true });
+  Subdocument.call(this, obj, fields, this[documentArrayParent], skipId, { isNew: true });
 }
 
 /*!