use mysql replace on cache items

1 files changed, 30 insertions, 12 deletions

diff --git a/include/cache.php b/include/cache.php
index 3c8a3f713..360c4acbd 100644
--- a/include/cache.php
+++ b/include/cache.php
@@ -14,22 +14,40 @@
 		}
 		
 		public static function set($key,$value) {
-			$r = q("SELECT * FROM `cache` WHERE `k`='%s' limit 1",
-				dbesc($key)
-			);
-			if(count($r)) {
-				q("UPDATE `cache` SET `v` = '%s', `updated = '%s' WHERE `k` = '%s' limit 1",
-					dbesc($value),
-					dbesc(datetime_convert()),
-					dbesc($key));
-			}
-			else {
-				q("INSERT INTO `cache` (`k`,`v`,`updated`) VALUES ('%s','%s','%s')",
+
+			q("REPLACE INTO `cache` (`k`,`v`,`updated`) VALUES ('%s','%s','%s')",
 					dbesc($key),
 					dbesc($value),
 					dbesc(datetime_convert()));
-			}
 		}
+
+		
+/* 
+ *
+ * Leaving this legacy code temporaily to see how REPLACE fares 
+ * as opposed to non-atomic checks when faced with fast moving key duplication.
+ * As a MySQL extension it isn't portable, but we're not yet very portable.
+ */
+
+/*
+ *			$r = q("SELECT * FROM `cache` WHERE `k`='%s' limit 1",
+ *				dbesc($key)
+ *			);
+ *			if(count($r)) {
+ *				q("UPDATE `cache` SET `v` = '%s', `updated = '%s' WHERE `k` = '%s' limit 1",
+ *					dbesc($value),
+ *					dbesc(datetime_convert()),
+ *					dbesc($key));
+ *			}
+ *			else {
+ *				q("INSERT INTO `cache` (`k`,`v`,`updated`) VALUES ('%s','%s','%s')",
+ *					dbesc($key),
+ *					dbesc($value),
+ *					dbesc(datetime_convert()));
+ *			}
+ *		}
+ */
+
 		
 		public static function clear(){
 			q("DELETE FROM `cache` WHERE `updated` < '%s'",