Skip to content

C
cs733
Commit 57b15e58 authored by Sushant Mahajan's avatar Sushant Mahajan
Browse files
Options

per key level versioning and tests modularized

parent d233a3c1
Hide whitespace changes
Inline Side-by-side
Showing with 152 additions and 38 deletions
assignment1/server.go
View file @ 57b15e58
......@@ -57,12 +57,12 @@ type KeyValueStore struct {
sync.RWMutex //mutex for synchronization when reading or writing to the hashtable
}
//global version counter
var ver uint64
//pointer to custom logger
var logger *log.Logger
//cache
var table *KeyValueStore
/*Function to start the server and accept connections.
*arguments: none
*return: none
......@@ -75,7 +75,7 @@ func startServer() {
}
//initialize key value store
table := &KeyValueStore{dictionary: make(map[string]*Data)}
table = &KeyValueStore{dictionary: make(map[string]*Data)}
//infinite loop
for {
......@@ -458,9 +458,8 @@ func performSet(conn net.Conn, tokens []string, table *KeyValueStore, ch chan []
val = new(Data)
table.dictionary[k] = val
}
ver++
val.numBytes = n
val.version = ver
val.version++
if e == 0 {
val.isPerpetual = true
val.expTime = 0
......@@ -561,8 +560,7 @@ func performCas(conn net.Conn, tokens []string, table *KeyValueStore, ch chan []
val.expTime = e + uint64(time.Now().Unix())
}
val.numBytes = n
ver++
val.version = ver
val.version++
val.value = v
//key found and changed
return val.version, 0, r
......@@ -654,8 +652,6 @@ func CustomSplitter(data []byte, atEOF bool) (advance int, token []byte, err err
*return: none
*/
func main() {
ver = 1
toLog := ""
if len(os.Args) > 1 {
toLog = os.Args[1]
......@@ -675,3 +671,11 @@ func main() {
var input string
fmt.Scanln(&input)
}
//server will not call this, we'll call it from test cases to clear the map
func ReInitServer() {
for key, _ := range table.dictionary {
delete(table.dictionary, key)
}
//fmt.Println(table.dictionary)
}
assignment1/server_test.go
View file @ 57b15e58
......@@ -20,7 +20,12 @@ func TestSerial(t *testing.T) {
//give some time for server to initialize
time.Sleep(time.Second)
testIndividualCommands(t)
testRapidCommands(t)
ReInitServer()
//testMaxClients(t)
//testConcurrentCommands(t)
}
func testIndividualCommands(t *testing.T) {
conn, err := net.Dial("tcp", ":5000")
defer conn.Close()
......@@ -29,27 +34,45 @@ func testIndividualCommands(t *testing.T) {
t.Errorf("Connection Error")
}
testSetCommand(t, conn)
testGetCommand(t, conn)
testDeleteCommand(t, conn)
testCasCommand(t, conn)
testGetmCommand(t, conn)
}
func doTest(t *testing.T, e TestCasePair, conn net.Conn) {
buf := make([]byte, 2048)
conn.Write(e.command)
n, _ := conn.Read(buf)
if !bytes.Equal(buf[:n], e.expected) {
fmt.Println(buf[:n], e.expected, "S:"+string(buf[:n]), "E:"+string(e.expected), "C:"+string(e.command))
t.Errorf("Error occured for case")
}
}
func testSetCommand(t *testing.T, conn net.Conn) {
cases := []TestCasePair{
/*test set command*/
{[]byte("set k 1 10" + CRLF + "1234567890" + CRLF), []byte("OK 2" + CRLF)}, //fast expiring
{[]byte("set l 1 10" + CRLF + "1234567890" + CRLF), []byte("OK 3" + CRLF)}, //fast expiring
{[]byte("set m 1 10" + CRLF + "1234567890" + CRLF), []byte("OK 4" + CRLF)}, //fast expiring
{[]byte("set n 1 10" + CRLF + "1234567890" + CRLF), []byte("OK 5" + CRLF)}, //fast expiring
{[]byte("set a 200 10" + CRLF + "1234567890" + CRLF), []byte("OK 6" + CRLF)}, //single length
{[]byte("set b 200 10" + CRLF + "12345" + CRLF + "890" + CRLF), []byte("OK 7" + CRLF)}, //"+CRLF+" in middle
{[]byte("set c 0 10" + CRLF + "12345" + CRLF + "890" + CRLF), []byte("OK 8" + CRLF)}, //perpetual key
{[]byte("set k 1 10" + CRLF + "1234567890" + CRLF), []byte("OK 1" + CRLF)}, //fast expiring
{[]byte("set l 1 10" + CRLF + "1234567890" + CRLF), []byte("OK 1" + CRLF)}, //fast expiring
{[]byte("set m 1 10" + CRLF + "1234567890" + CRLF), []byte("OK 1" + CRLF)}, //fast expiring
{[]byte("set n 1 10" + CRLF + "1234567890" + CRLF), []byte("OK 1" + CRLF)}, //fast expiring
{[]byte("set a 200 10" + CRLF + "1234567890" + CRLF), []byte("OK 1" + CRLF)}, //single length
{[]byte("set b 200 10" + CRLF + "12345" + CRLF + "890" + CRLF), []byte("OK 1" + CRLF)}, //"+CRLF+" in middle
{[]byte("set c 0 10" + CRLF + "12345" + CRLF + "890" + CRLF), []byte("OK 1" + CRLF)}, //perpetual key
{[]byte("set \n 200 10" + CRLF + "1234567890" + CRLF), []byte("ERR_CMD_ERR" + CRLF + "ERR_CMD_ERR" + CRLF)}, //newline key (error)
{[]byte("set d 200 10" + CRLF + "12345678901" + CRLF), []byte("ERR_CMD_ERR" + CRLF)}, //value length greater (error)
{[]byte("set e 200 10" + CRLF + "1234\r6789" + CRLF), []byte("ERR_CMD_ERR" + CRLF)}, //value length less (error)
//key length high (250 bytes)
{[]byte("set 1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890 200 10" + CRLF + "1234\r67890" + CRLF), []byte("OK 9" + CRLF)},
{[]byte("set cn 100 10" + CRLF + "1234\n\n7890" + CRLF), []byte("OK 10" + CRLF)}, //contiguous newlines in value
{[]byte("set cn 100 10" + CRLF + "12\n4\n\n78\r0" + CRLF), []byte("OK 11" + CRLF)}, //contiguous newlines in value
{[]byte("set 1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890 200 10" + CRLF + "1234\r67890" + CRLF), []byte("OK 1" + CRLF)},
{[]byte("set cn 100 10" + CRLF + "1234\n\n7890" + CRLF), []byte("OK 1" + CRLF)}, //contiguous newlines in value
{[]byte("set cn 100 10" + CRLF + "12\n4\n\n78\r0" + CRLF), []byte("OK 2" + CRLF)}, //contiguous newlines in value
//version update
{[]byte("set changing 200 2" + CRLF + "12" + CRLF + "set changing 200 2" + CRLF + "12" + CRLF + "set changing 200 2" + CRLF + "12" + CRLF), []byte("OK 12" + CRLF + "OK 13" + CRLF + "OK 14" + CRLF)},
{[]byte("set changing 200 2" + CRLF + "12" + CRLF + "set changing 200 2" + CRLF + "12" + CRLF + "set changing 200 2" + CRLF + "12" + CRLF), []byte("OK 1" + CRLF + "OK 2" + CRLF + "OK 3" + CRLF)},
//key length high (251 bytes), error
////key length high (251 bytes), error
{[]byte("set 12345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901 200 10" + CRLF + "1234\r67890" + CRLF), []byte("ERR_CMD_ERR" + CRLF + "ERR_CMD_ERR" + CRLF)},
{[]byte("set f -1 10" + CRLF + "1234\r6\r89" + CRLF), []byte(ERR_CMD_ERR + CRLF + ERR_CMD_ERR + CRLF)}, //invalid expiry (number)
......@@ -59,6 +82,28 @@ func testIndividualCommands(t *testing.T) {
{[]byte("set j 200 10 20" + CRLF + "1234\r6\r89" + CRLF), []byte(ERR_CMD_ERR + CRLF + ERR_CMD_ERR + CRLF)}, //invalid number of args >
{[]byte("set j 200" + CRLF + "1234\r6\r89" + CRLF), []byte(ERR_CMD_ERR + CRLF + ERR_CMD_ERR + CRLF)}, //invalid number of args <
/*set some keys to be used later*/
{[]byte("set fe1 1 10" + CRLF + "1234567890" + CRLF), []byte("OK 1" + CRLF)}, //fast expiring
{[]byte("set fe2 1 10" + CRLF + "1234567890" + CRLF), []byte("OK 1" + CRLF)}, //fast expiring
{[]byte("set fe3 1 10" + CRLF + "1234567890" + CRLF), []byte("OK 1" + CRLF)}, //fast expiring
{[]byte("set fe4 1 10" + CRLF + "1234567890" + CRLF), []byte("OK 1" + CRLF)}, //fast expiring
{[]byte("set nk1 200 10" + CRLF + "12\r45\n7890" + CRLF), []byte("OK 1" + CRLF)}, //normal key
{[]byte("set nk2 200 10" + CRLF + "1234\n\n7890" + CRLF), []byte("OK 1" + CRLF)}, //normal key
{[]byte("set nk3 200 10" + CRLF + "1234567890" + CRLF), []byte("OK 1" + CRLF)}, //normal key
{[]byte("set nk4 200 10" + CRLF + "1234567890" + CRLF), []byte("OK 1" + CRLF)}, //normal key
{[]byte("set pk1 0 10" + CRLF + "12\r45\n7890" + CRLF), []byte("OK 1" + CRLF)}, //perpetual key
{[]byte("set pk2 0 10" + CRLF + "1234\n\n7890" + CRLF), []byte("OK 1" + CRLF)}, //perpetual key
{[]byte("set pk3 0 10" + CRLF + "1234567890" + CRLF), []byte("OK 1" + CRLF)}, //perpetual key
{[]byte("set pk4 0 10" + CRLF + "1234567890" + CRLF), []byte("OK 1" + CRLF)}, //perpetual key
}
for _, e := range cases {
doTest(t, e, conn)
}
}
func testGetCommand(t *testing.T, conn net.Conn) {
cases := []TestCasePair{
/*test get command*/
{[]byte("get a" + CRLF), []byte("VALUE 10" + CRLF + "1234567890" + CRLF)}, //fetch key set earlier
{[]byte("get b" + CRLF), []byte("VALUE 10" + CRLF + "12345" + CRLF + "890" + CRLF)}, //fetch key with value having "+CRLF+" set earlier
......@@ -69,26 +114,42 @@ func testIndividualCommands(t *testing.T) {
//invalid key size
{[]byte("get 12345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901" + CRLF), []byte(ERR_CMD_ERR + CRLF)},
}
for _, e := range cases {
doTest(t, e, conn)
}
}
func testDeleteCommand(t *testing.T, conn net.Conn) {
cases := []TestCasePair{
/*test delete command*/
//set some keys first
{[]byte("set d1 200 10" + CRLF + "1234567890" + CRLF), []byte("OK 15" + CRLF)}, //some key will be deleted
{[]byte("set d2 200 10" + CRLF + "1234567890" + CRLF), []byte("OK 16" + CRLF)}, //some key will be deleted
{[]byte("set d1 200 10" + CRLF + "1234567890" + CRLF), []byte("OK 1" + CRLF)}, //some key will be deleted
{[]byte("set d2 200 10" + CRLF + "1234567890" + CRLF), []byte("OK 1" + CRLF)}, //some key will be deleted
//deletion begins
{[]byte("delete a" + CRLF), []byte(DELETED + CRLF)}, //delete normal key
{[]byte("delete l" + CRLF), []byte(ERR_NOT_FOUND + CRLF)}, //delete expired key
{[]byte("delete non_existant" + CRLF), []byte(ERR_NOT_FOUND + CRLF)}, //delete non existant key
{[]byte("delete d2 12" + CRLF), []byte(ERR_CMD_ERR + CRLF)}, //invalid arguments >
{[]byte("delete" + CRLF), []byte(ERR_CMD_ERR + CRLF)}, //invalid arguments <
}
for _, e := range cases {
doTest(t, e, conn)
}
}
func testCasCommand(t *testing.T, conn net.Conn) {
cases := []TestCasePair{
/*test cas command*/
//set some keys first
{[]byte("set c1 200 10" + CRLF + "1234567890" + CRLF), []byte("OK 17" + CRLF)}, //some key will be deleted
{[]byte("set c2 200 10" + CRLF + "1234567890" + CRLF), []byte("OK 18" + CRLF)}, //some key will be deleted
{[]byte("set c1 200 10" + CRLF + "1234567890" + CRLF), []byte("OK 1" + CRLF)}, //some key will be deleted
{[]byte("set c2 200 10" + CRLF + "1234567890" + CRLF), []byte("OK 1" + CRLF)}, //some key will be deleted
//set new value of version 15 key c1 and retrieve the result
{[]byte("cas c1 300 17 9" + CRLF + "123456789" + CRLF), []byte("OK 19" + CRLF)}, //cas key set earlier
{[]byte("cas c1 300 1 9" + CRLF + "123456789" + CRLF), []byte("OK 2" + CRLF)}, //cas key set earlier
{[]byte("get c1" + CRLF), []byte("VALUE 9" + CRLF + "123456789" + CRLF)}, //verify cas'ed key
{[]byte("cas m 2 4 5" + CRLF + "12345" + CRLF), []byte("ERR_NOT_FOUND" + CRLF)}, //cas expired key
{[]byte("cas m 2 1 5" + CRLF + "12345" + CRLF), []byte("ERR_NOT_FOUND" + CRLF)}, //cas expired key
{[]byte("cas non_existant 2 4 5" + CRLF + "12345" + CRLF), []byte("ERR_NOT_FOUND" + CRLF)}, //cas non-existant key
{[]byte("cas c2 100 5 5" + CRLF + "12345" + CRLF), []byte("ERR_VERSION" + CRLF)}, //cas incorrect version (16)
{[]byte("cas \n 300 15 9" + CRLF + "123456789" + CRLF), []byte("ERR_CMD_ERR" + CRLF + "ERR_CMD_ERR" + CRLF)}, //invalid key
......@@ -100,25 +161,74 @@ func testIndividualCommands(t *testing.T) {
{[]byte("cas c2 100 5 xyz" + CRLF + "12345" + CRLF), []byte("ERR_CMD_ERR" + CRLF + "ERR_CMD_ERR" + CRLF)}, //invalid value (string)
{[]byte("cas c2 100 5 5 6" + CRLF + "12345" + CRLF), []byte("ERR_CMD_ERR" + CRLF + "ERR_CMD_ERR" + CRLF)}, //invalid arg num >
{[]byte("cas c2 100 5" + CRLF + "12345" + CRLF), []byte("ERR_CMD_ERR" + CRLF + "ERR_CMD_ERR" + CRLF)}, //invalid arg num <
}
for _, e := range cases {
doTest(t, e, conn)
}
}
func testGetmCommand(t *testing.T, conn net.Conn) {
cases := []TestCasePair{
/*test getm commands*/
{[]byte("getm c" + CRLF), []byte("VALUE 8 0 10" + CRLF + "12345" + CRLF + "890" + CRLF)}, //perpetual key
{[]byte("getm c" + CRLF), []byte("VALUE 1 0 10" + CRLF + "12345" + CRLF + "890" + CRLF)}, //perpetual key
{[]byte("getm non_existant" + CRLF), []byte("ERR_NOT_FOUND" + CRLF)}, //non-existant key
{[]byte("getm a" + CRLF), []byte("ERR_NOT_FOUND" + CRLF)}, //deleted key
{[]byte("getm c x" + CRLF), []byte("ERR_CMD_ERR" + CRLF)}, //invalid args >
{[]byte("getm" + CRLF), []byte("ERR_CMD_ERR" + CRLF)}, //invalid args <
//invalid key size
{[]byte("get 12345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901" + CRLF), []byte(ERR_CMD_ERR + CRLF)},
////invalid key size
{[]byte("getm 12345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901" + CRLF), []byte(ERR_CMD_ERR + CRLF)},
}
for _, e := range cases {
doTest(t, e, conn)
}
}
func testRapidCommands(t *testing.T) {
conn, err := net.Dial("tcp", ":5000")
version := 0
defer conn.Close()
time.Sleep(time.Millisecond)
if err != nil {
t.Errorf("Connection Error")
}
for i, e := range cases {
buf := make([]byte, 2048)
conn.Write(e.command)
n, _ := conn.Read(buf)
if !bytes.Equal(buf[:n], e.expected) {
fmt.Println(buf[:n], e.expected, "S:"+string(buf[:n]), "E:"+string(e.expected), "C:"+string(e.command))
t.Errorf("Error occured for case:" + strconv.Itoa(i))
for i := 0; i < 10000; i++ {
version++
cases := TestCasePair{[]byte("set somekey 200 10" + CRLF + "1234567890" + CRLF), []byte("OK " + strconv.Itoa(version) + CRLF)}
doTest(t, cases, conn)
}
for i := 0; i < 10000; i++ {
cases := TestCasePair{[]byte("get somekey" + CRLF), []byte("VALUE 10" + CRLF + "1234567890" + CRLF)}
doTest(t, cases, conn)
}
for i := 0; i < 10000; i++ {
cases := TestCasePair{[]byte("getm pk1" + CRLF), []byte("VALUE 1 0 10" + CRLF + "12\r45\n7890" + CRLF)}
doTest(t, cases, conn)
}
version = 1
sample := TestCasePair{[]byte("set pk5 0 10" + CRLF + "1234567890" + CRLF), []byte("OK " + strconv.Itoa(version) + CRLF)} //perpetual key
doTest(t, sample, conn)
for i := 0; i < 10000; i++ {
cases := TestCasePair{[]byte("cas pk5 200 " + strconv.Itoa(version) + " 10" + CRLF + "1234567890" + CRLF), []byte("OK " + strconv.Itoa(version+1) + CRLF)}
doTest(t, cases, conn)
version++
}
}
func testMaxClients(t *testing.T) {
//conn, err := net.Dial("localhost", ":5000")
table := make(map[int]*net.Conn)
i := 0
for i < 1000 {
conn, err := net.Dial("tcp", ":5000")
if err != nil {
t.Errorf("error", err.Error())
}
table[i] = &conn
i++
//fmt.Println(len(table))
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment