diff options
| author |  tobi <31960611+tsmethurst@users.noreply.github.com> | 2022-05-02 12:53:46 +0200 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2022-05-02 11:53:46 +0100 |
| commit | a5852fd7e43bf97ea7def9de20cd6d02d954094d (patch) | |
| tree | d72b7fe9bf603786a5533e6b566a8412b2b8f634 /internal/db/bundb/domain.go | |
| parent | Add logging to the new generic worker package (#516) (diff) | |
| download | gotosocial-a5852fd7e43bf97ea7def9de20cd6d02d954094d.tar.xz | |
[performance] Speed up some of the slower db queries (#523)
* remove unnecessary LOWER() db calls
* warn during slow db queries
* use bundb built-in exists function
* add db block test
* update account block query
* add domain block db test
* optimize domain block query
* fix implementing wrong test
* exclude most columns when checking block
* go fmt
* remote more unnecessary use of LOWER()
Diffstat (limited to 'internal/db/bundb/domain.go')
| -rw-r--r-- | internal/db/bundb/domain.go | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/internal/db/bundb/domain.go b/internal/db/bundb/domain.go index 417b2becd..e63a584bd 100644 --- a/internal/db/bundb/domain.go +++ b/internal/db/bundb/domain.go @@ -21,6 +21,7 @@ package bundb import ( "context" "net/url" + "strings" "github.com/superseriousbusiness/gotosocial/internal/db" "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" @@ -39,7 +40,8 @@ func (d *domainDB) IsDomainBlocked(ctx context.Context, domain string) (bool, db q := d.conn. NewSelect(). Model(>smodel.DomainBlock{}). - Where("LOWER(domain) = LOWER(?)", domain). + ExcludeColumn("id", "created_at", "updated_at", "created_by_account_id", "private_comment", "public_comment", "obfuscate", "subscription_id"). + Where("domain = ?", domain). Limit(1) return d.conn.Exists(ctx, q) @@ -50,7 +52,7 @@ func (d *domainDB) AreDomainsBlocked(ctx context.Context, domains []string) (boo uniqueDomains := util.UniqueStrings(domains) for _, domain := range uniqueDomains { - if blocked, err := d.IsDomainBlocked(ctx, domain); err != nil { + if blocked, err := d.IsDomainBlocked(ctx, strings.ToLower(domain)); err != nil { return false, err } else if blocked { return blocked, nil |