Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

PERF: Remove one extra call to Redis when searching.

This commit is contained in:
Guo Xiang Tan 2020-08-04 14:01:43 +08:00
parent 5a3494b1e1
commit 3b08b15855
No known key found for this signature in database
GPG Key ID: FBD110179AAC1F20
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/controllers/search_controller.rb
View File

@ -69,7 +69,7 @@ class SearchController < ApplicationController
result.error = I18n.t("search.extreme_load_error") result.error = I18n.t("search.extreme_load_error")
else else
search = Search.new(@search_term, search_args) search = Search.new(@search_term, search_args)
result = search.execute result = search.execute(readonly_mode: @readonly_mode)
result.find_user_data(guardian) if result result.find_user_data(guardian) if result
end end
@ -129,7 +129,7 @@ class SearchController < ApplicationController
) )
else else
search = Search.new(params[:term], search_args) search = Search.new(params[:term], search_args)
result = search.execute result = search.execute(readonly_mode: @readonly_mode)
end end
render_serialized(result, GroupedSearchResultSerializer, result: result) render_serialized(result, GroupedSearchResultSerializer, result: result)
end end

4
lib/search.rb
View File

@ -227,8 +227,8 @@ class Search
end end
# Query a term # Query a term
def execute def execute(readonly_mode: Discourse.readonly_mode?)
if SiteSetting.log_search_queries? && @opts[:search_type].present? && !Discourse.readonly_mode? if SiteSetting.log_search_queries? && @opts[:search_type].present? && !readonly_mode
status, search_log_id = SearchLog.log( status, search_log_id = SearchLog.log(
term: @term, term: @term,
search_type: @opts[:search_type], search_type: @opts[:search_type],