From 91211220bad87a143ab99e4f8626ccefb032f101 Mon Sep 17 00:00:00 2001 From: voidlizard Date: Tue, 12 Aug 2025 19:26:21 +0300 Subject: [PATCH] removed excess imports --- .../lib/HBS2/Storage/NCQ3/Internal.hs | 21 ------------------- .../lib/HBS2/Storage/NCQ3/Internal/Class.hs | 2 +- .../lib/HBS2/Storage/NCQ3/Internal/Fossil.hs | 11 ---------- .../lib/HBS2/Storage/NCQ3/Internal/Index.hs | 3 --- .../HBS2/Storage/NCQ3/Internal/MMapCache.hs | 1 - .../lib/HBS2/Storage/NCQ3/Internal/Prelude.hs | 1 - .../lib/HBS2/Storage/NCQ3/Internal/Run.hs | 15 ------------- .../lib/HBS2/Storage/NCQ3/Internal/State.hs | 8 +------ .../lib/HBS2/Storage/NCQ3/Internal/Sweep.hs | 3 --- 9 files changed, 2 insertions(+), 63 deletions(-) diff --git a/hbs2-storage-ncq/lib/HBS2/Storage/NCQ3/Internal.hs b/hbs2-storage-ncq/lib/HBS2/Storage/NCQ3/Internal.hs index 76deeba7..930f0484 100644 --- a/hbs2-storage-ncq/lib/HBS2/Storage/NCQ3/Internal.hs +++ b/hbs2-storage-ncq/lib/HBS2/Storage/NCQ3/Internal.hs @@ -12,34 +12,15 @@ import HBS2.Storage.NCQ3.Internal.Index import HBS2.Storage.NCQ3.Internal.MMapCache import Control.Monad.Trans.Cont -import Control.Monad.Trans.Maybe -import Network.ByteOrder qualified as N import Data.HashPSQ qualified as HPSQ import Data.Vector qualified as V import Data.HashMap.Strict qualified as HM import Data.List qualified as List import Data.Set qualified as Set import Data.Either -import Lens.Micro.Platform import Data.ByteString qualified as BS import Data.ByteString.Lazy qualified as LBS -import Data.Sequence qualified as Seq -import System.FilePath.Posix -import System.Posix.Files qualified as Posix -import System.Posix.IO as PosixBase -import System.Posix.Types as Posix -import System.Posix.Unistd -import System.Posix.IO.ByteString as Posix -import System.Posix.Files ( getFileStatus - , modificationTimeHiRes - , setFileTimesHiRes - , getFdStatus - , FileStatus(..) - , setFileMode - ) import System.Posix.Files qualified as PFS -import System.IO.MMap as MMap -import Control.Concurrent.STM qualified as STM import Control.Concurrent.STM.TSem import System.FileLock as FL @@ -49,7 +30,6 @@ ncqStorageOpen fp upd = do let ncqGen = 0 let ncqFsync = 16 * megabytes let ncqWriteQLen = 1024 * 4 - -- let ncqMinLog = 512 * megabytes let ncqMinLog = 1 * gigabytes let ncqMaxLog = 32 * gigabytes let ncqWriteBlock = max 128 $ ncqWriteQLen `div` 2 @@ -191,7 +171,6 @@ ncqTryLoadState me@NCQStorage{..} = do realSize <- fileSize path let sizewtf = realSize /= fromIntegral s - let color = if sizewtf then red else id flip fix 0 $ \again i -> do diff --git a/hbs2-storage-ncq/lib/HBS2/Storage/NCQ3/Internal/Class.hs b/hbs2-storage-ncq/lib/HBS2/Storage/NCQ3/Internal/Class.hs index fcc5efbb..f821078b 100644 --- a/hbs2-storage-ncq/lib/HBS2/Storage/NCQ3/Internal/Class.hs +++ b/hbs2-storage-ncq/lib/HBS2/Storage/NCQ3/Internal/Class.hs @@ -68,7 +68,7 @@ ncqStorageHasBlock sto h = ncqLocate sto h >>= \case -- | Returns strict ByteString --- | It's up to user to perform +-- | It's up to user to perform BS.copy -- | in order to free memory mapped file where located -- | the found block. -- | Dangling substrings prevent mmaped files from being released diff --git a/hbs2-storage-ncq/lib/HBS2/Storage/NCQ3/Internal/Fossil.hs b/hbs2-storage-ncq/lib/HBS2/Storage/NCQ3/Internal/Fossil.hs index 82be1b76..a3bf67bf 100644 --- a/hbs2-storage-ncq/lib/HBS2/Storage/NCQ3/Internal/Fossil.hs +++ b/hbs2-storage-ncq/lib/HBS2/Storage/NCQ3/Internal/Fossil.hs @@ -6,8 +6,6 @@ import HBS2.Storage.NCQ3.Internal.Files import HBS2.Storage.NCQ3.Internal.Index import HBS2.Storage.NCQ3.Internal.State -import HBS2.Data.Types.Refs - import Data.HashSet qualified as HS import Data.List qualified as List import Data.ByteString.Lazy qualified as LBS @@ -17,19 +15,10 @@ import Network.ByteOrder qualified as N import Data.ByteString.Builder import System.IO.Temp (emptyTempFile) -import System.FilePath.Posix import System.Posix.Files qualified as Posix import System.Posix.IO as PosixBase import System.Posix.Types as Posix -import System.Posix.Unistd import System.Posix.IO.ByteString as Posix -import System.Posix.Files ( getFileStatus - , modificationTimeHiRes - , setFileTimesHiRes - , getFdStatus - , FileStatus(..) - , setFileMode - ) import System.Posix.Files qualified as PFS import Lens.Micro.Platform import UnliftIO.IO.File diff --git a/hbs2-storage-ncq/lib/HBS2/Storage/NCQ3/Internal/Index.hs b/hbs2-storage-ncq/lib/HBS2/Storage/NCQ3/Internal/Index.hs index 0bd26eec..66f69cd1 100644 --- a/hbs2-storage-ncq/lib/HBS2/Storage/NCQ3/Internal/Index.hs +++ b/hbs2-storage-ncq/lib/HBS2/Storage/NCQ3/Internal/Index.hs @@ -12,9 +12,6 @@ import Network.ByteOrder qualified as N import Control.Monad.Trans.Cont import Control.Monad.Trans.Maybe import Data.ByteString qualified as BS -import System.IO.MMap -import System.IO.Temp as Temp -import Streaming.Prelude qualified as S -- we need size in order to return block size faster diff --git a/hbs2-storage-ncq/lib/HBS2/Storage/NCQ3/Internal/MMapCache.hs b/hbs2-storage-ncq/lib/HBS2/Storage/NCQ3/Internal/MMapCache.hs index e35fdc75..e2a3bd8e 100644 --- a/hbs2-storage-ncq/lib/HBS2/Storage/NCQ3/Internal/MMapCache.hs +++ b/hbs2-storage-ncq/lib/HBS2/Storage/NCQ3/Internal/MMapCache.hs @@ -5,7 +5,6 @@ import HBS2.Storage.NCQ3.Internal.Types import HBS2.Storage.NCQ3.Internal.Files import Data.HashPSQ as HPSQ -import System.IO.MMap cacheLookupOrInsert :: forall m val. MonadUnliftIO m diff --git a/hbs2-storage-ncq/lib/HBS2/Storage/NCQ3/Internal/Prelude.hs b/hbs2-storage-ncq/lib/HBS2/Storage/NCQ3/Internal/Prelude.hs index e7cec949..8596d6ed 100644 --- a/hbs2-storage-ncq/lib/HBS2/Storage/NCQ3/Internal/Prelude.hs +++ b/hbs2-storage-ncq/lib/HBS2/Storage/NCQ3/Internal/Prelude.hs @@ -60,6 +60,5 @@ import Data.Set (Set) import Data.Ord (Down(..)) import System.IO.MMap as Exported -import UnliftIO as Exported import UnliftIO.Concurrent as Exported diff --git a/hbs2-storage-ncq/lib/HBS2/Storage/NCQ3/Internal/Run.hs b/hbs2-storage-ncq/lib/HBS2/Storage/NCQ3/Internal/Run.hs index da63b7fc..e97eb0c3 100644 --- a/hbs2-storage-ncq/lib/HBS2/Storage/NCQ3/Internal/Run.hs +++ b/hbs2-storage-ncq/lib/HBS2/Storage/NCQ3/Internal/Run.hs @@ -14,29 +14,14 @@ import HBS2.Storage.NCQ3.Internal.Fossil import Control.Monad.Trans.Cont import Control.Monad.Trans.Maybe -import Network.ByteOrder qualified as N import Data.HashSet qualified as HS -import Data.HashPSQ qualified as PSQ import Data.Vector qualified as V -import Data.HashMap.Strict qualified as HM -import Data.ByteString qualified as BS import Data.Sequence qualified as Seq import Data.Fixed -import System.FilePath.Posix -import System.Posix.Files qualified as Posix import System.Posix.IO as PosixBase import System.Posix.Types as Posix import System.Posix.Unistd import System.Posix.IO.ByteString as Posix -import System.Posix.Files ( getFileStatus - , modificationTimeHiRes - , setFileTimesHiRes - , getFdStatus - , FileStatus(..) - , setFileMode - ) -import System.Posix.Files qualified as PFS -import System.IO.MMap as MMap import Control.Concurrent.STM qualified as STM import System.FileLock as FL diff --git a/hbs2-storage-ncq/lib/HBS2/Storage/NCQ3/Internal/State.hs b/hbs2-storage-ncq/lib/HBS2/Storage/NCQ3/Internal/State.hs index 764a9486..db868d05 100644 --- a/hbs2-storage-ncq/lib/HBS2/Storage/NCQ3/Internal/State.hs +++ b/hbs2-storage-ncq/lib/HBS2/Storage/NCQ3/Internal/State.hs @@ -8,22 +8,16 @@ import HBS2.Storage.NCQ3.Internal.MMapCache import Data.Config.Suckless.Script -import Data.Generics.Product -import Data.Generics.Labels +import Data.Generics.Labels() import Data.List qualified as List import Control.Monad.Reader import Control.Monad.Trans.Maybe -import Control.Monad.Trans.Cont import Data.HashSet qualified as HS import Data.HashMap.Strict qualified as HM import Data.Set qualified as Set -import Data.ByteString qualified as BS import UnliftIO.IO.File -import Network.ByteOrder qualified as N -import UnliftIO.IO import System.IO qualified as IO import Lens.Micro.Platform -import Streaming.Prelude qualified as S newtype StateOP a = StateOP { fromStateOp :: ReaderT NCQStorage STM a } diff --git a/hbs2-storage-ncq/lib/HBS2/Storage/NCQ3/Internal/Sweep.hs b/hbs2-storage-ncq/lib/HBS2/Storage/NCQ3/Internal/Sweep.hs index c9193f03..f096cf76 100644 --- a/hbs2-storage-ncq/lib/HBS2/Storage/NCQ3/Internal/Sweep.hs +++ b/hbs2-storage-ncq/lib/HBS2/Storage/NCQ3/Internal/Sweep.hs @@ -4,15 +4,12 @@ module HBS2.Storage.NCQ3.Internal.Sweep where import HBS2.Storage.NCQ3.Internal.Prelude import HBS2.Storage.NCQ3.Internal.Types import HBS2.Storage.NCQ3.Internal.Files -import HBS2.Storage.NCQ3.Internal.State -import HBS2.Storage.NCQ3.Internal.Index import Data.Generics.Uniplate.Operations import Data.Generics.Uniplate.Data() import Data.List qualified as List import Data.HashSet qualified as HS import System.Posix.Files qualified as PFS -import Control.Monad.Trans.Maybe import Data.HashMap.Strict qualified as HM ncqLiveKeysSTM :: NCQStorage -> STM (HashSet FileKey)