summaryrefslogtreecommitdiff
path: root/classes
diff options
context:
space:
mode:
authorRobin Millette <millette@plantard.controlezvous.ca>2009-01-22 20:33:34 +0000
committerRobin Millette <millette@plantard.controlezvous.ca>2009-01-22 20:33:34 +0000
commit9e9b8349a2d32ae664a5b000ef34a7bb13a039f5 (patch)
tree029c69c1c9acf04fbe91994896d971cd25e7a48e /classes
parent5a84d7f975c2ae356d1fbd88757414ecb385ff5e (diff)
parent248fd763bde70537e5e9a14db435c27a52849c9a (diff)
Merge branch 'master' of /var/www/trunk
Diffstat (limited to 'classes')
-rw-r--r--classes/Memcached_DataObject.php49
-rw-r--r--classes/Notice.php6
-rw-r--r--classes/NoticeWrapper.php62
3 files changed, 42 insertions, 75 deletions
diff --git a/classes/Memcached_DataObject.php b/classes/Memcached_DataObject.php
index b9f599dbc..97e1ed736 100644
--- a/classes/Memcached_DataObject.php
+++ b/classes/Memcached_DataObject.php
@@ -21,7 +21,7 @@ if (!defined('LACONICA')) { exit(1); }
require_once INSTALLDIR.'/classes/Memcached_DataObject.php';
-class Memcached_DataObject extends DB_DataObject
+class Memcached_DataObject extends DB_DataObject
{
function &staticGet($cls, $k, $v=null)
{
@@ -69,7 +69,7 @@ class Memcached_DataObject extends DB_DataObject
$result = parent::insert();
return $result;
}
-
+
function update($orig=null)
{
if (is_object($orig) && $orig instanceof Memcached_DataObject) {
@@ -81,21 +81,21 @@ class Memcached_DataObject extends DB_DataObject
}
return $result;
}
-
+
function delete()
{
$this->decache(); # while we still have the values!
return parent::delete();
}
-
+
static function memcache() {
return common_memcache();
}
-
+
static function cacheKey($cls, $k, $v) {
return common_cache_key(strtolower($cls).':'.$k.':'.$v);
}
-
+
static function getcached($cls, $k, $v) {
$c = Memcached_DataObject::memcache();
if (!$c) {
@@ -114,7 +114,7 @@ class Memcached_DataObject extends DB_DataObject
}
return $_DB_DATAOBJECT['INI'][$this->_database][$this->__table."__keys"];
}
-
+
function encache()
{
$c = $this->memcache();
@@ -122,7 +122,7 @@ class Memcached_DataObject extends DB_DataObject
return false;
} else {
$pkey = array();
- $pval = array();
+ $pval = array();
$types = $this->keyTypes();
ksort($types);
foreach ($types as $key => $type) {
@@ -139,7 +139,7 @@ class Memcached_DataObject extends DB_DataObject
$c->set($this->cacheKey($this->tableName(), $pkeys, $pvals), $this);
}
}
-
+
function decache()
{
$c = $this->memcache();
@@ -147,7 +147,7 @@ class Memcached_DataObject extends DB_DataObject
return false;
} else {
$pkey = array();
- $pval = array();
+ $pval = array();
$types = $this->keyTypes();
ksort($types);
foreach ($types as $key => $type) {
@@ -201,4 +201,33 @@ class Memcached_DataObject extends DB_DataObject
}
return $search_engine;
}
+
+ static function cachedQuery($cls, $qry, $expiry=3600)
+ {
+ $c = Memcached_DataObject::memcache();
+ if (!$c) {
+ $inst = new $cls();
+ $inst->query($qry);
+ return $inst;
+ }
+ $key_part = common_keyize($cls).':'.md5($qry);
+ $ckey = common_cache_key($key_part);
+ $stored = $c->get($ckey);
+ if ($stored) {
+ return new ArrayWrapper($stored);
+ }
+
+ $inst = new $cls();
+ $result = $inst->query($qry);
+ if (!$result) {
+ return $inst;
+ }
+ $cached = array();
+ while ($inst->fetch()) {
+ $cached[] = clone($inst);
+ }
+ $inst->free();
+ $c->set($ckey, $cached, MEMCACHE_COMPRESSED, $expiry);
+ return new ArrayWrapper($cached);
+ }
}
diff --git a/classes/Notice.php b/classes/Notice.php
index 5fa078205..de7540705 100644
--- a/classes/Notice.php
+++ b/classes/Notice.php
@@ -443,7 +443,7 @@ class Notice extends Memcached_DataObject
# On a cache hit, return a DB-object-like wrapper
if ($notices !== false) {
- $wrapper = new NoticeWrapper(array_slice($notices, $offset, $limit));
+ $wrapper = new ArrayWrapper(array_slice($notices, $offset, $limit));
return $wrapper;
}
@@ -483,7 +483,7 @@ class Notice extends Memcached_DataObject
# return a wrapper of the array for use now
- return new NoticeWrapper(array_slice($notices, $offset, $limit));
+ return new ArrayWrapper(array_slice($notices, $offset, $limit));
}
}
@@ -514,7 +514,7 @@ class Notice extends Memcached_DataObject
# return a wrapper of the array for use now
- $wrapper = new NoticeWrapper(array_slice($notices, $offset, $limit));
+ $wrapper = new ArrayWrapper(array_slice($notices, $offset, $limit));
return $wrapper;
}
diff --git a/classes/NoticeWrapper.php b/classes/NoticeWrapper.php
deleted file mode 100644
index 233340ccd..000000000
--- a/classes/NoticeWrapper.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-/*
- * Laconica - a distributed open-source microblogging tool
- * Copyright (C) 2008, Controlez-Vous, Inc.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-if (!defined('LACONICA')) { exit(1); }
-
-require_once(INSTALLDIR.'/classes/Notice.php');
-
-class NoticeWrapper extends Notice
-{
-
- public $id; // int(4) primary_key not_null
- public $profile_id; // int(4) not_null
- public $uri; // varchar(255) unique_key
- public $content; // varchar(140)
- public $rendered; // text()
- public $url; // varchar(255)
- public $created; // datetime() not_null
- public $modified; // timestamp() not_null default_CURRENT_TIMESTAMP
- public $reply_to; // int(4)
- public $is_local; // tinyint(1)
- public $source; // varchar(32)
-
- var $notices = null;
- var $i = -1;
-
- function __construct($arr)
- {
- $this->notices = $arr;
- }
-
- function fetch()
- {
- static $fields = array('id', 'profile_id', 'uri', 'content', 'rendered',
- 'url', 'created', 'modified', 'reply_to', 'is_local', 'source');
- $this->i++;
- if ($this->i >= count($this->notices)) {
- return false;
- } else {
- $n = $this->notices[$this->i];
- foreach ($fields as $f) {
- $this->$f = $n->$f;
- }
- return true;
- }
- }
-} \ No newline at end of file