provide relief to sites that are severely impacted by the slow ITEM_UNSEEN searches. This does not incorporate any other flag optimisations as that will require a major DB update and possibly involve significant downtime. This is just to bite off a little chunk now and provide some much needed relief.

1 files changed, 5 insertions, 9 deletions

diff --git a/mod/channel.php b/mod/channel.php
index 1a471718d..788bacf70 100644
--- a/mod/channel.php
+++ b/mod/channel.php
@@ -147,23 +147,21 @@ function channel_content(&$a, $update = 0, $load = false) {
 	if(($update) && (! $load)) {
 		if ($mid) {
 			$r = q("SELECT parent AS item_id from item where mid = '%s' and uid = %d AND item_restrict = 0
-				AND (item_flags &  %d) > 0 AND (item_flags & %d) > 0 $sql_extra limit 1",
+				AND (item_flags &  %d) > 0 AND item_unseen = 1 $sql_extra limit 1",
 				dbesc($mid),
 				intval($a->profile['profile_uid']),
-				intval(ITEM_WALL),
-				intval(ITEM_UNSEEN)
+				intval(ITEM_WALL)
 			);
 		} else {
 			$r = q("SELECT distinct parent AS `item_id`, created from item
 				left join abook on item.author_xchan = abook.abook_xchan
 				WHERE uid = %d AND item_restrict = 0
-				AND (item_flags &  %d) > 0 AND ( item_flags & %d ) > 0
+				AND (item_flags &  %d) > 0 AND item_unseen = 1
 				AND ((abook.abook_flags & %d) = 0 or abook.abook_flags is null)
 				$sql_extra
 				ORDER BY created DESC",
 				intval($a->profile['profile_uid']),
 				intval(ITEM_WALL),
-				intval(ITEM_UNSEEN),
 				intval(ABOOK_FLAG_BLOCKED)
 			);
 		}
@@ -317,10 +315,8 @@ function channel_content(&$a, $update = 0, $load = false) {
 	}
 
 	if($is_owner && $update_unseen) {
-		$r = q("UPDATE item SET item_flags = (item_flags & ~%d)
-			WHERE (item_flags & %d) > 0 AND (item_flags & %d) > 0 AND uid = %d $update_unseen",
-			intval(ITEM_UNSEEN),
-			intval(ITEM_UNSEEN),
+		$r = q("UPDATE item SET item_unseen = 0 WHERE item_unseen = 1
+			AND (item_flags & %d) > 0 AND uid = %d $update_unseen",
 			intval(ITEM_WALL),
 			intval(local_channel())
 		);