github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-17 10:32:44 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: rare concurrency error when updating timings

Browse Source
This commit is contained in:
Sam 2016-03-24 16:02:23 +11:00
parent 936b55faad
commit f82b5dbc82
1 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
app/models/topic_user.rb
View File

@ -165,6 +165,16 @@ class TopicUser < ActiveRecord::Base
RETURNING RETURNING
topic_users.notification_level, tu.notification_level old_level, tu.last_read_post_number topic_users.notification_level, tu.notification_level old_level, tu.last_read_post_number
" "
INSERT_TOPIC_USER_SQL = "INSERT INTO topic_users (user_id, topic_id, last_read_post_number, highest_seen_post_number, last_visited_at, first_visited_at, notification_level)
SELECT :user_id, :topic_id, :post_number, ft.highest_post_number, :now, :now, :new_status
FROM topics AS ft
JOIN users u on u.id = :user_id
WHERE ft.id = :topic_id
AND NOT EXISTS(SELECT 1
FROM topic_users AS ftu
WHERE ftu.user_id = :user_id and ftu.topic_id = :topic_id)"
def update_last_read(user, topic_id, post_number, msecs, opts={}) def update_last_read(user, topic_id, post_number, msecs, opts={})
return if post_number.blank? return if post_number.blank?
msecs = 0 if msecs.to_i < 0 msecs = 0 if msecs.to_i < 0
@ -214,15 +224,18 @@ class TopicUser < ActiveRecord::Base
user.update_posts_read!(post_number, mobile: opts[:mobile]) user.update_posts_read!(post_number, mobile: opts[:mobile])
exec_sql("INSERT INTO topic_users (user_id, topic_id, last_read_post_number, highest_seen_post_number, last_visited_at, first_visited_at, notification_level) begin
SELECT :user_id, :topic_id, :post_number, ft.highest_post_number, :now, :now, :new_status exec_sql(INSERT_TOPIC_USER_SQL, args)
FROM topics AS ft rescue PG::UniqueViolation
JOIN users u on u.id = :user_id # if record is inserted between two statements this can happen
WHERE ft.id = :topic_id # we retry once to avoid failing the req
AND NOT EXISTS(SELECT 1 if opts[:retry]
FROM topic_users AS ftu raise
WHERE ftu.user_id = :user_id and ftu.topic_id = :topic_id)", else
args) opts[:retry] = true
update_last_read(user, topic_id, post_number, msecs, opts)
end
end
MessageBus.publish("/topic/#{topic_id}", { notification_level_change: args[:new_status] }, user_ids: [user.id]) MessageBus.publish("/topic/#{topic_id}", { notification_level_change: args[:new_status] }, user_ids: [user.id])
end end