add MAX() to claimtrie GROUP BY algo to make results consistent across SQLite versions

This commit is contained in:
Lex Berezhny 2019-05-20 14:11:53 -04:00
parent 6abb569ec8
commit 51720d9b73

View file

@ -363,13 +363,15 @@ class SQLDB:
if deleted_names: if deleted_names:
deleted_names_sql = f"OR normalized IN ({','.join('?' for _ in deleted_names)})" deleted_names_sql = f"OR normalized IN ({','.join('?' for _ in deleted_names)})"
overtakes = self.execute(f""" overtakes = self.execute(f"""
SELECT winner.normalized, winner.claim_hash, claimtrie.claim_hash AS current_winner FROM ( SELECT winner.normalized, winner.claim_hash,
SELECT normalized, claim_hash FROM claim claimtrie.claim_hash AS current_winner,
MAX(winner.effective_amount)
FROM (
SELECT normalized, claim_hash, effective_amount FROM claim
WHERE normalized IN ( WHERE normalized IN (
SELECT normalized FROM claim WHERE activation_height={height} {claim_hashes_sql} SELECT normalized FROM claim WHERE activation_height={height} {claim_hashes_sql}
) {deleted_names_sql} ) {deleted_names_sql}
ORDER BY effective_amount ASC, height DESC, tx_position DESC ORDER BY effective_amount DESC, height ASC, tx_position ASC
-- the order by is backwards, because GROUP BY picks last row
) AS winner LEFT JOIN claimtrie USING (normalized) ) AS winner LEFT JOIN claimtrie USING (normalized)
GROUP BY winner.normalized GROUP BY winner.normalized
HAVING current_winner IS NULL OR current_winner <> winner.claim_hash HAVING current_winner IS NULL OR current_winner <> winner.claim_hash