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

fast_count fixes

Browse Source
This commit is contained in:
albert
2013-02-20 22:08:21 -05:00
parent e51631fbfa
commit 77124bb889
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/models/post.rb
View File

@@ -570,7 +570,7 @@ class Post < ActiveRecord::Base
def get_count_from_cache(tags) def get_count_from_cache(tags)
count = Cache.get(count_cache_key(tags)) count = Cache.get(count_cache_key(tags))
if count.nil? && tags.to_s !~ /^(?:#{Tag::METATAGS}):/ if count.nil? && tags.to_s !~ /(?:#{Tag::METATAGS}):/
count = select_value_sql("SELECT post_count FROM tags WHERE name = ?", tags.to_s) count = select_value_sql("SELECT post_count FROM tags WHERE name = ?", tags.to_s)
end end
@@ -613,11 +613,11 @@ class Post < ActiveRecord::Base
def fast_count_search(tags) def fast_count_search(tags)
count = Post.with_timeout(500, Danbooru.config.blank_tag_search_fast_count || 1_000_000) do count = Post.with_timeout(500, Danbooru.config.blank_tag_search_fast_count || 1_000_000) do
Post.tag_match(tags).undeleted.count Post.tag_match(tags).count
end end
if count == 0 if count == 0
count = Post.tag_match(tags).undeleted.count count = Post.tag_match(tags).count
end end
if count > Danbooru.config.posts_per_page * 10 if count > Danbooru.config.posts_per_page * 10