Changeset 742

Timestamp:

12/05/06 02:57:11 (2 years ago)

Author:

sven

Message:

very rudimentary memcached experiment

Files:

• devel/includes.php (modified) (1 diff)
• devel/lib/cache (added)
• devel/lib/cache/engine.memcache.php (added)
• devel/lib/cache/engine.noop.php (added)
• devel/lib/cache/lib.php (added)
• devel/lib/datalib.php (modified) (11 diffs)
• devel/lib/setup.php (modified) (1 diff)
• devel/units/weblogs/weblogs_text_process.php (modified) (1 diff)

devel/includes.php

@@ -21 +21 @@
-    *    HELPER LIBRARIES
-    ****************************************************************************/
+
+    // Load cache lib
+        require_once($CFG->dirroot.'lib/cache/lib.php');
-
-    // Load datalib

devel/lib/datalib.php

@@ -41 +41 @@
-
-    if ($result) {
+        // elggcache_purge(); // TODO - should probably be here, given function can do anything, but very inefficient
-        if ($feedback) {
-            notify(__gettext('Success'), 'notifysuccess');
@@ -196 +197 @@
-
-    $METATABLES = $db->Metatables();
+    elggcache_purge();
-    
-    return $success;
@@ -222 +224 @@
-                      $signed='unsigned', $default='0', $null='not null', $after='') {
-    global $CFG, $db;
+    
+    elggcache_cachepurgetype($table);
-
-    if (empty($oldfield) && !empty($field)) { //adding
@@ -435 +439 @@
-
-    $values = where_values_prepared($value1, $value2, $value3);
-
+
-    return record_exists_sql('SELECT * FROM '. $CFG->prefix . $table .' '. $select .' LIMIT 1',$values);
-
-}
-
@@ -597 +600 @@
-
-    global $CFG;
+    $trycache = false;
+    
+    //just cache things by primary key for now
+    if ($field1 == "ident" && $value1 == intval($value1) && empty($field2)  && empty($value2) && empty($field3) && empty($value3) && $fields == "*") {
+        $trycache = true;
+        $cacheval = elggcache_get($table, $field1 . "_" . intval($value1));
+        if (!is_null($cacheval)) {
+            return $cacheval;
+        } else {
+            
+        }
+    }
-
-    $select = where_clause_prepared($field1, $field2, $field3);
@@ -602 +617 @@
-    $values = where_values_prepared($value1, $value2, $value3);
-    
-
+
+
+
+
+
+
+
-}
-
@@ -1166 +1187 @@
-    $select = where_clause_prepared($field1, $field2, $field3);
-    $values = where_values_prepared($newvalue, $value1, $value2, $value3);
-
+
-    $stmt = $db->Prepare('UPDATE '. $CFG->prefix . $table .' SET '. $newfield  .' = ? '. $select);
-
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -1195 +1226 @@
-    
-    $stmt = $db->Prepare('DELETE FROM '. $CFG->prefix . $table .' '. $select);
-
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -1225 +1266 @@
-        $result = $db->Execute('DELETE FROM '. $CFG->prefix . $table .' '. $select);
-    }
+    
+    elggcache_cachepurgetype($table);
+    
-    return $result;
-}
@@ -1269 +1313 @@
-        if ($nextval = (int)get_field_sql("SELECT NEXTVAL('{$CFG->prefix}{$table}_{$primarykey}_seq')")) {
-            $setfromseq = true;
-            
+
-        } 
-    }
@@ -1433 +1477 @@
-    $stmt = $db->Prepare('UPDATE '. $CFG->prefix . $table .' SET '. $update .' WHERE ident = \''. $dataobject->ident .'\'');
-    if ($rs = $db->Execute($stmt,$ddd)) {
+        elggcache_delete($table, "ident_" . $dataobject->ident);
-        return true;
-    } else {

devel/lib/setup.php

@@ -14 +14 @@
-
-// set up perf.
-        
+
-
-/// Just say no to link prefetching (Moz prefetching, Google Web Accelerator, others)

devel/units/weblogs/weblogs_text_process.php

@@ -12 +12 @@
-        }
-        
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-            
-            \$matches[1] = str_replace("&","&",\$matches[1]);
-            return "<embed style=\"width:400px; height:326px;\" id=\"VideoPlayback\" type=\"application/x-shockwave-flash\" src=\"\$matches[1]\" />";
-            
+            
+            
+            //check for mismatched <>s and force escaping if necessary
+            $numlt = substr_count($run_result, "<");
+            $numgt = substr_count($run_result, ">");
+            if ($numlt != $numgt) {
+                $run_result = htmlspecialchars($run_result, ENT_COMPAT, 'utf-8');
+            }
+            
+            // Videos
+            
+            $functionbody = <<< END
+                
+                \$matches[1] = str_replace("&amp;","&",\$matches[1]);
+                return "<embed style=\"width:400px; height:326px;\" id=\"VideoPlayback\" type=\"application/x-shockwave-flash\" src=\"\$matches[1]\" />";
+                
-END;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-