Redisgraph benchmark go params (#165)

* [fix] Fixed watchdog redistimeseries args parsing

* Bumping version from 0.3.4 to 0.3.5

* [add] Extended redisgraph-benchmark-go query parameters support

Author: filipecosta90

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "redisbench-admin"
-version = "0.3.5"
+version = "0.3.6"
 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/redisgraph_benchmark_go/redisgraph_benchmark_go.py

@@ -33,13 +33,13 @@ def prepare_redisgraph_benchmark_go_command(
             else:
                 graph_key = k["graph"]
             queries_str.extend(["-graph-key", graph_key])
-        if "clients" in k:
+        elif "clients" in k:
             queries_str.extend(["-c", "{}".format(k["clients"])])
-        if "requests" in k:
+        elif "requests" in k:
             queries_str.extend(["-n", "{}".format(k["requests"])])
-        if "rps" in k:
+        elif "rps" in k:
             queries_str.extend(["-rps", "{}".format(k["rps"])])
-        if "queries" in k:
+        elif "queries" in k:
             for kk in k["queries"]:
                 if is_remote:
                     query = "'{}'".format(kk["q"])
@@ -48,6 +48,11 @@ def prepare_redisgraph_benchmark_go_command(
                 queries_str.extend(["-query", query])
                 if "ratio" in kk:
                     queries_str.extend(["-query-ratio", "{}".format(kk["ratio"])])
+        else:
+            if "threads" not in k and "connections" not in k:
+                for kk in k.keys():
+                    queries_str.extend(["-{}".format(kk), str(k[kk])])
+
     queries_str.extend(["-h", "{}".format(server_private_ip)])
     queries_str.extend(["-p", "{}".format(server_plaintext_port)])
     queries_str.extend(["-json-out-file", "{}".format(results_file)])

tests/test_data/redisgraph-benchmark-go_2.yml

@@ -0,0 +1,27 @@
+name: "graph500-scale18-ef16_1hop_MIXED_READ_75_WRITE_25p"
+description: "Dataset: Synthetic graph500 network of scale 18 (262144x262144, 4194304 edges)
+                       - 262017 nodes with label 'Node'
+                       - 4194304 relations of type 'IS_CONNECTED'
+                       - Indexed properties:
+                          - exact-match: IS_CONNECTED; [external_id]
+             "
+remote:
+  - setup: redisgraph-r5
+  - type: oss-standalone
+dbconfig:
+  - dataset: "https://s3.amazonaws.com/benchmarks.redislabs/redisgraph/datasets/graph500-scale18-ef16_v2.4.7_dump.rdb"
+  - dataset_load_timeout_secs: 120
+clientconfig:
+  - tool: redisgraph-benchmark-go
+  - parameters:
+    - graph: "graph500-scale18-ef16"
+    - rps: 0
+    - clients: 32
+    - threads: 4
+    - connections: 32
+    - requests: 10000
+    - random-int-max: 262016
+    - random-seed: 12345
+    - queries:
+      - { q: "MATCH (n)-[:IS_CONNECTED]->(z) WHERE ID(n) = __rand_int__ RETURN ID(n), count(z)", ratio: 0.75 }
+      - { q: "CYPHER Id1=__rand_int__ Id2=__rand_int__ MATCH (n1:Node {id: $Id1}) MATCH (n1:Node {id: $Id2}) MERGE (n1)-[rel:IS_CONNECTED]->(n2)", ratio: 0.25 }

tests/test_redisgraph_benchmark_go.py

@@ -17,3 +17,16 @@ def test_prepare_redis_graph_benchmark_go_command():
                     command_str
                     == "redisgraph-benchmark-go -graph-key g -rps 0 -c 32 -n 1000000 -query MATCH (n) WHERE ID(n) = 0 SET n.v = n.v + 1 -query-ratio 1 -h localhost -p 6380 -json-out-file result.txt"
                 )
+
+def test_prepare_redis_graph_benchmark_go_new_command():
+    with open("./tests/test_data/redisgraph-benchmark-go_2.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_redisgraph_benchmark_go_command(
+                    "redisgraph-benchmark-go", "localhost", "6380", k, "result.txt"
+                )
+                assert (
+                    command_str
+                    == "redisgraph-benchmark-go -graph-key graph500-scale18-ef16 -rps 0 -c 32 -n 10000 -random-int-max 262016 -random-seed 12345 -query MATCH (n)-[:IS_CONNECTED]->(z) WHERE ID(n) = __rand_int__ RETURN ID(n), count(z) -query-ratio 0.75 -query CYPHER Id1=__rand_int__ Id2=__rand_int__ MATCH (n1:Node {id: $Id1}) MATCH (n1:Node {id: $Id2}) MERGE (n1)-[rel:IS_CONNECTED]->(n2) -query-ratio 0.25 -h localhost -p 6380 -json-out-file result.txt"
+                )