chalec
/
ctrlv-privatebin
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove cache from database backend

This commit is contained in:
Felix J. Ogris 2022-11-04 21:19:47 +01:00
parent 3d485ecd7f
commit 604c931875
1 changed files with 33 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

90
lib/Data/Database.php
View File

@ -25,13 +25,6 @@ use PrivateBin\Json;
*/ */
class Database extends AbstractData class Database extends AbstractData
{ {
/**
* cache for select queries
*
* @var array
*/
private $_cache = array();
/** /**
* instance of database connection * instance of database connection
* *
@ -149,16 +142,6 @@ class Database extends AbstractData
*/ */
public function create($pasteid, array $paste) public function create($pasteid, array $paste)
{ {
if (
array_key_exists($pasteid, $this->_cache)
) {
if (false !== $this->_cache[$pasteid]) {
return false;
} else {
unset($this->_cache[$pasteid]);
}
}
$expire_date = 0; $expire_date = 0;
$opendiscussion = $burnafterreading = false; $opendiscussion = $burnafterreading = false;
$attachment = $attachmentname = null; $attachment = $attachmentname = null;
@ -222,64 +205,59 @@ class Database extends AbstractData
*/ */
public function read($pasteid) public function read($pasteid)
{ {
if (array_key_exists($pasteid, $this->_cache)) {
return $this->_cache[$pasteid];
}
$this->_cache[$pasteid] = false;
try { try {
$paste = $this->_select( $row = $this->_select(
'SELECT * FROM "' . $this->_sanitizeIdentifier('paste') . 'SELECT * FROM "' . $this->_sanitizeIdentifier('paste') .
'" WHERE "dataid" = ?', array($pasteid), true '" WHERE "dataid" = ?', array($pasteid), true
); );
} catch (Exception $e) { } catch (Exception $e) {
$paste = false; $row = false;
} }
if ($paste === false) { if ($row === false) {
return false; return false;
} }
// create array // create array
$data = Json::decode($paste['data']); $data = Json::decode($row['data']);
$isVersion2 = array_key_exists('v', $data) && $data['v'] >= 2; $isVersion2 = array_key_exists('v', $data) && $data['v'] >= 2;
if ($isVersion2) { if ($isVersion2) {
$this->_cache[$pasteid] = $data; $paste = $data;
list($createdKey) = $this->_getVersionedKeys(2); list($createdKey) = $this->_getVersionedKeys(2);
} else { } else {
$this->_cache[$pasteid] = array('data' => $paste['data']); $paste = array('data' => $row['data']);
list($createdKey) = $this->_getVersionedKeys(1); list($createdKey) = $this->_getVersionedKeys(1);
} }
try { try {
$paste['meta'] = Json::decode($paste['meta']); $row['meta'] = Json::decode($row['meta']);
} catch (Exception $e) { } catch (Exception $e) {
$paste['meta'] = array(); $row['meta'] = array();
} }
$paste = self::upgradePreV1Format($paste); $row = self::upgradePreV1Format($row);
$this->_cache[$pasteid]['meta'] = $paste['meta']; $paste['meta'] = $row['meta'];
$this->_cache[$pasteid]['meta'][$createdKey] = (int) $paste['postdate']; $paste['meta'][$createdKey] = (int) $row['postdate'];
$expire_date = (int) $paste['expiredate']; $expire_date = (int) $row['expiredate'];
if ($expire_date > 0) { if ($expire_date > 0) {
$this->_cache[$pasteid]['meta']['expire_date'] = $expire_date; $paste['meta']['expire_date'] = $expire_date;
} }
if ($isVersion2) { if ($isVersion2) {
return $this->_cache[$pasteid]; return $paste;
} }
// support v1 attachments // support v1 attachments
if (array_key_exists('attachment', $paste) && !empty($paste['attachment'])) { if (array_key_exists('attachment', $row) && !empty($row['attachment'])) {
$this->_cache[$pasteid]['attachment'] = $paste['attachment']; $paste['attachment'] = $row['attachment'];
if (array_key_exists('attachmentname', $paste) && !empty($paste['attachmentname'])) { if (array_key_exists('attachmentname', $row) && !empty($row['attachmentname'])) {
$this->_cache[$pasteid]['attachmentname'] = $paste['attachmentname']; $paste['attachmentname'] = $row['attachmentname'];
} }
} }
if ($paste['opendiscussion']) { if ($row['opendiscussion']) {
$this->_cache[$pasteid]['meta']['opendiscussion'] = true; $paste['meta']['opendiscussion'] = true;
} }
if ($paste['burnafterreading']) { if ($row['burnafterreading']) {
$this->_cache[$pasteid]['meta']['burnafterreading'] = true; $paste['meta']['burnafterreading'] = true;
} }
return $this->_cache[$pasteid]; return $paste;
} }
/** /**
@ -298,11 +276,6 @@ class Database extends AbstractData
'DELETE FROM "' . $this->_sanitizeIdentifier('comment') . 'DELETE FROM "' . $this->_sanitizeIdentifier('comment') .
'" WHERE "pasteid" = ?', array($pasteid) '" WHERE "pasteid" = ?', array($pasteid)
); );
if (
array_key_exists($pasteid, $this->_cache)
) {
unset($this->_cache[$pasteid]);
}
} }
/** /**
@ -314,12 +287,15 @@ class Database extends AbstractData
*/ */
public function exists($pasteid) public function exists($pasteid)
{ {
if ( try {
!array_key_exists($pasteid, $this->_cache) $row = $this->_select(
) { 'SELECT * FROM "' . $this->_sanitizeIdentifier('paste') .
$this->_cache[$pasteid] = $this->read($pasteid); '" WHERE "dataid" = ?', array($pasteid), true
);
} catch (Exception $e) {
$row = false;
} }
return (bool) $this->_cache[$pasteid]; return (bool) $row;
} }
/** /**