Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

More conservative fixes to 4543-entity-caching #2

Merged
merged 2 commits into from Jun 14, 2012
Merged

More conservative fixes to 4543-entity-caching #2

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6dafbe0
small fixes
mrclay May 29, 2012
e274214
Added entity caching to elgg_get_entities with workaround for recursi…
mrclay Jun 13, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
34 changes: 24 additions & 10 deletions engine/lib/entities.php
View file
Open in desktop
Expand Up @@ -30,7 +30,7 @@
*
* @param int $guid The entity guid
*
* @return void
* @return null
* @access private
*/
function invalidate_cache_for_entity($guid) {
Expand All @@ -48,15 +48,21 @@ function invalidate_cache_for_entity($guid) {
*
* @param ElggEntity $entity Entity to cache
*
* @return void
* @return null
* @see retrieve_cached_entity()
* @see invalidate_cache_for_entity()
* @access private
* TODO(evan): Use an ElggCache object
*/
function cache_entity(ElggEntity $entity) {
global $ENTITY_CACHE;


// Don't cache entities while access control is off, otherwise they could be
// exposed to users who shouldn't see them when control is re-enabled.
if (elgg_get_ignore_access()) {
return;
}

// Don't store too many or we'll have memory problems
// TODO(evan): Pick a less arbitrary limit
if (count($ENTITY_CACHE) > 256) {
Expand All @@ -71,7 +77,7 @@ function cache_entity(ElggEntity $entity) {
*
* @param int $guid The guid
*
* @return void
* @return ElggEntity|bool false if entity not cached, or not fully loaded
* @see cache_entity()
* @see invalidate_cache_for_entity()
* @access private
Expand Down Expand Up @@ -703,7 +709,9 @@ function get_entity($guid) {
}

$new_entity = entity_row_to_elggstar(get_entity_as_row($guid));
cache_entity($new_entity);
if ($new_entity) {
cache_entity($new_entity);
}
return $new_entity;
}

Expand Down Expand Up @@ -946,13 +954,18 @@ function elgg_get_entities(array $options = array()) {
}

$dt = get_data($query, $options['callback']);
foreach ($dt as $entity) {
// If a custom callback is provided, it could return something other than ElggEntity,
// so we have to do an explicit check here.
if ($entity instanceof ElggEntity) {
cache_entity($entity);
if ($dt) {
foreach ($dt as $entity) {
// If a custom callback is provided, it could return something other than ElggEntity,
// so we have to do an explicit check here.
if ($entity instanceof ElggEntity) {
cache_entity($entity);
}
}
// @todo Without this, recursive delete fails. See #4568
reset($dt);
}

return $dt;
} else {
$total = get_data_row($query);
Expand Down Expand Up @@ -1425,6 +1438,7 @@ function disable_entity($guid, $reason = "", $recursive = true) {

$entity->disableMetadata();
$entity->disableAnnotations();
invalidate_cache_for_entity($guid);

$res = update_data("UPDATE {$CONFIG->dbprefix}entities
SET enabled = 'no'
Expand Down