From 0680ed5d7fb749c44c6de4d60ee97a1e8fde41b3 Mon Sep 17 00:00:00 2001
From: Corey Thomasson <corey@cthom06.com>
Date: Thu, 1 Jul 2010 18:35:41 +0000
Subject: [PATCH] Setnx, Msetnx: return bool indicating success

---
 redis.go | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/redis.go b/redis.go
index fefac20..bfa95c5 100644
--- a/redis.go
+++ b/redis.go
@@ -391,14 +391,16 @@ func (client *Client) Mget(keys []string) ([][]byte, os.Error) {
     return data, nil
 }
 
-func (client *Client) Setnx(key string, val []byte) os.Error {
-    _, err := client.sendCommand("SETNX", []string{key, string(val)})
+func (client *Client) Setnx(key string, val []byte) (bool, os.Error) {
+    res, err := client.sendCommand("SETNX", []string{key, string(val)})
 
     if err != nil {
-        return err
+        return false, err
     }
-
-    return nil
+    if data, ok := res.(int64); ok {
+        return data == 1, nil
+    }
+    return false, RedisError("Unexpected reply to SETNX")
 }
 
 func (client *Client) Setex(key string, time int64, val []byte) os.Error {
@@ -426,7 +428,7 @@ func (client *Client) Mset(mapping map[string][]byte) os.Error {
     return nil
 }
 
-func (client *Client) Msetnx(mapping map[string][]byte) os.Error {
+func (client *Client) Msetnx(mapping map[string][]byte) (bool, os.Error) {
     args := make([]string, len(mapping)*2)
     i := 0
     for k, v := range mapping {
@@ -434,11 +436,14 @@ func (client *Client) Msetnx(mapping map[string][]byte) os.Error {
         args[i+1] = string(v)
         i += 2
     }
-    _, err := client.sendCommand("MSETNX", args)
+    res, err := client.sendCommand("MSETNX", args)
     if err != nil {
-        return err
+        return false, err
     }
-    return nil
+    if data, ok := res.(int64); ok {
+        return data == 0, nil
+    }
+    return false, RedisError("Unexpected reply to MSETNX")
 }
 
 func (client *Client) Incr(key string) (int64, os.Error) {