mirror of
https://github.com/simonmichael/hledger.git
synced 2024-11-08 07:09:28 +03:00
5e7b69356f
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.
65 lines
2.0 KiB
Haskell
65 lines
2.0 KiB
Haskell
{-# LANGUAGE OverloadedStrings #-}
|
|
{-|
|
|
|
|
The Hledger.Data library allows parsing and querying of C++ ledger-style
|
|
journal files. It generally provides a compatible subset of C++ ledger's
|
|
functionality. This package re-exports all the Hledger.Data.* modules
|
|
(except UTF8, which requires an explicit import.)
|
|
|
|
-}
|
|
|
|
module Hledger.Data (
|
|
module Hledger.Data.Account,
|
|
module Hledger.Data.AccountName,
|
|
module Hledger.Data.Amount,
|
|
module Hledger.Data.Commodity,
|
|
module Hledger.Data.Dates,
|
|
module Hledger.Data.Journal,
|
|
module Hledger.Data.Json,
|
|
module Hledger.Data.Ledger,
|
|
module Hledger.Data.Period,
|
|
module Hledger.Data.PeriodicTransaction,
|
|
module Hledger.Data.Posting,
|
|
module Hledger.Data.RawOptions,
|
|
module Hledger.Data.StringFormat,
|
|
module Hledger.Data.Timeclock,
|
|
module Hledger.Data.Transaction,
|
|
module Hledger.Data.TransactionModifier,
|
|
module Hledger.Data.Types,
|
|
module Hledger.Data.Valuation,
|
|
tests_Data
|
|
)
|
|
where
|
|
|
|
import Hledger.Data.Account
|
|
import Hledger.Data.AccountName
|
|
import Hledger.Data.Amount
|
|
import Hledger.Data.Commodity
|
|
import Hledger.Data.Dates
|
|
import Hledger.Data.Journal
|
|
import Hledger.Data.Json
|
|
import Hledger.Data.Ledger
|
|
import Hledger.Data.Period
|
|
import Hledger.Data.PeriodicTransaction
|
|
import Hledger.Data.Posting
|
|
import Hledger.Data.RawOptions
|
|
import Hledger.Data.StringFormat
|
|
import Hledger.Data.Timeclock
|
|
import Hledger.Data.Transaction
|
|
import Hledger.Data.TransactionModifier
|
|
import Hledger.Data.Types hiding (MixedAmountKey, Mixed)
|
|
import Hledger.Data.Valuation
|
|
import Hledger.Utils.Test
|
|
|
|
tests_Data = tests "Data" [
|
|
tests_AccountName
|
|
,tests_Amount
|
|
,tests_Journal
|
|
,tests_Ledger
|
|
,tests_Posting
|
|
,tests_Valuation
|
|
,tests_StringFormat
|
|
,tests_Timeclock
|
|
,tests_Transaction
|
|
]
|