Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

performance: Avoid dup calls to subscribed_streams(). 

In stream_sort.sort_groups, we now have the caller
pass us in the list of streams, since they are getting
them anyway.
This commit is contained in:
Steve Howell 2019-12-27 20:45:28 +00:00 committed by Tim Abbott
parent 33246c5c49
commit 0711c7ea49
3 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
frontend_tests/node_tests/stream_sort.js
View File

@ -45,13 +45,18 @@ stream_data.add_sub(pneumonia.name, pneumonia);
stream_data.add_sub(clarinet.name, clarinet);
stream_data.add_sub(weaving.name, weaving);
function sort_groups(query) {
const streams = stream_data.subscribed_streams();
return stream_sort.sort_groups(streams, query);
}
with_overrides(function (override) {
override('stream_data.is_active', function (sub) {
return sub.name !== "pneumonia";
});
// Test sorting into categories/alphabetized
let sorted = stream_sort.sort_groups("");
let sorted = sort_groups("");
assert.deepEqual(sorted.pinned_streams, ['scalene']);
assert.deepEqual(sorted.normal_streams, ['clarinet', 'fast tortoise']);
assert.deepEqual(sorted.dormant_streams, ['pneumonia']);
@ -66,7 +71,7 @@ with_overrides(function (override) {
assert.equal(stream_sort.next_stream_id(pneumonia.stream_id), undefined);
// Test filtering
sorted = stream_sort.sort_groups("s");
sorted = sort_groups("s");
assert.deepEqual(sorted.pinned_streams, ['scalene']);
assert.deepEqual(sorted.normal_streams, []);
assert.deepEqual(sorted.dormant_streams, []);
@ -76,19 +81,19 @@ with_overrides(function (override) {
assert.equal(stream_sort.next_stream_id(clarinet.stream_id), undefined);
// Test searching entire word, case-insensitive
sorted = stream_sort.sort_groups("PnEuMoNiA");
sorted = sort_groups("PnEuMoNiA");
assert.deepEqual(sorted.pinned_streams, []);
assert.deepEqual(sorted.normal_streams, []);
assert.deepEqual(sorted.dormant_streams, ['pneumonia']);
// Test searching part of word
sorted = stream_sort.sort_groups("tortoise");
sorted = sort_groups("tortoise");
assert.deepEqual(sorted.pinned_streams, []);
assert.deepEqual(sorted.normal_streams, ['fast tortoise']);
assert.deepEqual(sorted.dormant_streams, []);
// Test searching stream with spaces
sorted = stream_sort.sort_groups("fast t");
sorted = sort_groups("fast t");
assert.deepEqual(sorted.pinned_streams, []);
assert.deepEqual(sorted.normal_streams, ['fast tortoise']);
assert.deepEqual(sorted.dormant_streams, []);

2
static/js/stream_list.js
View File

@ -91,7 +91,7 @@ exports.build_stream_list = function () {
// The main logic to build the list is in stream_sort.js, and
// we get three lists of streams (pinned/normal/dormant).
const stream_groups = stream_sort.sort_groups(get_search_term());
const stream_groups = stream_sort.sort_groups(streams, get_search_term());
if (stream_groups.same_as_before) {
return;

3
static/js/stream_sort.js
View File

@ -33,8 +33,7 @@ function filter_streams_by_search(streams, search_term) {
return filtered_streams;
}
exports.sort_groups = function (search_term) {
let streams = stream_data.subscribed_streams();
exports.sort_groups = function (streams, search_term) {
if (streams.length === 0) {
return;
}