Avoid calling GetSerializeSize on each tx in a block if !fTxIndex

TheBlueMatt · TheBlueMatt · commit 3b78b2d9ef1f · 2017-08-15T17:10:55.000-04:00
diff --git a/src/validation.cpp b/src/validation.cpp
@@ -1619,6 +1619,8 @@ static bool WriteUndoDataForBlock(const CBlockUndo& blockundo, CValidationState&
 
 static bool WriteTxIndexDataForBlock(const CBlock& block, CValidationState& state, CBlockIndex* pindex)
 {
+    if (!fTxIndex) return true;
+
     CDiskTxPos pos(pindex->GetBlockPos(), GetSizeOfCompactSize(block.vtx.size()));
     std::vector<std::pair<uint256, CDiskTxPos> > vPos;
     vPos.reserve(block.vtx.size());
@@ -1628,9 +1630,9 @@ static bool WriteTxIndexDataForBlock(const CBlock& block, CValidationState& stat
         pos.nTxOffset += ::GetSerializeSize(*tx, SER_DISK, CLIENT_VERSION);
     }
 
-    if (fTxIndex)
-        if (!pblocktree->WriteTxIndex(vPos))
-            return AbortNode(state, "Failed to write transaction index");
+    if (!pblocktree->WriteTxIndex(vPos)) {
+        return AbortNode(state, "Failed to write transaction index");
+    }
 
     return true;
 }

Original file line number	Diff line number	Diff line change
`@@ -1619,6 +1619,8 @@ static bool WriteUndoDataForBlock(const CBlockUndo& blockundo, CValidationState&`
`1619`	`1619`
`1620`	`1620`	`static bool WriteTxIndexDataForBlock(const CBlock& block, CValidationState& state, CBlockIndex* pindex)`
`1621`	`1621`	`{`
	`1622`	`+ if (!fTxIndex) return true;`
	`1623`	`+`
`1622`	`1624`	`CDiskTxPos pos(pindex->GetBlockPos(), GetSizeOfCompactSize(block.vtx.size()));`
`1623`	`1625`	`std::vector<std::pair<uint256, CDiskTxPos> > vPos;`
`1624`	`1626`	`vPos.reserve(block.vtx.size());`
`@@ -1628,9 +1630,9 @@ static bool WriteTxIndexDataForBlock(const CBlock& block, CValidationState& stat`
`1628`	`1630`	`pos.nTxOffset += ::GetSerializeSize(*tx, SER_DISK, CLIENT_VERSION);`
`1629`	`1631`	`}`
`1630`	`1632`
`1631`		`- if (fTxIndex)`
`1632`		`- if (!pblocktree->WriteTxIndex(vPos))`
`1633`		`- return AbortNode(state, "Failed to write transaction index");`
	`1633`	`+ if (!pblocktree->WriteTxIndex(vPos)) {`
	`1634`	`+ return AbortNode(state, "Failed to write transaction index");`
	`1635`	`+ }`
`1634`	`1636`
`1635`	`1637`	`return true;`
`1636`	`1638`	`}`