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

Fixed wrong optimization. Optimized more pieces of code in UnitOfWork.

Browse source
This commit is contained in:
Guilherme Blanco 2011-11-05 19:21:35 -02:00
parent c6a3ff4da5
commit ea69d9ca0c
1 changed files with 77 additions and 56 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -435,7 +435,11 @@ class UnitOfWork implements PropertyChangedListener
{ {
$oid = spl_object_hash($entity); $oid = spl_object_hash($entity);
return isset($this->entityChangeSets[$oid]) ? $this->entityChangeSets[$oid] : array(); if (isset($this->entityChangeSets[$oid])) {
return $this->entityChangeSets[$oid];
}
return array();
} }
/** /**
@ -531,6 +535,7 @@ class UnitOfWork implements PropertyChangedListener
$changeSet[$propName] = array(null, $actualValue); $changeSet[$propName] = array(null, $actualValue);
} }
} }
$this->entityChangeSets[$oid] = $changeSet; $this->entityChangeSets[$oid] = $changeSet;
} else { } else {
// Entity is "fully" MANAGED: it was already fully persisted before // Entity is "fully" MANAGED: it was already fully persisted before
@ -1195,61 +1200,67 @@ class UnitOfWork implements PropertyChangedListener
public function getEntityState($entity, $assume = null) public function getEntityState($entity, $assume = null)
{ {
$oid = spl_object_hash($entity); $oid = spl_object_hash($entity);
if ( ! isset($this->entityStates[$oid])) {
// State can only be NEW or DETACHED, because MANAGED/REMOVED states are known. if (isset($this->entityStates[$oid])) {
// Note that you can not remember the NEW or DETACHED state in _entityStates since return $this->entityStates[$oid];
// the UoW does not hold references to such objects and the object hash can be reused. }
// More generally because the state may "change" between NEW/DETACHED without the UoW being aware of it.
if ($assume === null) { if ($assume !== null) {
$class = $this->em->getClassMetadata(get_class($entity)); return $assume;
$id = $class->getIdentifierValues($entity); }
if ( ! $id) {
return self::STATE_NEW; // State can only be NEW or DETACHED, because MANAGED/REMOVED states are known.
} else if ($class->isIdentifierNatural()) { // Note that you can not remember the NEW or DETACHED state in _entityStates since
// Check for a version field, if available, to avoid a db lookup. // the UoW does not hold references to such objects and the object hash can be reused.
if ($class->isVersioned) { // More generally because the state may "change" between NEW/DETACHED without the UoW being aware of it.
if ($class->getFieldValue($entity, $class->versionField)) { $class = $this->em->getClassMetadata(get_class($entity));
return self::STATE_DETACHED; $id = $class->getIdentifierValues($entity);
} else {
return self::STATE_NEW; if ( ! $id) {
} return self::STATE_NEW;
} else { }
// Last try before db lookup: check the identity map.
if ($this->tryGetById($id, $class->rootEntityName)) { switch (true) {
return self::STATE_DETACHED; case ($class->isIdentifierNatural());
} else { // Check for a version field, if available, to avoid a db lookup.
// db lookup if ($class->isVersioned) {
if ($this->getEntityPersister(get_class($entity))->exists($entity)) { return ($class->getFieldValue($entity, $class->versionField))
return self::STATE_DETACHED; ? self::STATE_DETACHED
} else { : self::STATE_NEW;
return self::STATE_NEW; }
}
} // Last try before db lookup: check the identity map.
} if ($this->tryGetById($id, $class->rootEntityName)) {
} else if (!$class->idGenerator->isPostInsertGenerator()) {
// if we have a pre insert generator we can't be sure that having an id
// really means that the entity exists. We have to verify this through
// the last resort: a db lookup
// Last try before db lookup: check the identity map.
if ($this->tryGetById($id, $class->rootEntityName)) {
return self::STATE_DETACHED;
} else {
// db lookup
if ($this->getEntityPersister(get_class($entity))->exists($entity)) {
return self::STATE_DETACHED;
} else {
return self::STATE_NEW;
}
}
} else {
return self::STATE_DETACHED; return self::STATE_DETACHED;
} }
} else {
return $assume; // db lookup
} if ($this->getEntityPersister(get_class($entity))->exists($entity)) {
return self::STATE_DETACHED;
}
return self::STATE_NEW;
case ( ! $class->idGenerator->isPostInsertGenerator()):
// if we have a pre insert generator we can't be sure that having an id
// really means that the entity exists. We have to verify this through
// the last resort: a db lookup
// Last try before db lookup: check the identity map.
if ($this->tryGetById($id, $class->rootEntityName)) {
return self::STATE_DETACHED;
}
// db lookup
if ($this->getEntityPersister(get_class($entity))->exists($entity)) {
return self::STATE_DETACHED;
}
return self::STATE_NEW;
default:
return self::STATE_DETACHED;
} }
return $this->entityStates[$oid];
} }
/** /**
@ -1266,13 +1277,17 @@ class UnitOfWork implements PropertyChangedListener
$oid = spl_object_hash($entity); $oid = spl_object_hash($entity);
$classMetadata = $this->em->getClassMetadata(get_class($entity)); $classMetadata = $this->em->getClassMetadata(get_class($entity));
$idHash = implode(' ', $this->entityIdentifiers[$oid]); $idHash = implode(' ', $this->entityIdentifiers[$oid]);
if ($idHash === '') { if ($idHash === '') {
throw new InvalidArgumentException("The given entity has no identity."); throw new InvalidArgumentException("The given entity has no identity.");
} }
$className = $classMetadata->rootEntityName; $className = $classMetadata->rootEntityName;
if (isset($this->identityMap[$className][$idHash])) { if (isset($this->identityMap[$className][$idHash])) {
unset($this->identityMap[$className][$idHash]); unset($this->identityMap[$className][$idHash]);
//$this->entityStates[$oid] = self::STATE_DETACHED; //$this->entityStates[$oid] = self::STATE_DETACHED;
return true; return true;
} }
@ -1305,8 +1320,11 @@ class UnitOfWork implements PropertyChangedListener
*/ */
public function tryGetByIdHash($idHash, $rootClassName) public function tryGetByIdHash($idHash, $rootClassName)
{ {
return isset($this->identityMap[$rootClassName][$idHash]) ? if (isset($this->identityMap[$rootClassName][$idHash])) {
$this->identityMap[$rootClassName][$idHash] : false; return $this->identityMap[$rootClassName][$idHash];
}
return false;
} }
/** /**
@ -1318,11 +1336,14 @@ class UnitOfWork implements PropertyChangedListener
public function isInIdentityMap($entity) public function isInIdentityMap($entity)
{ {
$oid = spl_object_hash($entity); $oid = spl_object_hash($entity);
if ( ! isset($this->entityIdentifiers[$oid])) { if ( ! isset($this->entityIdentifiers[$oid])) {
return false; return false;
} }
$classMetadata = $this->em->getClassMetadata(get_class($entity)); $classMetadata = $this->em->getClassMetadata(get_class($entity));
$idHash = implode(' ', $this->entityIdentifiers[$oid]); $idHash = implode(' ', $this->entityIdentifiers[$oid]);
if ($idHash === '') { if ($idHash === '') {
return false; return false;
} }