Skip to content
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

Jump to bottom

Don't ask the database for user ids which are not emails #676

Merged
merged 3 commits into from Jul 8, 2021
Merged

Don't ask the database for user ids which are not emails #676

merged 3 commits into from Jul 8, 2021

Conversation

nickvergessen
Copy link
Member

@nickvergessen nickvergessen commented Jul 8, 2021 •
edited

User ids in the guest app are always emails, so there is no
use in querying the database when there is no @ in the user id.

Commit 1 saves 18.061 queries from our famous query log
Commit 2 saves 17.898 queries from our famous query log

@nickvergessen
Don't ask the database for user ids which are not emails
7403c5a 
User ids in the guest app are always emails, so there is no
use in querying the database when there is no @ in the user id.

Signed-off-by: Joas Schilling <coding@schilljs.com>
@nickvergessen nickvergessen added the 3. to review Waiting for reviews label Jul 8, 2021
@nickvergessen
Use the cached data when asking for the real UID as we queried it alr…
7a4630f 
…eady

Signed-off-by: Joas Schilling <coding@schilljs.com>
@nickvergessen
Copy link
Member Author

Regarding the second commit, we queried the user id twice all the time:

queries from our famous query log:

		2397678 Query	SELECT `uid`, `displayname` FROM `oc_guests_users` WHERE `uid_lower` = 'f@g.h'
		2397678 Query	SELECT `uid` FROM `oc_guests_users` WHERE `uid_lower` = 'f@g.h'
		2397719 Query	SELECT `uid`, `displayname` FROM `oc_guests_users` WHERE `uid_lower` = 'e@j.k'
		2397719 Query	SELECT `uid` FROM `oc_guests_users` WHERE `uid_lower` = 'e@j.k'
		2397678 Query	SELECT `uid`, `displayname` FROM `oc_guests_users` WHERE `uid_lower` = 'c@d''
		2397678 Query	SELECT `uid` FROM `oc_guests_users` WHERE `uid_lower` = 'c@d'
		2397719 Query	SELECT `uid`, `displayname` FROM `oc_guests_users` WHERE `uid_lower` = 'A@B'
		2397719 Query	SELECT `uid` FROM `oc_guests_users` WHERE `uid_lower` = 'A@B'

PVince81
PVince81 approved these changes Jul 8, 2021
View reviewed changes
Copy link
Member

@PVince81 PVince81 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

change looks fine 👍

@nickvergessen
Fix unit tests
3422c6b 
Signed-off-by: Joas Schilling <coding@schilljs.com>
PVince81
PVince81 approved these changes Jul 8, 2021
View reviewed changes
Copy link
Member

@PVince81 PVince81 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍 for the tests

@juliushaertl juliushaertl merged commit 870cf96 into master Jul 8, 2021
@juliushaertl juliushaertl deleted the bugfix/noid/dont-ask-the-database-on-non-email-users branch July 8, 2021 16:13
@nickvergessen
Copy link
Member Author

Can we release a new version until monday so we have a new deployment in the next company call?

@juliushaertl
Copy link
Member

I can do that tomorrow

@nickvergessen nickvergessen mentioned this pull request Jul 8, 2021
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@PVince81 PVince81 PVince81 approved these changes

@juliushaertl juliushaertl juliushaertl approved these changes

@icewind1991 icewind1991 Awaiting requested review from icewind1991

@blizzz blizzz Awaiting requested review from blizzz

Assignees
No one assigned
Labels
3. to review Waiting for reviews
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@nickvergessen @juliushaertl @PVince81