Increased coverage and enabled YCSB local runs (#67)

* [fix] Fixed redis-benchmark test time utils

* [wip] YCSB support

* [add] Updated Readme with YCSB info

* [add] Increased further the coverage

* [wip] further refactoring on run_local ( breaking into smaller chuncks)

* [wip] Increased coverage and enabled YCSB local runnable fetching

* [wip] YCSB configuration being properly prepared.

* [wip] further prunning of dead code

* [add] removed seaborn, numpy, pandas, and matplotlib from deps

* [wip] Bumping version from 0.1.58 to 0.1.59

Author: filipecosta90

.gitignore

@@ -4,6 +4,8 @@
 *.tar.gz
 *.csv
 *.txt
+binaries
+datasets
 
 # Byte-compiled / optimized / DLL files
 __pycache__/

README.md

@@ -20,8 +20,10 @@ Current supported benchmark tools:
 - [redisgraph-benchmark-go](https://github.com/RedisGraph/redisgraph-benchmark-go)
 - [ftsb_redisearch](https://github.com/RediSearch/ftsb)
 - [redis-benchmark](https://github.com/redis/redis)
+- [YCSB](https://github.com/RediSearch/YCSB)
 - [SOON][memtier_benchmark](https://github.com/RedisLabs/memtier_benchmark)
 - [SOON][aibench](https://github.com/RedisAI/aibench)
+- [SOON][redis-benchmark-go](https://github.com/filipecosta90/redis-benchmark-go)
 
 ## Installation
 

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "redisbench-admin"
-version = "0.1.58"
+version = "0.1.59"
 description = "Redis benchmark run helper. A wrapper around Redis and Redis Modules benchmark tools ( ftsb_redisearch, memtier_benchmark, redis-benchmark, aibench, etc... )."
 authors = ["filipecosta90 <filipecosta.90@gmail.com>"]
 readme = "README.md"
@@ -10,16 +10,13 @@ redisbench-admin = "redisbench_admin.cli:main"
 
 [tool.poetry.dependencies]
 python = "^3.6.1"
-pandas = "^1.0.4"
 humanize = "^2.4.0"
 requests = "^2.23.0"
 py_cpuinfo = "^5.0.0"
 redis = "^3.5.3"
 boto3 = "^1.13.24"
 tqdm = "^4.46.1"
 toml = "^0.10.1"
-seaborn = "^0.10.1"
-matplotlib = "^3.2.1"
 redistimeseries = "^1.4.3"
 redis-py-cluster = "^2.1.0"
 paramiko = "^2.7.2"
@@ -28,7 +25,6 @@ pysftp = "^0.2.9"
 python_terraform = "^0.10.1"
 GitPython = "^3.1.12"
 PyYAML = "^5.4.0"
-numpy = "^1.15.4"
 wget = "^3.2"
 
 [tool.poetry.dev-dependencies]

redisbench_admin/cli.py

@@ -2,12 +2,9 @@
 import logging
 import sys
 
-# import toml
 import toml
 
 from redisbench_admin import __version__
-from redisbench_admin.compare.args import create_compare_arguments
-from redisbench_admin.compare.compare import compare_command_logic
 from redisbench_admin.export.args import create_export_arguments
 from redisbench_admin.export.export import export_command_logic
 from redisbench_admin.extract.args import create_extract_arguments
@@ -68,8 +65,6 @@ def main():
         parser = create_run_local_arguments(parser)
     elif requested_tool == "extract":
         parser = create_extract_arguments(parser)
-    elif requested_tool == "compare":
-        parser = create_compare_arguments(parser)
     elif requested_tool == "export":
         parser = create_export_arguments(parser)
     elif requested_tool == "--version":
@@ -79,7 +74,7 @@ def main():
         print_help(project_name, project_version)
         sys.exit(0)
     else:
-        valid_tool_options = ["run-local", "run-remote", "export", "compare", "retrieve"]
+        valid_tool_options = ["run-local", "run-remote", "export", "extract"]
         print_invalid_tool_option(requested_tool, valid_tool_options)
         sys.exit(1)
 
@@ -89,8 +84,6 @@ def main():
         run_local_command_logic(args)
     if requested_tool == "run-remote":
         run_remote_command_logic(args)
-    if requested_tool == "compare":
-        compare_command_logic(args)
     if requested_tool == "export":
         export_command_logic(args)
     if requested_tool == "extract":

redisbench_admin/compare/args.py

@@ -110,3 +110,26 @@ def get_kv_tags(
         {"git_sha": git_sha},
     ]
     return common_broader_kv_tags, common_git_sha_kv_tags, common_version_kv_tags
+
+
+def get_metric_detail(key_metric_spec):
+    metric_step = get_or_None(key_metric_spec, "step")
+    metric_family = get_or_None(key_metric_spec, "metric-family")
+    metric_json_path = get_or_None(key_metric_spec, "metric-json-path")
+    metric_name = get_or_None(key_metric_spec, "metric-name")
+    metric_unit = get_or_None(key_metric_spec, "unit")
+    metric_type = get_or_None(key_metric_spec, "metric-type")
+    metric_comparison = get_or_None(key_metric_spec, "comparison")
+    metric_per_step_comparison_priority = get_or_None(
+        key_metric_spec, "per-step-comparison-metric-priority"
+    )
+    return (
+        metric_step,
+        metric_family,
+        metric_json_path,
+        metric_name,
+        metric_unit,
+        metric_type,
+        metric_comparison,
+        metric_per_step_comparison_priority,
+    )

redisbench_admin/compare/compare.py

@@ -5,9 +5,7 @@
 from redistimeseries.client import Client
 
 from redisbench_admin.export.common.common import split_tags_string
-from redisbench_admin.export.ftsb_redisearch.ftsb_redisearch_json_format import (
-    ftsb_export_logic,
-)
+
 from redisbench_admin.export.redis_benchmark.redis_benchmark_csv_format import (
     redis_benchmark_export_logic,
 )
@@ -35,20 +33,7 @@ def export_command_logic(args):
     print("Using the following extra tags: {}".format(extra_tags_array))
     results_type = "key-results"
     time_series_dict = {}
-    if results_format == "ftsb_redisearch":
-        benchmark_results = retrieve_local_or_remote_input_json(
-            benchmark_files, local_path, "--benchmark-result-files", "json"
-        )
-        for filename, benchmark_result in benchmark_results.items():
-            time_series_dict = ftsb_export_logic(
-                benchmark_result,
-                extra_tags_array,
-                included_steps,
-                results_type,
-                time_series_dict,
-                use_result,
-            )
-    elif results_format == "redis-benchmark":
+    if results_format == "redis-benchmark":
         benchmark_results = retrieve_local_or_remote_input_json(
             benchmark_files, local_path, "--benchmark-result-files", "csv"
         )