From 5656f90c27b9acfc09d4c1fdec13309ba38cda3c Mon Sep 17 00:00:00 2001 From: "Edward Z. Yang" Date: Wed, 6 Nov 2013 23:04:16 -0800 Subject: [PATCH] Convert to use hashtables, as Data.HashTable went away. Signed-off-by: Edward Z. Yang --- Database/MongoDB/Admin.hs | 6 +++--- mongoDB.cabal | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Database/MongoDB/Admin.hs b/Database/MongoDB/Admin.hs index 2aa3a87..93267a8 100644 --- a/Database/MongoDB/Admin.hs +++ b/Database/MongoDB/Admin.hs @@ -35,7 +35,7 @@ import Data.IORef (IORef, newIORef, readIORef, writeIORef) import Data.Set (Set) import System.IO.Unsafe (unsafePerformIO) -import qualified Data.HashTable as H +import qualified Data.HashTable.IO as H import qualified Data.Set as Set import Control.Monad.Trans (MonadIO, liftIO) @@ -148,7 +148,7 @@ dropIndexes coll = do -- *** Index cache -type DbIndexCache = H.HashTable Database IndexCache +type DbIndexCache = H.BasicHashTable Database IndexCache -- ^ Cache the indexes we create so repeatedly calling ensureIndex only hits database the first time. Clear cache every once in a while so if someone else deletes index we will recreate it on ensureIndex. type IndexCache = IORef (Set (Collection, IndexName)) @@ -156,7 +156,7 @@ type IndexCache = IORef (Set (Collection, IndexName)) dbIndexCache :: DbIndexCache -- ^ initialize cache and fork thread that clears it every 15 minutes dbIndexCache = unsafePerformIO $ do - table <- H.new (==) (H.hashString . T.unpack) + table <- H.new _ <- forkIO . forever $ threadDelay 900000000 >> clearDbIndexCache return table {-# NOINLINE dbIndexCache #-} diff --git a/mongoDB.cabal b/mongoDB.cabal index d36ccc3..5d04491 100644 --- a/mongoDB.cabal +++ b/mongoDB.cabal @@ -37,6 +37,7 @@ Library , monad-control >= 0.3.1 , lifted-base >= 0.1.0.3 , transformers-base >= 0.4.1 + , hashtables >= 1.1.2.0 Exposed-modules: Database.MongoDB Database.MongoDB.Admin