Merge pull request boltdb#601 from benbjohnson/stats-tx-n

benbjohnson · web-flow · commit f0d021274ded · 2016-10-03T13:08:47.000-06:00
Fix Stats.Sub() for Stats.TxN.
diff --git a/db.go b/db.go
@@ -952,7 +952,7 @@ func (s *Stats) Sub(other *Stats) Stats {
 	diff.PendingPageN = s.PendingPageN
 	diff.FreeAlloc = s.FreeAlloc
 	diff.FreelistInuse = s.FreelistInuse
-	diff.TxN = other.TxN - s.TxN
+	diff.TxN = s.TxN - other.TxN
 	diff.TxStats = s.TxStats.Sub(&other.TxStats)
 	return diff
 }

Original file line number	Diff line number	Diff line change
`@@ -952,7 +952,7 @@ func (s Stats) Sub(other Stats) Stats {`
`952`	`952`	`diff.PendingPageN = s.PendingPageN`
`953`	`953`	`diff.FreeAlloc = s.FreeAlloc`
`954`	`954`	`diff.FreelistInuse = s.FreelistInuse`
`955`		`- diff.TxN = other.TxN - s.TxN`
	`955`	`+ diff.TxN = s.TxN - other.TxN`
`956`	`956`	`diff.TxStats = s.TxStats.Sub(&other.TxStats)`
`957`	`957`	`return diff`
`958`	`958`	`}`