Changeset 513

Timestamp:

08/23/2010 03:32:14 AM (18 months ago)

Author:

ofer

Message:

Fixed caching of APC elements to avoid arrays and save memory, negative key caching is now really working, many internal changes

Location:

trunk/WordPress/plugin/transposh

Files:

• core/parser.php (modified) (4 diffs)
• wp/transposh_db.php (modified) (11 diffs)

trunk/WordPress/plugin/transposh/core/parser.php

@@ -332 +332 @@
                 if ($entity == '&transposh;') {
                     $closerent = strpos($string, $entity, $start);
+                    if ($closerent !== false) {
                     $start = $pos;
                     $this->tag_phrase($string, $start, $closerent + $len_of_entity, true); //special tagging?
                     $start = $closerent + $len_of_entity;
                     $pos = $closerent;
+                    logger("Process of transposh entity $pos $string $closerent");
+                    }
                 }
                 //skip past entity
@@ -620 +623 @@
             $replace = array();
             foreach ($e->nodes as $ep) {
-                list ($translated_text, $source) = call_user_func_array($this->fetch_translate_func, array($ep->phrase, $this->lang));
+                list ($source, $translated_text) = call_user_func_array($this->fetch_translate_func, array($ep->phrase, $this->lang));
                 //stats
                 $this->stats->total_phrases++;
@@ -664 +667 @@
                 foreach ($e->nodes as $ep) {
                     if ($ep->tag == 'phrase') {
-                        list ($translated_text, $source) = call_user_func_array($this->fetch_translate_func, array($ep->phrase, $this->lang));
+                        list ($source, $translated_text) = call_user_func_array($this->fetch_translate_func, array($ep->phrase, $this->lang));
                         // more stats
                         $this->stats->total_phrases++;
@@ -719 +722 @@
                     $this->stats->total_phrases++;
                     $this->stats->meta_phrases++;
-                    list ($translated_text, $source) = call_user_func_array($this->fetch_translate_func, array($ep->phrase, $this->lang));
+                    list ($source, $translated_text) = call_user_func_array($this->fetch_translate_func, array($ep->phrase, $this->lang));
                     if ($translated_text) {
                         $this->stats->translated_phrases++;

trunk/WordPress/plugin/transposh/wp/transposh_db.php

@@ -59 +59 @@
         if (!TP_ENABLE_CACHE) return false;
         $cached = false;
-        $key = $original . '___' . $lang;
+        $key = $lang . '_' . $original;
         if (function_exists('apc_fetch')) {
             $cached = apc_fetch($key, $rc);
@@ -71 +71 @@
         } elseif (function_exists('eaccelerator_get')) {
             $cached = eaccelerator_get($key);
-            if ($cached === null)
-                    return false; //TODO - unfortunantly null storing does not work here..
- logger('eaccelerator', 5);
-        }
-        logger("Cached: $original", 5);
+            if ($cached === null) return false;
+            //TODO - unfortunantly null storing does not work here..
+            logger('eaccelerator', 5);
+        }
+        logger("Cache fetched: $original => $cached", 3);
+        if ($cached !== null) $cached = explode('_', $cached, 2);
         return $cached;
     }
@@ -89 +90 @@
     function cache_store($original, $lang, $translated, $ttl) {
         if (!TP_ENABLE_CACHE) return false;
-        $key = $original . '___' . $lang;
-        $cache_entry = $translated;
+        $key = $lang . '_' . $original;
+        if ($translated !== null) {
+            $translated = implode('_', $translated);
+        }
         //If we don't have translation still we want to have it in cache
         //update cache FIXME, do we really need this null to ""?
-        if ($cache_entry == NULL) {
-            $cache_entry = "";
-        }
         if (function_exists('apc_store')) {
-            $rc = apc_store($key, $cache_entry, $ttl);
+            $rc = apc_store($key, $translated, $ttl);
         } elseif (function_exists('xcache_set')) {
-            $rc = xcache_set($key, $cache_entry, $ttl);
+            $rc = xcache_set($key, $translated, $ttl);
         } elseif (function_exists('eaccelerator_put')) {
-            $rc = eaccelerator_put($key, $cache_entry, $ttl);
+            $rc = eaccelerator_put($key, $translated, $ttl);
         }
 
         if ($rc) {
-            logger("Stored in cache: $original => {$translated[0]},{$translated[1]}", 3);
+            logger("Stored in cache: $original => {$translated}", 3);
+        } else {
+            logger("Didn't cache: $original => {$translated}", 3);
         }
         return $rc;
@@ -164 +166 @@
         // we are saving in the array and not directly to cache, because cache might not exist...
         foreach ($rows as $row) {
-            $this->translations[$row['original']] = array(stripslashes($row['translated']), $row['source']);
+            $this->translations[$row['original']] = array($row['source'], stripslashes($row['translated']));
         }
         logger($this->translations, 5);
@@ -175 +177 @@
      * @param string $original
      * @param string $lang
-     * @return array list(translation,source)
+     * @return array list(source,translation)
      */
     function fetch_translation($original, $lang) {
-        $translated = NULL;
-        logger("Enter: $original", 4);
+        $translated = null;
+        logger("Fetching for: $original-$lang", 4);
         //The original is saved in db in its escaped form
         $original = $GLOBALS['wpdb']->escape(html_entity_decode($original, ENT_NOQUOTES, 'UTF-8'));
@@ -191 +193 @@
         if ($this->translations[$original]) {
             $translated = $this->translations[$original];
-            logger("prefetch result for $original >>> {$this->translations[$original][0]} ({$this->translations[$original][1]})", 4);
+            logger("prefetch result for $original >>> {$this->translations[$original][0]} ({$this->translations[$original][1]})", 3);
         } else {
             $query = "SELECT * FROM {$this->translation_table} WHERE original = '$original' and lang = '$lang' ";
             $row = $GLOBALS['wpdb']->get_row($query);
 
-            if ($row !== FALSE) {
+            if ($row !== null) {
                 $translated_text = stripslashes($row->translated);
-                $translated = array($translated_text, $row->source);
-
-                logger("db result for $original >>> $translated_text ($lang) ({$row->source})", 4);
+                $translated = array($row->source, $translated_text);
+                logger("db result for $original >>> $translated_text ($lang) ({$row->source})", 3);
             }
         }
@@ -218 +219 @@
      */
     function fetch_original($translation, $lang) {
-        $original = NULL;
+        $original = null;
         logger("Enter: $translation", 4);
 
@@ -224 +225 @@
         $translation = $GLOBALS['wpdb']->escape(html_entity_decode($translation, ENT_NOQUOTES, 'UTF-8'));
         // The translation might be cached (notice the additional postfix)
-        $cached = $this->cache_fetch($translation . '_R_', $lang);
+        $cached = $this->cache_fetch('R_' . $translation, $lang);
         if ($cached !== false) {
             logger("Exit from cache: $cached", 4);
@@ -237 +238 @@
             $row = $GLOBALS['wpdb']->get_row($query);
 
-            if ($row !== FALSE) {
+            if ($row !== null) {
                 $original = stripslashes($row->original);
                 logger("db result for $translation >>> $original ($lang) ({$row->source})", 4);
@@ -244 +245 @@
 
         // we can store the result in the cache (or the fact we don't have one)
-        $this->cache_store($translation . '_R_', $lang, $original, TP_CACHE_TTL);
+        $this->cache_store('R_' . $translation, $lang, $original, TP_CACHE_TTL);
 
         logger("Exit: $translation/$original", 4);
@@ -647 +648 @@
 
 }
+
 ?>