tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-07-01 00:49:33 +02:00
Code Issues Projects Releases Wiki Activity

ENHANCEMENT Added Hierarchy->flushCache() to clear in-memory caches for allChildrenIncludingDeleted() and allChildren()

Browse Source 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@70213 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Ingo Schommer 2009-01-15 05:54:10 +00:00
parent 613d13e15d
commit 42fd02234d
1 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
core/model/Hierarchy.php
View File

@ -323,7 +323,7 @@ class Hierarchy extends DataObjectDecorator {
* @var array $idList Array to put results in. * @var array $idList Array to put results in.
*/ */
public function loadDescendantIDListInto(&$idList) { public function loadDescendantIDListInto(&$idList) {
if($children = $this->AllChildren()) { if($children = $this->_cache_allChildren()) {
foreach($children as $child) { foreach($children as $child) {
if(in_array($child->ID, $idList)) { if(in_array($child->ID, $idList)) {
continue; continue;
@ -338,18 +338,13 @@ class Hierarchy extends DataObjectDecorator {
* Cached result for AllChildren(). * Cached result for AllChildren().
* @var DataObjectSet * @var DataObjectSet
*/ */
protected $allChildren; protected $_cache_allChildren;
/** /**
* Cached result for AllChildrenIncludingDeleted(). * Cached result for AllChildrenIncludingDeleted().
* @var DataObjectSet * @var DataObjectSet
*/ */
protected $allChildrenIncludingDeleted; protected $_cache_allChildrenIncludingDeleted;
/**
* Cached result for Children().
*/
protected $children;
/** /**
* Get the children for this DataObject. * Get the children for this DataObject.
@ -366,11 +361,11 @@ class Hierarchy extends DataObjectDecorator {
public function AllChildren() { public function AllChildren() {
// Cache the allChildren data, so that future requests will return the references to the same // Cache the allChildren data, so that future requests will return the references to the same
// object. This allows the mark..() system to work appropriately. // object. This allows the mark..() system to work appropriately.
if(!$this->allChildren) { if(!$this->_cache_allChildren) {
$this->allChildren = $this->owner->stageChildren(true); $this->_cache_allChildren = $this->owner->stageChildren(true);
} }
return $this->allChildren; return $this->_cache_allChildren;
} }
/** /**
@ -395,11 +390,11 @@ class Hierarchy extends DataObjectDecorator {
// Cache the allChildren data, so that future requests will return the references to the same // Cache the allChildren data, so that future requests will return the references to the same
// object. This allows the mark..() system to work appropriately. // object. This allows the mark..() system to work appropriately.
if(!$this->allChildrenIncludingDeleted) { if(!$this->_cache_allChildrenIncludingDeleted) {
$baseClass = ClassInfo::baseDataClass($this->owner->class); $baseClass = ClassInfo::baseDataClass($this->owner->class);
if($baseClass) { if($baseClass) {
$stageChildren = $this->owner->stageChildren(true); $stageChildren = $this->owner->stageChildren(true);
$this->allChildrenIncludingDeleted = $stageChildren; $this->_cache_allChildrenIncludingDeleted = $stageChildren;
$this->owner->extend("augmentAllChildrenIncludingDeleted", $stageChildren, $context); $this->owner->extend("augmentAllChildrenIncludingDeleted", $stageChildren, $context);
@ -442,12 +437,12 @@ class Hierarchy extends DataObjectDecorator {
} }
} }
$this->allChildrenIncludingDeleted = new DataObjectSet(); $this->_cache_allChildrenIncludingDeleted = new DataObjectSet();
// First, go through the stage children. They will all be listed but may be different colours // First, go through the stage children. They will all be listed but may be different colours
if($stageChildren) { if($stageChildren) {
foreach($stageChildren as $child) { foreach($stageChildren as $child) {
$this->allChildrenIncludingDeleted->push($child); $this->_cache_allChildrenIncludingDeleted->push($child);
} }
} }
@ -456,7 +451,7 @@ class Hierarchy extends DataObjectDecorator {
foreach($liveChildren as $child) { foreach($liveChildren as $child) {
// Not found on stage = deleted page. Anything else is ignored // Not found on stage = deleted page. Anything else is ignored
if(!isset($idxFoundInStage[$child->ID])) { if(!isset($idxFoundInStage[$child->ID])) {
$this->allChildrenIncludingDeleted->push($child); $this->_cache_allChildrenIncludingDeleted->push($child);
} }
} }
} }
@ -467,7 +462,7 @@ class Hierarchy extends DataObjectDecorator {
} }
} }
return $this->allChildrenIncludingDeleted; return $this->_cache_allChildrenIncludingDeleted;
} }
/** /**
@ -556,7 +551,7 @@ class Hierarchy extends DataObjectDecorator {
// child as the root of the search. This will stop the recursive call from searching backwards. // child as the root of the search. This will stop the recursive call from searching backwards.
// If afterNode is given, then only search for the nodes after // If afterNode is given, then only search for the nodes after
if(!$afterNode || $afterNode->ParentID != $this->owner->ID) { if(!$afterNode || $afterNode->ParentID != $this->owner->ID) {
$children = $this->AllChildren(); $children = $this->_cache_allChildren();
} else { } else {
$children = DataObject::get(ClassInfo::baseDataClass($this->owner->class), "\"$baseClass\".\"ParentID\"={$this->owner->ID}" . ( ( $afterNode ) ? " AND \"Sort\" > " . sprintf( '%d', $afterNode->Sort ) : "" ), '"Sort" ASC'); $children = DataObject::get(ClassInfo::baseDataClass($this->owner->class), "\"$baseClass\".\"ParentID\"={$this->owner->ID}" . ( ( $afterNode ) ? " AND \"Sort\" > " . sprintf( '%d', $afterNode->Sort ) : "" ), '"Sort" ASC');
} }
@ -584,6 +579,11 @@ class Hierarchy extends DataObjectDecorator {
return null; return null;
} }
function flushCache() {
$this->_cache_allChildrenIncludingDeleted = null;
$this->_cache_allChildren = null;
}
} }
?> ?>