Skip to content

Remove 'delta' parameter from delete. #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Network/Memcache.hs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import Network.Memcache.Key
class Memcache a where
set, add, replace :: (Key k, Serializable s) => a -> k -> s -> IO Bool
get :: (Key k, Serializable s) => a -> k -> IO (Maybe s)
delete :: (Key k) => a -> k -> Int -> IO Bool
delete :: (Key k) => a -> k -> IO Bool
incr, decr :: (Key k) => a -> k -> Int -> IO (Maybe Int)

-- vim: set ts=2 sw=2 et :
4 changes: 2 additions & 2 deletions Network/Memcache/Protocol.hs
Original file line number Diff line number Diff line change
Expand Up @@ -111,8 +111,8 @@ instance Memcache Server where
hGetNetLn handle
return $ deserialize val

delete (Server handle) key delta = do
hPutCommand handle ["delete", toKey key, show delta]
delete (Server handle) key = do
hPutCommand handle ["delete", toKey key]
response <- hGetNetLn handle
return (response == "DELETED")

Expand Down
14 changes: 13 additions & 1 deletion Test.hs
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,18 @@ setGetTest = TestCase $ withServerConnection $ \server -> do
Nothing -> assertFailure "'foo' not found just after setting it"
Just v -> assertEqual "foo value" (3 :: Int) v

deleteTest :: Test
deleteTest = TestCase $ withServerConnection $ \server -> do
let foo = 3 :: Int
success <- Network.Memcache.set server "foo2" foo
success' <- Network.Memcache.delete server "foo2"
foo' <- Network.Memcache.get server "foo2"
if (not success')
then assertFailure "delete did not succeed"
else case foo' of
Nothing -> do return ()
Just v -> assertEqual "foo value" (3 :: Int) v

hashTest :: Test
hashTest = TestCase $ do
assertBool "hash produces different values" (hash key1 /= hash key2)
Expand All @@ -46,6 +58,6 @@ main = bracket upDaemon downDaemon runTests >> return () where
sleep 200 -- give it time to start up and bind.
return m
downDaemon = terminateProcess
runTests _ = runTestTT $ TestList [statsTest, setGetTest, hashTest]
runTests _ = runTestTT $ TestList [statsTest, setGetTest, hashTest, deleteTest]

-- vim: set ts=2 sw=2 et :