jaculabilis/danbooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #2934 from evazion/opt-mod-dashboard

Browse Source 
/moderator/dashboard: optimize sql queries
This commit is contained in:
Albert Yi
2017-03-23 10:45:37 -07:00
committed by GitHub
parent b3e3012a9c 66b5dc641c
commit f30f21f891
12 changed files with 101 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
app/logical/moderator/dashboard/queries/artist.rb
View File

@@ -1,28 +1,16 @@
module Moderator
module Dashboard
module Queries
class Artist
attr_reader :user, :count
class Artist < ::Struct.new(:user, :count)
def self.all(min_date, max_level)
sql = <<-EOS
SELECT artist_versions.updater_id AS updater_id, count(*)
FROM artist_versions
JOIN users ON users.id = artist_versions.updater_id
WHERE
artist_versions.created_at > ?
AND users.level <= ?
GROUP BY artist_versions.updater_id
ORDER BY count(*) DESC
LIMIT 10
EOS
ActiveRecord::Base.select_all_sql(sql, min_date, max_level).map {|x| new(x)}
end
def initialize(hash)
@user = ::User.find(hash["updater_id"])
@count = hash["count"]
::ArtistVersion.joins(:updater)
.where("artist_versions.created_at > ?", min_date)
.where("users.level <= ?", max_level)
.group(:updater)
.order("count(*) desc")
.limit(10)
.count
.map { |user, count| new(user, count) }
end
end
end

35
app/logical/moderator/dashboard/queries/comment.rb
View File

@@ -1,31 +1,18 @@
module Moderator
module Dashboard
module Queries
class Comment
attr_reader :comment, :count
class Comment < ::Struct.new(:comment, :count)
def self.all(min_date, max_level)
sql = <<-EOS
SELECT comment_votes.comment_id, count(*)
FROM comment_votes
JOIN comments ON comments.id = comment_id
JOIN users ON users.id = comments.creator_id
WHERE
comment_votes.created_at > ?
AND comments.score < 0
AND users.level <= ?
GROUP BY comment_votes.comment_id
HAVING count(*) >= 3
ORDER BY count(*) DESC
LIMIT 10
EOS
ActiveRecord::Base.select_all_sql(sql, min_date, max_level).map {|x| new(x)}
end
def initialize(hash)
@comment = ::Comment.find(hash["comment_id"])
@count = hash["count"]
::CommentVote.joins(comment: [:creator])
.where("comments.score < 0")
.where("comment_votes.created_at > ?", min_date)
.where("users.level <= ?", max_level)
.group(:comment)
.having("count(*) >= 3")
.order("count(*) desc")
.limit(10)
.count
.map { |comment, count| new(comment, count) }
end
end
end

2
app/logical/moderator/dashboard/queries/mod_action.rb
View File

@@ -3,7 +3,7 @@ module Moderator
module Queries
class ModAction
def self.all
::ModAction.order("id desc").limit(10)
::ModAction.includes(:creator).order("id desc").limit(10)
end
end
end

30
app/logical/moderator/dashboard/queries/note.rb
View File

@@ -1,28 +1,16 @@
module Moderator
module Dashboard
module Queries
class Note
attr_reader :user, :count
class Note < ::Struct.new(:user, :count)
def self.all(min_date, max_level)
sql = <<-EOS
SELECT note_versions.updater_id, count(*)
FROM note_versions
JOIN users ON users.id = note_versions.updater_id
WHERE
note_versions.created_at > ?
AND users.level <= ?
GROUP BY note_versions.updater_id
ORDER BY count(*) DESC
LIMIT 10
EOS
ActiveRecord::Base.select_all_sql(sql, min_date, max_level).map {|x| new(x)}
end
def initialize(hash)
@user = ::User.find(hash["updater_id"])
@count = hash["count"]
::NoteVersion.joins(:updater)
.where("note_versions.created_at > ?", min_date)
.where("users.level <= ?", max_level)
.group(:updater)
.order("count(*) desc")
.limit(10)
.count
.map { |user, count| new(user, count) }
end
end
end

27
app/logical/moderator/dashboard/queries/post_appeal.rb
View File

@@ -2,28 +2,13 @@ module Moderator
module Dashboard
module Queries
class PostAppeal
attr_reader :post, :count
def self.all(min_date)
sql = <<-EOS
SELECT post_appeals.post_id, count(*)
FROM post_appeals
JOIN posts ON posts.id = post_appeals.post_id
WHERE
post_appeals.created_at > ?
and posts.is_deleted = true
and posts.is_pending = false
GROUP BY post_appeals.post_id
ORDER BY count(*) DESC
LIMIT 10
EOS
ActiveRecord::Base.select_all_sql(sql, min_date).map {|x| new(x)}
end
def initialize(hash)
@post = ::Post.find(hash["post_id"])
@count = hash["count"]
::Post.joins(:appeals).includes(:uploader, :flags, appeals: [:creator])
.deleted
.where("post_appeals.created_at > ?", min_date)
.group(:id)
.order("count(*) desc")
.limit(10)
end
end
end

8
app/logical/moderator/dashboard/queries/tag.rb
View File

@@ -1,9 +1,7 @@
module Moderator
module Dashboard
module Queries
class Tag
attr_reader :user, :count
class Tag < ::Struct.new(:user, :count)
def self.all(min_date, max_level)
return [] unless PostArchive.enabled?
@@ -13,10 +11,6 @@ module Moderator
records.select { |rec| rec.user.level <= max_level }.sort_by(&:count).reverse.take(10)
end
def initialize(user, count)
@user, @count = user, count
end
end
end
end

30
app/logical/moderator/dashboard/queries/upload.rb
View File

@@ -1,28 +1,16 @@
module Moderator
module Dashboard
module Queries
class Upload
attr_reader :user, :count
class Upload < ::Struct.new(:user, :count)
def self.all(min_date, max_level)
sql = <<-EOS
select uploader_id, count(*)
from posts
join users on uploader_id = users.id
where
posts.created_at > ?
and level <= ?
group by posts.uploader_id
order by count(*) desc
limit 10
EOS
ActiveRecord::Base.select_all_sql(sql, min_date, max_level).map {|x| new(x)}
end
def initialize(hash)
@user = ::User.find(hash["uploader_id"])
@count = hash["count"]
::Post.joins(:uploader)
.where("posts.created_at > ?", min_date)
.where("users.level <= ?", max_level)
.group(:uploader)
.order("count(*) desc")
.limit(10)
.count
.map { |user, count| new(user, count) }
end
end
end

2
app/logical/moderator/dashboard/queries/user_feedback.rb
View File

@@ -3,7 +3,7 @@ module Moderator
module Queries
class UserFeedback
def self.all
::UserFeedback.order("id desc").limit(10)
::UserFeedback.includes(:user).order("id desc").limit(10)
end
end
end

30
app/logical/moderator/dashboard/queries/wiki_page.rb
View File

@@ -1,28 +1,16 @@
module Moderator
module Dashboard
module Queries
class WikiPage
attr_reader :user, :count
class WikiPage < ::Struct.new(:user, :count)
def self.all(min_date, max_level)
sql = <<-EOS
SELECT wiki_page_versions.updater_id, count(*)
FROM wiki_page_versions
JOIN users ON users.id = wiki_page_versions.updater_id
WHERE
wiki_page_versions.created_at > ?
AND users.level <= ?
GROUP BY wiki_page_versions.updater_id
ORDER BY count(*) DESC
LIMIT 10
EOS
ActiveRecord::Base.select_all_sql(sql, min_date, max_level).map {|x| new(x)}
end
def initialize(hash)
@user = ::User.find(hash["updater_id"])
@count = hash["count"]
::WikiPageVersion.joins(:updater)
.where("wiki_page_versions.created_at > ?", min_date)
.where("users.level <= ?", max_level)
.group(:updater)
.order("count(*) desc")
.limit(10)
.count
.map { |user, count| new(user, count) }
end
end
end

12
app/views/moderator/dashboards/_activity_appeal.html.erb
View File

@@ -10,13 +10,13 @@
</tr>
</thead>
<tbody>
<% @dashboard.appeals.each do |appeal| %>
<% @dashboard.appeals.each do |post| %>
<tr>
<td><%= link_to image_tag(appeal.post.preview_file_url), post_path(appeal.post) %></td>
<td><%= mod_link_to_user appeal.post.uploader, :negative %></td>
<td><%= post_flag_reasons(appeal.post) %></td>
<td><%= post_appeal_reasons(appeal.post) %></td>
<td><%= appeal.post.score %></td>
<td><%= PostPresenter.preview(post, show_deleted: true) %></td>
<td><%= mod_link_to_user post.uploader, :negative %></td>
<td><%= post_flag_reasons(post) %></td>
<td><%= post_appeal_reasons(post) %></td>
<td><%= post.score %></td>
</tr>
<% end %>
</tbody>

10
db/migrate/20170319000519_add_created_at_index_to_versions.rb Normal file
View File

@@ -0,0 +1,10 @@
class AddCreatedAtIndexToVersions < ActiveRecord::Migration
def change
ActiveRecord::Base.without_timeout do
add_index :note_versions, :created_at
add_index :artist_versions, :created_at
add_index :wiki_page_versions, :created_at
add_index :post_appeals, :created_at
end
end
end

29
db/structure.sql
View File

@@ -4977,6 +4977,13 @@ CREATE INDEX index_artist_urls_on_url_pattern ON artist_urls USING btree (url te
CREATE INDEX index_artist_versions_on_artist_id ON artist_versions USING btree (artist_id);
--
-- Name: index_artist_versions_on_created_at; Type: INDEX; Schema: public; Owner: -
--
CREATE INDEX index_artist_versions_on_created_at ON artist_versions USING btree (created_at);
--
-- Name: index_artist_versions_on_name; Type: INDEX; Schema: public; Owner: -
--
@@ -6706,6 +6713,13 @@ CREATE UNIQUE INDEX index_key_values_on_key ON key_values USING btree (key);
CREATE INDEX index_news_updates_on_created_at ON news_updates USING btree (created_at);
--
-- Name: index_note_versions_on_created_at; Type: INDEX; Schema: public; Owner: -
--
CREATE INDEX index_note_versions_on_created_at ON note_versions USING btree (created_at);
--
-- Name: index_note_versions_on_note_id; Type: INDEX; Schema: public; Owner: -
--
@@ -6790,6 +6804,13 @@ CREATE INDEX index_pools_on_name ON pools USING btree (name);
CREATE INDEX index_pools_on_name_trgm ON pools USING gin (name gin_trgm_ops);
--
-- Name: index_post_appeals_on_created_at; Type: INDEX; Schema: public; Owner: -
--
CREATE INDEX index_post_appeals_on_created_at ON post_appeals USING btree (created_at);
--
-- Name: index_post_appeals_on_creator_id; Type: INDEX; Schema: public; Owner: -
--
@@ -7147,6 +7168,13 @@ CREATE UNIQUE INDEX index_users_on_name ON users USING btree (lower((name)::text
CREATE INDEX index_users_on_name_trgm ON users USING gin (lower((name)::text) gin_trgm_ops);
--
-- Name: index_wiki_page_versions_on_created_at; Type: INDEX; Schema: public; Owner: -
--
CREATE INDEX index_wiki_page_versions_on_created_at ON wiki_page_versions USING btree (created_at);
--
-- Name: index_wiki_page_versions_on_updater_ip_addr; Type: INDEX; Schema: public; Owner: -
--
@@ -7532,3 +7560,4 @@ INSERT INTO schema_migrations (version) VALUES ('20170314235626');
INSERT INTO schema_migrations (version) VALUES ('20170316224630');
INSERT INTO schema_migrations (version) VALUES ('20170319000519');