From 4474d305cb89f2b12e7df2cf310065732fc8e50e Mon Sep 17 00:00:00 2001 From: Benjamin Eberlei Date: Sat, 15 Oct 2011 21:47:16 +0200 Subject: [PATCH] DDC-1210 - Optimize UnitOfWork collection handling internally. --- lib/Doctrine/ORM/UnitOfWork.php | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/lib/Doctrine/ORM/UnitOfWork.php b/lib/Doctrine/ORM/UnitOfWork.php index bd48373a4..6851d25e4 100644 --- a/lib/Doctrine/ORM/UnitOfWork.php +++ b/lib/Doctrine/ORM/UnitOfWork.php @@ -490,8 +490,9 @@ class UnitOfWork implements PropertyChangedListener } } else if ($orgValue instanceof PersistentCollection && $orgValue !== $actualValue) { // A PersistentCollection was de-referenced, so delete it. - if ( ! in_array($orgValue, $this->collectionDeletions, true)) { - $this->collectionDeletions[] = $orgValue; + $coid = spl_object_hash($orgValue); + if ( ! isset($this->collectionDeletions[$coid]) ) { + $this->collectionDeletions[$coid] = $orgValue; $changeSet[$propName] = $orgValue; // Signal changeset, to-many assocs will be ignored. } } @@ -569,10 +570,11 @@ class UnitOfWork implements PropertyChangedListener private function computeAssociationChanges($assoc, $value) { if ($value instanceof PersistentCollection && $value->isDirty()) { + $coid = spl_object_hash($value); if ($assoc['isOwningSide']) { - $this->collectionUpdates[] = $value; + $this->collectionUpdates[$coid] = $value; } - $this->visitedCollections[] = $value; + $this->visitedCollections[$coid] = $value; } // Look through the entities, and in any of their associations, for transient (new) @@ -1889,12 +1891,12 @@ class UnitOfWork implements PropertyChangedListener { //TODO: if $coll is already scheduled for recreation ... what to do? // Just remove $coll from the scheduled recreations? - $this->collectionDeletions[] = $coll; + $this->collectionDeletions[spl_object_hash($coll)] = $coll; } public function isCollectionScheduledForDeletion(PersistentCollection $coll) { - return in_array($coll, $this->collectionsDeletions, true); + return isset( $this->collectionsDeletions[spl_object_hash($coll)] ); } /**