mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2025-12-21 05:43:09 -06:00
Code Issues Packages Projects Releases Wiki Activity

Remove locks on reads

Browse source
This commit is contained in:
Neil Alexander 2020-07-15 13:58:03 +01:00
parent d9a1d20422
commit b27dc53070
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944
1 changed files with 0 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
userapi/storage/accounts/sqlite3/storage.go
View file

@ -93,8 +93,6 @@ func NewDatabase(dataSourceName string, serverName gomatrixserverlib.ServerName)
func (d *Database) GetAccountByPassword( func (d *Database) GetAccountByPassword(
ctx context.Context, localpart, plaintextPassword string, ctx context.Context, localpart, plaintextPassword string,
) (*api.Account, error) { ) (*api.Account, error) {
d.accountsMu.Lock()
defer d.accountsMu.Unlock()
hash, err := d.accounts.selectPasswordHash(ctx, localpart) hash, err := d.accounts.selectPasswordHash(ctx, localpart)
if err != nil { if err != nil {
return nil, err return nil, err
@ -110,8 +108,6 @@ func (d *Database) GetAccountByPassword(
func (d *Database) GetProfileByLocalpart( func (d *Database) GetProfileByLocalpart(
ctx context.Context, localpart string, ctx context.Context, localpart string,
) (*authtypes.Profile, error) { ) (*authtypes.Profile, error) {
d.profilesMu.Lock()
defer d.profilesMu.Unlock()
return d.profiles.selectProfileByLocalpart(ctx, localpart) return d.profiles.selectProfileByLocalpart(ctx, localpart)
} }
@ -240,8 +236,6 @@ func (d *Database) GetAccountData(ctx context.Context, localpart string) (
rooms map[string]map[string]json.RawMessage, rooms map[string]map[string]json.RawMessage,
err error, err error,
) { ) {
d.accountDatasMu.Lock()
defer d.accountDatasMu.Unlock()
return d.accountDatas.selectAccountData(ctx, localpart) return d.accountDatas.selectAccountData(ctx, localpart)
} }
@ -252,8 +246,6 @@ func (d *Database) GetAccountData(ctx context.Context, localpart string) (
func (d *Database) GetAccountDataByType( func (d *Database) GetAccountDataByType(
ctx context.Context, localpart, roomID, dataType string, ctx context.Context, localpart, roomID, dataType string,
) (data json.RawMessage, err error) { ) (data json.RawMessage, err error) {
d.accountDatasMu.Lock()
defer d.accountDatasMu.Unlock()
return d.accountDatas.selectAccountDataByType( return d.accountDatas.selectAccountDataByType(
ctx, localpart, roomID, dataType, ctx, localpart, roomID, dataType,
) )
@ -263,8 +255,6 @@ func (d *Database) GetAccountDataByType(
func (d *Database) GetNewNumericLocalpart( func (d *Database) GetNewNumericLocalpart(
ctx context.Context, ctx context.Context,
) (int64, error) { ) (int64, error) {
d.accountsMu.Lock()
defer d.accountsMu.Unlock()
return d.accounts.selectNewNumericLocalpart(ctx, nil) return d.accounts.selectNewNumericLocalpart(ctx, nil)
} }
@ -322,8 +312,6 @@ func (d *Database) RemoveThreePIDAssociation(
func (d *Database) GetLocalpartForThreePID( func (d *Database) GetLocalpartForThreePID(
ctx context.Context, threepid string, medium string, ctx context.Context, threepid string, medium string,
) (localpart string, err error) { ) (localpart string, err error) {
d.threepidsMu.Lock()
defer d.threepidsMu.Unlock()
return d.threepids.selectLocalpartForThreePID(ctx, nil, threepid, medium) return d.threepids.selectLocalpartForThreePID(ctx, nil, threepid, medium)
} }
@ -334,8 +322,6 @@ func (d *Database) GetLocalpartForThreePID(
func (d *Database) GetThreePIDsForLocalpart( func (d *Database) GetThreePIDsForLocalpart(
ctx context.Context, localpart string, ctx context.Context, localpart string,
) (threepids []authtypes.ThreePID, err error) { ) (threepids []authtypes.ThreePID, err error) {
d.threepidsMu.Lock()
defer d.threepidsMu.Unlock()
return d.threepids.selectThreePIDsForLocalpart(ctx, localpart) return d.threepids.selectThreePIDsForLocalpart(ctx, localpart)
} }
@ -343,8 +329,6 @@ func (d *Database) GetThreePIDsForLocalpart(
// in the database. // in the database.
// If the DB returns sql.ErrNoRows the Localpart isn't taken. // If the DB returns sql.ErrNoRows the Localpart isn't taken.
func (d *Database) CheckAccountAvailability(ctx context.Context, localpart string) (bool, error) { func (d *Database) CheckAccountAvailability(ctx context.Context, localpart string) (bool, error) {
d.accountsMu.Lock()
defer d.accountsMu.Unlock()
_, err := d.accounts.selectAccountByLocalpart(ctx, localpart) _, err := d.accounts.selectAccountByLocalpart(ctx, localpart)
if err == sql.ErrNoRows { if err == sql.ErrNoRows {
return true, nil return true, nil
@ -357,7 +341,5 @@ func (d *Database) CheckAccountAvailability(ctx context.Context, localpart strin
// Returns sql.ErrNoRows if no account exists which matches the given localpart. // Returns sql.ErrNoRows if no account exists which matches the given localpart.
func (d *Database) GetAccountByLocalpart(ctx context.Context, localpart string, func (d *Database) GetAccountByLocalpart(ctx context.Context, localpart string,
) (*api.Account, error) { ) (*api.Account, error) {
d.accountsMu.Lock()
defer d.accountsMu.Unlock()
return d.accounts.selectAccountByLocalpart(ctx, localpart) return d.accounts.selectAccountByLocalpart(ctx, localpart)
} }