summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHeinrich Lee Yu <hleeyu@gmail.com>2018-12-21 19:44:37 +0800
committerHeinrich Lee Yu <hleeyu@gmail.com>2019-01-04 01:59:41 +0800
commit40f31486a8397c9142a0d5d0434b02d578aa8a67 (patch)
tree87e8684e20df494d5b555875166c77de8298b08b
parent725cd1367f8579e6c054c6cd2df42b934abfdc16 (diff)
downloadgitlab-ce-40f31486a8397c9142a0d5d0434b02d578aa8a67.tar.gz
Reduce counts in search_entries_info44353-improve-snippet-search-performance
-rw-r--r--app/helpers/search_helper.rb4
-rw-r--r--app/views/search/_results.html.haml2
-rw-r--r--changelogs/unreleased/44353-improve-snippet-search-performance.yml5
3 files changed, 8 insertions, 3 deletions
diff --git a/app/helpers/search_helper.rb b/app/helpers/search_helper.rb
index 80cc568820a..0ee76a51f7d 100644
--- a/app/helpers/search_helper.rb
+++ b/app/helpers/search_helper.rb
@@ -24,10 +24,10 @@ module SearchHelper
end
def search_entries_info(collection, scope, term)
- return unless collection.count > 0
+ return if collection.to_a.empty?
from = collection.offset_value + 1
- to = collection.offset_value + collection.count
+ to = collection.offset_value + collection.to_a.size
count = collection.total_count
"Showing #{from} - #{to} of #{count} #{scope.humanize(capitalize: false)} for \"#{term}\""
diff --git a/app/views/search/_results.html.haml b/app/views/search/_results.html.haml
index ab56f48ba4d..c4d52431d6e 100644
--- a/app/views/search/_results.html.haml
+++ b/app/views/search/_results.html.haml
@@ -1,4 +1,4 @@
-- if @search_objects.empty?
+- if @search_objects.to_a.empty?
= render partial: "search/results/empty"
- else
.row-content-block
diff --git a/changelogs/unreleased/44353-improve-snippet-search-performance.yml b/changelogs/unreleased/44353-improve-snippet-search-performance.yml
new file mode 100644
index 00000000000..2ecbcef8843
--- /dev/null
+++ b/changelogs/unreleased/44353-improve-snippet-search-performance.yml
@@ -0,0 +1,5 @@
+---
+title: Improve snippet search performance by removing duplicate counts
+merge_request: 23952
+author:
+type: performance