parser Sscanf and error typos

README.md

@@ -1,5 +1,3 @@
-[![Build Status](https://travis-ci.org/dotcloud/go-redis-server.png)](https://travis-ci.org/dotcloud/go-redis-server)
-
 Redis server protocol library
 =============================
 

auto.go

@@ -105,7 +105,7 @@ func (srv *Server) handlerFn(autoHandler interface{}, f *reflect.Value, checkers
 			ret = result[0].Interface()
 			return srv.createReply(request, ret)
 		}
-		return &StatusReply{code: "OK"}, nil
+		return &StatusReply{Code: "OK"}, nil
 	}, nil
 }
 
@@ -148,13 +148,12 @@ func (srv *Server) createReply(r *Request, val interface{}) (ReplyWriter, error)
 	case *MonitorReply:
 		c := make(chan string)
 		srv.MonitorChans = append(srv.MonitorChans, c)
-		println("len monitor: ", len(srv.MonitorChans))
+		fmt.Println(Stderr, "len monitor: ", len(srv.MonitorChans))
 		v.c = c
 		return v, nil
 	case *ChannelWriter:
 		return v, nil
 	case *MultiChannelWriter:
-		println("New client")
 		for _, mcw := range v.Chans {
 			mcw.clientChan = r.ClientChan
 		}

auto_test.go

@@ -129,6 +129,7 @@ func TestAutoHandler(t *testing.T) {
 	if err != nil {
 		t.Fatalf("Unexpected error: %s", err)
 	}
+	defer srv.Close()
 	expected := []struct {
 		request  *Request
 		expected []string

debug.go

@@ -2,26 +2,36 @@ package redis
 
 import (
 	"fmt"
+	"io"
 	"os"
 	"runtime"
 	"strings"
 )
 
-// Debug function, if the debug flag is set, then display. Do nothing otherwise
-// If Docker is in damon mode, also send the debug info on the socket
-// Convenience debug function, courtesy of http://github.com/dotcloud/docker
-func Debugf(format string, a ...interface{}) {
+var Stderr = io.Writer(os.Stderr)
+
+// This closure is a no-op unless the DEBUG env is non empty.
+var Debugf = func(format string, a ...interface{}) {}
+
+func init() {
 	if os.Getenv("DEBUG") != "" {
+		Debugf = ActualDebugf
+	}
 
-		// Retrieve the stack infos
-		_, file, line, ok := runtime.Caller(1)
-		if !ok {
-			file = "<unknown>"
-			line = -1
-		} else {
-			file = file[strings.LastIndex(file, "/")+1:]
-		}
+}
 
-		fmt.Fprintf(os.Stderr, fmt.Sprintf("[%d] [debug] %s:%d %s\n", os.Getpid(), file, line, format), a...)
+// If Docker is in damon mode, also send the debug info on the socket
+// Convenience debug function, courtesy of http://github.com/dotcloud/docker
+func ActualDebugf(format string, a ...interface{}) {
+	// Retrieve the stack infos
+	_, file, line, ok := runtime.Caller(1)
+	if !ok {
+		file = "<unknown>"
+		line = -1
+	} else {
+		file = file[strings.LastIndex(file, "/")+1:]
 	}
+	fmt.Fprintf(Stderr, "[%d] [debug] %s:%d ", os.Getpid(), file, line)
+	fmt.Fprintf(Stderr, format, a...)
+	fmt.Fprintln(Stderr)
 }

defaultHandler.go

@@ -8,10 +8,11 @@ import (
 )
 
 type (
-	HashValue   map[string][]byte
-	HashHash    map[string]HashValue
-	HashSub     map[string][]*ChannelWriter
-	HashBrStack map[string]*Stack
+	HashValue      map[string][]byte
+	HashHash       map[string]HashValue
+	HashSub        map[string][]*ChannelWriter
+	HashBrStack    map[string]*Stack
+	HashOrderedSet map[string]*OrderedSet
 )
 
 type Database struct {
@@ -23,15 +24,18 @@ type Database struct {
 	brstack HashBrStack
 
 	sub HashSub
+
+	orderedSet HashOrderedSet
 }
 
 func NewDatabase(parent *Database) *Database {
 	db := &Database{
-		values:   make(HashValue),
-		sub:      make(HashSub),
-		brstack:  make(HashBrStack),
-		children: map[int]*Database{},
-		parent:   parent,
+		values:     make(HashValue),
+		sub:        make(HashSub),
+		brstack:    make(HashBrStack),
+		children:   map[int]*Database{},
+		parent:     parent,
+		orderedSet: make(HashOrderedSet),
 	}
 	db.children[0] = db
 	return db
@@ -126,6 +130,12 @@ func (h *DefaultHandler) Lrange(key string, start, stop int) ([][]byte, error) {
 		}
 	}
 
+	if stop < 0 {
+		if stop = h.brstack[key].Len() + stop; stop < 0 {
+			stop = 0
+		}
+	}
+
 	var ret [][]byte
 	for i := start; i <= stop; i++ {
 		if val := h.brstack[key].GetIndex(i); val != nil {
@@ -234,6 +244,9 @@ func (h *DefaultHandler) Hset(key, subkey string, value []byte) (int, error) {
 	if h.Database == nil {
 		h.Database = NewDatabase(nil)
 	}
+	if h.hvalues == nil {
+		h.hvalues = make(HashHash)
+	}
 	if _, exists := h.hvalues[key]; !exists {
 		h.hvalues[key] = make(HashValue)
 		ret = 1
@@ -281,16 +294,21 @@ func (h *DefaultHandler) Del(key string, keys ...string) (int, error) {
 			delete(h.values, k)
 			count++
 		}
-		if _, exists := h.hvalues[key]; exists {
+		if _, exists := h.hvalues[k]; exists {
 			delete(h.hvalues, k)
 			count++
 		}
+
+		if _, exists := h.brstack[k]; exists {
+			delete(h.brstack, k)
+			count++
+		}
 	}
 	return count, nil
 }
 
 func (h *DefaultHandler) Ping() (*StatusReply, error) {
-	return &StatusReply{code: "PONG"}, nil
+	return &StatusReply{Code: "PONG"}, nil
 }
 
 func (h *DefaultHandler) Subscribe(channels ...[]byte) (*MultiChannelWriter, error) {
@@ -353,7 +371,7 @@ func (h *DefaultHandler) Select(key string) error {
 	h.dbs[h.currentDb] = h.Database
 	h.currentDb = index
 	if _, exists := h.dbs[index]; !exists {
-		println("DB not exits, create ", index)
+		fmt.Println(Stderr, "DB not exits, create ", index)
 		h.dbs[index] = NewDatabase(nil)
 	}
 	h.Database = h.dbs[index]
@@ -364,6 +382,145 @@ func (h *DefaultHandler) Monitor() (*MonitorReply, error) {
 	return &MonitorReply{}, nil
 }
 
+var lock = make(chan bool, 1)
+
+func (h *DefaultHandler) Incr(key string) (int, error) {
+	if h.Database == nil {
+		h.Database = NewDatabase(nil)
+	}
+
+	lock <- true
+
+	temp, _ := strconv.Atoi(string(h.values[key]))
+	temp = temp + 1
+	h.values[key] = []byte(strconv.Itoa(temp))
+
+	<-lock
+
+	return temp, nil
+}
+
+func (h *DefaultHandler) Decr(key string) (int, error) {
+	if h.Database == nil {
+		h.Database = NewDatabase(nil)
+	}
+
+	lock <- true
+
+	temp, _ := strconv.Atoi(string(h.values[key]))
+	temp = temp - 1
+	h.values[key] = []byte(strconv.Itoa(temp))
+
+	<-lock
+
+	return temp, nil
+}
+
+func (h *DefaultHandler) Expire(key, after string) (int, error) {
+	if h.Database == nil {
+		h.Database = NewDatabase(nil)
+	}
+
+	d, _ := strconv.Atoi(after)
+
+	time.AfterFunc(time.Duration(d)*time.Second, func() {
+		h.Del(key)
+	})
+
+	return 1, nil
+}
+
+func (h *DefaultHandler) Exists(key string) (int, error) {
+	if h.Database == nil {
+		h.Database = NewDatabase(nil)
+	}
+
+	_, exists := h.values[key]
+	if exists {
+		return 1, nil
+	} else {
+		return 0, nil
+	}
+}
+
+func (h *DefaultHandler) Zadd(key string, score int, value []byte, values ...[]byte) (int, error) {
+	values = append([][]byte{value}, values...)
+
+	if h.Database == nil {
+		h.Database = NewDatabase(nil)
+	}
+
+	if _, exists := h.orderedSet[key]; !exists {
+		h.orderedSet[key] = NewOrderedSet()
+	}
+
+	ctr := 0
+	for _, v := range values {
+		ctr = ctr + h.orderedSet[key].Add(score, v)
+	}
+
+	return ctr, nil
+}
+
+func (h *DefaultHandler) Zrange(key string, min int, max int) ([][]byte, error) {
+	if h.Database == nil {
+		h.Database = NewDatabase(nil)
+	}
+
+	if _, exists := h.orderedSet[key]; !exists {
+		return [][]byte{}, nil
+	}
+
+	r := h.orderedSet[key].Range(min, max)
+
+	return r, nil
+}
+
+func (h *DefaultHandler) Zrangebyscore(key string, min int, max int) ([][]byte, error) {
+	if h.Database == nil {
+		h.Database = NewDatabase(nil)
+	}
+
+	if _, exists := h.orderedSet[key]; !exists {
+		return [][]byte{}, nil
+	}
+
+	r := h.orderedSet[key].RangeByScore(min, max)
+
+	return r, nil
+}
+
+func (h *DefaultHandler) Zrem(key string, value []byte, values ...[]byte) (int, error) {
+	values = append([][]byte{value}, values...)
+
+	if h.Database == nil {
+		h.Database = NewDatabase(nil)
+	}
+
+	if _, exists := h.orderedSet[key]; !exists {
+		return 0, nil
+	}
+
+	ctr := 0
+	for _, v := range values {
+		ctr += h.orderedSet[key].Rem(v)
+	}
+
+	return ctr, nil
+}
+
+func (h *DefaultHandler) Zremrangebyscore(key string, min int, max int) (int, error) {
+	if h.Database == nil {
+		h.Database = NewDatabase(nil)
+	}
+
+	if _, exists := h.orderedSet[key]; !exists {
+		return 0, nil
+	}
+
+	return h.orderedSet[key].RemRangeByScore(min, max), nil
+}
+
 func NewDefaultHandler() *DefaultHandler {
 	db := NewDatabase(nil)
 	ret := &DefaultHandler{

example/main.go

@@ -2,7 +2,8 @@ package main
 
 import (
 	"fmt"
-	redis "github.com/dotcloud/go-redis-server"
+
+	redis "github.com/platinasystems/go-redis-server"
 )
 
 type MyHandler struct {
@@ -45,7 +46,7 @@ func main() {
 	if err := srv.RegisterFct("test2", Test2); err != nil {
 		panic(err)
 	}
-	if err := srv.ListenAndServe(); err != nil {
+	if err := srv.Start(); err != nil {
 		panic(err)
 	}
 }

example/simple/main.go

@@ -1,15 +1,15 @@
 package main
 
 import (
-	redis "github.com/dotcloud/go-redis-server"
+	redis "github.com/platinasystems/go-redis-server"
 )
 
 func main() {
 	server, err := redis.NewServer(redis.DefaultConfig())
 	if err != nil {
 		panic(err)
 	}
-	if err := server.ListenAndServe(); err != nil {
+	if err := server.Start(); err != nil {
 		panic(err)
 	}
 }

go.mod

@@ -0,0 +1 @@
+module github.com/platinasystems/go-redis-server

handler.go

@@ -28,6 +28,9 @@ func (srv *Server) Register(name string, fn HandlerFn) {
 }
 
 func (srv *Server) Apply(r *Request) (ReplyWriter, error) {
+	srv.Lock()
+	defer srv.Unlock()
+
 	if srv == nil || srv.methods == nil {
 		Debugf("The method map is uninitialized")
 		return ErrMethodNotSupported, nil

handler_test.go

@@ -9,6 +9,7 @@ func TestEmptyHandler(t *testing.T) {
 	c := make(chan struct{})
 	defer close(c)
 	srv := &Server{}
+	defer srv.Close()
 	reply, err := srv.ApplyString(&Request{})
 	if err != nil {
 		t.Fatalf("Unexpected error: %s", err)
@@ -23,6 +24,7 @@ func TestCustomHandler(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
+	defer srv.Close()
 	srv.Register("GET", func(r *Request) (ReplyWriter, error) {
 		return &BulkReply{value: []byte("42")}, nil
 	})