Merge remote-tracking branch 'origin/main' into extend.zset.2

Author: fcostaoliveira

redis_benchmarks_specification/__cli__/stats.py

@@ -108,6 +108,8 @@ def generate_stats_cli_command_logic(args, project_name, project_version):
         benchmark_config = {}
         requires_override = False
         test_result = True
+        tested_groups_match_origin = True
+
         with open(test_file, "r") as stream:
 
             try:
@@ -291,7 +293,7 @@ def generate_stats_cli_command_logic(args, project_name, project_version):
                     )
 
                 if tested_groups != origin_tested_groups:
-                    requires_override = True
+                    tested_groups_match_origin = False
                     benchmark_config["tested-groups"] = tested_groups
                     logging.warn(
                         "there is a difference between specified test-groups in the yaml (name={}) and the ones we've detected {}!={}".format(
@@ -312,7 +314,15 @@ def generate_stats_cli_command_logic(args, project_name, project_version):
             test_result = False
         overall_result &= test_result
 
-        if requires_override and override_enabled:
+        if not tested_groups_match_origin:
+            if len(tested_groups) > 0:
+                overall_result = False
+            else:
+                logging.warn(
+                    "difference between specified and detected test-groups was ignored since command info is not available in this benchmark version"
+                )
+
+        if (requires_override or not tested_groups_match_origin) and override_enabled:
             logging.info(
                 "Saving a new version of the file {} with the overrided data".format(
                     test_file

redis_benchmarks_specification/test-suites/memtier_benchmark-10Mkeys-string-get-10B-pipeline-100-nokeyprefix.yml

@@ -1,34 +1,28 @@
 version: 0.4
 name: memtier_benchmark-10Mkeys-string-get-10B-pipeline-100-nokeyprefix
-description: Runs memtier_benchmark, for a keyspace length of 10M keys with a data size of 10 Bytes for each key.
+description: memtier_benchmark, 10M keys, string GET, 10B value size, pipeline=100, no key prefix
 dbconfig:
   configuration-parameters:
     save: '""'
   check:
     keyspacelen: 10000000
-  preload_tool:
-    run_image: redislabs/memtier_benchmark:edge
-    tool: memtier_benchmark
-    arguments: '--key-maximum  10000000 -n allkeys --key-prefix "" --data-size 10 --ratio 1:0 --key-pattern P:P -c 50 -t 2 --hide-histogram --key-minimum 1'
   resources:
     requests:
-      memory: 1g
+      memory: 10g
+tested-groups:
+- string
 tested-commands:
 - get
 redis-topologies:
 - oss-standalone
-build-variants:
-- gcc:8.5.0-amd64-debian-buster-default
-- dockerhub
+- oss-cluster-3-primaries
 clientconfig:
   run_image: redislabs/memtier_benchmark:edge
   tool: memtier_benchmark
-  arguments: '--key-maximum  10000000 --key-minimum 1 --pipeline 100 --key-prefix "" --distinct-client-seed --data-size 10 --ratio 0:1 --key-pattern R:R -c 10 -t 10 --hide-histogram --test-time 120'
+  arguments: '"--data-size" "10" --command "GET __key__" --command-key-pattern="R" --key-prefix="" -c 50 -t 2 --pipeline 100 --hide-histogram --test-time 180'
   resources:
     requests:
-      cpus: '10'
+      cpus: '3'
       memory: 2g
 
-tested-groups:
-- string
-priority: 1
+priority: 33

redis_benchmarks_specification/test-suites/memtier_benchmark-1Mkeys-load-string-with-10B-values-pipeline-100-nokeyprefix.yml

@@ -1,30 +1,28 @@
 version: 0.4
 name: memtier_benchmark-1Mkeys-load-string-with-10B-values-pipeline-100-nokeyprefix
-description: Runs memtier_benchmark, for a keyspace length of 1M keys loading STRINGs in which the value has a data size of 10 Bytes.
+description: memtier_benchmark, 1M keys, string SET, 10B value size, pipeline=100, no key prefix
 dbconfig:
   configuration-parameters:
     save: '""'
   check:
-    keyspacelen: 0
+    keyspacelen: 1000000
   resources:
     requests:
       memory: 1g
+tested-groups:
+- string
 tested-commands:
 - set
 redis-topologies:
 - oss-standalone
-build-variants:
-- gcc:8.5.0-amd64-debian-buster-default
-- dockerhub
+- oss-cluster-3-primaries
 clientconfig:
   run_image: redislabs/memtier_benchmark:edge
   tool: memtier_benchmark
-  arguments: '"--pipeline" "100" "--data-size" "10" --distinct-client-seed --key-prefix "" --ratio 1:0 --key-pattern P:P --key-minimum=1 --key-maximum 1000000 --test-time 120 -c 10 -t 10 --hide-histogram'
+  arguments: '"--data-size" "10" --command "SET __key__ __data__" --command-key-pattern="R" --key-prefix="" -c 50 -t 2 --pipeline 100 --hide-histogram --test-time 180'
   resources:
     requests:
-      cpus: '10'
+      cpus: '3'
       memory: 2g
 
-tested-groups:
-- string
-priority: 17
+priority: 33

redis_benchmarks_specification/test-suites/memtier_benchmark-1Mkeys-string-get-10B-pipeline-100-nokeyprefix.yml

@@ -1,34 +1,28 @@
 version: 0.4
 name: memtier_benchmark-1Mkeys-string-get-10B-pipeline-100-nokeyprefix
-description: Runs memtier_benchmark, for a keyspace length of 1M keys with a data size of 10 Bytes for each key.
+description: memtier_benchmark, 1M keys, string GET, 10B value size, pipeline=100, no key prefix
 dbconfig:
   configuration-parameters:
     save: '""'
   check:
     keyspacelen: 1000000
-  preload_tool:
-    run_image: redislabs/memtier_benchmark:edge
-    tool: memtier_benchmark
-    arguments: '--key-maximum  1000000 -n allkeys --key-prefix "" --data-size 10 --ratio 1:0 --key-pattern P:P -c 50 -t 2 --hide-histogram --key-minimum 1'
   resources:
     requests:
       memory: 1g
+tested-groups:
+- string
 tested-commands:
 - get
 redis-topologies:
 - oss-standalone
-build-variants:
-- gcc:8.5.0-amd64-debian-buster-default
-- dockerhub
+- oss-cluster-3-primaries
 clientconfig:
   run_image: redislabs/memtier_benchmark:edge
   tool: memtier_benchmark
-  arguments: '--key-maximum  1000000 --key-minimum 1 --pipeline 100 --key-prefix "" --distinct-client-seed --data-size 10 --ratio 0:1 --key-pattern R:R -c 10 -t 10 --hide-histogram --test-time 120'
+  arguments: '"--data-size" "10" --command "GET __key__" --command-key-pattern="R" --key-prefix="" -c 50 -t 2 --pipeline 100 --hide-histogram --test-time 180'
   resources:
     requests:
-      cpus: '10'
+      cpus: '3'
       memory: 2g
 
-tested-groups:
-- string
-priority: 1
+priority: 33

redis_benchmarks_specification/test-suites/vector_db_benchmark_test.yml

@@ -10,9 +10,10 @@ dbconfig:
     requests:
       memory: 1g
 tested-groups:
-- redisearch
-tested-commands:
 - search
+tested-commands:
+- hset
+- ft.search
 redis-topologies:
 - oss-standalone-with-redisearch
 build-variants: