Remove split-files logic from test code

This commit is contained in:
jeremy 2022-11-08 11:35:54 +01:00
parent a54bcb9819
commit 61b9457718
4 changed files with 3 additions and 21 deletions
.github/workflows
tests/mgbench

View File

@ -180,7 +180,7 @@ jobs:
# Run simulation tests.
cd tests/mgbench
./benchmark.py accesscontrol/small --num-workers-for-import 1 --test-system-arg "bolt-num-workers 1"
./benchmark.py accesscontrol/small --num-workers-for-import 1 --test-system-arg "split-file splitfiles/accesscontrol_small.shard_configuration bolt-num-workers 1"
release_build:
name: "Release build"
@ -236,7 +236,7 @@ jobs:
# Run simulation tests.
cd tests/mgbench
./benchmark.py accesscontrol/small --num-workers-for-import 1 --test-system-arg "bolt-num-workers 1"
./benchmark.py accesscontrol/small --num-workers-for-import 1 --test-system-arg "split-file splitfiles/accesscontrol_small.shard_configuration bolt-num-workers 1"
- name: Run e2e tests
run: |

View File

@ -185,7 +185,6 @@ for dataset, tests in benchmarks:
args.temporary_directory,
not args.no_properties_on_edges,
args.test_system_args,
dataset.get_split_file(),
)
client = runners.Client(args.client_binary, args.temporary_directory)
memgraph.start_preparation()

View File

@ -63,9 +63,6 @@ class Dataset:
raise ValueError("The size defined for this variant doesn't " "have the number of vertices and/or edges!")
self._num_vertices = self._size["vertices"]
self._num_edges = self._size["edges"]
self._split_file = self.SPLIT_FILES.get(variant, None)
assert self._split_file is not None
assert self._split_file != ""
def prepare(self, directory):
if self._file is not None:
@ -95,11 +92,6 @@ class Dataset:
"""Returns number of vertices/edges for the current variant."""
return self._size
def get_split_file(self):
"""Returns the location of the split file of the dataset."""
assert self._split_file is not None
return self._split_file
# All tests should be query generator functions that output all of the
# queries that should be executed by the runner. The functions should be
# named `benchmark__GROUPNAME__TESTNAME` and should not accept any
@ -307,12 +299,6 @@ class AccessControl(Dataset):
"medium": "https://s3.eu-west-1.amazonaws.com/deps.memgraph.io/dataset/accesscontrol/accesscontrol_medium.setup.cypher.gz",
"large": "https://s3.eu-west-1.amazonaws.com/deps.memgraph.io/dataset/accesscontrol/accesscontrol_large.setup.cypher.gz",
}
SPLIT_FILES = {
"empty_only_index": "splitfiles/accesscontrol_small.shard_configuration",
"small": "splitfiles/accesscontrol_small.shard_configuration",
"medium": "splitfiles/accesscontrol_medium.shard_configuration",
"large": "splitfiles/accesscontrol_large.shard_configuration",
}
SIZES = {
"empty_only_index": {
"vertices": 0,

View File

@ -51,13 +51,12 @@ def _get_usage(pid):
class Memgraph:
def __init__(self, memgraph_binary, temporary_dir, properties_on_edges, extra_args, split_file):
def __init__(self, memgraph_binary, temporary_dir, properties_on_edges, extra_args):
self._memgraph_binary = memgraph_binary
self._directory = tempfile.TemporaryDirectory(dir=temporary_dir)
self._properties_on_edges = properties_on_edges
self._proc_mg = None
self._extra_args = extra_args
self._split_file = split_file
atexit.register(self._cleanup)
# Determine Memgraph version
@ -86,8 +85,6 @@ class Memgraph:
for i in range(0, len(args_list), 2):
kwargs[args_list[i]] = args_list[i + 1]
kwargs["split-file"] = self._split_file
return _convert_args_to_flags(self._memgraph_binary, **kwargs)
def _start(self, **kwargs):