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

Optimizations in UnitOfWork.

Browse source
This commit is contained in:
Guilherme Blanco 2011-11-05 03:09:14 -02:00
parent 793a1032e6
commit c6a3ff4da5
2 changed files with 154 additions and 119 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php
View file

@ -136,10 +136,6 @@ class ClassMetadataInfo implements ClassMetadata
* Identifies a many-to-one association. * Identifies a many-to-one association.
*/ */
const MANY_TO_ONE = 2; const MANY_TO_ONE = 2;
/**
* Combined bitmask for to-one (single-valued) associations.
*/
const TO_ONE = 3;
/** /**
* Identifies a one-to-many association. * Identifies a one-to-many association.
*/ */
@ -148,6 +144,10 @@ class ClassMetadataInfo implements ClassMetadata
* Identifies a many-to-many association. * Identifies a many-to-many association.
*/ */
const MANY_TO_MANY = 8; const MANY_TO_MANY = 8;
/**
* Combined bitmask for to-one (single-valued) associations.
*/
const TO_ONE = 3;
/** /**
* Combined bitmask for to-many (collection-valued) associations. * Combined bitmask for to-many (collection-valued) associations.
*/ */
@ -1504,14 +1504,16 @@ class ClassMetadataInfo implements ClassMetadata
/** /**
* Stores the association mapping. * Stores the association mapping.
* *
* @param AssociationMapping $assocMapping * @param array $assocMapping
*/ */
protected function _storeAssociationMapping(array $assocMapping) protected function _storeAssociationMapping(array $assocMapping)
{ {
$sourceFieldName = $assocMapping['fieldName']; $sourceFieldName = $assocMapping['fieldName'];
if (isset($this->fieldMappings[$sourceFieldName]) || isset($this->associationMappings[$sourceFieldName])) { if (isset($this->fieldMappings[$sourceFieldName]) || isset($this->associationMappings[$sourceFieldName])) {
throw MappingException::duplicateFieldMapping($this->name, $sourceFieldName); throw MappingException::duplicateFieldMapping($this->name, $sourceFieldName);
} }
$this->associationMappings[$sourceFieldName] = $assocMapping; $this->associationMappings[$sourceFieldName] = $assocMapping;
} }

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

@ -290,8 +290,8 @@ class UnitOfWork implements PropertyChangedListener
$commitOrder = $this->getCommitOrder(); $commitOrder = $this->getCommitOrder();
$conn = $this->em->getConnection(); $conn = $this->em->getConnection();
$conn->beginTransaction(); $conn->beginTransaction();
try { try {
if ($this->entityInsertions) { if ($this->entityInsertions) {
foreach ($commitOrder as $class) { foreach ($commitOrder as $class) {
@ -312,13 +312,11 @@ class UnitOfWork implements PropertyChangedListener
// Collection deletions (deletions of complete collections) // Collection deletions (deletions of complete collections)
foreach ($this->collectionDeletions as $collectionToDelete) { foreach ($this->collectionDeletions as $collectionToDelete) {
$this->getCollectionPersister($collectionToDelete->getMapping()) $this->getCollectionPersister($collectionToDelete->getMapping())->delete($collectionToDelete);
->delete($collectionToDelete);
} }
// Collection updates (deleteRows, updateRows, insertRows) // Collection updates (deleteRows, updateRows, insertRows)
foreach ($this->collectionUpdates as $collectionToUpdate) { foreach ($this->collectionUpdates as $collectionToUpdate) {
$this->getCollectionPersister($collectionToUpdate->getMapping()) $this->getCollectionPersister($collectionToUpdate->getMapping())->update($collectionToUpdate);
->update($collectionToUpdate);
} }
// Entity deletions come last and need to be in reverse commit order // Entity deletions come last and need to be in reverse commit order
@ -332,6 +330,7 @@ class UnitOfWork implements PropertyChangedListener
} catch (Exception $e) { } catch (Exception $e) {
$this->em->close(); $this->em->close();
$conn->rollback(); $conn->rollback();
throw $e; throw $e;
} }
@ -397,7 +396,7 @@ class UnitOfWork implements PropertyChangedListener
// Compute changes for INSERTed entities first. This must always happen even in this case. // Compute changes for INSERTed entities first. This must always happen even in this case.
$this->computeScheduleInsertsChangeSets(); $this->computeScheduleInsertsChangeSets();
if ( $class->isReadOnly ) { if ($class->isReadOnly) {
return; return;
} }
@ -408,6 +407,7 @@ class UnitOfWork implements PropertyChangedListener
// Only MANAGED entities that are NOT SCHEDULED FOR INSERTION are processed here. // Only MANAGED entities that are NOT SCHEDULED FOR INSERTION are processed here.
$oid = spl_object_hash($entity); $oid = spl_object_hash($entity);
if ( ! isset($this->entityInsertions[$oid]) && isset($this->entityStates[$oid])) { if ( ! isset($this->entityInsertions[$oid]) && isset($this->entityStates[$oid])) {
$this->computeChangeSet($class, $entity); $this->computeChangeSet($class, $entity);
} }
@ -420,6 +420,7 @@ class UnitOfWork implements PropertyChangedListener
{ {
foreach ($this->extraUpdates as $oid => $update) { foreach ($this->extraUpdates as $oid => $update) {
list ($entity, $changeset) = $update; list ($entity, $changeset) = $update;
$this->entityChangeSets[$oid] = $changeset; $this->entityChangeSets[$oid] = $changeset;
$this->getEntityPersister(get_class($entity))->update($entity); $this->getEntityPersister(get_class($entity))->update($entity);
} }
@ -433,10 +434,8 @@ class UnitOfWork implements PropertyChangedListener
public function getEntityChangeSet($entity) public function getEntityChangeSet($entity)
{ {
$oid = spl_object_hash($entity); $oid = spl_object_hash($entity);
if (isset($this->entityChangeSets[$oid])) {
return $this->entityChangeSets[$oid]; return isset($this->entityChangeSets[$oid]) ? $this->entityChangeSets[$oid] : array();
}
return array();
} }
/** /**
@ -486,11 +485,7 @@ class UnitOfWork implements PropertyChangedListener
foreach ($class->reflFields as $name => $refProp) { foreach ($class->reflFields as $name => $refProp) {
$value = $refProp->getValue($entity); $value = $refProp->getValue($entity);
if (isset($class->associationMappings[$name]) if ($class->isCollectionValuedAssociation($name) && $value !== null && ! ($value instanceof PersistentCollection)) {
&& ($class->associationMappings[$name]['type'] & ClassMetadata::TO_MANY)
&& $value !== null
&& ! ($value instanceof PersistentCollection)) {
// If $value is not a Collection then use an ArrayCollection. // If $value is not a Collection then use an ArrayCollection.
if ( ! $value instanceof Collection) { if ( ! $value instanceof Collection) {
$value = new ArrayCollection($value); $value = new ArrayCollection($value);
@ -499,17 +494,20 @@ class UnitOfWork implements PropertyChangedListener
$assoc = $class->associationMappings[$name]; $assoc = $class->associationMappings[$name];
// Inject PersistentCollection // Inject PersistentCollection
$coll = new PersistentCollection( $value = new PersistentCollection(
$this->em, $this->em, $this->em->getClassMetadata($assoc['targetEntity']), $value
$this->em->getClassMetadata($assoc['targetEntity']),
$value
); );
$value->setOwner($entity, $assoc);
$value->setDirty( ! $value->isEmpty());
$coll->setOwner($entity, $assoc); $class->reflFields[$name]->setValue($entity, $value);
$coll->setDirty( ! $coll->isEmpty());
$class->reflFields[$name]->setValue($entity, $coll); $actualData[$name] = $value;
$actualData[$name] = $coll;
} else if ( (! $class->isIdentifier($name) || ! $class->isIdGeneratorIdentity()) && ($name !== $class->versionField) ) { continue;
}
if (( ! $class->isIdentifier($name) || ! $class->isIdGeneratorIdentity()) && ($name !== $class->versionField)) {
$actualData[$name] = $value; $actualData[$name] = $value;
} }
} }
@ -519,13 +517,17 @@ class UnitOfWork implements PropertyChangedListener
// These result in an INSERT. // These result in an INSERT.
$this->originalEntityData[$oid] = $actualData; $this->originalEntityData[$oid] = $actualData;
$changeSet = array(); $changeSet = array();
foreach ($actualData as $propName => $actualValue) { foreach ($actualData as $propName => $actualValue) {
if (isset($class->associationMappings[$propName])) { if ( ! isset($class->associationMappings[$propName])) {
$assoc = $class->associationMappings[$propName]; $changeSet[$propName] = array(null, $actualValue);
if ($assoc['isOwningSide'] && $assoc['type'] & ClassMetadata::TO_ONE) {
$changeSet[$propName] = array(null, $actualValue); continue;
} }
} else {
$assoc = $class->associationMappings[$propName];
if ($assoc['isOwningSide'] && $assoc['type'] & ClassMetadata::TO_ONE) {
$changeSet[$propName] = array(null, $actualValue); $changeSet[$propName] = array(null, $actualValue);
} }
} }
@ -533,54 +535,65 @@ class UnitOfWork implements PropertyChangedListener
} else { } else {
// Entity is "fully" MANAGED: it was already fully persisted before // Entity is "fully" MANAGED: it was already fully persisted before
// and we have a copy of the original data // and we have a copy of the original data
$originalData = $this->originalEntityData[$oid]; $originalData = $this->originalEntityData[$oid];
$isChangeTrackingNotify = $class->isChangeTrackingNotify(); $isChangeTrackingNotify = $class->isChangeTrackingNotify();
$changeSet = ($isChangeTrackingNotify && isset($this->entityChangeSets[$oid])) ? $this->entityChangeSets[$oid] : array(); $changeSet = ($isChangeTrackingNotify && isset($this->entityChangeSets[$oid]))
? $this->entityChangeSets[$oid]
: array();
foreach ($actualData as $propName => $actualValue) { foreach ($actualData as $propName => $actualValue) {
if (isset($originalData[$propName])) { // skip field, its a partially omitted one!
$orgValue = $originalData[$propName]; if ( ! (isset($originalData[$propName]) || array_key_exists($propName, $originalData))) continue;
} else if (array_key_exists($propName, $originalData)) {
$orgValue = null; $orgValue = $originalData[$propName];
} else {
// skip field, its a partially omitted one! // skip if value havent changed
if ($orgValue === $actualValue) continue;
// if regular field
if ( ! isset($class->associationMappings[$propName])) {
if ($isChangeTrackingNotify) continue;
$changeSet[$propName] = array($orgValue, $actualValue);
continue;
}
if ($orgValue instanceof PersistentCollection) {
// A PersistentCollection was de-referenced, so delete it.
$coid = spl_object_hash($orgValue);
if (isset($this->collectionDeletions[$coid])) continue;
$this->collectionDeletions[$coid] = $orgValue;
$changeSet[$propName] = $orgValue; // Signal changeset, to-many assocs will be ignored.
continue; continue;
} }
if (isset($class->associationMappings[$propName])) { $assoc = $class->associationMappings[$propName];
$assoc = $class->associationMappings[$propName];
if ($assoc['type'] & ClassMetadata::TO_ONE && $orgValue !== $actualValue) { if ($assoc['type'] & ClassMetadata::TO_ONE) {
if ($assoc['isOwningSide']) { if ($assoc['isOwningSide']) {
$changeSet[$propName] = array($orgValue, $actualValue); $changeSet[$propName] = array($orgValue, $actualValue);
} }
if ($orgValue !== null && $assoc['orphanRemoval']) {
$this->scheduleOrphanRemoval($orgValue); if ($orgValue !== null && $assoc['orphanRemoval']) {
} $this->scheduleOrphanRemoval($orgValue);
} else if ($orgValue instanceof PersistentCollection && $orgValue !== $actualValue) {
// A PersistentCollection was de-referenced, so delete it.
$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.
}
} }
} else if ($isChangeTrackingNotify) {
continue;
} else if ($orgValue !== $actualValue) {
$changeSet[$propName] = array($orgValue, $actualValue);
} }
} }
if ($changeSet) { if ($changeSet) {
$this->entityChangeSets[$oid] = $changeSet; $this->entityChangeSets[$oid] = $changeSet;
$this->originalEntityData[$oid] = $actualData; $this->originalEntityData[$oid] = $actualData;
$this->entityUpdates[$oid] = $entity; $this->entityUpdates[$oid] = $entity;
} }
} }
// Look for changes in associations of the entity // Look for changes in associations of the entity
foreach ($class->associationMappings as $field => $assoc) { foreach ($class->associationMappings as $field => $assoc) {
$val = $class->reflFields[$field]->getValue($entity); if (($val = $class->reflFields[$field]->getValue($entity)) !== null) {
if ($val !== null) {
$this->computeAssociationChanges($assoc, $val); $this->computeAssociationChanges($assoc, $val);
} }
} }
@ -601,24 +614,21 @@ class UnitOfWork implements PropertyChangedListener
$class = $this->em->getClassMetadata($className); $class = $this->em->getClassMetadata($className);
// Skip class if instances are read-only // Skip class if instances are read-only
if ($class->isReadOnly) { if ($class->isReadOnly) continue;
continue;
}
// If change tracking is explicit or happens through notification, then only compute // If change tracking is explicit or happens through notification, then only compute
// changes on entities of that type that are explicitly marked for synchronization. // changes on entities of that type that are explicitly marked for synchronization.
$entitiesToProcess = ! $class->isChangeTrackingDeferredImplicit() ? $entitiesToProcess = ! $class->isChangeTrackingDeferredImplicit()
(isset($this->scheduledForDirtyCheck[$className]) ? ? (isset($this->scheduledForDirtyCheck[$className]) ? $this->scheduledForDirtyCheck[$className] : array())
$this->scheduledForDirtyCheck[$className] : array()) : $entities;
: $entities;
foreach ($entitiesToProcess as $entity) { foreach ($entitiesToProcess as $entity) {
// Ignore uninitialized proxy objects // Ignore uninitialized proxy objects
if ($entity instanceof Proxy && ! $entity->__isInitialized__) { if ($entity instanceof Proxy && ! $entity->__isInitialized__) continue;
continue;
}
// Only MANAGED entities that are NOT SCHEDULED FOR INSERTION are processed here. // Only MANAGED entities that are NOT SCHEDULED FOR INSERTION are processed here.
$oid = spl_object_hash($entity); $oid = spl_object_hash($entity);
if ( ! isset($this->entityInsertions[$oid]) && isset($this->entityStates[$oid])) { if ( ! isset($this->entityInsertions[$oid]) && isset($this->entityStates[$oid])) {
$this->computeChangeSet($class, $entity); $this->computeChangeSet($class, $entity);
} }
@ -634,75 +644,96 @@ class UnitOfWork implements PropertyChangedListener
*/ */
private function computeAssociationChanges($assoc, $value) private function computeAssociationChanges($assoc, $value)
{ {
if ($value instanceof Proxy && ! $value->__isInitialized__) {
return;
}
if ($value instanceof PersistentCollection && $value->isDirty()) { if ($value instanceof PersistentCollection && $value->isDirty()) {
$coid = spl_object_hash($value); $coid = spl_object_hash($value);
if ($assoc['isOwningSide']) { if ($assoc['isOwningSide']) {
$this->collectionUpdates[$coid] = $value; $this->collectionUpdates[$coid] = $value;
} }
$this->visitedCollections[$coid] = $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)
// enities, recursively. ("Persistence by reachability") // entities, recursively. ("Persistence by reachability")
if ($assoc['type'] & ClassMetadata::TO_ONE) { // Unwrap. Uninitialized collections will simply be empty.
if ($value instanceof Proxy && ! $value->__isInitialized__) { $unwrappedValue = ($assoc['type'] & ClassMetadata::TO_ONE) ? array($value) : $value->unwrap();
return; // Ignore uninitialized proxy objects $targetClass = $this->em->getClassMetadata($assoc['targetEntity']);
}
$value = array($value); foreach ($unwrappedValue as $key => $entry) {
} else if ($value instanceof PersistentCollection) {
// Unwrap. Uninitialized collections will simply be empty.
$value = $value->unwrap();
}
$targetClass = $this->em->getClassMetadata($assoc['targetEntity']);
foreach ($value as $entry) {
$state = $this->getEntityState($entry, self::STATE_NEW); $state = $this->getEntityState($entry, self::STATE_NEW);
$oid = spl_object_hash($entry); $oid = spl_object_hash($entry);
if ($state == self::STATE_NEW) {
if ( ! $assoc['isCascadePersist']) { switch ($state) {
throw new InvalidArgumentException("A new entity was found through the relationship '" case self::STATE_NEW:
. $assoc['sourceEntity'] . "#" . $assoc['fieldName'] . "' that was not" if ( ! $assoc['isCascadePersist']) {
. " configured to cascade persist operations for entity: " . self::objToStr($entry) . "." $message = "A new entity was found through the relationship '%s#%s' that was not configured " .
. " Explicitly persist the new entity or configure cascading persist operations" ' to cascade persist operations for entity: %s. Explicitly persist the new entity or ' .
. " on the relationship. If you cannot find out which entity causes the problem" 'configure cascading persist operations on tbe relationship. If you cannot find out ' .
. " implement '" . $assoc['targetEntity'] . "#__toString()' to get a clue."); 'which entity causes the problem, implement %s#__toString() to get a clue.';
}
$this->persistNew($targetClass, $entry); throw new InvalidArgumentException(sprintf(
$this->computeChangeSet($targetClass, $entry); $message, $assoc['sourceEntity'], $assoc['fieldName'], self::objToStr($entry), $assoc['targetEntity']
} else if ($state == self::STATE_REMOVED) { ));
return new InvalidArgumentException("Removed entity detected during flush: " }
. self::objToStr($entry).". Remove deleted entities from associations.");
} else if ($state == self::STATE_DETACHED) { $this->persistNew($targetClass, $entry);
// Can actually not happen right now as we assume STATE_NEW, $this->computeChangeSet($targetClass, $entry);
// so the exception will be raised from the DBAL layer (constraint violation). break;
throw new InvalidArgumentException("A detached entity was found through a "
. "relationship during cascading a persist operation."); case self::STATE_REMOVED:
// Consume the $value as array (it's either an array or an ArrayAccess)
// and remove the element from Collection.
if ($assoc['type'] & ClassMetadata::TO_MANY) {
unset($value[$key]);
}
break;
case self::STATE_DETACHED:
// Can actually not happen right now as we assume STATE_NEW,
// so the exception will be raised from the DBAL layer (constraint violation).
$message = 'A detached entity was found through a relationship during cascading a persist operation.';
throw new InvalidArgumentException($message);
break;
default:
// MANAGED associated entities are already taken into account
// during changeset calculation anyway, since they are in the identity map.
} }
// MANAGED associated entities are already taken into account
// during changeset calculation anyway, since they are in the identity map.
} }
} }
private function persistNew($class, $entity) private function persistNew($class, $entity)
{ {
$oid = spl_object_hash($entity); $oid = spl_object_hash($entity);
if (isset($class->lifecycleCallbacks[Events::prePersist])) { if (isset($class->lifecycleCallbacks[Events::prePersist])) {
$class->invokeLifecycleCallbacks(Events::prePersist, $entity); $class->invokeLifecycleCallbacks(Events::prePersist, $entity);
} }
if ($this->evm->hasListeners(Events::prePersist)) { if ($this->evm->hasListeners(Events::prePersist)) {
$this->evm->dispatchEvent(Events::prePersist, new LifecycleEventArgs($entity, $this->em)); $this->evm->dispatchEvent(Events::prePersist, new LifecycleEventArgs($entity, $this->em));
} }
$idGen = $class->idGenerator; $idGen = $class->idGenerator;
if ( ! $idGen->isPostInsertGenerator()) { if ( ! $idGen->isPostInsertGenerator()) {
$idValue = $idGen->generate($this->em, $entity); $idValue = $idGen->generate($this->em, $entity);
if ( ! $idGen instanceof \Doctrine\ORM\Id\AssignedGenerator) { if ( ! $idGen instanceof \Doctrine\ORM\Id\AssignedGenerator) {
$this->entityIdentifiers[$oid] = array($class->identifier[0] => $idValue); $idValue = array($class->identifier[0] => $idValue);
$class->setIdentifierValues($entity, $this->entityIdentifiers[$oid]);
} else { $class->setIdentifierValues($entity, $idValue);
$this->entityIdentifiers[$oid] = $idValue;
} }
$this->entityIdentifiers[$oid] = $idValue;
} }
$this->entityStates[$oid] = self::STATE_MANAGED; $this->entityStates[$oid] = self::STATE_MANAGED;
$this->scheduleForInsert($entity); $this->scheduleForInsert($entity);
@ -730,16 +761,17 @@ class UnitOfWork implements PropertyChangedListener
throw new InvalidArgumentException('Entity must be managed.'); throw new InvalidArgumentException('Entity must be managed.');
} }
/* TODO: Just return if changetracking policy is NOTIFY? // skip if change tracking is "NOTIFY"
if ($class->isChangeTrackingNotify()) { if ($class->isChangeTrackingNotify()) {
return; return;
}*/ }
if ( ! $class->isInheritanceTypeNone()) { if ( ! $class->isInheritanceTypeNone()) {
$class = $this->em->getClassMetadata(get_class($entity)); $class = $this->em->getClassMetadata(get_class($entity));
} }
$actualData = array(); $actualData = array();
foreach ($class->reflFields as $name => $refProp) { foreach ($class->reflFields as $name => $refProp) {
if ( ! $class->isIdentifier($name) || ! $class->isIdGeneratorIdentity()) { if ( ! $class->isIdentifier($name) || ! $class->isIdGeneratorIdentity()) {
$actualData[$name] = $refProp->getValue($entity); $actualData[$name] = $refProp->getValue($entity);
@ -751,6 +783,7 @@ class UnitOfWork implements PropertyChangedListener
foreach ($actualData as $propName => $actualValue) { foreach ($actualData as $propName => $actualValue) {
$orgValue = isset($originalData[$propName]) ? $originalData[$propName] : null; $orgValue = isset($originalData[$propName]) ? $originalData[$propName] : null;
if (is_object($orgValue) && $orgValue !== $actualValue) { if (is_object($orgValue) && $orgValue !== $actualValue) {
$changeSet[$propName] = array($orgValue, $actualValue); $changeSet[$propName] = array($orgValue, $actualValue);
} else if ($orgValue != $actualValue || ($orgValue === null ^ $actualValue === null)) { } else if ($orgValue != $actualValue || ($orgValue === null ^ $actualValue === null)) {