Changeset 965

Timestamp:

11/23/08 16:19:59 (3 years ago)

Author:

bogdan2412

Message:

Make it possible for disk cache to handle more complex paths for files (for example to put all files beginning with ab in cache/a/ab/)
Since I don't know how we can benchmark this properly the default behaiviour is still the same as before (all cache files are put in IA_ROOT_DIR/cache/)

Also, I added a few fixes from live.

Location:

trunk

Files:

• common/cache.php (modified) (7 diffs)
• common/db/job.php (modified) (1 diff)
• scripts/ia_job_reindex (modified) (1 diff)

trunk/common/cache.php

@@ -7 +7 @@
 //
 // Only returns true/false.
+
+// Used internally to determine file path from cache_id
+function _disk_cache_path($cache_id) {
+    return IA_ROOT_DIR . "cache/" . $cache_id;
+}
+
+// Recursively delete directories
+function _recursive_delete($path) {
+    foreach (glob($path . "/*") as $file_name) {
+        if (is_dir($file_name)) {
+            _recursive_delete($file_name);
+        } else if (is_file($file_name)) {
+            unlink($file_name);
+        }
+    }
+    rmdir($path);
+}
+
 function disk_cache_has($cache_id, $date = null) {
-    $file_name = IA_ROOT_DIR . 'cache/' . $cache_id;
+    $file_name = _disk_cache_path($cache_id);
 
     if (!@is_readable($file_name)) {
@@ -32 +50 @@
 // Get an object from the cache, or FALSE if nothing is found.
 function disk_cache_get($cache_id) {
-    $file_name = IA_ROOT_DIR . 'cache/' . $cache_id;
+    $file_name = _disk_cache_path($cache_id);
 
     if (@is_readable($file_name)) {
@@ -51 +69 @@
 function disk_cache_serve($cache_id, $http_file_name, $mime_type = null) {
     require_once(IA_ROOT_DIR . 'www/utilities.php');
-    $file_name = IA_ROOT_DIR . 'cache/' . $cache_id;
+    $file_name = _disk_cache_path($cache_id);
 
     if (IA_LOG_DISK_CACHE) {
@@ -63 +81 @@
 // Always returns $buffer.
 function disk_cache_set($cache_id, $buffer, $ttl = 0) {
-    $file_name = IA_ROOT_DIR . 'cache/' . $cache_id;
-
+    $file_name = _disk_cache_path($cache_id);
+
+    @mkdir(dirname($file_name), 0777, true);
     $ret = @file_put_contents($file_name, $buffer, LOCK_EX);
 
@@ -80 +99 @@
 // Delete something from the disk cache.
 function disk_cache_delete($cache_id) {
-    $file_name = IA_ROOT_DIR . 'cache/' . $cache_id;
+    $file_name = _disk_cache_path($cache_id);
     @unlink($file_name);
 }
@@ -86 +105 @@
 // Delete the entire disk cache
 function disk_cache_purge() {
-    foreach (glob(IA_ROOT_DIR . 'cache/[^.]*') as $file_name) {
-        @unlink($file_name);
+    foreach (glob(IA_ROOT_DIR . "cache/*", GLOB_ONLYDIR) as $dir_name) {
+        _recursive_delete($dir_name);
+    }
+
+    foreach (glob(IA_ROOT_DIR . "cache/*") as $file_name) {
+        unlink($file_name);
     }
 }
@@ -167 +190 @@
 
     // Purge the entire SHM cache.
-    // FIXME: does this actually work?
+    // FIXME: This does not work
     function mem_cache_purge() {
         if (IA_LOG_MEM_CACHE) {

trunk/common/db/job.php

@@ -257 +257 @@
     if (!isset($wheres[1])) {
         // if we have no filters outside of `ia_job` table then optimize query
-        $subquery = sprintf("
+        $subquery = "
             SELECT `job`.`id` AS `ID`
             FROM `ia_job` as `job`
             WHERE (" . implode(") AND (", $wheres_job) . ")
-            ORDER BY `id` DESC LIMIT %s, %s",
-            $start, $range);
+            ORDER BY `id` DESC LIMIT {$start}, {$range}";
 
         $job_ids_fetched = db_fetch_all($subquery);

trunk/scripts/ia_job_reindex

@@ -4 +4 @@
 
 db_connect();
-$query = "ALTER TABLE `webdb`.`ia_job`
+$query = "ALTER TABLE `ia_job`
     DROP INDEX `by_round`,
     ADD INDEX by_round USING BTREE(`round_id`, `id`),