Avoid unnecessary database access for unknown transactions

morcos · morcos · commit c6cb6f7d4c4b · 2016-04-13T16:02:46.000-04:00
diff --git a/src/main.cpp b/src/main.cpp
@@ -4344,10 +4344,12 @@ bool static AlreadyHave(const CInv& inv) EXCLUSIVE_LOCKS_REQUIRED(cs_main)
                 recentRejects->reset();
             }
 
+            // Use pcoinsTip->HaveCoinsInCache as a quick approximation to exclude
+            // requesting or processing some txs which have already been included in a block
             return recentRejects->contains(inv.hash) ||
                    mempool.exists(inv.hash) ||
                    mapOrphanTransactions.count(inv.hash) ||
-                   pcoinsTip->HaveCoins(inv.hash);
+                   pcoinsTip->HaveCoinsInCache(inv.hash);
         }
     case MSG_BLOCK:
         return mapBlockIndex.count(inv.hash);

Original file line number	Diff line number	Diff line change
`@@ -4344,10 +4344,12 @@ bool static AlreadyHave(const CInv& inv) EXCLUSIVE_LOCKS_REQUIRED(cs_main)`
`4344`	`4344`	`recentRejects->reset();`
`4345`	`4345`	`}`
`4346`	`4346`
	`4347`	`+ // Use pcoinsTip->HaveCoinsInCache as a quick approximation to exclude`
	`4348`	`+ // requesting or processing some txs which have already been included in a block`
`4347`	`4349`	`return recentRejects->contains(inv.hash) \|\|`
`4348`	`4350`	`mempool.exists(inv.hash) \|\|`
`4349`	`4351`	`mapOrphanTransactions.count(inv.hash) \|\|`
`4350`		`- pcoinsTip->HaveCoins(inv.hash);`
	`4352`	`+ pcoinsTip->HaveCoinsInCache(inv.hash);`
`4351`	`4353`	`}`
`4352`	`4354`	`case MSG_BLOCK:`
`4353`	`4355`	`return mapBlockIndex.count(inv.hash);`