perf: avoid calls to ownerDocument() when first creating a document

Re: #10451
Automattic · Apr 28, 2022 · cd6735b · cd6735b
1 parent 1aa4c4e
commit cd6735b
Show file tree

Hide file tree

Showing 7 changed files with 31 additions and 28 deletions.
diff --git a/lib/document.js b/lib/document.js
@@ -1455,14 +1455,18 @@ Document.prototype.$set = function $set(path, val, type, options) {
   }
 
   if (shouldSet) {
-    const doc = this.$isSubdocument ? this.ownerDocument() : this;
-    const savedState = doc.$__.savedState;
-    const savedStatePath = this.$isSubdocument ? this.$__.fullPath + '.' + path : path;
-    if (savedState != null) {
-      const firstDot = savedStatePath.indexOf('.');
-      const topLevelPath = firstDot === -1 ? savedStatePath : savedStatePath.slice(0, firstDot);
-      if (!savedState.hasOwnProperty(topLevelPath)) {
-        savedState[topLevelPath] = utils.clone(doc.$__getValue(topLevelPath));
+    let savedState = null;
+    let savedStatePath = null;
+    if (!constructing) {
+      const doc = this.$isSubdocument ? this.ownerDocument() : this;
+      savedState = doc.$__.savedState;
+      savedStatePath = this.$isSubdocument ? this.$__.fullPath + '.' + path : path;
+      if (savedState != null) {
+        const firstDot = savedStatePath.indexOf('.');
+        const topLevelPath = firstDot === -1 ? savedStatePath : savedStatePath.slice(0, firstDot);
+        if (!savedState.hasOwnProperty(topLevelPath)) {
+          savedState[topLevelPath] = utils.clone(doc.$__getValue(topLevelPath));
+        }
       }
     }
 

diff --git a/lib/schema/SubdocumentPath.js b/lib/schema/SubdocumentPath.js
@@ -63,11 +63,10 @@ function _createConstructor(schema, baseClass) {
     this.$__parent = parent;
     Subdocument.apply(this, arguments);
 
-    const ownerDocument = this.ownerDocument();
-    if (ownerDocument == null) {
+    if (parent == null) {
       return;
     }
-    this.$session(ownerDocument.$session());
+    this.$session(parent.$session());
   };
 
   schema._preCompile();

diff --git a/lib/schema/documentarray.js b/lib/schema/documentarray.js
@@ -113,10 +113,12 @@ function _createConstructor(schema, options, baseClass) {
   Subdocument || (Subdocument = require('../types/ArraySubdocument'));
 
   // compile an embedded document for this schema
-  function EmbeddedDocument() {
+  function EmbeddedDocument(_value, parentArray) {
     Subdocument.apply(this, arguments);
-
-    this.$session(this.ownerDocument().$session());
+    if (parentArray == null || parentArray.getArrayParent() == null) {
+      return;
+    }
+    this.$session(parentArray.getArrayParent().$session());
   }
 
   schema._preCompile();

diff --git a/lib/schema/number.js b/lib/schema/number.js
@@ -353,11 +353,7 @@ SchemaNumber.prototype.enum = function(values, message) {
  */
 
 SchemaNumber.prototype.cast = function(value, doc, init) {
-  if (SchemaType._isRef(this, value, doc, init)) {
-    if (typeof value === 'number') {
-      return value;
-    }
-
+  if (typeof value !== 'number' && SchemaType._isRef(this, value, doc, init)) {
     if (value == null || utils.isNonBuiltinObject(value)) {
       return this._castRef(value, doc, init);
     }

diff --git a/lib/schema/objectid.js b/lib/schema/objectid.js
@@ -221,11 +221,9 @@ ObjectId.prototype.checkRequired = function checkRequired(value, doc) {
  */
 
 ObjectId.prototype.cast = function(value, doc, init) {
-  if (SchemaType._isRef(this, value, doc, init)) {
+  if (!(value instanceof oid) && SchemaType._isRef(this, value, doc, init)) {
     // wait! we may need to cast this to a document
-    if (value instanceof oid) {
-      return value;
-    } else if ((getConstructorName(value) || '').toLowerCase() === 'objectid') {
+    if ((getConstructorName(value) || '').toLowerCase() === 'objectid') {
       return new oid(value.toHexString());
     }
 

diff --git a/lib/schema/string.js b/lib/schema/string.js
@@ -580,11 +580,7 @@ SchemaString.prototype.checkRequired = function checkRequired(value, doc) {
  */
 
 SchemaString.prototype.cast = function(value, doc, init) {
-  if (SchemaType._isRef(this, value, doc, init)) {
-    if (typeof value === 'string') {
-      return value;
-    }
-
+  if (typeof value !== 'string' && SchemaType._isRef(this, value, doc, init)) {
     return this._castRef(value, doc, init);
   }
 

diff --git a/lib/types/DocumentArray/methods/index.js b/lib/types/DocumentArray/methods/index.js
@@ -22,6 +22,14 @@ const methods = {
     return this.toObject(internalToObjectOptions);
   },
 
+  /*!
+   * ignore
+   */
+
+  getArrayParent() {
+    return this[arrayParentSymbol];
+  },
+
   /**
    * Overrides MongooseArray#cast
    *