Skip to content

chore: Improve performance of getActiveLocalUserCount #29681

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ggazzo merged 3 commits into from
Jul 3, 2023
Merged

chore: Improve performance of getActiveLocalUserCount #29681

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
31aab9a
chore: Improve performance of getActiveLocalUserCount
rodrigok Jun 30, 2023
971312c
Merge branch 'develop' into chore/improve-getActiveLocalUserCount
sampaiodiego Jul 3, 2023
8a56b18
Merge branch 'develop' into chore/improve-getActiveLocalUserCount
kodiakhq[bot] Jul 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 5 additions & 7 deletions apps/meteor/server/models/raw/Users.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2815,19 +2815,17 @@ export class UsersRaw extends BaseRaw {
// here
getActiveLocalUserCount() {
return Promise.all([
// Count all active users (fast based on index)
this.col.countDocuments({
active: true,
type: {
$nin: ['app'],
},
roles: { $ne: ['guest'] },
}),
this.col.countDocuments({ federated: true, active: true }),
// Count all active that are guests, apps or federated
// Fast based on indexes, usually based on guest index as is usually small
this.col.countDocuments({
isRemote: true,
active: true,
roles: { $ne: ['guest'] },
$or: [{ roles: ['guest'] }, { type: 'app' }, { federated: true }, { isRemote: true }],
}),
// Get all active and remove the guests, apps, federated, etc
]).then((results) => results.reduce((a, b) => a - b));
}

Expand Down