V0.5.15 (#93)

* Prepare next release

* TPC-H: Improved examples

* eval_parameters for arbitrary parameters per experiment or configuration

* Remove explicit AWS reference

* Config docs to be used by sphinx

* Config docs to be used by sphinx

* markdown as sphinx

* markdown as sphinx path

* index.rst for readthedocs

* index.rst for readthedocs

* index.rst for readthedocs

* Docs files cleaned

* Revert "Auxiliary commit to revert individual files from 24f34c5"

This reverts commit f70e36b552822f9d823ad0b7b3a14d8375658fc4.

* Docs files cleaned

* Docs files cleaned

bexhoma/__init__.py

@@ -1,4 +1,4 @@
 """
 The clustermanager module
 """
-__all__ = ["masterAWS", "masterK8s", "clusters", "experiments", "configurations"]
+__all__ = ["masterK8s", "clusters", "experiments", "configurations"]

bexhoma/configurations.py

@@ -76,6 +76,7 @@ def __init__(self, experiment, docker=None, configuration='', script=None, alias
         self.resources = {}
         self.set_resources(**self.experiment.resources)
         self.set_ddl_parameters(**self.experiment.ddl_parameters)
+        self.set_eval_parameters(**self.experiment.eval_parameters)
         self.set_connectionmanagement(**self.experiment.connectionmanagement)
         self.set_storage(**self.experiment.storage)
         self.experiment.add_configuration(self)
@@ -132,6 +133,8 @@ def set_storage(self, **kwargs):
         self.storage = kwargs
     def set_ddl_parameters(self, **kwargs):
         self.ddl_parameters = kwargs
+    def set_eval_parameters(self, **kwargs):
+        self.eval_parameters = kwargs
     def set_experiment(self, instance=None, volume=None, docker=None, script=None):
         """ Read experiment details from cluster config"""
         #self.bChangeInstance = True
@@ -1086,7 +1089,8 @@ def run_benchmarker_pod(self, connection=None, code=None, info=[], resultfolder=
         self.pod_sut = pods[0]
         #service_port = config_K8s['port']
         c = self.get_connection_config(connection, alias, dialect, serverip=service_host, monitoring_host=monitoring_host)#config_K8s['ip'])
-        c['parameter'] = {}
+        #c['parameter'] = {}
+        c['parameter'] = self.eval_parameters
         c['parameter']['parallelism'] = parallelism
         c['parameter']['client'] = client
         c['parameter']['numExperiment'] = str(self.numExperimentsDone+1)

bexhoma/experiments.py

@@ -77,6 +77,7 @@ def __init__(self,
 		self.appname = self.cluster.appname
 		self.resources = {}
 		self.ddl_parameters = {}
+		self.eval_parameters = {}
 		self.storage = {}
 		#self.connectionmanagement = {}
 		#self.connectionmanagement['numProcesses'] = None
@@ -132,6 +133,8 @@ def set_resources(self, **kwargs):
 		self.resources = {**self.resources, **kwargs}
 	def set_ddl_parameters(self, **kwargs):
 		self.ddl_parameters = kwargs
+	def set_eval_parameters(self, **kwargs):
+		self.eval_parameters = kwargs
 	def set_storage(self, **kwargs):
 		self.storage = kwargs
 	def add_configuration(self, configuration):

docs/README.md

@@ -0,0 +1,2 @@
+```{include} ../README.md
+```

docs/conf.py

@@ -0,0 +1,37 @@
+# Configuration file for the Sphinx documentation builder.
+
+# -- Project information
+
+project = 'Bexhoma'
+copyright = '2021, Patrick Erdelt'
+author = 'Patrick Erdelt'
+
+release = '0.1'
+version = '0.1.0'
+
+# -- General configuration
+
+extensions = [
+    'sphinx.ext.duration',
+    'sphinx.ext.doctest',
+    'sphinx.ext.autodoc',
+    'sphinx.ext.autosummary',
+    'sphinx.ext.intersphinx',
+    "myst_parser",
+]
+
+intersphinx_mapping = {
+    'python': ('https://docs.python.org/3/', None),
+    'sphinx': ('https://www.sphinx-doc.org/en/master/', None),
+}
+intersphinx_disabled_domains = ['std']
+
+templates_path = ['_templates']
+
+# -- Options for HTML output
+
+html_theme = 'sphinx_rtd_theme'
+html_static_path = ['_static']
+
+# -- Options for EPUB output
+epub_show_urls = 'footnote'

docs/index.rst

@@ -0,0 +1,7 @@
+.. toctree::
+    :maxdepth: 2
+    :caption: Table of Contents:
+
+    README.md
+    ...
+.. mdinclude:: ../README.md

experiments/tpch/MySQL/initindexes-tpch.sql

@@ -1,4 +1,4 @@
--- indexes for foreign keys
+-- btree indexes for foreign keys
 
 -- for table region
 alter table tpch.region

requirements.txt

@@ -6,3 +6,4 @@ scp>=0.13.2
 kubernetes>=9.0.0
 psutil>=5.6.1
 dbmsbenchmarker>=0.11.4
+myst-parser

setup.py

@@ -8,7 +8,7 @@
 
 setuptools.setup(
     name="bexhoma",
-    version="0.5.14",
+    version="0.5.15",
     author="Patrick Erdelt",
     author_email="perdelt@beuth-hochschule.de",
     description="This python tools helps managing DBMS benchmarking experiments in a Kubernetes-based HPC cluster environment. It enables users to configure hardware / software setups for easily repeating tests over varying configurations.",