Go:Implement generic map handler and config get,set for standalone.

Signed-off-by: Janhavi Gupta <[email protected]>

go/.gitignore

@@ -9,3 +9,4 @@ lib.h
 # benchmarking results
 benchmarks/results/**
 benchmarks/gobenchmarks.json
+benchmarks/benchmarks

go/api/base_client.go

@@ -102,7 +102,13 @@ func (client *baseClient) executeCommand(requestType C.RequestType, args []strin
 		return nil, &ClosingError{"ExecuteCommand failed. The client is closed."}
 	}
 
-	cArgs, argLengths := toCStrings(args)
+	var cArgsPtr *C.uintptr_t = nil
+	var argLengthsPtr *C.ulong = nil
+	if len(args) > 0 {
+		cArgs, argLengths := toCStrings(args)
+		cArgsPtr = &cArgs[0]
+		argLengthsPtr = &argLengths[0]
+	}
 
 	resultChannel := make(chan payload)
 	resultChannelPtr := uintptr(unsafe.Pointer(&resultChannel))
@@ -112,8 +118,8 @@ func (client *baseClient) executeCommand(requestType C.RequestType, args []strin
 		C.uintptr_t(resultChannelPtr),
 		uint32(requestType),
 		C.size_t(len(args)),
-		&cArgs[0],
-		&argLengths[0],
+		cArgsPtr,
+		argLengthsPtr,
 	)
 	payload := <-resultChannel
 	if payload.error != nil {
@@ -160,23 +166,15 @@ func (client *baseClient) Get(key string) (string, error) {
 }
 
 func (client *baseClient) MSet(keyValueMap map[string]string) (string, error) {
-	flat := []string{}
-	for key, value := range keyValueMap {
-		flat = append(flat, key, value)
-	}
-	result, err := client.executeCommand(C.MSet, flat)
+	result, err := client.executeCommand(C.MSet, utils.MapToString(keyValueMap))
 	if err != nil {
 		return "", err
 	}
 	return handleStringResponse(result), nil
 }
 
 func (client *baseClient) MSetNX(keyValueMap map[string]string) (bool, error) {
-	flat := []string{}
-	for key, value := range keyValueMap {
-		flat = append(flat, key, value)
-	}
-	result, err := client.executeCommand(C.MSetNX, flat)
+	result, err := client.executeCommand(C.MSetNX, utils.MapToString(keyValueMap))
 	if err != nil {
 		return false, err
 	}

go/api/glide_client.go

@@ -5,6 +5,7 @@ package api
 // #cgo LDFLAGS: -L../target/release -lglide_rs
 // #include "../lib.h"
 import "C"
+import "github.com/valkey-io/valkey-glide/go/glide/utils"
 
 // GlideClient is a client used for connection in Standalone mode.
 type GlideClient struct {
@@ -41,3 +42,56 @@ func (client *GlideClient) CustomCommand(args []string) (interface{}, error) {
 	}
 	return handleStringOrNullResponse(res), nil
 }
+
+// Sets configuration parameters to the specified values.
+//
+// Note: Prior to Version 7.0.0, only one parameter can be send.
+//
+// Parameters:
+//
+//	parameters - A map consisting of configuration parameters and their respective values to set.
+//
+// Return value:
+//
+//	"OK" if all configurations have been successfully set. Otherwise, raises an error.
+//
+// For example:
+//
+//	result, err := client.ConfigSet(map[string]string{"timeout": "1000", "maxmemory": "1GB"})
+//	result: "OK"
+//
+// [valkey.io]: https://valkey.io/commands/config-set/
+func (client *GlideClient) ConfigSet(parameters map[string]string) (string, error) {
+	result, err := client.executeCommand(C.ConfigSet, utils.MapToString(parameters))
+	if err != nil {
+		return "", err
+	}
+	return handleStringResponse(result), nil
+}
+
+// Gets the values of configuration parameters.
+//
+// Note: Prior to Version 7.0.0, only one parameter can be send.
+//
+// Parameters:
+//
+//	args - A slice of configuration parameter names to retrieve values for.
+//
+// Return value:
+//
+//	A map of values corresponding to the configuration parameters.
+//
+// For example:
+//
+//	result, err := client.ConfigGet([]string{"timeout" , "maxmemory"})
+//	result["timeout"] = "1000"
+//	result["maxmemory"] = "1GB"
+//
+// [valkey.io]: https://valkey.io/commands/config-get/
+func (client *GlideClient) ConfigGet(args []string) (map[string]string, error) {
+	res, err := client.executeCommand(C.ConfigGet, args)
+	if err != nil {
+		return nil, err
+	}
+	return handleStringToStringMapResponse(res), nil
+}

go/api/response_handlers.go

@@ -54,3 +54,14 @@ func handleBooleanResponse(response *C.struct_CommandResponse) bool {
 	defer C.free_command_response(response)
 	return bool(response.bool_value)
 }
+
+func handleStringToStringMapResponse(response *C.struct_CommandResponse) map[string]string {
+	defer C.free_command_response(response)
+	m := make(map[string]string, response.array_value_len)
+	for _, v := range unsafe.Slice(response.array_value, response.array_value_len) {
+		key := convertCharArrayToString(v.map_key.string_value, v.map_key.string_value_len)
+		value := convertCharArrayToString(v.map_value.string_value, v.map_value.string_value_len)
+		m[key] = value
+	}
+	return m
+}

go/integTest/glide_test_suite_test.go

@@ -21,7 +21,7 @@ type GlideTestSuite struct {
 	suite.Suite
 	standalonePorts []int
 	clusterPorts    []int
-	redisVersion    string
+	serverVersion   string
 	clients         []*api.GlideClient
 	clusterClients  []*api.GlideClusterClient
 }
@@ -55,8 +55,8 @@ func (suite *GlideTestSuite) SetupSuite() {
 		suite.T().Fatal(err.Error())
 	}
 
-	suite.redisVersion = extractServerVersion(string(byteOutput))
-	suite.T().Logf("Redis version = %s", suite.redisVersion)
+	suite.serverVersion = extractServerVersion(string(byteOutput))
+	suite.T().Logf("Redis version = %s", suite.serverVersion)
 }
 
 func extractPorts(suite *GlideTestSuite, output string) []int {

go/integTest/standalone_commands_test.go

@@ -72,3 +72,51 @@ func (suite *GlideTestSuite) TestCustomCommand_closedClient() {
 	assert.NotNil(suite.T(), err)
 	assert.IsType(suite.T(), &api.ClosingError{}, err)
 }
+
+func (suite *GlideTestSuite) TestConfigSetAndGet_multipleArgs() {
+	client := suite.defaultClient()
+
+	if suite.serverVersion < "7.0.0" {
+		suite.T().Skip("This feature is added in version 7")
+	}
+	configMap := map[string]string{"timeout": "1000", "maxmemory": "1GB"}
+	resultConfigMap := map[string]string{"timeout": "1000", "maxmemory": "1073741824"}
+	result, err := client.ConfigSet(configMap)
+	assert.Nil(suite.T(), err)
+	assert.Equal(suite.T(), result, "OK")
+
+	result2, err := client.ConfigGet([]string{"timeout", "maxmemory"})
+	assert.Nil(suite.T(), err)
+	assert.Equal(suite.T(), resultConfigMap, result2)
+}
+
+func (suite *GlideTestSuite) TestConfigSetAndGet_noArgs() {
+	client := suite.defaultClient()
+
+	configMap := map[string]string{}
+
+	result, err := client.ConfigSet(configMap)
+	assert.Equal(suite.T(), "", result)
+	assert.NotNil(suite.T(), err)
+	assert.IsType(suite.T(), &api.RequestError{}, err)
+
+	result2, err := client.ConfigGet([]string{})
+	assert.Nil(suite.T(), result2)
+	assert.NotNil(suite.T(), err)
+	assert.IsType(suite.T(), &api.RequestError{}, err)
+}
+
+func (suite *GlideTestSuite) TestConfigSetAndGet_invalidArgs() {
+	client := suite.defaultClient()
+
+	configMap := map[string]string{"time": "1000"}
+
+	result, err := client.ConfigSet(configMap)
+	assert.Equal(suite.T(), "", result)
+	assert.NotNil(suite.T(), err)
+	assert.IsType(suite.T(), &api.RequestError{}, err)
+
+	result2, err := client.ConfigGet([]string{"time"})
+	assert.Equal(suite.T(), map[string]string{}, result2)
+	assert.Nil(suite.T(), err)
+}

go/src/lib.rs

@@ -48,6 +48,14 @@ pub struct CommandResponse {
     #[derivative(Default(value = "std::ptr::null_mut()"))]
     array_value: *mut CommandResponse,
     array_value_len: c_long,
+
+    /// Below two values represent the Map structure inside CommandResponse.
+    /// The map is transformed into an array of (map_key: CommandResponse, map_value: CommandResponse) and passed to Go.
+    /// These are represented as pointers as the map can be null (optionally present).
+    #[derivative(Default(value = "std::ptr::null_mut()"))]
+    map_key: *mut CommandResponse,
+    #[derivative(Default(value = "std::ptr::null_mut()"))]
+    map_value: *mut CommandResponse,
 }
 
 /// Success callback that is called when a command succeeds.
@@ -240,11 +248,17 @@ pub unsafe extern "C" fn free_command_response(command_response_ptr: *mut Comman
 /// * The contained `string_value` must be valid until `free_command_response` is called and it must outlive the `CommandResponse` that contains it.
 /// * The contained `array_value` must be obtained from the `CommandResponse` returned in [`SuccessCallback`] from [`command`].
 /// * The contained `array_value` must be valid until `free_command_response` is called and it must outlive the `CommandResponse` that contains it.
+/// * The contained `map_key` must be obtained from the `CommandResponse` returned in [`SuccessCallback`] from [`command`].
+/// * The contained `map_key` must be valid until `free_command_response` is called and it must outlive the `CommandResponse` that contains it.
+/// * The contained `map_value` must be obtained from the `CommandResponse` returned in [`SuccessCallback`] from [`command`].
+/// * The contained `map_value` must be valid until `free_command_response` is called and it must outlive the `CommandResponse` that contains it.
 fn free_command_response_elements(command_response: CommandResponse) {
     let string_value = command_response.string_value;
     let string_value_len = command_response.string_value_len;
     let array_value = command_response.array_value;
     let array_value_len = command_response.array_value_len;
+    let map_key = command_response.map_key;
+    let map_value = command_response.map_value;
     if !string_value.is_null() {
         let len = string_value_len as usize;
         unsafe { Vec::from_raw_parts(string_value, len, len) };
@@ -256,9 +270,16 @@ fn free_command_response_elements(command_response: CommandResponse) {
             free_command_response_elements(element);
         }
     }
+    if !map_key.is_null() {
+        unsafe { free_command_response(map_key) };
+    }
+    if !map_value.is_null() {
+        unsafe { free_command_response(map_value) };
+    }
 }
 
 /// Frees the error_message received on a command failure.
+/// TODO: Add a test case to check for memory leak.
 ///
 /// # Panics
 ///
@@ -304,6 +325,7 @@ fn convert_vec_to_pointer<T>(mut vec: Vec<T>) -> (*mut T, c_long) {
     (vec_ptr, len)
 }
 
+/// TODO: Avoid the use of expect and unwrap in the code and add a common error handling mechanism.
 fn valkey_value_to_command_response(value: Value) -> RedisResult<Option<CommandResponse>> {
     let mut command_response = CommandResponse::default();
     let result: RedisResult<Option<CommandResponse>> = match value {
@@ -339,6 +361,10 @@ fn valkey_value_to_command_response(value: Value) -> RedisResult<Option<CommandR
             command_response.int_value = num;
             Ok(Some(command_response))
         }
+        Value::Double(num) => {
+            command_response.float_value = num;
+            Ok(Some(command_response))
+        }
         Value::Boolean(boolean) => {
             command_response.bool_value = boolean;
             Ok(Some(command_response))
@@ -357,6 +383,31 @@ fn valkey_value_to_command_response(value: Value) -> RedisResult<Option<CommandR
             command_response.array_value_len = len;
             Ok(Some(command_response))
         }
+        Value::Map(map) => {
+            let result: Vec<CommandResponse> = map
+                .into_iter()
+                .map(|(key, val)| {
+                    let mut map_response = CommandResponse::default();
+
+                    let map_key = valkey_value_to_command_response(key)
+                        .expect("Value couldn't be converted to CommandResponse")
+                        .unwrap_or_default();
+                    map_response.map_key = Box::into_raw(Box::new(map_key));
+
+                    let map_val = valkey_value_to_command_response(val)
+                        .expect("Value couldn't be converted to CommandResponse")
+                        .unwrap_or_default();
+                    map_response.map_value = Box::into_raw(Box::new(map_val));
+
+                    map_response
+                })
+                .collect::<Vec<_>>();
+
+            let (vec_ptr, len) = convert_vec_to_pointer(result);
+            command_response.array_value = vec_ptr;
+            command_response.array_value_len = len;
+            Ok(Some(command_response))
+        }
         // TODO: Add support for other return types.
         _ => todo!(),
     };

go/utils/transform_utils.go

@@ -21,3 +21,12 @@ func IntToString(value int64) string {
 func FloatToString(value float64) string {
 	return strconv.FormatFloat(value, 'g', -1 /*precision*/, 64 /*bit*/)
 }
+
+// Flattens the Map: { (key1, value1), (key2, value2), ..} to a slice { key1, value1, key2, value2, ..}
+func MapToString(parameter map[string]string) []string {
+	flat := []string{}
+	for key, value := range parameter {
+		flat = append(flat, key, value)
+	}
+	return flat
+}