PERF: optimise new/unread query

This is part 1 of the work, need some internal cleanup to follow

new query seems to handle very large sets very efficiently
This commit is contained in:
Sam 2015-09-29 11:55:09 +10:00
parent 42925b46b8
commit bc8c6d1a97
1 changed files with 8 additions and 8 deletions

View File

@ -128,13 +128,9 @@ class TopicTrackingState
# cycles from usual requests # cycles from usual requests
# #
# #
sql = report_raw_sql(topic_id: topic_id) sql = report_raw_sql(topic_id: topic_id, skip_unread: true, skip_order: true)
sql << "\nUNION ALL\n\n"
sql = <<SQL sql << report_raw_sql(topic_id: topic_id, skip_new: true, skip_order: true)
WITH x AS (
#{sql}
) SELECT * FROM x LIMIT #{SiteSetting.max_tracked_new_unread.to_i}
SQL
SqlBuilder.new(sql) SqlBuilder.new(sql)
.map_exec(TopicTrackingState, user_id: user_id, topic_id: topic_id) .map_exec(TopicTrackingState, user_id: user_id, topic_id: topic_id)
@ -198,7 +194,11 @@ SQL
sql << " AND topics.id = :topic_id" sql << " AND topics.id = :topic_id"
end end
sql << " ORDER BY topics.bumped_at DESC" unless opts && opts[:skip_order]
sql << " ORDER BY topics.bumped_at DESC"
end
sql
end end
end end