end to end run

Author: ankitshaw

Diff for: datastore/map.go

@@ -1,26 +1,23 @@
-package storage
+package datastore
 
 import (
 	"sync"
-	"time"
 )
 
-type ConcurrentMap struct{
+type ConcurrentMap struct {
 	sync.RWMutex
 	datastore map[string]string
 }
 
 func NewKeyValueStore() *ConcurrentMap {
-	kvStore := ConcurrentMap{
-		datastore: make(map[string]string)
-	}
+	kvStore := ConcurrentMap{datastore: make(map[string]string)}
 	return &kvStore
 }
 
 func (kvStore *ConcurrentMap) Load(key string) (value string, ok bool) {
 	kvStore.RLock()
 	defer kvStore.RUnlock()
-	result, ok := gcm.internal[key]
+	result, ok := kvStore.datastore[key]
 	return result, ok
 }
 
@@ -35,13 +32,13 @@ func (kvStore *ConcurrentMap) Delete(key string) bool {
 	kvStore.RLock()
 	defer kvStore.RUnlock()
 
-	_ , ok := kvStore.datastore[key]
-	if ok == false{
+	_, ok := kvStore.datastore[key]
+	if !ok {
 		return false
 	}
 
 	delete(kvStore.datastore, key)
 
 	return true
 
-}
+}

Diff for: main.go

@@ -3,6 +3,7 @@ package main
 import (
 	"fmt"
 	"log"
+	"my-redis-go/operations"
 	"my-redis-go/resp"
 	"net"
 )
@@ -58,32 +59,40 @@ func (server *Server) establishConnection() {
 
 func (server *Server) requestHandler(conn net.Conn) {
 	defer conn.Close()
-	buf := make([]byte, 2048)
 	for {
+		buf := make([]byte, 2048)
 		n, err := conn.Read(buf)
 		if err != nil {
+			print("hello error")
 			log.Fatal(err)
 		}
 		msg := buf[:n]
-
-		// echo := "HTTP/1.1 200 OK\r\n\r\n" + string(msg) + "\r\n"
-		commands, totalBytes := resp.ParseRequest(msg)
-
+		// print("hello")
+		// print(string(msg))
+		// echo := "+OK\r\n"
+		commands, _ := resp.ParseRequest(msg)
 		for _, command := range commands {
 			dataType, err := operations.ExecuteCommand(command)
+			fmt.Println(dataType.ToString())
 			if err != resp.EmptyRedisError {
+				fmt.Println("else error")
 				conn.Write([]byte(err.ToString() + "\n"))
 			} else {
+				fmt.Println("else")
 				if dataType == nil {
+					fmt.Println("else nil")
 					conn.Write([]byte("(nil)" + "\n"))
 				} else {
-					conn.Write([]byte(dataType.ToString() + "\n"))
+					fmt.Println("elsewow")
+					out := fmt.Sprintf("$%d\r\n%s\r\n", len(dataType.ToString()), dataType.ToString())
+					fmt.Println(out)
+					conn.Write([]byte(out))
 				}
 			}
 		}
 
 		// conn.Write([]byte(echo))
-		log.Println("Done Writing!")
+		// log.Println("Done Writing!")
 		fmt.Println(string(msg))
 	}
 }

Diff for: my-redis-go

@@ -0,0 +1,77 @@
+package operations
+
+import (
+	"fmt"
+	"my-redis-go/datastore"
+	"my-redis-go/resp"
+)
+
+const (
+	getCommand = "GET"
+	setCommand = "SET"
+	command    = "COMMAND"
+)
+
+var kvStore = datastore.NewKeyValueStore()
+
+func executeGetCommand(array *resp.Array) (resp.IDataType, resp.RedisError) {
+	numberOfItems := array.GetNumberOfItems()
+
+	if numberOfItems == 1 {
+		return nil, resp.NewDefaultRedisError("wrong number of arguments for (get) command")
+	} else if numberOfItems > 2 {
+		fmt.Printf("WARN: GET command acccepts only one argument. But received %d. Other arguments will be ignored\n", numberOfItems-1)
+	}
+
+	key := array.GetItemAtIndex(1)
+
+	value, ok := kvStore.Load(key.ToString())
+	if !ok {
+		return resp.EmptyBulkString, resp.EmptyRedisError
+	}
+	bs, e := resp.NewBulkString(value)
+	if e != nil {
+		return nil, resp.NewDefaultRedisError(e.Error())
+	}
+	return bs, resp.EmptyRedisError
+}
+
+func executeSetCommand(array *resp.Array) (resp.IDataType, resp.RedisError) {
+	numberOfItems := array.GetNumberOfItems()
+
+	if numberOfItems <= 2 {
+		return nil, resp.NewDefaultRedisError("wrong number of arguments for (get) command")
+	} else if numberOfItems > 3 {
+		fmt.Printf("WARN: SET command acccepts only two argument. But received %d. Other arguments will be ignored\n", numberOfItems-1)
+	}
+
+	key := array.GetItemAtIndex(1)
+	value := array.GetItemAtIndex(2)
+	kvStore.Store(key.ToString(), value.ToString())
+
+	bs, e := resp.NewBulkString("OK")
+	if e != nil {
+		return nil, resp.NewDefaultRedisError(e.Error())
+	}
+	return bs, resp.EmptyRedisError
+}
+
+func ExecuteCommand(array resp.Array) (resp.IDataType, resp.RedisError) {
+	if array.GetNumberOfItems() == 0 {
+		return nil, resp.NewDefaultRedisError("No command found")
+	}
+	first := array.GetItemAtIndex(0)
+	switch first.ToString() {
+	case getCommand:
+		return executeGetCommand(&array)
+	case setCommand:
+		return executeSetCommand(&array)
+	case command:
+		fmt.Println("COM")
+		bs, _ := resp.NewBulkString("OK")
+		return bs, resp.EmptyRedisError
+	default:
+		break
+	}
+	return nil, resp.NewDefaultRedisError(fmt.Sprintf("Unknown or disabled command '%s'", first.ToString()))
+}

Diff for: operations/string.go

@@ -215,7 +215,6 @@ func parseArray(bytes []byte) (*Array, int) {
 	return array, arrReadLen + readLen
 }
 
-
 func getNextArrayStartIndex(bytes []byte) int {
 	for i := 1; i < len(bytes); i++ {
 		if bytes[i] == arrayStartByte {
@@ -225,9 +224,8 @@ func getNextArrayStartIndex(bytes []byte) int {
 	return len(bytes)
 }
 
-func ParseRequest(bytes []byte) (err RedisError) (command []Array, totalBytes int) {
-
-	commands = make([]Array, 0)
+func ParseRequest(bytes []byte) (command []Array, totalBytes int) {
+	commands := make([]Array, 0)
 	totalBytesRead := 0
 
 	for len(bytes) > 0 {