Skip to content

Commit

Permalink
Fix some bugs in the cache database driver, and update the tests for …
Browse files Browse the repository at this point in the history 
…K24.
  • Loading branch information
@bharat
bharat committed Dec 21, 2009
1 parent 0c3fd95 commit 5df1dc1
Show file tree
Hide file tree
Showing 2 changed files with 37 additions and 49 deletions.
7 changes: 3 additions & 4 deletions modules/gallery/libraries/drivers/Cache/Database.php
View file
Expand Up @@ -90,7 +90,7 @@ public function get_tag($tags) {
->select()
->from("caches");
foreach ($tags as $tag) {
$db->where("tags", "LIKE", "<$tag>");
$db->where("tags", "LIKE", "%<$tag>%");
}
$db_result = $db->execute();

Expand Down Expand Up @@ -153,14 +153,13 @@ public function get($keys, $single=false) {
* @param bool delete a tag
* @return bool
*/
public function delete($id, $tag = false) {
public function delete($id, $tag=false) {
$db = db::build()
->delete("caches");
if ($id === true) {
// Delete all caches
$db->where("1", "=", "1");
} else if ($tag === true) {
$db->where("tags", "LIKE", "<$id>");
$db->where("tags", "LIKE", "%<$id>%");
} else {
$db->where("key", "=", $id);
}
Expand Down
79 changes: 34 additions & 45 deletions modules/gallery/tests/Cache_Test.php
View file
Expand Up @@ -20,88 +20,83 @@
class Cache_Test extends Unit_Test_Case {
private $_driver;
public function setup() {
Database::instance()->from("caches")->where("1", "=", "1")->delete();
db::build()->delete("caches")->execute();
$this->_driver = new Cache_Database_Driver();
}

public function cache_exists_test() {
$db = Database::instance();

$this->assert_false($this->_driver->exists("test_key"), "test_key should not be defined");

$id = md5(rand());
$db->insert("caches", array("key" => $id, "tags" => "<tag1>, <tag2>",
"expiration" => 84600 + time(),
"cache" => serialize("some test data")));
db::build()
->insert("caches")
->columns("key", "tags", "expiration", "cache")
->values($id, "<tag1>, <tag2>", 84600 + time(), serialize("some test data"))
->execute();

$this->assert_true($this->_driver->exists($id), "test_key should be defined");
}

public function cache_get_test() {
$db = Database::instance();

$id = md5(rand());
$db->insert("caches", array("key" => $id, "tags" => "<tag1>, <tag2>",
"expiration" => 84600 + time(),
"cache" => serialize("some test data")));

$data = $this->_driver->get($id);
db::build()
->insert("caches")
->columns("key", "tags", "expiration", "cache")
->values($id, "<tag1>, <tag2>", 84600 + time(), serialize("some test data"))
->execute();

$data = $this->_driver->get(array($id));
$this->assert_equal("some test data", $data, "cached data should match");

$data = $this->_driver->get("");
$data = $this->_driver->get(array(""));
$this->assert_equal(null, $data, "cached data should not be found");
}

public function cache_set_test() {
$db = Database::instance();

$id = md5(rand());
$original_data = array("field1" => "value1", "field2" => "value2");
$this->_driver->set($id, $original_data, array("tag1", "tag2"), 84600);
$this->_driver->set(array($id => $original_data), array("tag1", "tag2"), 84600);

$data = $this->_driver->get($id);
$data = $this->_driver->get(array($id));
$this->assert_equal($original_data, $data, "cached data should match");
}

public function cache_find_test() {
$db = Database::instance();

public function cache_get_tag_test() {
$id1 = md5(rand());
$value1 = array("field1" => "value1", "field2" => "value2");
$this->_driver->set($id1, $value1, array("tag1", "tag2"), 84600);
$this->_driver->set(array($id1 => $value1), array("tag1", "tag2"), 84600);

$id2 = md5(rand());
$value2 = array("field3" => "value3", "field4" => "value4");
$this->_driver->set($id2, $value2, array("tag2", "tag3"), 84600);
$this->_driver->set(array($id2 => $value2), array("tag2", "tag3"), 84600);

$id3 = md5(rand());
$value3 = array("field5" => "value5", "field6" => "value6");
$this->_driver->set($id3, $value3, array("tag3", "tag4"), 84600);
$this->_driver->set(array($id3 => $value3), array("tag3", "tag4"), 84600);

$data = $this->_driver->find("tag2");
$data = $this->_driver->get_tag(array("tag2"));

$expected = array($id1 => $value1, $id2 => $value2);
ksort($expected);
$this->assert_equal($expected, $data, "Expected id1 & id2");

$data = $this->_driver->find("tag4");
$data = $this->_driver->get_tag(array("tag4"));
$this->assert_equal(array($id3 => $value3), $data, "Expected id3");
}

public function cache_delete_expired_test() {
$db = Database::instance();

$id1 = md5(rand());
$value1 = array("field1" => "value1", "field2" => "value2");
$this->_driver->set($id1, $value1, array("tag1", "tag2"), -84600);
$this->_driver->set(array($id1 => $value1), array("tag1", "tag2"), -84600);

$id2 = md5(rand());
$value2 = array("field3" => "value3", "field4" => "value4");
$this->_driver->set($id2, $value2, array("tag2", "tag3"), -846000);
$this->_driver->set(array($id2 => $value2), array("tag2", "tag3"), -846000);

$id3 = md5(rand());
$value3 = array("field5" => "value5", "field6" => "value6");
$this->_driver->set($id3, $value3, array("tag3", "tag4"), -84600);
$this->_driver->set(array($id3 => $value3), array("tag3", "tag4"), -84600);

$data = $this->_driver->delete_expired();

Expand All @@ -111,19 +106,17 @@ public function cache_delete_expired_test() {
}

public function cache_delete_id_test() {
$db = Database::instance();

$id1 = md5(rand());
$value1 = array("field1" => "value1", "field2" => "value2");
$this->_driver->set($id1, $value1, array("tag1", "tag2"), 84600);
$this->_driver->set(array($id1 => $value1), array("tag1", "tag2"), 84600);

$id2 = md5(rand());
$value2 = array("field3" => "value3", "field4" => "value4");
$this->_driver->set($id2, $value2, array("tag2", "tag3"), 846000);
$this->_driver->set(array($id2 => $value2), array("tag2", "tag3"), 846000);

$id3 = md5(rand());
$value3 = array("field5" => "value5", "field6" => "value6");
$this->_driver->set($id3, $value3, array("tag3", "tag4"), 84600);
$this->_driver->set(array($id3 => $value3), array("tag3", "tag4"), 84600);

$this->_driver->delete($id1);

Expand All @@ -133,19 +126,17 @@ public function cache_delete_id_test() {
}

public function cache_delete_tag_test() {
$db = Database::instance();

$id1 = md5(rand());
$value1 = array("field1" => "value1", "field2" => "value2");
$this->_driver->set($id1, $value1, array("tag1", "tag2"), 84600);
$this->_driver->set(array($id1 => $value1), array("tag1", "tag2"), 84600);

$id2 = md5(rand());
$value2 = array("field3" => "value3", "field4" => "value4");
$this->_driver->set($id2, $value2, array("tag2", "tag3"), 846000);
$this->_driver->set(array($id2 => $value2), array("tag2", "tag3"), 846000);

$id3 = md5(rand());
$value3 = array("field5" => "value5", "field6" => "value6");
$this->_driver->set($id3, $value3, array("tag3", "tag4"), 84600);
$this->_driver->set(array($id3 => $value3), array("tag3", "tag4"), 84600);

$data = $this->_driver->delete("tag3", true);

Expand All @@ -155,19 +146,17 @@ public function cache_delete_tag_test() {
}

public function cache_delete_all_test() {
$db = Database::instance();

$id1 = md5(rand());
$value1 = array("field1" => "value1", "field2" => "value2");
$this->_driver->set($id1, $value1, array("tag1", "tag2"), 84600);
$this->_driver->set(array($id1 => $value1), array("tag1", "tag2"), 84600);

$id2 = md5(rand());
$value2 = array("field3" => "value3", "field4" => "value4");
$this->_driver->set($id2, $value2, array("tag2", "tag3"), 846000);
$this->_driver->set(array($id2 => $value2), array("tag2", "tag3"), 846000);

$id3 = md5(rand());
$value3 = array("field5" => "value5", "field6" => "value6");
$this->_driver->set($id3, $value3, array("tag3", "tag4"), 84600);
$this->_driver->set(array($id3 => $value3), array("tag3", "tag4"), 84600);

$data = $this->_driver->delete(true);

Expand Down

0 comments on commit 5df1dc1

Please sign in to comment.