2009-04-03 14:58:05 +04:00
|
|
|
{-|
|
|
|
|
|
2012-05-14 22:52:22 +04:00
|
|
|
A 'Transaction' represents a movement of some commodity(ies) between two
|
|
|
|
or more accounts. It consists of multiple account 'Posting's which balance
|
2012-05-28 02:59:06 +04:00
|
|
|
to zero, a date, and optional extras like description, cleared status, and
|
|
|
|
tags.
|
2009-04-03 14:58:05 +04:00
|
|
|
|
|
|
|
-}
|
|
|
|
|
2021-08-08 11:03:46 +03:00
|
|
|
{-# LANGUAGE NamedFieldPuns #-}
|
2019-02-15 21:34:40 +03:00
|
|
|
{-# LANGUAGE OverloadedStrings #-}
|
2020-12-27 10:59:30 +03:00
|
|
|
{-# LANGUAGE RecordWildCards #-}
|
lib: textification begins! account names
The first of several conversions from String to (strict) Text, hopefully
reducing space and time usage.
This one shows a small improvement, with GHC 7.10.3 and text-1.2.2.1:
hledger -f data/100x100x10.journal stats
string: <<ghc: 39471064 bytes, 77 GCs, 198421/275048 avg/max bytes residency (3 samples), 2M in use, 0.000 INIT (0.001 elapsed), 0.015 MUT (0.020 elapsed), 0.010 GC (0.014 elapsed) :ghc>>
text: <<ghc: 39268024 bytes, 77 GCs, 197018/270840 avg/max bytes residency (3 samples), 2M in use, 0.000 INIT (0.002 elapsed), 0.016 MUT (0.022 elapsed), 0.009 GC (0.011 elapsed) :ghc>>
hledger -f data/1000x100x10.journal stats
string: <<ghc: 318555920 bytes, 617 GCs, 2178997/7134472 avg/max bytes residency (7 samples), 16M in use, 0.000 INIT (0.001 elapsed), 0.129 MUT (0.136 elapsed), 0.067 GC (0.077 elapsed) :ghc>>
text: <<ghc: 314248496 bytes, 612 GCs, 2074045/6617960 avg/max bytes residency (7 samples), 16M in use, 0.000 INIT (0.003 elapsed), 0.137 MUT (0.145 elapsed), 0.067 GC (0.079 elapsed) :ghc>>
hledger -f data/10000x100x10.journal stats
string: <<ghc: 3114763608 bytes, 6026 GCs, 18858950/75552024 avg/max bytes residency (11 samples), 201M in use, 0.000 INIT (0.000 elapsed), 1.331 MUT (1.372 elapsed), 0.699 GC (0.812 elapsed) :ghc>>
text: <<ghc: 3071468920 bytes, 5968 GCs, 14120344/62951360 avg/max bytes residency (9 samples), 124M in use, 0.000 INIT (0.003 elapsed), 1.272 MUT (1.349 elapsed), 0.513 GC (0.578 elapsed) :ghc>>
hledger -f data/100000x100x10.journal stats
string: <<ghc: 31186579432 bytes, 60278 GCs, 135332581/740228992 avg/max bytes residency (13 samples), 1697M in use, 0.000 INIT (0.008 elapsed), 14.677 MUT (15.508 elapsed), 7.081 GC (8.074 elapsed) :ghc>>
text: <<ghc: 30753427672 bytes, 59763 GCs, 117595958/666457240 avg/max bytes residency (14 samples), 1588M in use, 0.000 INIT (0.008 elapsed), 13.713 MUT (13.966 elapsed), 6.220 GC (7.108 elapsed) :ghc>>
2016-05-24 04:16:21 +03:00
|
|
|
|
2021-08-24 05:34:32 +03:00
|
|
|
module Hledger.Data.Transaction
|
|
|
|
( -- * Transaction
|
|
|
|
nulltransaction
|
|
|
|
, transaction
|
|
|
|
, txnTieKnot
|
|
|
|
, txnUntieKnot
|
2012-05-07 18:36:40 +04:00
|
|
|
-- * operations
|
2021-08-24 05:34:32 +03:00
|
|
|
, hasRealPostings
|
|
|
|
, realPostings
|
|
|
|
, assignmentPostings
|
|
|
|
, virtualPostings
|
|
|
|
, balancedVirtualPostings
|
|
|
|
, transactionsPostings
|
|
|
|
, transactionTransformPostings
|
|
|
|
, transactionApplyValuation
|
|
|
|
, transactionToCost
|
|
|
|
, transactionApplyAliases
|
|
|
|
, transactionMapPostings
|
|
|
|
, transactionMapPostingAmounts
|
|
|
|
-- nonzerobalanceerror
|
2012-05-07 18:36:40 +04:00
|
|
|
-- * date operations
|
2021-08-24 05:34:32 +03:00
|
|
|
, transactionDate2
|
2021-10-10 22:27:09 +03:00
|
|
|
, transactionDateOrDate2
|
2019-07-10 13:04:05 +03:00
|
|
|
-- * transaction description parts
|
2021-08-24 05:34:32 +03:00
|
|
|
, transactionPayee
|
|
|
|
, transactionNote
|
|
|
|
-- payeeAndNoteFromDescription
|
2012-05-07 18:36:40 +04:00
|
|
|
-- * rendering
|
2021-08-24 05:34:32 +03:00
|
|
|
, showTransaction
|
|
|
|
, showTransactionOneLineAmounts
|
|
|
|
, transactionFile
|
2018-09-04 21:31:31 +03:00
|
|
|
-- * tests
|
2021-08-24 05:34:32 +03:00
|
|
|
, tests_Transaction
|
|
|
|
) where
|
2020-12-22 15:35:20 +03:00
|
|
|
|
2021-08-24 05:34:32 +03:00
|
|
|
import Data.Maybe (fromMaybe)
|
lib: textification: comments and tags
No change.
hledger -f data/100x100x10.journal stats
<<ghc: 42859576 bytes, 84 GCs, 193781/269984 avg/max bytes residency (3 samples), 2M in use, 0.000 INIT (0.001 elapsed), 0.016 MUT (0.020 elapsed), 0.009 GC (0.011 elapsed) :ghc>>
<<ghc: 42859576 bytes, 84 GCs, 193781/269984 avg/max bytes residency (3 samples), 2M in use, 0.000 INIT (0.001 elapsed), 0.015 MUT (0.018 elapsed), 0.009 GC (0.013 elapsed) :ghc>>
hledger -f data/1000x1000x10.journal stats
<<ghc: 349576344 bytes, 681 GCs, 1407388/4091680 avg/max bytes residency (7 samples), 11M in use, 0.000 INIT (0.000 elapsed), 0.124 MUT (0.130 elapsed), 0.047 GC (0.055 elapsed) :ghc>>
<<ghc: 349576280 bytes, 681 GCs, 1407388/4091680 avg/max bytes residency (7 samples), 11M in use, 0.000 INIT (0.000 elapsed), 0.126 MUT (0.132 elapsed), 0.049 GC (0.058 elapsed) :ghc>>
hledger -f data/10000x1000x10.journal stats
<<ghc: 3424030664 bytes, 6658 GCs, 11403359/41071624 avg/max bytes residency (11 samples), 111M in use, 0.000 INIT (0.000 elapsed), 1.207 MUT (1.228 elapsed), 0.473 GC (0.528 elapsed) :ghc>>
<<ghc: 3424030760 bytes, 6658 GCs, 11403874/41077288 avg/max bytes residency (11 samples), 111M in use, 0.000 INIT (0.002 elapsed), 1.234 MUT (1.256 elapsed), 0.470 GC (0.520 elapsed) :ghc>>
hledger -f data/100000x1000x10.journal stats
<<ghc: 34306547448 bytes, 66727 GCs, 76805504/414629288 avg/max bytes residency (14 samples), 1009M in use, 0.000 INIT (0.003 elapsed), 12.615 MUT (12.813 elapsed), 4.656 GC (5.291 elapsed) :ghc>>
<<ghc: 34306547320 bytes, 66727 GCs, 76805504/414629288 avg/max bytes residency (14 samples), 1009M in use, 0.000 INIT (0.009 elapsed), 12.802 MUT (13.065 elapsed), 4.774 GC (5.441 elapsed) :ghc>>
2016-05-25 03:09:20 +03:00
|
|
|
import Data.Text (Text)
|
lib: textification begins! account names
The first of several conversions from String to (strict) Text, hopefully
reducing space and time usage.
This one shows a small improvement, with GHC 7.10.3 and text-1.2.2.1:
hledger -f data/100x100x10.journal stats
string: <<ghc: 39471064 bytes, 77 GCs, 198421/275048 avg/max bytes residency (3 samples), 2M in use, 0.000 INIT (0.001 elapsed), 0.015 MUT (0.020 elapsed), 0.010 GC (0.014 elapsed) :ghc>>
text: <<ghc: 39268024 bytes, 77 GCs, 197018/270840 avg/max bytes residency (3 samples), 2M in use, 0.000 INIT (0.002 elapsed), 0.016 MUT (0.022 elapsed), 0.009 GC (0.011 elapsed) :ghc>>
hledger -f data/1000x100x10.journal stats
string: <<ghc: 318555920 bytes, 617 GCs, 2178997/7134472 avg/max bytes residency (7 samples), 16M in use, 0.000 INIT (0.001 elapsed), 0.129 MUT (0.136 elapsed), 0.067 GC (0.077 elapsed) :ghc>>
text: <<ghc: 314248496 bytes, 612 GCs, 2074045/6617960 avg/max bytes residency (7 samples), 16M in use, 0.000 INIT (0.003 elapsed), 0.137 MUT (0.145 elapsed), 0.067 GC (0.079 elapsed) :ghc>>
hledger -f data/10000x100x10.journal stats
string: <<ghc: 3114763608 bytes, 6026 GCs, 18858950/75552024 avg/max bytes residency (11 samples), 201M in use, 0.000 INIT (0.000 elapsed), 1.331 MUT (1.372 elapsed), 0.699 GC (0.812 elapsed) :ghc>>
text: <<ghc: 3071468920 bytes, 5968 GCs, 14120344/62951360 avg/max bytes residency (9 samples), 124M in use, 0.000 INIT (0.003 elapsed), 1.272 MUT (1.349 elapsed), 0.513 GC (0.578 elapsed) :ghc>>
hledger -f data/100000x100x10.journal stats
string: <<ghc: 31186579432 bytes, 60278 GCs, 135332581/740228992 avg/max bytes residency (13 samples), 1697M in use, 0.000 INIT (0.008 elapsed), 14.677 MUT (15.508 elapsed), 7.081 GC (8.074 elapsed) :ghc>>
text: <<ghc: 30753427672 bytes, 59763 GCs, 117595958/666457240 avg/max bytes residency (14 samples), 1588M in use, 0.000 INIT (0.008 elapsed), 13.713 MUT (13.966 elapsed), 6.220 GC (7.108 elapsed) :ghc>>
2016-05-24 04:16:21 +03:00
|
|
|
import qualified Data.Text as T
|
2020-12-25 08:38:26 +03:00
|
|
|
import qualified Data.Text.Lazy as TL
|
|
|
|
import qualified Data.Text.Lazy.Builder as TB
|
2020-12-22 15:35:20 +03:00
|
|
|
import Data.Time.Calendar (Day, fromGregorian)
|
2019-10-20 05:17:35 +03:00
|
|
|
import qualified Data.Map as M
|
2010-11-15 01:44:37 +03:00
|
|
|
|
2019-07-15 13:28:52 +03:00
|
|
|
import Hledger.Utils
|
2010-05-20 03:08:53 +04:00
|
|
|
import Hledger.Data.Types
|
|
|
|
import Hledger.Data.Dates
|
|
|
|
import Hledger.Data.Posting
|
|
|
|
import Hledger.Data.Amount
|
2019-10-20 05:41:21 +03:00
|
|
|
import Hledger.Data.Valuation
|
2009-04-03 14:58:05 +04:00
|
|
|
|
2017-01-20 18:33:24 +03:00
|
|
|
|
2009-12-19 08:57:54 +03:00
|
|
|
nulltransaction :: Transaction
|
|
|
|
nulltransaction = Transaction {
|
2015-10-30 06:12:46 +03:00
|
|
|
tindex=0,
|
2014-08-01 04:32:42 +04:00
|
|
|
tsourcepos=nullsourcepos,
|
2009-12-19 08:57:54 +03:00
|
|
|
tdate=nulldate,
|
2012-12-06 08:43:41 +04:00
|
|
|
tdate2=Nothing,
|
2017-06-16 02:25:37 +03:00
|
|
|
tstatus=Unmarked,
|
2014-09-11 00:07:53 +04:00
|
|
|
tcode="",
|
|
|
|
tdescription="",
|
2009-12-19 08:57:54 +03:00
|
|
|
tcomment="",
|
2012-05-28 02:59:06 +04:00
|
|
|
ttags=[],
|
2009-12-19 08:57:54 +03:00
|
|
|
tpostings=[],
|
2019-01-04 23:01:45 +03:00
|
|
|
tprecedingcomment=""
|
2009-12-19 08:57:54 +03:00
|
|
|
}
|
2009-04-03 14:58:05 +04:00
|
|
|
|
2019-02-22 03:20:04 +03:00
|
|
|
-- | Make a simple transaction with the given date and postings.
|
2020-08-26 11:11:20 +03:00
|
|
|
transaction :: Day -> [Posting] -> Transaction
|
|
|
|
transaction day ps = txnTieKnot $ nulltransaction{tdate=day, tpostings=ps}
|
2019-02-22 03:20:04 +03:00
|
|
|
|
2019-07-10 13:04:05 +03:00
|
|
|
transactionPayee :: Transaction -> Text
|
|
|
|
transactionPayee = fst . payeeAndNoteFromDescription . tdescription
|
|
|
|
|
|
|
|
transactionNote :: Transaction -> Text
|
|
|
|
transactionNote = snd . payeeAndNoteFromDescription . tdescription
|
|
|
|
|
|
|
|
-- | Parse a transaction's description into payee and note (aka narration) fields,
|
|
|
|
-- assuming a convention of separating these with | (like Beancount).
|
|
|
|
-- Ie, everything up to the first | is the payee, everything after it is the note.
|
|
|
|
-- When there's no |, payee == note == description.
|
|
|
|
payeeAndNoteFromDescription :: Text -> (Text,Text)
|
|
|
|
payeeAndNoteFromDescription t
|
|
|
|
| T.null n = (t, t)
|
2020-07-16 13:51:48 +03:00
|
|
|
| otherwise = (T.strip p, T.strip $ T.drop 1 n)
|
2019-07-10 13:04:05 +03:00
|
|
|
where
|
|
|
|
(p, n) = T.span (/= '|') t
|
|
|
|
|
2009-04-03 14:58:05 +04:00
|
|
|
{-|
|
2020-02-08 16:06:52 +03:00
|
|
|
Render a journal transaction as text similar to the style of Ledger's print command.
|
2018-10-22 16:46:31 +03:00
|
|
|
|
2020-02-08 16:06:52 +03:00
|
|
|
Adapted from Ledger 2.x and 3.x standard format:
|
2009-04-03 14:58:05 +04:00
|
|
|
|
|
|
|
@
|
2020-02-08 16:06:52 +03:00
|
|
|
yyyy-mm-dd[ *][ CODE] description......... [ ; comment...............]
|
2009-04-03 14:58:05 +04:00
|
|
|
account name 1..................... ...$amount1[ ; comment...............]
|
|
|
|
account name 2..................... ..$-amount1[ ; comment...............]
|
|
|
|
|
|
|
|
pcodewidth = no limit -- 10 -- mimicking ledger layout.
|
|
|
|
pdescwidth = no limit -- 20 -- I don't remember what these mean,
|
|
|
|
pacctwidth = 35 minimum, no maximum -- they were important at the time.
|
|
|
|
pamtwidth = 11
|
|
|
|
pcommentwidth = no limit -- 22
|
|
|
|
@
|
2018-10-22 16:46:31 +03:00
|
|
|
|
|
|
|
The output will be parseable journal syntax.
|
2019-07-15 13:28:52 +03:00
|
|
|
To facilitate this, postings with explicit multi-commodity amounts
|
2018-10-22 16:46:31 +03:00
|
|
|
are displayed as multiple similar postings, one per commodity.
|
|
|
|
(Normally does not happen with this function).
|
2009-04-03 14:58:05 +04:00
|
|
|
-}
|
2020-10-28 04:53:37 +03:00
|
|
|
showTransaction :: Transaction -> Text
|
2020-12-25 08:38:26 +03:00
|
|
|
showTransaction = TL.toStrict . TB.toLazyText . showTransactionHelper False
|
2009-04-03 14:58:05 +04:00
|
|
|
|
2019-11-16 14:23:38 +03:00
|
|
|
-- | Like showTransaction, but explicit multi-commodity amounts
|
2019-07-15 13:28:52 +03:00
|
|
|
-- are shown on one line, comma-separated. In this case the output will
|
2018-10-22 16:46:31 +03:00
|
|
|
-- not be parseable journal syntax.
|
2020-10-28 04:53:37 +03:00
|
|
|
showTransactionOneLineAmounts :: Transaction -> Text
|
2020-12-25 08:38:26 +03:00
|
|
|
showTransactionOneLineAmounts = TL.toStrict . TB.toLazyText . showTransactionHelper True
|
2015-10-30 04:05:02 +03:00
|
|
|
|
2019-07-15 13:28:52 +03:00
|
|
|
-- | Helper for showTransaction*.
|
2020-12-25 08:38:26 +03:00
|
|
|
showTransactionHelper :: Bool -> Transaction -> TB.Builder
|
2019-11-16 14:23:38 +03:00
|
|
|
showTransactionHelper onelineamounts t =
|
2020-12-25 08:38:26 +03:00
|
|
|
TB.fromText descriptionline <> newline
|
|
|
|
<> foldMap ((<> newline) . TB.fromText) newlinecomments
|
|
|
|
<> foldMap ((<> newline) . TB.fromText) (postingsAsLines onelineamounts $ tpostings t)
|
|
|
|
<> newline
|
2020-10-28 04:53:37 +03:00
|
|
|
where
|
|
|
|
descriptionline = T.stripEnd $ T.concat [date, status, code, desc, samelinecomment]
|
2020-11-05 04:58:04 +03:00
|
|
|
date = showDate (tdate t) <> maybe "" (("="<>) . showDate) (tdate2 t)
|
2020-10-28 04:53:37 +03:00
|
|
|
status | tstatus t == Cleared = " *"
|
|
|
|
| tstatus t == Pending = " !"
|
|
|
|
| otherwise = ""
|
|
|
|
code = if T.null (tcode t) then "" else wrap " (" ")" $ tcode t
|
|
|
|
desc = if T.null d then "" else " " <> d where d = tdescription t
|
|
|
|
(samelinecomment, newlinecomments) =
|
|
|
|
case renderCommentLines (tcomment t) of [] -> ("",[])
|
|
|
|
c:cs -> (c,cs)
|
2020-12-25 08:38:26 +03:00
|
|
|
newline = TB.singleton '\n'
|
2013-09-10 21:32:49 +04:00
|
|
|
|
2011-06-29 04:31:37 +04:00
|
|
|
hasRealPostings :: Transaction -> Bool
|
|
|
|
hasRealPostings = not . null . realPostings
|
|
|
|
|
2010-02-27 21:06:29 +03:00
|
|
|
realPostings :: Transaction -> [Posting]
|
|
|
|
realPostings = filter isReal . tpostings
|
|
|
|
|
2016-12-10 18:04:48 +03:00
|
|
|
assignmentPostings :: Transaction -> [Posting]
|
2019-02-18 23:11:07 +03:00
|
|
|
assignmentPostings = filter hasBalanceAssignment . tpostings
|
2016-12-10 18:04:48 +03:00
|
|
|
|
2010-02-27 21:06:29 +03:00
|
|
|
virtualPostings :: Transaction -> [Posting]
|
|
|
|
virtualPostings = filter isVirtual . tpostings
|
|
|
|
|
|
|
|
balancedVirtualPostings :: Transaction -> [Posting]
|
|
|
|
balancedVirtualPostings = filter isBalancedVirtual . tpostings
|
|
|
|
|
2011-06-11 20:11:38 +04:00
|
|
|
transactionsPostings :: [Transaction] -> [Posting]
|
2019-02-14 16:14:52 +03:00
|
|
|
transactionsPostings = concatMap tpostings
|
2011-06-11 20:11:38 +04:00
|
|
|
|
2021-10-10 22:27:09 +03:00
|
|
|
-- Get a transaction's secondary date, or the primary date if there is none.
|
2012-12-06 08:43:41 +04:00
|
|
|
transactionDate2 :: Transaction -> Day
|
|
|
|
transactionDate2 t = fromMaybe (tdate t) $ tdate2 t
|
2011-09-23 18:50:20 +04:00
|
|
|
|
2021-10-10 22:27:09 +03:00
|
|
|
-- Get a transaction's primary or secondary date, as specified.
|
|
|
|
transactionDateOrDate2 :: WhichDate -> Transaction -> Day
|
|
|
|
transactionDateOrDate2 PrimaryDate = tdate
|
|
|
|
transactionDateOrDate2 SecondaryDate = transactionDate2
|
|
|
|
|
2015-06-28 22:02:33 +03:00
|
|
|
-- | Ensure a transaction's postings refer back to it, so that eg
|
|
|
|
-- relatedPostings works right.
|
2009-12-19 06:44:52 +03:00
|
|
|
txnTieKnot :: Transaction -> Transaction
|
2017-01-16 18:42:41 +03:00
|
|
|
txnTieKnot t@Transaction{tpostings=ps} = t' where
|
|
|
|
t' = t{tpostings=map (postingSetTransaction t') ps}
|
2009-12-19 06:44:52 +03:00
|
|
|
|
lib: textification begins! account names
The first of several conversions from String to (strict) Text, hopefully
reducing space and time usage.
This one shows a small improvement, with GHC 7.10.3 and text-1.2.2.1:
hledger -f data/100x100x10.journal stats
string: <<ghc: 39471064 bytes, 77 GCs, 198421/275048 avg/max bytes residency (3 samples), 2M in use, 0.000 INIT (0.001 elapsed), 0.015 MUT (0.020 elapsed), 0.010 GC (0.014 elapsed) :ghc>>
text: <<ghc: 39268024 bytes, 77 GCs, 197018/270840 avg/max bytes residency (3 samples), 2M in use, 0.000 INIT (0.002 elapsed), 0.016 MUT (0.022 elapsed), 0.009 GC (0.011 elapsed) :ghc>>
hledger -f data/1000x100x10.journal stats
string: <<ghc: 318555920 bytes, 617 GCs, 2178997/7134472 avg/max bytes residency (7 samples), 16M in use, 0.000 INIT (0.001 elapsed), 0.129 MUT (0.136 elapsed), 0.067 GC (0.077 elapsed) :ghc>>
text: <<ghc: 314248496 bytes, 612 GCs, 2074045/6617960 avg/max bytes residency (7 samples), 16M in use, 0.000 INIT (0.003 elapsed), 0.137 MUT (0.145 elapsed), 0.067 GC (0.079 elapsed) :ghc>>
hledger -f data/10000x100x10.journal stats
string: <<ghc: 3114763608 bytes, 6026 GCs, 18858950/75552024 avg/max bytes residency (11 samples), 201M in use, 0.000 INIT (0.000 elapsed), 1.331 MUT (1.372 elapsed), 0.699 GC (0.812 elapsed) :ghc>>
text: <<ghc: 3071468920 bytes, 5968 GCs, 14120344/62951360 avg/max bytes residency (9 samples), 124M in use, 0.000 INIT (0.003 elapsed), 1.272 MUT (1.349 elapsed), 0.513 GC (0.578 elapsed) :ghc>>
hledger -f data/100000x100x10.journal stats
string: <<ghc: 31186579432 bytes, 60278 GCs, 135332581/740228992 avg/max bytes residency (13 samples), 1697M in use, 0.000 INIT (0.008 elapsed), 14.677 MUT (15.508 elapsed), 7.081 GC (8.074 elapsed) :ghc>>
text: <<ghc: 30753427672 bytes, 59763 GCs, 117595958/666457240 avg/max bytes residency (14 samples), 1588M in use, 0.000 INIT (0.008 elapsed), 13.713 MUT (13.966 elapsed), 6.220 GC (7.108 elapsed) :ghc>>
2016-05-24 04:16:21 +03:00
|
|
|
-- | Ensure a transaction's postings do not refer back to it, so that eg
|
|
|
|
-- recursiveSize and GHCI's :sprint work right.
|
|
|
|
txnUntieKnot :: Transaction -> Transaction
|
|
|
|
txnUntieKnot t@Transaction{tpostings=ps} = t{tpostings=map (\p -> p{ptransaction=Nothing}) ps}
|
|
|
|
|
2009-12-19 06:44:52 +03:00
|
|
|
-- | Set a posting's parent transaction.
|
2016-08-14 22:44:19 +03:00
|
|
|
postingSetTransaction :: Transaction -> Posting -> Posting
|
|
|
|
postingSetTransaction t p = p{ptransaction=Just t}
|
2009-12-21 08:23:07 +03:00
|
|
|
|
2019-10-20 05:41:21 +03:00
|
|
|
-- | Apply a transform function to this transaction's amounts.
|
|
|
|
transactionTransformPostings :: (Posting -> Posting) -> Transaction -> Transaction
|
|
|
|
transactionTransformPostings f t@Transaction{tpostings=ps} = t{tpostings=map f ps}
|
|
|
|
|
|
|
|
-- | Apply a specified valuation to this transaction's amounts, using
|
2021-01-26 01:26:25 +03:00
|
|
|
-- the provided price oracle, commodity styles, and reference dates.
|
|
|
|
-- See amountApplyValuation.
|
2020-12-30 08:04:08 +03:00
|
|
|
transactionApplyValuation :: PriceOracle -> M.Map CommoditySymbol AmountStyle -> Day -> Day -> ValuationType -> Transaction -> Transaction
|
|
|
|
transactionApplyValuation priceoracle styles periodlast today v =
|
|
|
|
transactionTransformPostings (postingApplyValuation priceoracle styles periodlast today v)
|
2019-10-20 05:41:21 +03:00
|
|
|
|
|
|
|
-- | Convert this transaction's amounts to cost, and apply the appropriate amount styles.
|
|
|
|
transactionToCost :: M.Map CommoditySymbol AmountStyle -> Transaction -> Transaction
|
2021-05-07 14:56:48 +03:00
|
|
|
transactionToCost styles = transactionTransformPostings (postingToCost styles)
|
2019-10-20 05:41:21 +03:00
|
|
|
|
2020-11-24 20:17:01 +03:00
|
|
|
-- | Apply some account aliases to all posting account names in the transaction, as described by accountNameApplyAliases.
|
2020-11-26 07:59:07 +03:00
|
|
|
-- This can fail due to a bad replacement pattern in a regular expression alias.
|
|
|
|
transactionApplyAliases :: [AccountAlias] -> Transaction -> Either RegexError Transaction
|
2020-11-24 20:17:01 +03:00
|
|
|
transactionApplyAliases aliases t =
|
2020-11-26 07:59:07 +03:00
|
|
|
case mapM (postingApplyAliases aliases) $ tpostings t of
|
|
|
|
Right ps -> Right $ txnTieKnot $ t{tpostings=ps}
|
|
|
|
Left err -> Left err
|
2020-11-24 20:17:01 +03:00
|
|
|
|
2021-02-04 18:57:26 +03:00
|
|
|
-- | Apply a transformation to a transaction's postings.
|
|
|
|
transactionMapPostings :: (Posting -> Posting) -> Transaction -> Transaction
|
|
|
|
transactionMapPostings f t@Transaction{tpostings=ps} = t{tpostings=map f ps}
|
|
|
|
|
|
|
|
-- | Apply a transformation to a transaction's posting amounts.
|
lib: Change internal representation of MixedAmount to use a strict Map
instead of a list of Amounts. No longer export Mixed constructor, to
keep API clean (if you really need it, you can import it directly from
Hledger.Data.Types). We also ensure the JSON representation of
MixedAmount doesn't change: it is stored as a normalised list of
Amounts.
This commit improves performance. Here are some indicative results.
hledger reg -f examples/10000x1000x10.journal
- Maximum residency decreases from 65MB to 60MB (8% decrease)
- Total memory in use decreases from 178MiB to 157MiB (12% decrease)
hledger reg -f examples/10000x10000x10.journal
- Maximum residency decreases from 69MB to 60MB (13% decrease)
- Total memory in use decreases from 198MiB to 153MiB (23% decrease)
hledger bal -f examples/10000x1000x10.journal
- Total heap usage decreases from 6.4GB to 6.0GB (6% decrease)
- Total memory in use decreases from 178MiB to 153MiB (14% decrease)
hledger bal -f examples/10000x10000x10.journal
- Total heap usage decreases from 7.3GB to 6.9GB (5% decrease)
- Total memory in use decreases from 196MiB to 185MiB (5% decrease)
hledger bal -M -f examples/10000x1000x10.journal
- Total heap usage decreases from 16.8GB to 10.6GB (47% decrease)
- Total time decreases from 14.3s to 12.0s (16% decrease)
hledger bal -M -f examples/10000x10000x10.journal
- Total heap usage decreases from 108GB to 48GB (56% decrease)
- Total time decreases from 62s to 41s (33% decrease)
If you never directly use the constructor Mixed or pattern match against
it then you don't need to make any changes. If you do, then do the
following:
- If you really care about the individual Amounts and never normalise
your MixedAmount (for example, just storing `Mixed amts` and then
extracting `amts` as a pattern match, then use should switch to using
[Amount]. This should just involve removing the `Mixed` constructor.
- If you ever call `mixed`, `normaliseMixedAmount`, or do any sort of
amount arithmetic (+), (-), then you should replace the constructor
`Mixed` with the function `mixed`. To extract the list of Amounts, use
the function `amounts`.
- If you ever call `normaliseMixedAmountSquashPricesForDisplay`, you can
replace that with `mixedAmountStripPrices`. (N.B. this does something
slightly different from `normaliseMixedAmountSquashPricesForDisplay`,
but I don't think there's any use case for squashing prices and then
keeping the first of the squashed prices around. If you disagree let
me know.)
- Any remaining calls to `normaliseMixedAmount` can be removed, as that
is now the identity function.
2021-01-29 08:07:11 +03:00
|
|
|
transactionMapPostingAmounts :: (MixedAmount -> MixedAmount) -> Transaction -> Transaction
|
|
|
|
transactionMapPostingAmounts f = transactionMapPostings (postingTransformAmount f)
|
2021-02-04 18:58:09 +03:00
|
|
|
|
2021-03-03 17:44:25 +03:00
|
|
|
-- | The file path from which this transaction was parsed.
|
|
|
|
transactionFile :: Transaction -> FilePath
|
2021-08-25 06:04:28 +03:00
|
|
|
transactionFile Transaction{tsourcepos} = sourceName $ fst tsourcepos
|
2021-03-03 17:44:25 +03:00
|
|
|
|
2018-09-04 21:31:31 +03:00
|
|
|
-- tests
|
|
|
|
|
2019-12-07 20:06:52 +03:00
|
|
|
tests_Transaction :: TestTree
|
2019-02-14 16:14:52 +03:00
|
|
|
tests_Transaction =
|
2021-08-30 08:23:23 +03:00
|
|
|
testGroup "Transaction" [
|
2019-11-27 23:46:29 +03:00
|
|
|
|
2021-08-30 08:23:23 +03:00
|
|
|
testGroup "showPostingLines" [
|
|
|
|
testCase "null posting" $ showPostingLines nullposting @?= [" 0"]
|
|
|
|
, testCase "non-null posting" $
|
2019-11-27 23:46:29 +03:00
|
|
|
let p =
|
2019-02-14 16:14:52 +03:00
|
|
|
posting
|
|
|
|
{ pstatus = Cleared
|
|
|
|
, paccount = "a"
|
lib: Change internal representation of MixedAmount to use a strict Map
instead of a list of Amounts. No longer export Mixed constructor, to
keep API clean (if you really need it, you can import it directly from
Hledger.Data.Types). We also ensure the JSON representation of
MixedAmount doesn't change: it is stored as a normalised list of
Amounts.
This commit improves performance. Here are some indicative results.
hledger reg -f examples/10000x1000x10.journal
- Maximum residency decreases from 65MB to 60MB (8% decrease)
- Total memory in use decreases from 178MiB to 157MiB (12% decrease)
hledger reg -f examples/10000x10000x10.journal
- Maximum residency decreases from 69MB to 60MB (13% decrease)
- Total memory in use decreases from 198MiB to 153MiB (23% decrease)
hledger bal -f examples/10000x1000x10.journal
- Total heap usage decreases from 6.4GB to 6.0GB (6% decrease)
- Total memory in use decreases from 178MiB to 153MiB (14% decrease)
hledger bal -f examples/10000x10000x10.journal
- Total heap usage decreases from 7.3GB to 6.9GB (5% decrease)
- Total memory in use decreases from 196MiB to 185MiB (5% decrease)
hledger bal -M -f examples/10000x1000x10.journal
- Total heap usage decreases from 16.8GB to 10.6GB (47% decrease)
- Total time decreases from 14.3s to 12.0s (16% decrease)
hledger bal -M -f examples/10000x10000x10.journal
- Total heap usage decreases from 108GB to 48GB (56% decrease)
- Total time decreases from 62s to 41s (33% decrease)
If you never directly use the constructor Mixed or pattern match against
it then you don't need to make any changes. If you do, then do the
following:
- If you really care about the individual Amounts and never normalise
your MixedAmount (for example, just storing `Mixed amts` and then
extracting `amts` as a pattern match, then use should switch to using
[Amount]. This should just involve removing the `Mixed` constructor.
- If you ever call `mixed`, `normaliseMixedAmount`, or do any sort of
amount arithmetic (+), (-), then you should replace the constructor
`Mixed` with the function `mixed`. To extract the list of Amounts, use
the function `amounts`.
- If you ever call `normaliseMixedAmountSquashPricesForDisplay`, you can
replace that with `mixedAmountStripPrices`. (N.B. this does something
slightly different from `normaliseMixedAmountSquashPricesForDisplay`,
but I don't think there's any use case for squashing prices and then
keeping the first of the squashed prices around. If you disagree let
me know.)
- Any remaining calls to `normaliseMixedAmount` can be removed, as that
is now the identity function.
2021-01-29 08:07:11 +03:00
|
|
|
, pamount = mixed [usd 1, hrs 2]
|
2019-02-14 16:14:52 +03:00
|
|
|
, pcomment = "pcomment1\npcomment2\n tag3: val3 \n"
|
|
|
|
, ptype = RegularPosting
|
|
|
|
, ptags = [("ptag1", "val1"), ("ptag2", "val2")]
|
|
|
|
}
|
2021-03-18 08:11:19 +03:00
|
|
|
in showPostingLines p @?=
|
2019-06-12 16:01:17 +03:00
|
|
|
[ " * a $1.00 ; pcomment1"
|
2019-02-14 16:14:52 +03:00
|
|
|
, " ; pcomment2"
|
|
|
|
, " ; tag3: val3 "
|
2019-06-12 16:01:17 +03:00
|
|
|
, " * a 2.00h ; pcomment1"
|
2019-02-14 16:14:52 +03:00
|
|
|
, " ; pcomment2"
|
|
|
|
, " ; tag3: val3 "
|
|
|
|
]
|
|
|
|
]
|
2019-11-27 23:46:29 +03:00
|
|
|
|
|
|
|
, let
|
|
|
|
-- one implicit amount
|
|
|
|
timp = nulltransaction {tpostings = ["a" `post` usd 1, "b" `post` missingamt]}
|
|
|
|
-- explicit amounts, balanced
|
|
|
|
texp = nulltransaction {tpostings = ["a" `post` usd 1, "b" `post` usd (-1)]}
|
|
|
|
-- explicit amount, only one posting
|
|
|
|
texp1 = nulltransaction {tpostings = ["(a)" `post` usd 1]}
|
|
|
|
-- explicit amounts, two commodities, explicit balancing price
|
|
|
|
texp2 = nulltransaction {tpostings = ["a" `post` usd 1, "b" `post` (hrs (-1) `at` usd 1)]}
|
|
|
|
-- explicit amounts, two commodities, implicit balancing price
|
|
|
|
texp2b = nulltransaction {tpostings = ["a" `post` usd 1, "b" `post` hrs (-1)]}
|
|
|
|
-- one missing amount, not the last one
|
|
|
|
t3 = nulltransaction {tpostings = ["a" `post` usd 1, "b" `post` missingamt, "c" `post` usd (-1)]}
|
|
|
|
-- unbalanced amounts when precision is limited (#931)
|
|
|
|
-- t4 = nulltransaction {tpostings = ["a" `post` usd (-0.01), "b" `post` usd (0.005), "c" `post` usd (0.005)]}
|
2021-08-30 08:23:23 +03:00
|
|
|
in testGroup "postingsAsLines" [
|
|
|
|
testCase "null-transaction" $ postingsAsLines False (tpostings nulltransaction) @?= []
|
|
|
|
, testCase "implicit-amount" $ postingsAsLines False (tpostings timp) @?=
|
2019-02-14 16:14:52 +03:00
|
|
|
[ " a $1.00"
|
|
|
|
, " b" -- implicit amount remains implicit
|
|
|
|
]
|
2021-08-30 08:23:23 +03:00
|
|
|
, testCase "explicit-amounts" $ postingsAsLines False (tpostings texp) @?=
|
2019-02-14 16:14:52 +03:00
|
|
|
[ " a $1.00"
|
2019-11-16 14:23:38 +03:00
|
|
|
, " b $-1.00"
|
2019-02-14 16:14:52 +03:00
|
|
|
]
|
2021-08-30 08:23:23 +03:00
|
|
|
, testCase "one-explicit-amount" $ postingsAsLines False (tpostings texp1) @?=
|
2019-11-16 14:23:38 +03:00
|
|
|
[ " (a) $1.00"
|
2019-02-14 16:14:52 +03:00
|
|
|
]
|
2021-08-30 08:23:23 +03:00
|
|
|
, testCase "explicit-amounts-two-commodities" $ postingsAsLines False (tpostings texp2) @?=
|
2019-02-14 16:14:52 +03:00
|
|
|
[ " a $1.00"
|
2019-11-16 14:23:38 +03:00
|
|
|
, " b -1.00h @ $1.00"
|
2019-02-14 16:14:52 +03:00
|
|
|
]
|
2021-08-30 08:23:23 +03:00
|
|
|
, testCase "explicit-amounts-not-explicitly-balanced" $ postingsAsLines False (tpostings texp2b) @?=
|
2019-02-14 16:14:52 +03:00
|
|
|
[ " a $1.00"
|
2019-11-16 14:23:38 +03:00
|
|
|
, " b -1.00h"
|
2019-02-14 16:14:52 +03:00
|
|
|
]
|
2021-08-30 08:23:23 +03:00
|
|
|
, testCase "implicit-amount-not-last" $ postingsAsLines False (tpostings t3) @?=
|
2019-02-14 16:14:52 +03:00
|
|
|
[" a $1.00", " b", " c $-1.00"]
|
2021-08-30 08:23:23 +03:00
|
|
|
-- , testCase "ensure-visibly-balanced" $
|
2019-11-27 23:46:29 +03:00
|
|
|
-- in postingsAsLines False (tpostings t4) @?=
|
2019-11-27 00:56:14 +03:00
|
|
|
-- [" a $-0.01", " b $0.005", " c $0.005"]
|
|
|
|
|
2019-02-14 16:14:52 +03:00
|
|
|
]
|
2019-11-27 23:46:29 +03:00
|
|
|
|
2021-08-30 08:23:23 +03:00
|
|
|
, testGroup "showTransaction" [
|
|
|
|
testCase "null transaction" $ showTransaction nulltransaction @?= "0000-01-01\n\n"
|
|
|
|
, testCase "non-null transaction" $ showTransaction
|
2019-11-16 14:23:38 +03:00
|
|
|
nulltransaction
|
2020-08-26 11:11:20 +03:00
|
|
|
{ tdate = fromGregorian 2012 05 14
|
|
|
|
, tdate2 = Just $ fromGregorian 2012 05 15
|
2019-11-16 14:23:38 +03:00
|
|
|
, tstatus = Unmarked
|
|
|
|
, tcode = "code"
|
|
|
|
, tdescription = "desc"
|
|
|
|
, tcomment = "tcomment1\ntcomment2\n"
|
|
|
|
, ttags = [("ttag1", "val1")]
|
|
|
|
, tpostings =
|
|
|
|
[ nullposting
|
|
|
|
{ pstatus = Cleared
|
|
|
|
, paccount = "a"
|
lib: Change internal representation of MixedAmount to use a strict Map
instead of a list of Amounts. No longer export Mixed constructor, to
keep API clean (if you really need it, you can import it directly from
Hledger.Data.Types). We also ensure the JSON representation of
MixedAmount doesn't change: it is stored as a normalised list of
Amounts.
This commit improves performance. Here are some indicative results.
hledger reg -f examples/10000x1000x10.journal
- Maximum residency decreases from 65MB to 60MB (8% decrease)
- Total memory in use decreases from 178MiB to 157MiB (12% decrease)
hledger reg -f examples/10000x10000x10.journal
- Maximum residency decreases from 69MB to 60MB (13% decrease)
- Total memory in use decreases from 198MiB to 153MiB (23% decrease)
hledger bal -f examples/10000x1000x10.journal
- Total heap usage decreases from 6.4GB to 6.0GB (6% decrease)
- Total memory in use decreases from 178MiB to 153MiB (14% decrease)
hledger bal -f examples/10000x10000x10.journal
- Total heap usage decreases from 7.3GB to 6.9GB (5% decrease)
- Total memory in use decreases from 196MiB to 185MiB (5% decrease)
hledger bal -M -f examples/10000x1000x10.journal
- Total heap usage decreases from 16.8GB to 10.6GB (47% decrease)
- Total time decreases from 14.3s to 12.0s (16% decrease)
hledger bal -M -f examples/10000x10000x10.journal
- Total heap usage decreases from 108GB to 48GB (56% decrease)
- Total time decreases from 62s to 41s (33% decrease)
If you never directly use the constructor Mixed or pattern match against
it then you don't need to make any changes. If you do, then do the
following:
- If you really care about the individual Amounts and never normalise
your MixedAmount (for example, just storing `Mixed amts` and then
extracting `amts` as a pattern match, then use should switch to using
[Amount]. This should just involve removing the `Mixed` constructor.
- If you ever call `mixed`, `normaliseMixedAmount`, or do any sort of
amount arithmetic (+), (-), then you should replace the constructor
`Mixed` with the function `mixed`. To extract the list of Amounts, use
the function `amounts`.
- If you ever call `normaliseMixedAmountSquashPricesForDisplay`, you can
replace that with `mixedAmountStripPrices`. (N.B. this does something
slightly different from `normaliseMixedAmountSquashPricesForDisplay`,
but I don't think there's any use case for squashing prices and then
keeping the first of the squashed prices around. If you disagree let
me know.)
- Any remaining calls to `normaliseMixedAmount` can be removed, as that
is now the identity function.
2021-01-29 08:07:11 +03:00
|
|
|
, pamount = mixed [usd 1, hrs 2]
|
2019-11-16 14:23:38 +03:00
|
|
|
, pcomment = "\npcomment2\n"
|
|
|
|
, ptype = RegularPosting
|
|
|
|
, ptags = [("ptag1", "val1"), ("ptag2", "val2")]
|
|
|
|
}
|
2019-02-14 16:14:52 +03:00
|
|
|
]
|
2019-11-27 23:46:29 +03:00
|
|
|
} @?=
|
2020-10-28 04:53:37 +03:00
|
|
|
T.unlines
|
2019-12-30 01:36:32 +03:00
|
|
|
[ "2012-05-14=2012-05-15 (code) desc ; tcomment1"
|
2019-11-16 14:23:38 +03:00
|
|
|
, " ; tcomment2"
|
|
|
|
, " * a $1.00"
|
|
|
|
, " ; pcomment2"
|
|
|
|
, " * a 2.00h"
|
|
|
|
, " ; pcomment2"
|
|
|
|
, ""
|
|
|
|
]
|
2021-08-30 08:23:23 +03:00
|
|
|
, testCase "show a balanced transaction" $
|
2019-02-14 16:14:52 +03:00
|
|
|
(let t =
|
|
|
|
Transaction
|
|
|
|
0
|
|
|
|
""
|
|
|
|
nullsourcepos
|
2020-08-26 11:11:20 +03:00
|
|
|
(fromGregorian 2007 01 28)
|
2019-02-14 16:14:52 +03:00
|
|
|
Nothing
|
|
|
|
Unmarked
|
|
|
|
""
|
|
|
|
"coopportunity"
|
|
|
|
""
|
|
|
|
[]
|
lib: Change internal representation of MixedAmount to use a strict Map
instead of a list of Amounts. No longer export Mixed constructor, to
keep API clean (if you really need it, you can import it directly from
Hledger.Data.Types). We also ensure the JSON representation of
MixedAmount doesn't change: it is stored as a normalised list of
Amounts.
This commit improves performance. Here are some indicative results.
hledger reg -f examples/10000x1000x10.journal
- Maximum residency decreases from 65MB to 60MB (8% decrease)
- Total memory in use decreases from 178MiB to 157MiB (12% decrease)
hledger reg -f examples/10000x10000x10.journal
- Maximum residency decreases from 69MB to 60MB (13% decrease)
- Total memory in use decreases from 198MiB to 153MiB (23% decrease)
hledger bal -f examples/10000x1000x10.journal
- Total heap usage decreases from 6.4GB to 6.0GB (6% decrease)
- Total memory in use decreases from 178MiB to 153MiB (14% decrease)
hledger bal -f examples/10000x10000x10.journal
- Total heap usage decreases from 7.3GB to 6.9GB (5% decrease)
- Total memory in use decreases from 196MiB to 185MiB (5% decrease)
hledger bal -M -f examples/10000x1000x10.journal
- Total heap usage decreases from 16.8GB to 10.6GB (47% decrease)
- Total time decreases from 14.3s to 12.0s (16% decrease)
hledger bal -M -f examples/10000x10000x10.journal
- Total heap usage decreases from 108GB to 48GB (56% decrease)
- Total time decreases from 62s to 41s (33% decrease)
If you never directly use the constructor Mixed or pattern match against
it then you don't need to make any changes. If you do, then do the
following:
- If you really care about the individual Amounts and never normalise
your MixedAmount (for example, just storing `Mixed amts` and then
extracting `amts` as a pattern match, then use should switch to using
[Amount]. This should just involve removing the `Mixed` constructor.
- If you ever call `mixed`, `normaliseMixedAmount`, or do any sort of
amount arithmetic (+), (-), then you should replace the constructor
`Mixed` with the function `mixed`. To extract the list of Amounts, use
the function `amounts`.
- If you ever call `normaliseMixedAmountSquashPricesForDisplay`, you can
replace that with `mixedAmountStripPrices`. (N.B. this does something
slightly different from `normaliseMixedAmountSquashPricesForDisplay`,
but I don't think there's any use case for squashing prices and then
keeping the first of the squashed prices around. If you disagree let
me know.)
- Any remaining calls to `normaliseMixedAmount` can be removed, as that
is now the identity function.
2021-01-29 08:07:11 +03:00
|
|
|
[ posting {paccount = "expenses:food:groceries", pamount = mixedAmount (usd 47.18), ptransaction = Just t}
|
|
|
|
, posting {paccount = "assets:checking", pamount = mixedAmount (usd (-47.18)), ptransaction = Just t}
|
2019-02-14 16:14:52 +03:00
|
|
|
]
|
2019-11-27 23:46:29 +03:00
|
|
|
in showTransaction t) @?=
|
2020-10-28 04:53:37 +03:00
|
|
|
(T.unlines
|
2019-12-30 01:36:32 +03:00
|
|
|
[ "2007-01-28 coopportunity"
|
2019-02-14 16:14:52 +03:00
|
|
|
, " expenses:food:groceries $47.18"
|
|
|
|
, " assets:checking $-47.18"
|
|
|
|
, ""
|
|
|
|
])
|
2021-08-30 08:23:23 +03:00
|
|
|
, testCase "show an unbalanced transaction, should not elide" $
|
2019-02-14 16:14:52 +03:00
|
|
|
(showTransaction
|
|
|
|
(txnTieKnot $
|
|
|
|
Transaction
|
|
|
|
0
|
|
|
|
""
|
|
|
|
nullsourcepos
|
2020-08-26 11:11:20 +03:00
|
|
|
(fromGregorian 2007 01 28)
|
2019-02-14 16:14:52 +03:00
|
|
|
Nothing
|
|
|
|
Unmarked
|
|
|
|
""
|
|
|
|
"coopportunity"
|
|
|
|
""
|
|
|
|
[]
|
lib: Change internal representation of MixedAmount to use a strict Map
instead of a list of Amounts. No longer export Mixed constructor, to
keep API clean (if you really need it, you can import it directly from
Hledger.Data.Types). We also ensure the JSON representation of
MixedAmount doesn't change: it is stored as a normalised list of
Amounts.
This commit improves performance. Here are some indicative results.
hledger reg -f examples/10000x1000x10.journal
- Maximum residency decreases from 65MB to 60MB (8% decrease)
- Total memory in use decreases from 178MiB to 157MiB (12% decrease)
hledger reg -f examples/10000x10000x10.journal
- Maximum residency decreases from 69MB to 60MB (13% decrease)
- Total memory in use decreases from 198MiB to 153MiB (23% decrease)
hledger bal -f examples/10000x1000x10.journal
- Total heap usage decreases from 6.4GB to 6.0GB (6% decrease)
- Total memory in use decreases from 178MiB to 153MiB (14% decrease)
hledger bal -f examples/10000x10000x10.journal
- Total heap usage decreases from 7.3GB to 6.9GB (5% decrease)
- Total memory in use decreases from 196MiB to 185MiB (5% decrease)
hledger bal -M -f examples/10000x1000x10.journal
- Total heap usage decreases from 16.8GB to 10.6GB (47% decrease)
- Total time decreases from 14.3s to 12.0s (16% decrease)
hledger bal -M -f examples/10000x10000x10.journal
- Total heap usage decreases from 108GB to 48GB (56% decrease)
- Total time decreases from 62s to 41s (33% decrease)
If you never directly use the constructor Mixed or pattern match against
it then you don't need to make any changes. If you do, then do the
following:
- If you really care about the individual Amounts and never normalise
your MixedAmount (for example, just storing `Mixed amts` and then
extracting `amts` as a pattern match, then use should switch to using
[Amount]. This should just involve removing the `Mixed` constructor.
- If you ever call `mixed`, `normaliseMixedAmount`, or do any sort of
amount arithmetic (+), (-), then you should replace the constructor
`Mixed` with the function `mixed`. To extract the list of Amounts, use
the function `amounts`.
- If you ever call `normaliseMixedAmountSquashPricesForDisplay`, you can
replace that with `mixedAmountStripPrices`. (N.B. this does something
slightly different from `normaliseMixedAmountSquashPricesForDisplay`,
but I don't think there's any use case for squashing prices and then
keeping the first of the squashed prices around. If you disagree let
me know.)
- Any remaining calls to `normaliseMixedAmount` can be removed, as that
is now the identity function.
2021-01-29 08:07:11 +03:00
|
|
|
[ posting {paccount = "expenses:food:groceries", pamount = mixedAmount (usd 47.18)}
|
|
|
|
, posting {paccount = "assets:checking", pamount = mixedAmount (usd (-47.19))}
|
2019-11-27 23:46:29 +03:00
|
|
|
])) @?=
|
2020-10-28 04:53:37 +03:00
|
|
|
(T.unlines
|
2019-12-30 01:36:32 +03:00
|
|
|
[ "2007-01-28 coopportunity"
|
2019-02-14 16:14:52 +03:00
|
|
|
, " expenses:food:groceries $47.18"
|
|
|
|
, " assets:checking $-47.19"
|
|
|
|
, ""
|
|
|
|
])
|
2021-08-30 08:23:23 +03:00
|
|
|
, testCase "show a transaction with one posting and a missing amount" $
|
2019-02-14 16:14:52 +03:00
|
|
|
(showTransaction
|
|
|
|
(txnTieKnot $
|
|
|
|
Transaction
|
|
|
|
0
|
|
|
|
""
|
|
|
|
nullsourcepos
|
2020-08-26 11:11:20 +03:00
|
|
|
(fromGregorian 2007 01 28)
|
2019-02-14 16:14:52 +03:00
|
|
|
Nothing
|
|
|
|
Unmarked
|
|
|
|
""
|
|
|
|
"coopportunity"
|
|
|
|
""
|
|
|
|
[]
|
2019-11-27 23:46:29 +03:00
|
|
|
[posting {paccount = "expenses:food:groceries", pamount = missingmixedamt}])) @?=
|
2020-10-28 04:53:37 +03:00
|
|
|
(T.unlines ["2007-01-28 coopportunity", " expenses:food:groceries", ""])
|
2021-08-30 08:23:23 +03:00
|
|
|
, testCase "show a transaction with a priced commodityless amount" $
|
2020-12-25 08:38:26 +03:00
|
|
|
(showTransaction
|
2019-02-14 16:14:52 +03:00
|
|
|
(txnTieKnot $
|
|
|
|
Transaction
|
|
|
|
0
|
|
|
|
""
|
|
|
|
nullsourcepos
|
2020-08-26 11:11:20 +03:00
|
|
|
(fromGregorian 2010 01 01)
|
2019-02-14 16:14:52 +03:00
|
|
|
Nothing
|
|
|
|
Unmarked
|
|
|
|
""
|
|
|
|
"x"
|
|
|
|
""
|
|
|
|
[]
|
lib: Change internal representation of MixedAmount to use a strict Map
instead of a list of Amounts. No longer export Mixed constructor, to
keep API clean (if you really need it, you can import it directly from
Hledger.Data.Types). We also ensure the JSON representation of
MixedAmount doesn't change: it is stored as a normalised list of
Amounts.
This commit improves performance. Here are some indicative results.
hledger reg -f examples/10000x1000x10.journal
- Maximum residency decreases from 65MB to 60MB (8% decrease)
- Total memory in use decreases from 178MiB to 157MiB (12% decrease)
hledger reg -f examples/10000x10000x10.journal
- Maximum residency decreases from 69MB to 60MB (13% decrease)
- Total memory in use decreases from 198MiB to 153MiB (23% decrease)
hledger bal -f examples/10000x1000x10.journal
- Total heap usage decreases from 6.4GB to 6.0GB (6% decrease)
- Total memory in use decreases from 178MiB to 153MiB (14% decrease)
hledger bal -f examples/10000x10000x10.journal
- Total heap usage decreases from 7.3GB to 6.9GB (5% decrease)
- Total memory in use decreases from 196MiB to 185MiB (5% decrease)
hledger bal -M -f examples/10000x1000x10.journal
- Total heap usage decreases from 16.8GB to 10.6GB (47% decrease)
- Total time decreases from 14.3s to 12.0s (16% decrease)
hledger bal -M -f examples/10000x10000x10.journal
- Total heap usage decreases from 108GB to 48GB (56% decrease)
- Total time decreases from 62s to 41s (33% decrease)
If you never directly use the constructor Mixed or pattern match against
it then you don't need to make any changes. If you do, then do the
following:
- If you really care about the individual Amounts and never normalise
your MixedAmount (for example, just storing `Mixed amts` and then
extracting `amts` as a pattern match, then use should switch to using
[Amount]. This should just involve removing the `Mixed` constructor.
- If you ever call `mixed`, `normaliseMixedAmount`, or do any sort of
amount arithmetic (+), (-), then you should replace the constructor
`Mixed` with the function `mixed`. To extract the list of Amounts, use
the function `amounts`.
- If you ever call `normaliseMixedAmountSquashPricesForDisplay`, you can
replace that with `mixedAmountStripPrices`. (N.B. this does something
slightly different from `normaliseMixedAmountSquashPricesForDisplay`,
but I don't think there's any use case for squashing prices and then
keeping the first of the squashed prices around. If you disagree let
me know.)
- Any remaining calls to `normaliseMixedAmount` can be removed, as that
is now the identity function.
2021-01-29 08:07:11 +03:00
|
|
|
[ posting {paccount = "a", pamount = mixedAmount $ num 1 `at` (usd 2 `withPrecision` Precision 0)}
|
2019-02-14 16:14:52 +03:00
|
|
|
, posting {paccount = "b", pamount = missingmixedamt}
|
2019-11-27 23:46:29 +03:00
|
|
|
])) @?=
|
2020-12-25 08:38:26 +03:00
|
|
|
(T.unlines ["2010-01-01 x", " a 1 @ $2", " b", ""])
|
2019-02-14 16:14:52 +03:00
|
|
|
]
|
2018-09-04 21:31:31 +03:00
|
|
|
]
|