Fix #3390: Searching certain metatags results in an empty paginator
Fixes Post#get_count_from_cache to only lookup the count in the tags table when the search is for a single "simple" tag. Check memcache when the search is not a simple tag: * multi-tag searches (touhou rating:s) * single metatag searches (rating:s, source:"foo bar") * negated tags (-touhou) * wildcard tags (*touhou*) * or searches (~touhou)
This commit is contained in:
@@ -1218,14 +1218,14 @@ class Post < ApplicationRecord
|
|||||||
end
|
end
|
||||||
|
|
||||||
def get_count_from_cache(tags)
|
def get_count_from_cache(tags)
|
||||||
count = Cache.get(count_cache_key(tags)) # this will only have a value for multi-tag searches
|
if Tag.is_simple_tag?(tags)
|
||||||
|
|
||||||
if count.nil? && !tags.include?(" ")
|
|
||||||
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)
|
||||||
# set_count_in_cache(tags, count.to_i) if count
|
else
|
||||||
|
# this will only have a value for multi-tag searches or single metatag searches
|
||||||
|
count = Cache.get(count_cache_key(tags))
|
||||||
end
|
end
|
||||||
|
|
||||||
count ? count.to_i : nil
|
count.try(:to_i)
|
||||||
end
|
end
|
||||||
|
|
||||||
def set_count_in_cache(tags, count, expiry = nil)
|
def set_count_in_cache(tags, count, expiry = nil)
|
||||||
|
|||||||
@@ -415,6 +415,12 @@ class Tag < ApplicationRecord
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
# true if query is a single "simple" tag (not a metatag, negated tag, or wildcard tag).
|
||||||
|
def is_simple_tag?(query)
|
||||||
|
q = parse_query(query)
|
||||||
|
(scan_query(query).size == 1) && (q[:tags][:related].size == 1)
|
||||||
|
end
|
||||||
|
|
||||||
def parse_query(query, options = {})
|
def parse_query(query, options = {})
|
||||||
q = {}
|
q = {}
|
||||||
|
|
||||||
|
|||||||
@@ -2380,13 +2380,39 @@ class PostTest < ActiveSupport::TestCase
|
|||||||
Danbooru.config.stubs(:blank_tag_search_fast_count).returns(nil)
|
Danbooru.config.stubs(:blank_tag_search_fast_count).returns(nil)
|
||||||
Danbooru.config.stubs(:estimate_post_counts).returns(false)
|
Danbooru.config.stubs(:estimate_post_counts).returns(false)
|
||||||
FactoryGirl.create(:tag_alias, :antecedent_name => "alias", :consequent_name => "aaa")
|
FactoryGirl.create(:tag_alias, :antecedent_name => "alias", :consequent_name => "aaa")
|
||||||
FactoryGirl.create(:post, :tag_string => "aaa")
|
FactoryGirl.create(:post, :tag_string => "aaa", "score" => 42)
|
||||||
|
end
|
||||||
|
|
||||||
|
context "a single basic tag" do
|
||||||
|
should "return the cached count" do
|
||||||
|
Tag.find_or_create_by_name("aaa").update_columns(post_count: 100)
|
||||||
|
assert_equal(100, Post.fast_count("aaa"))
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
context "a single metatag" do
|
||||||
|
should "return the correct cached count" do
|
||||||
|
FactoryGirl.build(:tag, name: "score:42", post_count: -100).save(validate: false)
|
||||||
|
Post.set_count_in_cache("score:42", 100)
|
||||||
|
|
||||||
|
assert_equal(100, Post.fast_count("score:42"))
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
context "a multi-tag search" do
|
||||||
|
should "return the cached count, if it exists" do
|
||||||
|
Post.set_count_in_cache("aaa score:42", 100)
|
||||||
|
assert_equal(100, Post.fast_count("aaa score:42"))
|
||||||
|
end
|
||||||
|
|
||||||
|
should "return the true count, if not cached" do
|
||||||
|
assert_equal(1, Post.fast_count("aaa score:42"))
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
context "a blank search" do
|
context "a blank search" do
|
||||||
should "should execute a search" do
|
should "should execute a search" do
|
||||||
Cache.delete(Post.count_cache_key(''))
|
Cache.delete(Post.count_cache_key(''))
|
||||||
Post.expects(:select_value_sql).with(kind_of(String), "").once.returns(nil)
|
|
||||||
Post.expects(:fast_count_search).with("", kind_of(Hash)).once.returns(1)
|
Post.expects(:fast_count_search).with("", kind_of(Hash)).once.returns(1)
|
||||||
assert_equal(1, Post.fast_count(""))
|
assert_equal(1, Post.fast_count(""))
|
||||||
end
|
end
|
||||||
@@ -2420,7 +2446,6 @@ class PostTest < ActiveSupport::TestCase
|
|||||||
end
|
end
|
||||||
|
|
||||||
should "execute a search" do
|
should "execute a search" do
|
||||||
Post.expects(:select_value_sql).once.with(kind_of(String), "rating:s").returns(nil)
|
|
||||||
Post.expects(:fast_count_search).once.with("rating:s", kind_of(Hash)).returns(1)
|
Post.expects(:fast_count_search).once.with("rating:s", kind_of(Hash)).returns(1)
|
||||||
assert_equal(1, Post.fast_count(""))
|
assert_equal(1, Post.fast_count(""))
|
||||||
end
|
end
|
||||||
|
|||||||
Reference in New Issue
Block a user