rewriteAOF method in echovault.go now handles the rewrite synchronously. Removed newline character in Write method of append store. Added test case for REWRITEAOF command and restore from AOF.

echovault/echovault.go

@@ -552,11 +552,9 @@ func (server *EchoVault) rewriteAOF() error {
 	if server.rewriteAOFInProgress.Load() {
 		return errors.New("aof rewrite in progress")
 	}
-	go func() {
+	if err := server.aofEngine.RewriteLog(); err != nil {
-		if err := server.aofEngine.RewriteLog(); err != nil {
+		return err
-			log.Println(err)
+	}
-		}
-	}()
 	return nil
 }
 

echovault/echovault_test.go

@@ -995,6 +995,99 @@ func Test_Standalone(t *testing.T) {
 
 	t.Run("Test_AOFRestore", func(t *testing.T) {
 		t.Parallel()
-		// TODO: Implemented AOF persistence and restore.
+
+		ticker := time.NewTicker(50 * time.Millisecond)
+
+		dataDir := path.Join(".", "testdata", "test_aof")
+		t.Cleanup(func() {
+			_ = os.RemoveAll(dataDir)
+			ticker.Stop()
+		})
+
+		// Prepare data for testing.
+		data := map[string]map[string]string{
+			"before-rewrite": {
+				"key1": "value1",
+				"key2": "value2",
+				"key3": "value3",
+				"key4": "value4",
+			},
+			"after-rewrite": {
+				"key3": "value3-updated",
+				"key4": "value4-updated",
+				"key5": "value5",
+				"key6": "value6",
+			},
+			"expected-values": {
+				"key1": "value1",
+				"key2": "value2",
+				"key3": "value3-updated",
+				"key4": "value4-updated",
+				"key5": "value5",
+				"key6": "value6",
+			},
+		}
+
+		conf := DefaultConfig()
+		conf.RestoreAOF = true
+		conf.DataDir = dataDir
+		conf.AOFSyncStrategy = "always"
+
+		mockServer, err := NewEchoVault(WithConfig(conf))
+		if err != nil {
+			t.Error(err)
+			return
+		}
+
+		// Perform write commands from "before-rewrite"
+		for key, value := range data["before-rewrite"] {
+			if _, _, err := mockServer.Set(key, value, SetOptions{}); err != nil {
+				t.Error(err)
+				return
+			}
+		}
+
+		// Yield
+		<-ticker.C
+
+		// Rewrite AOF
+		if _, err := mockServer.RewriteAOF(); err != nil {
+			t.Error(err)
+			return
+		}
+
+		// Perform write commands from "after-rewrite"
+		for key, value := range data["after-rewrite"] {
+			if _, _, err := mockServer.Set(key, value, SetOptions{}); err != nil {
+				t.Error(err)
+				return
+			}
+		}
+
+		// Yield
+		<-ticker.C
+
+		// Shutdown the EchoVault instance
+		mockServer.ShutDown()
+
+		// Start another instance of EchoVault
+		mockServer, err = NewEchoVault(WithConfig(conf))
+		if err != nil {
+			t.Error(err)
+			return
+		}
+
+		// Check if the servers contains the keys and values from "expected-values"
+		for key, value := range data["expected-values"] {
+			res, err := mockServer.Get(key)
+			if err != nil {
+				t.Error(err)
+				return
+			}
+			if res != value {
+				t.Errorf("expected value at key \"%s\" to be \"%s\", got \"%s\"", key, value, res)
+				return
+			}
+		}
 	})
 }

internal/aof/engine.go

@@ -179,7 +179,7 @@ func (engine *Engine) RewriteLog() error {
 	engine.startRewriteFunc()
 	defer engine.finishRewriteFunc()
 
-	// Create AOF preamble
+	// Create AOF preamble.
 	if err := engine.preambleStore.CreatePreamble(); err != nil {
 		return fmt.Errorf("rewrite log -> create preamble error: %+v", err)
 	}

internal/aof/engine_test.go

@@ -29,7 +29,7 @@ import (
 
 func marshalRespCommand(command []string) []byte {
 	return []byte(fmt.Sprintf(
-		"*%d\r\n$%d\r\n%s\r\n$%d\r\n%s\r\n$%d\r\n%s", len(command),
+		"*%d\r\n$%d\r\n%s\r\n$%d\r\n%s\r\n$%d\r\n%s\r\n", len(command),
 		len(command[0]), command[0],
 		len(command[1]), command[1],
 		len(command[2]), command[2],
@@ -151,11 +151,11 @@ func Test_AOFEngine(t *testing.T) {
 	}
 
 	if len(wantRestoredState) != len(restoredState) {
-		t.Errorf("expected restored state to be lenght %d, got %d", len(wantRestoredState), len(restoredState))
+		t.Errorf("expected restored state to be length %d, got %d", len(wantRestoredState), len(restoredState))
 		for key, data := range restoredState {
 			want, ok := wantRestoredState[key]
 			if !ok {
-				t.Errorf("could not find key %s in expected state state", key)
+				t.Errorf("could not find key %s in expected state", key)
 			}
 			if want.Value != data.Value {
 				t.Errorf("expected value %v for key %s, got %v", want.Value, key, data.Value)

internal/aof/log/store.go

@@ -134,9 +134,7 @@ func (store *AppendStore) Write(command []byte) error {
 	store.mut.Lock()
 	defer store.mut.Unlock()
 
-	// Add new line before writing to AOF file.
+	if _, err := store.rw.Write(command); err != nil {
-	out := append(command, []byte("\r\n")...)
-	if _, err := store.rw.Write(out); err != nil {
 		return err
 	}
 

internal/aof/log/store_test.go

@@ -27,7 +27,7 @@ import (
 
 func marshalRespCommand(command []string) []byte {
 	return []byte(fmt.Sprintf(
-		"*%d\r\n$%d\r\n%s\r\n$%d\r\n%s\r\n$%d\r\n%s", len(command),
+		"*%d\r\n$%d\r\n%s\r\n$%d\r\n%s\r\n$%d\r\n%s\r\n", len(command),
 		len(command[0]), command[0],
 		len(command[1]), command[1],
 		len(command[2]), command[2],
@@ -138,9 +138,6 @@ func Test_AppendStore(t *testing.T) {
 		}()
 
 		ticker := time.NewTicker(200 * time.Millisecond)
-		defer func() {
-			ticker.Stop()
-		}()
 
 		select {
 		case <-done:

internal/modules/admin/commands_test.go

@@ -825,4 +825,174 @@ func Test_AdminCommands(t *testing.T) {
 			})
 		}
 	})
+
+	t.Run("Test REWRITEAOF command", func(t *testing.T) {
+		t.Parallel()
+
+		ticker := time.NewTicker(100 * time.Millisecond)
+
+		dataDir := path.Join(".", "testdata", "test_aof")
+		t.Cleanup(func() {
+			_ = os.RemoveAll(dataDir)
+			ticker.Stop()
+		})
+
+		// Prepare data for testing.
+		data := map[string]map[string]string{
+			"before-rewrite": {
+				"key1": "value1",
+				"key2": "value2",
+				"key3": "value3",
+				"key4": "value4",
+			},
+			"after-rewrite": {
+				"key3": "value3-updated",
+				"key4": "value4-updated",
+				"key5": "value5",
+				"key6": "value6",
+			},
+			"expected-values": {
+				"key1": "value1",
+				"key2": "value2",
+				"key3": "value3-updated",
+				"key4": "value4-updated",
+				"key5": "value5",
+				"key6": "value6",
+			},
+		}
+
+		port, err := internal.GetFreePort()
+		if err != nil {
+			t.Error(err)
+			return
+		}
+
+		conf := echovault.DefaultConfig()
+		conf.BindAddr = "localhost"
+		conf.Port = uint16(port)
+		conf.RestoreAOF = true
+		conf.DataDir = dataDir
+		conf.AOFSyncStrategy = "always"
+
+		// Start new server
+		mockServer, err := echovault.NewEchoVault(echovault.WithConfig(conf))
+		if err != nil {
+			t.Error(err)
+			return
+		}
+		go func() {
+			mockServer.Start()
+		}()
+
+		// Get client connection
+		conn, err := internal.GetConnection("localhost", port)
+		if err != nil {
+			t.Error(err)
+			return
+		}
+		client := resp.NewConn(conn)
+
+		// Perform write commands from "before-rewrite"
+		for key, value := range data["before-rewrite"] {
+			if err := client.WriteArray([]resp.Value{
+				resp.StringValue("SET"),
+				resp.StringValue(key),
+				resp.StringValue(value),
+			}); err != nil {
+				t.Error(err)
+				return
+			}
+			res, _, err := client.ReadValue()
+			if err != nil {
+				t.Error(err)
+				return
+			}
+			if !strings.EqualFold(res.String(), "ok") {
+				t.Errorf("expected response OK, got \"%s\"", res.String())
+			}
+		}
+
+		// Yield
+		<-ticker.C
+
+		// Rewrite AOF
+		if err := client.WriteArray([]resp.Value{resp.StringValue("REWRITEAOF")}); err != nil {
+			t.Error(err)
+			return
+		}
+		res, _, err := client.ReadValue()
+		if err != nil {
+			t.Error(err)
+			return
+		}
+		if !strings.EqualFold(res.String(), "ok") {
+			t.Errorf("expected response OK, got \"%s\"", res.String())
+		}
+
+		// Perform write commands from "after-rewrite"
+		for key, value := range data["after-rewrite"] {
+			if err := client.WriteArray([]resp.Value{
+				resp.StringValue("SET"),
+				resp.StringValue(key),
+				resp.StringValue(value),
+			}); err != nil {
+				t.Error(err)
+				return
+			}
+			res, _, err := client.ReadValue()
+			if err != nil {
+				t.Error(err)
+				return
+			}
+			if !strings.EqualFold(res.String(), "ok") {
+				t.Errorf("expected response OK, got \"%s\"", res.String())
+			}
+		}
+
+		// Yield
+		<-ticker.C
+
+		// Shutdown the EchoVault instance and close current client connection
+		mockServer.ShutDown()
+		_ = conn.Close()
+
+		// Start another instance of EchoVault
+		mockServer, err = echovault.NewEchoVault(echovault.WithConfig(conf))
+		if err != nil {
+			t.Error(err)
+			return
+		}
+		go func() {
+			mockServer.Start()
+		}()
+
+		// Get a new client connection
+		conn, err = internal.GetConnection("localhost", port)
+		if err != nil {
+			t.Error(err)
+			return
+		}
+		client = resp.NewConn(conn)
+
+		// Check if the servers contains the keys and values from "expected-values"
+		for key, value := range data["expected-values"] {
+			if err := client.WriteArray([]resp.Value{resp.StringValue("GET"), resp.StringValue(key)}); err != nil {
+				t.Error(err)
+				return
+			}
+			res, _, err := client.ReadValue()
+			if err != nil {
+				t.Error(err)
+				return
+			}
+			if res.String() != value {
+				t.Errorf("expected value at key \"%s\" to be \"%s\", got \"%s\"", key, value, res)
+				return
+			}
+		}
+
+		// Shutdown server and close client connection
+		_ = conn.Close()
+		mockServer.ShutDown()
+	})
 }