Skip to content

Commit 6afd1de

Browse files
Merge branch 'main' into leaderboard.description
2 parents 62466d2 + af2bd3a commit 6afd1de

File tree

41 files changed

+22475
-20402
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+22475
-20402
lines changed

commands.json

Lines changed: 19689 additions & 19675 deletions
Large diffs are not rendered by default.

groups.json

Lines changed: 39 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,70 +1,74 @@
11
{
22
"bitmap": {
3-
"display": "Bitmap",
4-
"description": "Operations on the Bitmap data type"
3+
"description": "Operations on the Bitmap data type",
4+
"display": "Bitmap"
55
},
66
"cluster": {
7-
"display": "Cluster",
8-
"description": "Redis Cluster management"
7+
"description": "Redis Cluster management",
8+
"display": "Cluster"
99
},
1010
"connection": {
11-
"display": "Connection",
12-
"description": "Client connections management"
11+
"description": "Client connections management",
12+
"display": "Connection"
1313
},
1414
"generic": {
15-
"display": "Generic",
16-
"description": "Generic commands"
15+
"description": "Generic commands",
16+
"display": "Generic"
1717
},
1818
"geo": {
19-
"display": "Geospatial indices",
20-
"description": "Operations on the Geospatial Index data type"
19+
"description": "Operations on the Geospatial Index data type",
20+
"display": "Geospatial indices"
2121
},
2222
"hash": {
23-
"display": "Hash",
24-
"description": "Operations on the Hash data type"
23+
"description": "Operations on the Hash data type",
24+
"display": "Hash"
2525
},
2626
"hyperloglog": {
27-
"display": "HyperLogLog",
28-
"description": "Operations on the HyperLogLog data type"
27+
"description": "Operations on the HyperLogLog data type",
28+
"display": "HyperLogLog"
2929
},
30+
"json": [
31+
"JSON.GET",
32+
"JSON.SET"
33+
],
3034
"list": {
31-
"display": "List",
32-
"description": "Operations on the List data type"
35+
"description": "Operations on the List data type",
36+
"display": "List"
3337
},
3438
"pubsub": {
35-
"display": "Pub/Sub",
36-
"description": "Pub/Sub commands"
39+
"description": "Pub/Sub commands",
40+
"display": "Pub/Sub"
3741
},
3842
"scripting": {
39-
"display": "Scripting and Functions",
40-
"description": "Redis server-side scripting and functions"
43+
"description": "Redis server-side scripting and functions",
44+
"display": "Scripting and Functions"
4145
},
4246
"sentinel": {
43-
"display": "Sentinel",
44-
"description": "Redis Sentinel commands"
47+
"description": "Redis Sentinel commands",
48+
"display": "Sentinel"
4549
},
4650
"server": {
47-
"display": "Server",
48-
"description": "Server management commands"
51+
"description": "Server management commands",
52+
"display": "Server"
4953
},
5054
"set": {
51-
"display": "Set",
52-
"description": "Operations on the Set data type"
55+
"description": "Operations on the Set data type",
56+
"display": "Set"
5357
},
5458
"sorted-set": {
55-
"display": "Sorted Set",
56-
"description": "Operations on the Sorted Set data type"
59+
"description": "Operations on the Sorted Set data type",
60+
"display": "Sorted Set"
5761
},
5862
"stream": {
59-
"display": "Stream",
60-
"description": "Operations on the Stream data type"
63+
"description": "Operations on the Stream data type",
64+
"display": "Stream"
6165
},
6266
"string": {
63-
"display": "String",
64-
"description": "Operations on the String data type"
67+
"description": "Operations on the String data type",
68+
"display": "String"
6569
},
6670
"transactions": {
67-
"display": "Transactions",
68-
"description": "Redis Transaction management"
71+
"description": "Redis Transaction management",
72+
"display": "Transactions"
6973
}
70-
}
74+
}

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[tool.poetry]
22
name = "redis-benchmarks-specification"
3-
version = "0.2.25"
3+
version = "0.2.36"
44
description = "The Redis benchmarks specification describes the cross-language/tools requirements and expectations to foster performance and observability standards around redis related technologies. Members from both industry and academia, including organizations and individuals are encouraged to contribute."
55
authors = ["filipecosta90 <filipecosta.90@gmail.com>","Redis Performance Group <performance@redis.com>"]
66
readme = "Readme.md"

redis_benchmarks_specification/__cli__/cli.py

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,22 @@ def trigger_tests_dockerhub_cli_command_logic(args, project_name, project_versio
8080
decode_responses=False,
8181
)
8282
conn.ping()
83+
84+
# Extract version from Docker image tag if possible
85+
# e.g., "redis:7.4.0" -> "7.4.0"
86+
# e.g., "valkey/valkey:7.2.6-bookworm" -> "7.2.6"
87+
git_version = None
88+
if ":" in args.run_image:
89+
tag = args.run_image.split(":")[-1]
90+
# Try to extract version number from tag
91+
# Common patterns: "7.4.0", "7.2.6-bookworm", "latest"
92+
import re
93+
94+
version_match = re.match(r"^(\d+\.\d+\.\d+)", tag)
95+
if version_match:
96+
git_version = version_match.group(1)
97+
logging.info(f"Extracted git_version '{git_version}' from image tag")
98+
8399
testDetails = {}
84100
build_stream_fields, result = generate_benchmark_stream_request(
85101
args.id,
@@ -96,7 +112,7 @@ def trigger_tests_dockerhub_cli_command_logic(args, project_name, project_versio
96112
None,
97113
None,
98114
None,
99-
None,
115+
git_version, # Pass extracted version
100116
None,
101117
None,
102118
None,

redis_benchmarks_specification/__compare__/args.py

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -230,4 +230,11 @@ def create_compare_arguments(parser):
230230
action="store_true",
231231
help="Skip interactive approval of changes to github before applying.",
232232
)
233+
parser.add_argument(
234+
"--compare-by-env",
235+
required=False,
236+
default=False,
237+
action="store_true",
238+
help="Compare by environments for each test instead of comparing by tests for each environment (default behavior).",
239+
)
233240
return parser

0 commit comments

Comments
 (0)