RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-04-03 13:23:37 +03:00
Code Issues Projects Releases Wiki Activity

DDC-1210 - Optimize UnitOfWork collection handling internally.

Browse source
This commit is contained in:
Benjamin Eberlei 2011-10-15 21:47:16 +02:00
parent 7c244abc1c
commit 4474d305cb
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
lib/Doctrine/ORM/UnitOfWork.php
View file

@ -490,8 +490,9 @@ class UnitOfWork implements PropertyChangedListener
} }
} else if ($orgValue instanceof PersistentCollection && $orgValue !== $actualValue) { } else if ($orgValue instanceof PersistentCollection && $orgValue !== $actualValue) {
// A PersistentCollection was de-referenced, so delete it. // A PersistentCollection was de-referenced, so delete it.
if ( ! in_array($orgValue, $this->collectionDeletions, true)) { $coid = spl_object_hash($orgValue);
$this->collectionDeletions[] = $orgValue; if ( ! isset($this->collectionDeletions[$coid]) ) {
$this->collectionDeletions[$coid] = $orgValue;
$changeSet[$propName] = $orgValue; // Signal changeset, to-many assocs will be ignored. $changeSet[$propName] = $orgValue; // Signal changeset, to-many assocs will be ignored.
} }
} }
@ -569,10 +570,11 @@ class UnitOfWork implements PropertyChangedListener
private function computeAssociationChanges($assoc, $value) private function computeAssociationChanges($assoc, $value)
{ {
if ($value instanceof PersistentCollection && $value->isDirty()) { if ($value instanceof PersistentCollection && $value->isDirty()) {
$coid = spl_object_hash($value);
if ($assoc['isOwningSide']) { 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) // 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? //TODO: if $coll is already scheduled for recreation ... what to do?
// Just remove $coll from the scheduled recreations? // Just remove $coll from the scheduled recreations?
$this->collectionDeletions[] = $coll; $this->collectionDeletions[spl_object_hash($coll)] = $coll;
} }
public function isCollectionScheduledForDeletion(PersistentCollection $coll) public function isCollectionScheduledForDeletion(PersistentCollection $coll)
{ {
return in_array($coll, $this->collectionsDeletions, true); return isset( $this->collectionsDeletions[spl_object_hash($coll)] );
} }
/** /**