Remove GetOption

cybergarage · Aug 21, 2022 · 041eeba · 041eeba
1 parent 67cdec4
commit 041eeba
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 18 deletions.
diff --git a/doc/server_impl.md b/doc/server_impl.md
@@ -31,7 +31,7 @@ func (server *Server) Set(ctx *redis.DBContext, key string, val string, opt redi
 	return redis.NewOKMessage(), nil
 }
 
-func (server *Server) Get(ctx *redis.DBContext, key string, opt redis.GetOption) (*redis.Message, error) {
+func (server *Server) Get(ctx *redis.DBContext, key string) (*redis.Message, error) {
 	dbID := ctx.ID()
 
     ....

diff --git a/examples/go-redis-server/server/server_string_handler.go b/examples/go-redis-server/server/server_string_handler.go
@@ -67,7 +67,7 @@ func (server *Server) Set(ctx *redis.DBContext, key string, val string, opt redi
 	return redis.NewOKMessage(), nil
 }
 
-func (server *Server) Get(ctx *redis.DBContext, key string, opt redis.GetOption) (*redis.Message, error) {
+func (server *Server) Get(ctx *redis.DBContext, key string) (*redis.Message, error) {
 	db, err := server.GetDatabase(ctx.ID())
 	if err != nil {
 		return nil, err
@@ -85,9 +85,8 @@ func (server *Server) Get(ctx *redis.DBContext, key string, opt redis.GetOption)
 
 func (server *Server) MSet(ctx *redis.DBContext, dict map[string]string, opt redis.MSetOption) (*redis.Message, error) {
 	if opt.NX {
-		getOpt := redis.GetOption{}
 		for key := range dict {
-			res, err := server.Get(ctx, key, getOpt)
+			res, err := server.Get(ctx, key)
 			if err != nil {
 				return nil, err
 			}
@@ -121,11 +120,10 @@ func (server *Server) MSet(ctx *redis.DBContext, dict map[string]string, opt red
 }
 
 func (server *Server) MGet(ctx *redis.DBContext, keys []string) (*redis.Message, error) {
-	getOpt := redis.GetOption{}
 	arrayMsg := redis.NewArrayMessage()
 	array, _ := arrayMsg.Array()
 	for _, key := range keys {
-		msg, err := server.Get(ctx, key, getOpt)
+		msg, err := server.Get(ctx, key)
 		if err != nil {
 			return nil, err
 		}

diff --git a/redis/handler.go b/redis/handler.go
@@ -29,7 +29,7 @@ type GenericCommandHandler interface {
 // StringHandler represents a core command hander interface for string commands.
 type StringCommandHandler interface {
 	Set(ctx *DBContext, key string, val string, opt SetOption) (*Message, error)
-	Get(ctx *DBContext, key string, opt GetOption) (*Message, error)
+	Get(ctx *DBContext, key string) (*Message, error)
 	MSet(ctx *DBContext, dict map[string]string, opt MSetOption) (*Message, error)
 	MGet(ctx *DBContext, keys []string) (*Message, error)
 }

diff --git a/redis/options.go b/redis/options.go
@@ -35,9 +35,6 @@ type SetOption struct {
 	GET     bool
 }
 
-type GetOption struct {
-}
-
 type MSetOption struct {
 	NX bool
 }

diff --git a/redis/server_core_commands.go b/redis/server_core_commands.go
@@ -155,12 +155,11 @@ func (server *Server) registerCoreExecutors() {
 	// String commands.
 
 	server.RegisterExexutor("GET", func(ctx *DBContext, cmd string, args Arguments) (*Message, error) {
-		opt := GetOption{}
 		key, err := nextKeyArgument(cmd, args)
 		if err != nil {
 			return nil, err
 		}
-		return server.userCommandHandler.Get(ctx, key, opt)
+		return server.userCommandHandler.Get(ctx, key)
 	})
 
 	server.RegisterExexutor("SET", func(ctx *DBContext, cmd string, args Arguments) (*Message, error) {

diff --git a/redis/server_sugar_commands.go b/redis/server_sugar_commands.go
@@ -21,8 +21,7 @@ func (server *Server) registerSugarExecutors() {
 	// common internal sugar functions
 
 	incdecExecutor := func(ctx *DBContext, cmd string, key string, val int) (*Message, error) {
-		getOpt := GetOption{}
-		getRet, err := server.userCommandHandler.Get(ctx, key, getOpt)
+		getRet, err := server.userCommandHandler.Get(ctx, key)
 		if err != nil {
 			return nil, err
 		}
@@ -50,8 +49,7 @@ func (server *Server) registerSugarExecutors() {
 		if err != nil {
 			return nil, err
 		}
-		getOpt := GetOption{}
-		getRet, err := server.userCommandHandler.Get(ctx, key, getOpt)
+		getRet, err := server.userCommandHandler.Get(ctx, key)
 		if err != nil {
 			return nil, err
 		}
@@ -112,8 +110,7 @@ func (server *Server) registerSugarExecutors() {
 		if err != nil {
 			return nil, err
 		}
-		getOpt := GetOption{}
-		getRet, err := server.userCommandHandler.Get(ctx, key, getOpt)
+		getRet, err := server.userCommandHandler.Get(ctx, key)
 		if err != nil {
 			return NewNilMessage(), nil
 		}
-Original file line number
+Diff line change
@@ Expand Up / @@ -35,9 +35,6 @@ type SetOption struct { @@
     	GET     bool
     }
-    type GetOption struct {
-    }
     type MSetOption struct {
     	NX bool
     }
@@ Expand Down @@