Tsumanu/bitque
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Reduce memory usage and prevent HashMap overflow

Browse Source
This commit is contained in:
eraden 2021-10-16 11:16:58 +02:00
parent e390ce62b5
commit 97f2023596
2 changed files with 48 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
web/src/pages/project_page/model.rs
View File

@ -33,6 +33,7 @@ impl ProjectPage {
page: &ProjectPage,
num_of_epics: usize,
epics: EpicStream,
num_of_statuses: usize,
statuses: IssueStatusStream,
issues: IssueStream,
user: &Option<User>,
@ -49,13 +50,15 @@ impl ProjectPage {
let statuses = statuses
.map(|s| (s.id, s.name.as_str()))
.collect::<Vec<(IssueStatusId, &str)>>();
let mut scoped_issues = {
let issues = issues.filter(|issue| {
issue_filter_with_avatars(issue, &page.active_avatar_filters)
&& issue_filter_with_text(issue, page.text_filter.as_str())
&& issue_filter_with_only_my(issue, page.only_my_filter, user)
});
let mut issues: Vec<&Issue> = if page.recently_updated_filter {
let mut m = HashMap::new();
if page.recently_updated_filter {
let mut m = HashMap::with_capacity(num_of_statuses * num_of_epics);
let mut sorted: Vec<(IssueId, NaiveDateTime)> = issues
.map(|issue| {
m.insert(issue.id, issue);
@ -63,25 +66,17 @@ impl ProjectPage {
})
.collect();
sorted.sort_by(|(_, a_time), (_, b_time)| a_time.cmp(b_time));
to_per_epic_and_status_scoped(
num_of_epics,
sorted
.into_iter()
.take(10)
.flat_map(|(id, _)| m.remove(&id))
.collect()
.flat_map(|(id, _)| m.remove(&id)),
)
} else {
issues.collect()
to_per_epic_and_status_scoped(num_of_epics, issues)
}
};
issues.sort_by(|a, b| a.list_position.cmp(&b.list_position));
let issues_per_epic_id =
issues
.into_iter()
.fold(HashMap::with_capacity(num_of_epics), |mut m, issue| {
m.entry(issue.epic_id)
.or_insert_with(|| Vec::with_capacity(100))
.push(issue);
m
});
epics
.map(|epic| EpicIssuePerStatus {
@ -93,13 +88,11 @@ impl ProjectPage {
.map(|(current_status_id, issue_status_name)| StatusIssueIds {
status_id: *current_status_id,
status_name: issue_status_name.to_string(),
issue_ids: issues_per_epic_id
.get(&epic.map(|(id, ..)| id))
.map(|v| {
v.iter()
.filter(|issue| issue_filter_status(issue, *current_status_id))
.map(|issue| issue.id)
.collect()
issue_ids: scoped_issues
.remove(&(epic.map(|(id, ..)| id), *current_status_id))
.map(|mut v| {
v.sort_by(|a, b| a.list_position.cmp(&b.list_position));
v.iter().map(|issue| issue.id).collect()
})
.unwrap_or_default(),
})
@ -117,11 +110,6 @@ fn issue_filter_with_avatars(issue: &Issue, user_ids: &[UserId]) -> bool {
user_ids.contains(&issue.reporter_id) || issue.user_ids.iter().any(|id| user_ids.contains(id))
}
#[inline]
fn issue_filter_status(issue: &Issue, current_status_id: IssueStatusId) -> bool {
issue.issue_status_id == current_status_id
}
#[inline]
fn issue_filter_with_text(issue: &Issue, text: &str) -> bool {
text.is_empty() || issue.title.contains(text)
@ -132,3 +120,18 @@ fn issue_filter_with_only_my(issue: &Issue, only_my: bool, user: &Option<User>)
let my_id = user.as_ref().map(|u| u.id).unwrap_or_default();
!only_my || issue.user_ids.contains(&my_id)
}
fn to_per_epic_and_status_scoped<'model, IssueStream>(
num_of_epics: usize,
issues: IssueStream,
) -> HashMap<(Option<EpicId>, IssueStatusId), Vec<&'model Issue>>
where
IssueStream: std::iter::Iterator<Item = &'model Issue>,
{
issues.fold(HashMap::with_capacity(num_of_epics), |mut m, issue| {
m.entry((issue.epic_id, issue.issue_status_id))
.or_insert_with(|| Vec::with_capacity(100))
.push(issue);
m
})
}

1
web/src/ws/issue.rs
View File

@ -173,6 +173,7 @@ pub fn change_visible(model: &mut Model) {
.epic_ids
.iter()
.filter_map(|id| model.epics_by_id.get(id)),
model.issue_status_ids.len(),
model
.issue_status_ids
.iter()