Fixes related to redis-benchmark config (#113)

* [fix] Fixed -r and -d parameters of redis-benchmark

Author: filipecosta90

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "redisbench-admin"
-version = "0.1.78"
+version = "0.1.79"
 description = "Redis benchmark run helper. A wrapper around Redis and Redis Modules benchmark tools ( ftsb_redisearch, memtier_benchmark, redis-benchmark, aibench, etc... )."
 authors = ["filipecosta90 <[email protected]>"]
 readme = "README.md"

redisbench_admin/run/redis_benchmark/redis_benchmark.py

@@ -67,6 +67,10 @@ def prepare_redis_benchmark_command(
             command_arr.extend(["--threads", "{}".format(k["threads"])])
         if "pipeline" in k:
             command_arr.extend(["-P", "{}".format(k["pipeline"])])
+        if "keyspacelen" in k:
+            command_arr.extend(["-r", "{}".format(k["keyspacelen"])])
+        if "size" in k:
+            command_arr.extend(["-d", "{}".format(k["size"])])
         # if we have the command keywork then it needs to be at the end of args
         if "command" in k:
             last_str = k["command"]

tests/test_data/redis-benchmark2.yml

@@ -0,0 +1,17 @@
+version: 0.2
+name: "bf_add_cap10K_err0.01"
+description: "bf.add test __rand_int__"
+remote:
+ - type: oss-standalone
+ - setup: redisearch-m5d
+clientconfig:
+  - tool: redis-benchmark
+  - min-tool-version: "6.2.0"
+  - parameters:
+    - clients: 16
+    - requests: 1000000000
+    - threads: 2
+    - pipeline: 1
+    - keyspacelen: 100000
+    - size: 128
+    - command: 'bf.add test __rand_int__'

tests/test_redis_benchmark.py

@@ -23,6 +23,20 @@ def test_prepare_redis_benchmark_command():
                 )
 
 
+def test_prepare_redis_benchmark_command():
+    with open("./tests/test_data/redis-benchmark2.yml", "r") as yml_file:
+        benchmark_config = yaml.safe_load(yml_file)
+        for k in benchmark_config["clientconfig"]:
+            if "parameters" in k:
+                command_arr, command_str = prepare_redis_benchmark_command(
+                    "redis-benchmark", "localhost", "6380", k
+                )
+                assert (
+                    command_str
+                    == "redis-benchmark -h localhost -p 6380 --csv -e -c 16 -n 1000000000 --threads 2 -P 1 -r 100000 -d 128 bf.add test __rand_int__"
+                )
+
+
 def test_redis_benchmark_ensure_min_version_local():
     redis_benchmark_bin = shutil.which("redis-benchmark")
     if redis_benchmark_bin: