additional error handling for set command

assignment1/client.go

@@ -7,16 +7,25 @@ import (
 	"os"
 )
 
+var die bool
+
 func doRead(conn net.Conn) {
 	for {
 		buf := make([]byte, 1024)
-		conn.Read(buf)
+		_, err := conn.Read(buf)
+		if err != nil {
+			fmt.Println("Server closed connection")
+			die = true
+			break
+		}
+
 		fmt.Println(string(buf))
 	}
 }
 
 func main() {
 	conn, err := net.Dial("tcp", "localhost:5000")
+	die = false
 	go doRead(conn)
 
 	if err != nil {
@@ -25,6 +34,9 @@ func main() {
 
 	reader := bufio.NewReader(os.Stdin)
 	for {
+		if die {
+			break
+		}
 		msg, err := reader.ReadString('\n')
 		if err != nil {
 			fmt.Println("Err: ", err)

assignment1/server.go

@@ -94,8 +94,9 @@ func read(conn net.Conn, toRead uint64) ([]byte, bool){
 }
 
 func write(conn net.Conn, msg string) {
-	buf := []byte(msg)[0:len(msg)-1]
-	buf = append(buf, []byte(CRLF))
+	buf := []byte(msg)
+	buf = append(buf, []byte(CRLF)...)
+	logger.Println(buf, len(buf))
 	conn.Write(buf)
 }
 
@@ -116,6 +117,23 @@ func isValid(cmd string, tokens []string, conn net.Conn) int{
 		case SET:
 			if len(tokens) > 5 || len(tokens) < 4 {
 				flag = 1
+				logger.Println(cmd, ":Invalid no. of tokens")
+			}
+			if len([]byte(tokens[1])) > 250 {
+				flag = 1
+				logger.Println(cmd, ":Invalid size of key")
+			}
+			if len(tokens) == 5 && tokens[4] != NOREPLY {
+				logger.Println(cmd, ":optional arg incorrect")
+				flag = 1
+			}
+			if _, err := strconv.ParseUint(tokens[2], 10, 64); err != nil {
+				logger.Println(cmd, ":expiry time invalid")
+				flag = 1
+			}
+			if _, err := strconv.ParseUint(tokens[3], 10, 64); err != nil {
+				logger.Println(cmd, ":numBytes invalid")
+				flag = 1
 			}
 			//other validations
 		case GET:
@@ -159,9 +177,14 @@ func parseInput(conn net.Conn, msg string, table *KeyValueStore) {
 				return
 			}
 			if ver, ok := performSet(conn, tokens[1:len(tokens)], table); ok {
-				
+				logger.Println(ver)
+				buffer.WriteString(OK)
+				buffer.WriteString(" ")
+				buffer.WriteString(strconv.FormatUint(ver, 10))
+				logger.Println(buffer.String())
+				write(conn, buffer.String())
 			}
-		//case GET: performGet(tokens[1:len(tokens)])
+		case GET: performGet(tokens[1:len(tokens)])
 		//case GETM: performGetm(tokens[1:len(tokens)])
 		//case CAS: performCas(tokens[1:len(tokens)])
 		//case DELETE: performDelete(tokens[1:len(tokens)])
@@ -185,7 +208,7 @@ func performSet(conn net.Conn, tokens []string, table *KeyValueStore) (uint64, b
 	v, ok := read(conn, n+2) 
 	if !ok {
 		//error here
-		return
+		return 0, false
 	}
 
 	table.Lock()