Merge bitcoin#11529: Avoid slow transaction search with txindex enabled

laanwj · laanwj · commit ff92fbf24739 · 2017-10-19T20:04:57.000+02:00
7a5f930 Avoid slow transaction search with txindex enabled (João Barbosa) Pull request description: This is an alternative to bitcoin#11507 where a slow search is not attempted (in any case) if `txindex` is enabled. Tree-SHA512: e680621781a9241c0513ddd79d23b0b42f3ccec8a63ed1c926b35c43321c81c39a1028770397dd5070501dcf644d897026a2bd68a161a4b435f19227c1bbca48
diff --git a/src/validation.cpp b/src/validation.cpp
@@ -939,6 +939,9 @@ bool GetTransaction(const uint256 &hash, CTransactionRef &txOut, const Consensus
                 return error("%s: txid mismatch", __func__);
             return true;
         }
+
+        // transaction not found in index, nothing more can be done
+        return false;
     }
 
     if (fAllowSlow) { // use coin database to locate block that contains transaction, and scan it

Original file line number	Diff line number	Diff line change
`@@ -939,6 +939,9 @@ bool GetTransaction(const uint256 &hash, CTransactionRef &txOut, const Consensus`
`939`	`939`	`return error("%s: txid mismatch", __func__);`
`940`	`940`	`return true;`
`941`	`941`	`}`
	`942`	`+`
	`943`	`+ // transaction not found in index, nothing more can be done`
	`944`	`+ return false;`
`942`	`945`	`}`
`943`	`946`
`944`	`947`	`if (fAllowSlow) { // use coin database to locate block that contains transaction, and scan it`