JakeHillion/storj
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove unnecessary UNION and Selects (#2624)

Browse Source
This commit is contained in:
Stefan Benten 2019-07-25 15:17:12 -04:00 committed by GitHub
parent 734c793deb
commit e260f9f1cc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
satellite/satellitedb/overlaycache.go
View File

@ -309,14 +309,10 @@ func (cache *overlaycache) postgresQueryNodesDistinct(ctx context.Context, exclu
audit_reputation_alpha, audit_reputation_beta, uptime_reputation_alpha,
uptime_reputation_beta
FROM (
SELECT * FROM (
SELECT DISTINCT ON (last_net) * -- choose at max 1 node from this IP or network
FROM candidates
WHERE last_net <> '' -- don't try to IP-filter nodes with no known IP yet
ORDER BY last_net, RANDOM() -- equal chance of choosing any qualified node at this IP or network
) ipfiltered
UNION ALL
SELECT * FROM candidates WHERE last_net = ''
SELECT DISTINCT ON (last_net) * -- choose at max 1 node from this IP or network
FROM candidates
WHERE last_net <> '' -- don't try to IP-filter nodes with no known IP yet
ORDER BY last_net, RANDOM() -- equal chance of choosing any qualified node at this IP or network
) filteredcandidates
ORDER BY RANDOM() -- do the actual node selection from filtered pool
LIMIT ?`), args...)