aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/acm/acm_db.php
diff options
context:
space:
mode:
authorLudovic Arnaud <ludovic_arnaud@users.sourceforge.net>2003-11-26 23:34:33 +0000
committerLudovic Arnaud <ludovic_arnaud@users.sourceforge.net>2003-11-26 23:34:33 +0000
commitac0b5d79ad4c6b7d1e9bf52763918f1e0017b9a0 (patch)
treeae435d9e1fe6180d9bed855c8f72b01ab3215d1a /phpBB/includes/acm/acm_db.php
parent1dd9ad2f79c5d3e26705ea21396456d346c42c30 (diff)
downloadforums-ac0b5d79ad4c6b7d1e9bf52763918f1e0017b9a0.tar
forums-ac0b5d79ad4c6b7d1e9bf52763918f1e0017b9a0.tar.gz
forums-ac0b5d79ad4c6b7d1e9bf52763918f1e0017b9a0.tar.bz2
forums-ac0b5d79ad4c6b7d1e9bf52763918f1e0017b9a0.tar.xz
forums-ac0b5d79ad4c6b7d1e9bf52763918f1e0017b9a0.zip
Changed: the way caches expire. (see dev forum)
Added: "private" caching. (see dev forum too ;)) git-svn-id: file:///svn/phpbb/trunk@4684 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/acm/acm_db.php')
-rw-r--r--phpBB/includes/acm/acm_db.php175
1 files changed, 116 insertions, 59 deletions
diff --git a/phpBB/includes/acm/acm_db.php b/phpBB/includes/acm/acm_db.php
index 6301307723..ed57e7605a 100644
--- a/phpBB/includes/acm/acm_db.php
+++ b/phpBB/includes/acm/acm_db.php
@@ -13,30 +13,51 @@
class acm
{
+ // Contains all loaded variables
var $vars = '';
- var $is_modified = FALSE;
+
+ // Contains the names of the variables that are ready to be used
+ // (iow, variables that have been unserialized)
+ var $var_ready = array();
+
+ // Contains variables that have been updated or destroyed this session
+ var $var_expires = array();
+
+ // Contains variables that have already been requested
+ // If a variable has been requested but not loaded, it simply means it
+ // wasn't found in the db
+ var $var_requested = array();
function load($var_names = '')
{
global $db;
$this->vars = array();
- $sql = 'SELECT var_name, var_ts, var_data
- FROM ' . CACHE_TABLE;
-
- if (!empty($var_names))
+ if (is_array($var_names))
{
- $sql .= "\nWHERE var_name IN ('" . implode("', '", $var_names) . "')";
+ $var_requested = $var_names;
+ $sql_condition = "var_name IN ('" . implode("', '", $var_names) . "')";
+ }
+ else
+ {
+// $sql_condition = "var_name NOT LIKE '\_%'";
+ $sql_condition = "LEFT(var_name, 1) <> '_'";
}
+ $sql = 'SELECT var_name, var_data
+ FROM ' . CACHE_TABLE . '
+ WHERE var_expires > ' . time() . "
+ AND $sql_condition";
$result = $db->sql_query($sql);
while ($row = $db->sql_fetchrow($result))
{
- $this->vars[$row['var_name']] = array(
- 'data' => unserialize($row['var_data']),
- 'ts' => intval($row['var_ts'])
- );
+ $this->vars[$row['var_name']] = $row['var_data'];
+
+ if (!$var_names)
+ {
+ $var_requested[] = $row['var_name'];
+ }
}
}
@@ -48,31 +69,22 @@ class acm
function save()
{
- if (!$this->is_modified)
- {
- return;
- }
-
global $db;
$delete = $insert = array();
- foreach ($this->vars as $var_name => $var_ary)
+ foreach ($this->var_expires as $var_name => $expires)
{
- if (!empty($var_ary['is_modified']))
+ if ($expires == 'now')
{
- if (!empty($var_ary['delete']))
- {
- $delete[] = $var_name;
- }
- else
- {
- $delete[] = $var_name;
- $insert[] = "'$var_name', " . time() . ", '" . $db->sql_escape(serialize($var_ary['data'])) . "'";
- }
-
- $this->vars[$var_name]['is_modified'] = FALSE;
+ $delete[] = $var_name;
+ }
+ else
+ {
+ $delete[] = $var_name;
+ $insert[] = "'$var_name', $expires, '" . $db->sql_escape(serialize($this->vars[$var_name])) . "'";
}
}
+ $this->var_expires = array();
if (count($delete))
{
@@ -85,7 +97,8 @@ class acm
switch (SQL_LAYER)
{
case 'mysql':
- $sql = 'INSERT INTO ' . CACHE_TABLE . ' (var_name, var_ts, var_data)
+ case 'mysql4':
+ $sql = 'INSERT INTO ' . CACHE_TABLE . ' (var_name, var_expires, var_data)
VALUES (' . implode('), (', $insert) . ')';
$db->sql_query($sql);
break;
@@ -93,70 +106,114 @@ class acm
default:
foreach ($insert as $values)
{
- $sql = 'INSERT INTO ' . CACHE_TABLE . " (var_name, var_ts, var_data)
+ $sql = 'INSERT INTO ' . CACHE_TABLE . " (var_name, var_expires, var_data)
VALUES ($values)";
$db->sql_query($sql);
}
}
}
-
- $this->is_modified = FALSE;
}
- function tidy($max_age = 0)
+ function tidy()
{
global $db;
$sql = 'DELETE FROM ' . CACHE_TABLE . '
- WHERE var_ts < ' . (time() - $max_age);
+ WHERE var_expires < ' . time();
$db->sql_query($sql);
}
- function get($var_name, $max_age = 0)
+ function get($var_name)
{
- return ($this->exists($var_name, $max_age)) ? $this->vars[$var_name]['data'] : NULL;
+ if (!is_array($this->vars))
+ {
+ $this->load();
+ }
+
+ if ($var_name{0} == '_')
+ {
+ if (!in_array($this->var_requested, $var_name))
+ {
+ $this->var_requested[] = $var_name;
+
+ global $db;
+ $sql = 'SELECT var_data
+ FROM ' . CACHE_TABLE . "
+ WHERE var_name = '$var_name'
+ AND var_expires > " . time();
+ $result = $db->sql_query($sql);
+ if ($row = $db->sql_fetchrow($result))
+ {
+ $this->vars[$var_name] = $row['var_data'];
+ }
+ }
+ }
+
+ if ($this->exists($var_name))
+ {
+ if (empty($this->var_ready[$var_name]))
+ {
+ $this->vars[$var_name] = unserialize($this->vars[$var_name]);
+ $this->var_ready[$var_name] = TRUE;
+ }
+
+ return $this->vars[$var_name];
+ }
+ else
+ {
+ return NULL;
+ }
}
- function put($var_name, $var_data)
+ function put($var_name, $var_data, $ttl = 31536000)
{
- $this->vars[$var_name] = array(
- 'data' => $var_data,
- 'ts' => time(),
- 'is_modified' => TRUE
- );
+ $this->vars[$var_name] = $var_data;
+
+ if ($var_name{0} == '_')
+ {
+ global $db;
+
+ switch (SQL_LAYER)
+ {
+ case 'mysql':
+ case 'mysql4':
+ $INSERT = 'REPLACE';
+ break;
+
+ default:
+ $sql = 'DELETE FROM ' . CACHE_TABLE . "
+ WHERE var_name = '$var_name'";
+ $db->sql_query($sql);
+
+ $INSERT = 'INSERT';
+ }
- $this->is_modified = TRUE;
+ $sql = "$INSERT INTO " . CACHE_TABLE . " (var_name, var_expires, var_data)
+ VALUES ('$var_name', " . (time() + $ttl) . ", '" . $db->sql_escape(serialize($var_data)) . "')";
+ $db->sql_query($sql);
+ }
+ else
+ {
+ $this->var_expires[$var_name] = time() + $ttl;
+ }
}
function destroy($var_name, $void = NULL)
{
if (isset($this->vars[$var_name]))
{
- $this->is_modified = TRUE;
-
- $this->vars[$var_name] = array(
- 'is_modified' => TRUE,
- 'delete' => TRUE
- );
+ $this->var_expires[$var_name] = 'now';
+ unset($this->vars[$var_name]);
}
}
- function exists($var_name, $max_age = 0)
+ function exists($var_name)
{
if (!is_array($this->vars))
{
$this->load();
}
- if ($max_age > 0 && isset($this->vars[$var_name]))
- {
- if ($this->vars[$var_name]['ts'] + $max_age < time())
- {
- $this->destroy($var_name);
- return FALSE;
- }
- }
-
return isset($this->vars[$var_name]);
}
}
generated by cgit v1.2.1 (git 2.21.0) at 2025-04-21 19:20:46 +0000