Merge pull request #1 from redis-go/list

List

Author: robinbraemer

Gopkg.lock

@@ -39,7 +39,7 @@ go get -u github.com/redis-go/redis
 - [x] active key expirer
 - [ ] Implementing data structures
   - [x] String
-  - [ ] List
+  - [x] List
   - [ ] Set
   - [ ] Sorted Set
   - [ ] Hash

README.md

@@ -34,6 +34,15 @@ func (r *Redis) NewClient(conn redcon.Conn) *Client {
 	return c
 }
 
+// NextClientId atomically gets and increments a counter to return the next client id.
+func (r *Redis) NextClientId() ClientId {
+	r.Mu().Lock()
+	defer r.Mu().Unlock()
+	id := r.nextClientId
+	r.nextClientId++
+	return id
+}
+
 // Clients gets the current connected clients.
 func (r *Redis) Clients() Clients {
 	r.Mu().RLock()

client.go

@@ -14,8 +14,8 @@ func GetCommand(c *Client, cmd redcon.Command) {
 		return
 	}
 
-	if i.ValueType() != StringType {
-		c.Conn().WriteError(fmt.Sprintf("%s: key is a %s not a %s", WrongTypeErr, i.ValueTypeFancy(), StringTypeFancy))
+	if i.Type() != StringType {
+		c.Conn().WriteError(fmt.Sprintf("%s: key is a %s not a %s", WrongTypeErr, i.TypeFancy(), StringTypeFancy))
 		return
 	}
 

del.go renamed to cmd_del.go

@@ -0,0 +1,34 @@
+package redis
+
+import (
+	"fmt"
+	"github.com/redis-go/redcon"
+)
+
+func LPopCommand(c *Client, cmd redcon.Command) {
+	if len(cmd.Args) < 2 {
+		c.Conn().WriteError(fmt.Sprintf(WrongNumOfArgsErr, "lpop"))
+		return
+	}
+	key := string(cmd.Args[1])
+
+	db := c.Db()
+	i := db.GetOrExpire(&key, true)
+	if i == nil {
+		c.Conn().WriteNull()
+		return
+	} else if i.Type() != ListType {
+		c.Conn().WriteError(fmt.Sprintf("%s: key is a %s not a %s", WrongTypeErr, i.TypeFancy(), ListTypeFancy))
+		return
+	}
+
+	l := i.(*List)
+	c.Redis().Mu().Lock()
+	v, b := l.LPop()
+	if b {
+		db.Delete(&key)
+	}
+	c.Redis().Mu().Unlock()
+
+	c.Conn().WriteBulkString(*v)
+}

get.go renamed to cmd_get.go

@@ -0,0 +1,37 @@
+package redis
+
+import (
+	"fmt"
+	"github.com/redis-go/redcon"
+	"time"
+)
+
+func LPushCommand(c *Client, cmd redcon.Command) {
+	if len(cmd.Args) < 3 {
+		c.Conn().WriteError(fmt.Sprintf(WrongNumOfArgsErr, "lpush"))
+		return
+	}
+	key := string(cmd.Args[1])
+	fmt.Println("KEY:", key)
+	db := c.Db()
+	i := db.GetOrExpire(&key, true)
+	if i == nil {
+		i = NewList()
+		db.Set(&key, i, false, time.Time{})
+		fmt.Println("CREATED NEW LIST")
+	} else if i.Type() != ListType {
+		c.Conn().WriteError(fmt.Sprintf("%s: key is a %s not a %s", WrongTypeErr, i.TypeFancy(), ListTypeFancy))
+		return
+	}
+
+	l := i.(*List)
+	var length int
+	c.Redis().Mu().Lock()
+	for j := 2; j < len(cmd.Args); j++ {
+		v := string(cmd.Args[j])
+		length = l.LPush(&v)
+	}
+	c.Redis().Mu().Unlock()
+
+	c.Conn().WriteInt(length)
+}

cmd_lpop.go

@@ -0,0 +1,45 @@
+package redis
+
+import (
+	"fmt"
+	"github.com/redis-go/redcon"
+	"strconv"
+)
+
+func LRangeCommand(c *Client, cmd redcon.Command) {
+	if len(cmd.Args) < 3 {
+		c.Conn().WriteError(fmt.Sprintf(WrongNumOfArgsErr, "lrange"))
+		return
+	}
+	key := string(cmd.Args[1])
+	start, err := strconv.Atoi(string(cmd.Args[2]))
+	if err != nil {
+		c.Conn().WriteError(fmt.Sprintf("%s: %s", InvalidIntErr, err.Error()))
+		return
+	}
+	end, err := strconv.Atoi(string(cmd.Args[3]))
+	if err != nil {
+		c.Conn().WriteError(fmt.Sprintf("%s: %s", InvalidIntErr, err.Error()))
+		return
+	}
+
+	db := c.Db()
+	i := db.GetOrExpire(&key, true)
+	if i == nil {
+		c.Conn().WriteNull()
+		return
+	} else if i.Type() != ListType {
+		c.Conn().WriteError(fmt.Sprintf("%s: key is a %s not a %s", WrongTypeErr, i.TypeFancy(), ListTypeFancy))
+		return
+	}
+
+	l := i.(*List)
+	c.Redis().Mu().RLock()
+	values := l.LRange(start, end)
+	c.Redis().Mu().RUnlock()
+
+	c.Conn().WriteArray(len(values))
+	for _, v := range values {
+		c.Conn().WriteBulkString(v)
+	}
+}

cmd_lpush.go

@@ -0,0 +1,34 @@
+package redis
+
+import (
+	"fmt"
+	"github.com/redis-go/redcon"
+)
+
+func RPopCommand(c *Client, cmd redcon.Command) {
+	if len(cmd.Args) < 2 {
+		c.Conn().WriteError(fmt.Sprintf(WrongNumOfArgsErr, "rpop"))
+		return
+	}
+	key := string(cmd.Args[1])
+
+	db := c.Db()
+	i := db.GetOrExpire(&key, true)
+	if i == nil {
+		c.Conn().WriteNull()
+		return
+	} else if i.Type() != ListType {
+		c.Conn().WriteError(fmt.Sprintf("%s: key is a %s not a %s", WrongTypeErr, i.TypeFancy(), ListTypeFancy))
+		return
+	}
+
+	l := i.(*List)
+	c.Redis().Mu().Lock()
+	v, b := l.RPop()
+	if b {
+		db.Delete(&key)
+	}
+	c.Redis().Mu().Unlock()
+
+	c.Conn().WriteBulkString(*v)
+}

cmd_lrange.go

@@ -0,0 +1,36 @@
+package redis
+
+import (
+	"fmt"
+	"github.com/redis-go/redcon"
+	"time"
+)
+
+func RPushCommand(c *Client, cmd redcon.Command) {
+	if len(cmd.Args) < 3 {
+		c.Conn().WriteError(fmt.Sprintf(WrongNumOfArgsErr, "rpush"))
+		return
+	}
+	key := string(cmd.Args[1])
+
+	db := c.Db()
+	i := db.GetOrExpire(&key, true)
+	if i == nil {
+		i := NewList()
+		db.Set(&key, i, false, time.Time{})
+	} else if i.Type() != ListType {
+		c.Conn().WriteError(fmt.Sprintf("%s: key is a %s not a %s", WrongTypeErr, i.TypeFancy(), ListTypeFancy))
+		return
+	}
+
+	l := i.(*List)
+	var length int
+	c.Redis().Mu().Lock()
+	for j := 2; j < len(cmd.Args); j++ {
+		v := string(cmd.Args[j])
+		length = l.RPush(&v)
+	}
+	c.Redis().Mu().Unlock()
+
+	c.Conn().WriteInt(length)
+}

ping.go renamed to cmd_ping.go

@@ -8,6 +8,7 @@ import (
 	"time"
 )
 
+// SET key value [NX] [XX] [EX <seconds>] [PX <milliseconds>]
 func SetCommand(c *Client, cmd redcon.Command) {
 	if len(cmd.Args) == 1 { // nothing done
 		c.Conn().WriteString("OK")
@@ -35,17 +36,17 @@ func SetCommand(c *Client, cmd redcon.Command) {
 			arg := strings.ToLower(string(cmd.Args[i]))
 			switch arg {
 			default:
-				c.Conn().WriteError(SyntaxERR)
+				c.Conn().WriteError(SyntaxErr)
 				return
 			case "ex":
 				if isPX { // is already px
-					c.Conn().WriteError(SyntaxERR)
+					c.Conn().WriteError(SyntaxErr)
 					return
 				}
 
 				// was last arg?
 				if len(cmd.Args) == i {
-					c.Conn().WriteError(SyntaxERR)
+					c.Conn().WriteError(SyntaxErr)
 					return
 				}
 
@@ -66,13 +67,13 @@ func SetCommand(c *Client, cmd redcon.Command) {
 				continue
 			case "px":
 				if isEX { // is already ex
-					c.Conn().WriteError(SyntaxERR)
+					c.Conn().WriteError(SyntaxErr)
 					return
 				}
 
 				// was last arg?
 				if len(cmd.Args) == i {
-					c.Conn().WriteError(SyntaxERR)
+					c.Conn().WriteError(SyntaxErr)
 					return
 				}
 
@@ -93,15 +94,15 @@ func SetCommand(c *Client, cmd redcon.Command) {
 				continue
 			case "nx":
 				if XX { // is already xx
-					c.Conn().WriteError(SyntaxERR)
+					c.Conn().WriteError(SyntaxErr)
 					return
 				}
 				NX = true
 				i++
 				continue
 			case "xx":
 				if NX { // is already nx
-					c.Conn().WriteError(SyntaxERR)
+					c.Conn().WriteError(SyntaxErr)
 					return
 				}
 				XX = true

cmd_rpop.go

@@ -23,7 +23,7 @@ const (
 	CMD_MODULE_NO_CLUSTER                    /* Deny on Redis Cluster. */
 )
 
-// A registered.
+// A command can be registered.
 type Command struct {
 	// The command name.
 	name string
@@ -73,11 +73,24 @@ func (cmd *Command) Name() string {
 	return cmd.name
 }
 
+// RegisterCommands adds commands to the redis instance.
+// If a cmd already exists the handler is overridden.
+func (r *Redis) RegisterCommands(cmds []*Command) {
+	r.Mu().Lock()
+	defer r.Mu().Unlock()
+	for _, cmd := range cmds {
+		r.registerCommand(cmd)
+	}
+}
+
 // RegisterCommand adds a command to the redis instance.
-// If cmd exists already the handler is overridden.
+// If cmd already exists the handler is overridden.
 func (r *Redis) RegisterCommand(cmd *Command) {
 	r.Mu().Lock()
 	defer r.Mu().Unlock()
+	r.registerCommand(cmd)
+}
+func (r *Redis) registerCommand(cmd *Command) {
 	r.getCommands()[cmd.Name()] = cmd
 }