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

More optimizations and increased code readability in Id Generators.

Browse source
This commit is contained in:
Guilherme Blanco 2011-11-08 18:36:18 -02:00
parent d943e67c65
commit c391287cc4
2 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lib/Doctrine/ORM/Id/SequenceGenerator.php
View file

@ -59,10 +59,12 @@ class SequenceGenerator extends AbstractIdGenerator implements Serializable
if ($this->_maxValue === null || $this->_nextValue == $this->_maxValue) { if ($this->_maxValue === null || $this->_nextValue == $this->_maxValue) {
// Allocate new values // Allocate new values
$conn = $em->getConnection(); $conn = $em->getConnection();
$sql = $conn->getDatabasePlatform()->getSequenceNextValSQL($this->_sequenceName); $sql = $conn->getDatabasePlatform()->getSequenceNextValSQL($this->_sequenceName);
$this->_nextValue = $conn->fetchColumn($sql); $this->_nextValue = $conn->fetchColumn($sql);
$this->_maxValue = $this->_nextValue + $this->_allocationSize; $this->_maxValue = $this->_nextValue + $this->_allocationSize;
} }
return $this->_nextValue++; return $this->_nextValue++;
} }
@ -90,13 +92,14 @@ class SequenceGenerator extends AbstractIdGenerator implements Serializable
{ {
return serialize(array( return serialize(array(
'allocationSize' => $this->_allocationSize, 'allocationSize' => $this->_allocationSize,
'sequenceName' => $this->_sequenceName 'sequenceName' => $this->_sequenceName
)); ));
} }
public function unserialize($serialized) public function unserialize($serialized)
{ {
$array = unserialize($serialized); $array = unserialize($serialized);
$this->_sequenceName = $array['sequenceName']; $this->_sequenceName = $array['sequenceName'];
$this->_allocationSize = $array['allocationSize']; $this->_allocationSize = $array['allocationSize'];
} }

8
lib/Doctrine/ORM/Id/TableGenerator.php
View file

@ -50,11 +50,12 @@ class TableGenerator extends AbstractIdGenerator
if ($this->_maxValue === null || $this->_nextValue == $this->_maxValue) { if ($this->_maxValue === null || $this->_nextValue == $this->_maxValue) {
// Allocate new values // Allocate new values
$conn = $em->getConnection(); $conn = $em->getConnection();
if ($conn->getTransactionNestingLevel() == 0) {
if ($conn->getTransactionNestingLevel() === 0) {
// use select for update // use select for update
$sql = $conn->getDatabasePlatform()->getTableHiLoCurrentValSql($this->_tableName, $this->_sequenceName); $sql = $conn->getDatabasePlatform()->getTableHiLoCurrentValSql($this->_tableName, $this->_sequenceName);
$currentLevel = $conn->fetchColumn($sql); $currentLevel = $conn->fetchColumn($sql);
if ($currentLevel != null) { if ($currentLevel != null) {
$this->_nextValue = $currentLevel; $this->_nextValue = $currentLevel;
$this->_maxValue = $this->_nextValue + $this->_allocationSize; $this->_maxValue = $this->_nextValue + $this->_allocationSize;
@ -74,6 +75,7 @@ class TableGenerator extends AbstractIdGenerator
// or do we want to work with table locks exclusively? // or do we want to work with table locks exclusively?
} }
} }
return $this->_nextValue++; return $this->_nextValue++;
} }
} }