From 3f247a1cef0d467f4fa51d690240de1c7492f55d Mon Sep 17 00:00:00 2001 From: Alexander Bondarenko <486682+dpwiz@users.noreply.github.com> Date: Tue, 27 Feb 2024 13:26:27 +0200 Subject: [PATCH] test dict building --- src/Simplex/Chat/Store/Messages.hs | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/src/Simplex/Chat/Store/Messages.hs b/src/Simplex/Chat/Store/Messages.hs index f597fe1caf..350ac03c8b 100644 --- a/src/Simplex/Chat/Store/Messages.hs +++ b/src/Simplex/Chat/Store/Messages.hs @@ -125,7 +125,7 @@ import Data.ByteString.Char8 (ByteString) import qualified Data.ByteString.Char8 as B import Data.Either (fromRight, rights) import Data.Int (Int64) -import Data.List (sortBy) +import Data.List (sortBy, sortOn) import Data.Maybe (fromMaybe, isJust, mapMaybe) import Data.Ord (Down (..), comparing) import Data.Text (Text) @@ -152,6 +152,7 @@ import Simplex.Messaging.Crypto.File (CryptoFile (..), CryptoFileArgs (..)) import Simplex.Messaging.Util (eitherToMaybe, (<$$>)) import Simplex.Messaging.Version (VersionRange) import UnliftIO.STM +import Debug.Trace deleteContactCIs :: DB.Connection -> User -> Contact -> IO () deleteContactCIs db user@User {userId} ct@Contact {contactId} = do @@ -2548,14 +2549,22 @@ getGroupHistoryItems db user@User {userId} GroupInfo {groupId} count = do (userId, groupId, rcvMsgContentTag, sndMsgContentTag, count) testZstd :: DB.Connection -> IO [ZstdRow] -testZstd db = process <$$> DB.query_ db "SELECT msg_body FROM messages" +testZstd db = do + samples <- fromOnly <$$> DB.query_ db "SELECT msg_body FROM messages" + let totalSize = sum $ map B.length samples + maxDictSize = totalSize `div` 100 + dict16k <- either fail pure $ Zstd.trainFromSamples (1024 * 16) samples + dict100k <- either fail pure $ Zstd.trainFromSamples (1024 * 100) samples + dictMax <- either fail pure $ Zstd.trainFromSamples maxDictSize samples + traceShowM ('D', Zstd.getDictID dict100k, (totalSize, maxDictSize)) + pure $ sortOn raw $ map (process dict16k dict100k dictMax) samples where - process (Only msg_body) = + process dict1 dict2 dict3 msg_body = ZstdRow { raw = B.length msg_body, z1 = B.length $ Zstd.compress 1 msg_body, - z3 = B.length $ Zstd.compress 3 msg_body, - z6 = B.length $ Zstd.compress 6 msg_body, - z9 = B.length $ Zstd.compress 9 msg_body, + z3 = B.length $ Zstd.compressUsingDict dict1 1 msg_body, + z6 = B.length $ Zstd.compressUsingDict dict2 1 msg_body, + z9 = B.length $ Zstd.compressUsingDict dict3 1 msg_body, z = B.length $ Zstd.compress Zstd.maxCLevel msg_body }