Skip to content

Commit bc4ba4a

Browse files
Updated ann pkg. Introduced --from-date and --to-date into compare tool (#330)
1 parent 98505ca commit bc4ba4a

File tree

4 files changed

+25
-6
lines changed

4 files changed

+25
-6
lines changed

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 = "redisbench-admin"
3-
version = "0.7.24"
3+
version = "0.7.25"
44
description = "Redis benchmark run helper. A wrapper around Redis and Redis Modules benchmark tools ( ftsb_redisearch, memtier_benchmark, redis-benchmark, aibench, etc... )."
55
authors = ["filipecosta90 <[email protected]>","Redis Performance Group <[email protected]>"]
66
readme = "README.md"

redisbench_admin/compare/args.py

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
#
66

77
# environment variables
8+
import datetime
9+
810
from redisbench_admin.run.args import TRIGGERING_ENV
911
from redisbench_admin.run.common import get_start_time_vars
1012
from redisbench_admin.utils.remote import (
@@ -26,6 +28,8 @@
2628

2729
_, NOW_UTC, _ = get_start_time_vars()
2830
LAST_WEEK_UTC = NOW_UTC - (7 * 24 * 60 * 60 * 1000)
31+
START_TIME_NOW_UTC, _, _ = get_start_time_vars()
32+
START_TIME_LAST_WEEK_UTC = START_TIME_NOW_UTC - datetime.timedelta(days=7)
2933

3034

3135
def create_compare_arguments(parser):
@@ -43,6 +47,17 @@ def create_compare_arguments(parser):
4347
parser.add_argument("--baseline_deployment_name", type=str, default="")
4448
parser.add_argument("--comparison_deployment_name", type=str, default="")
4549
parser.add_argument("--metric_name", type=str, default="Tests.Overall.rps")
50+
parser.add_argument(
51+
"--from-date",
52+
type=lambda s: datetime.datetime.strptime(s, "%Y-%m-%d"),
53+
default=START_TIME_LAST_WEEK_UTC,
54+
help="Only consider regressions with a percentage over the defined limit. (0-100)",
55+
)
56+
parser.add_argument(
57+
"--to-date",
58+
type=lambda s: datetime.datetime.strptime(s, "%Y-%m-%d"),
59+
default=START_TIME_NOW_UTC,
60+
)
4661
parser.add_argument(
4762
"--metric_mode",
4863
type=str,
@@ -77,9 +92,8 @@ def create_compare_arguments(parser):
7792
)
7893
parser.add_argument(
7994
"--from_timestamp",
80-
type=int,
81-
default=LAST_WEEK_UTC,
95+
default=None,
8296
help="The minimum period to use for the the value fetching",
8397
)
84-
parser.add_argument("--to_timestamp", type=int, default=NOW_UTC)
98+
parser.add_argument("--to_timestamp", default=None)
8599
return parser

redisbench_admin/compare/compare.py

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,10 @@ def compare_command_logic(args, project_name, project_version):
5656
)
5757
from_ts_ms = args.from_timestamp
5858
to_ts_ms = args.to_timestamp
59+
if from_ts_ms is None:
60+
from_ts_ms = int(args.from_date.timestamp() * 1000)
61+
if to_ts_ms is None:
62+
to_ts_ms = int(args.to_date.timestamp() * 1000)
5963
from_human_str = humanize.naturaltime(
6064
dt.datetime.utcfromtimestamp(from_ts_ms / 1000)
6165
)
@@ -336,12 +340,13 @@ def compare_command_logic(args, project_name, project_version):
336340

337341
logging.info("Printing differential analysis between branches")
338342
writer = MarkdownTableWriter(
339-
table_name="Comparison between {} and {} for metric: {}. Time Period from {} to {}".format(
343+
table_name="Comparison between {} and {} for metric: {}. Time Period from {} to {}. (environment used: {})".format(
340344
baseline_branch,
341345
comparison_branch,
342346
metric_name,
343347
from_human_str,
344348
to_human_str,
349+
baseline_deployment_name,
345350
),
346351
headers=[
347352
"Test Case",

redisbench_admin/run/ann/pkg

0 commit comments

Comments
 (0)