Added support for Oracle v12.1c.

server/website/script/fixture_generators/knob_settings/oracle/.gitignore

@@ -0,0 +1 @@
+oracle-*_knobs.json

server/website/script/fixture_generators/knob_settings/oracle/create_knob_settings.py

@@ -6,7 +6,6 @@
 import csv
 import json
 import shutil
-from collections import OrderedDict
 from operator import itemgetter
 
 # Oracle Type:
@@ -161,19 +160,12 @@ def set_field(fields):
 
 COLNAMES = ("NAME", "TYPE", "DEFAULT_VALUE", "DESCRIPTION")
 
-# DB_VERSIONS = {
-#     '19': 19,
-#     '12': 12,
-#     '12.1': 121,
-# }
 
-
-def process_version(version, dbms_id, delim=','):
+def process_version(version, delim=','):
     fields_list = []
     with open('oracle{}.csv'.format(version), 'r', newline='') as f:
         reader = csv.reader(f, delimiter=delim)
         header = [h.upper() for h in next(reader)]
-        # header = ["NUM","NAME","TYPE","VALUE","DISPLAY_VALUE","DEFAULT_VALUE","ISDEFAULT","ISSES_MODIFIABLE","ISSYS_MODIFIABLE","ISPDB_MODIFIABLE","ISINSTANCE_MODIFIABLE","ISMODIFIED","ISADJUSTED","ISDEPRECATED","ISBASIC","DESCRIPTION","UPDATE_COMMENT","HASH","CON_ID"]
         idxs = [header.index(c) for c in COLNAMES]
         ncols = len(header)
 
@@ -188,7 +180,6 @@ def process_version(version, dbms_id, delim=','):
                 if cname == 'NAME':
                     fields['name'] = value.upper()
                 elif cname == 'TYPE':
-                    print('TYPE: {}'.format(value))
                     value = int(value)
                     if value == 1:
                         fields['vartype'] = 4  # Boolean
@@ -203,7 +194,7 @@ def process_version(version, dbms_id, delim=','):
 
                 fields.update(
                     scope='global',
-                    dbms=dbms_id,
+                    dbms=version,
                     category='',
                     enumvals=None,
                     context='',
@@ -224,12 +215,13 @@ def process_version(version, dbms_id, delim=','):
     filename = 'oracle-{}_knobs.json'.format(version)
     with open(filename, 'w') as f:
         json.dump(final_metrics, f, indent=4)
-    # shutil.copy(filename, "../../../../website/fixtures/{}".format(filename))
+    shutil.copy(filename, "../../../../website/fixtures/{}".format(filename))
+
 
 def main():
-    process_version('19', 19)
-    # process_version('12', 12)
-    process_version('12.1', 121, delim='|')
+    process_version(19)
+    # process_version(12)
+    process_version(121, delim='|')
 
 
 if __name__ == '__main__':

server/website/script/fixture_generators/metric_settings/oracle/.gitignore

@@ -0,0 +1 @@
+oracle-*_metrics.json

server/website/script/fixture_generators/metric_settings/oracle/create_metric_settings.py

@@ -5,16 +5,10 @@
 #
 import json
 import os
+import shutil
 import sys
 from collections import OrderedDict
 
-ROOT = os.path.abspath(os.path.dirname(os.path.abspath(__file__)))
-while os.path.basename(ROOT) != 'website':
-    ROOT = os.path.dirname(ROOT)
-print('WEBSITE ROOT: {}'.format(ROOT))
-sys.path.insert(0, ROOT)
-
-from website.types import MetricType, VarType
 
 # Metric catalog fields:
 # dbms
@@ -24,42 +18,18 @@ from website.types import MetricType, VarType
 # scope
 # metric_type
 
-# Constants
-MODEL = 'website.MetricCatalog'
-SCOPE = 'global'
-VERSIONS = (12, 19)
+# Ottertune Type:
+# STRING = 1
+# INTEGER = 2
+# REAL = 3
+# BOOL = 4
+# ENUM = 5
+# TIMESTAMP = 6
 
-
-# def main():
-#     final_metrics = []
-#     with open('oracle12.txt', 'r') as f:
-#         odd = 0
-#         entry = {}
-#         fields = {}
-#         lines = f.readlines()
-#         for line in lines:
-#             line = line.strip().replace("\n", "")
-#             if not line:
-#                 continue
-#             if line == 'NAME' or line.startswith('-'):
-#                 continue
-#             if odd == 0:
-#                 entry = {}
-#                 entry['model'] = 'website.MetricCatalog'
-#                 fields = {}
-#                 fields['name'] = "global." + line
-#                 fields['summary'] = line
-#                 fields['vartype'] = 2	 # int
-#                 fields['scope'] = 'global'
-#                 fields['metric_type'] = 3	 # stat
-#                 if fields['name'] == "global.user commits":
-#                     fields['metric_type'] = 1	 # counter
-#                 fields['dbms'] = 12  # oracle
-#                 entry['fields'] = fields
-#                 final_metrics.append(entry)
-#     with open('oracle-12_metrics.json', 'w') as f:
-#         json.dump(final_metrics, f, indent=4)
-#     shutil.copy('oracle-12_metrics.json', '../../../../website/fixtures/oracle-12_metrics.json')
+# Metric Types:
+# COUNTER = 1
+# INFO = 2
+# STATISTICS = 3
 
 
 def check_type(value):
@@ -72,32 +42,31 @@ def check_type(value):
         except ValueError:
             pass
     if isinstance(value, int):
-        vtype = VarType.INTEGER
+        vtype = 2  # Integer
     elif isinstance(value, float):
-        vtype = VarType.REAL
+        vtype = 3  # Real
     else:
-        vtype = VarType.STRING
+        vtype = 1  # String
 
     return vtype
 
-
 def create_settings(metric_data, dbms):
     metrics = []
     for name, value in metric_data.items():
         vartype = check_type(value)
 
-        if vartype in (VarType.INTEGER, VarType.REAL):
+        if vartype in (2, 3):  # Numeric (integer/real)
             if 'average' in name or name.endswith('current') or \
-                    name.startswith('session pga memory'):
-                mettype = MetricType.STATISTICS
+                    name.startswith('sysstat.session pga memory'):
+                mettype = 3  # Statistic
             else:
-                mettype = MetricType.COUNTER  # Most int/float metrics are counters
+                mettype = 1  # Counter - most common type of numeric metric
         else:
-            mettype = MetricType.INFO
+            mettype = 2  # Info (anything that's not numeric)
         summary = '{}: {}'.format(name, value)
 
-        if name == 'user commits':
-            assert vartype == VarType.INTEGER and mettype == MetricType.COUNTER
+        if name == 'sysstat.user commits':
+            assert vartype == 2 and 1  # Check it's an int/counter
 
         entry = OrderedDict([
             ('dbms', dbms),
@@ -107,13 +76,17 @@ def create_settings(metric_data, dbms):
             ('scope', 'global'),
             ('metric_type', mettype),
         ])
-        metrics.append(OrderedDict([('fields', entry), ('model', MODEL)]))
+        metrics.append(OrderedDict([('fields', entry), ('model', 'website.MetricCatalog')]))
 
     return metrics
 
 
+VERSIONS = (121, 19)
+
+
 def usage():
-    print('python3 create_metric_settings.py [version] (valid versions: 12, 19)')
+    print('python3 create_metric_settings.py [version] (valid versions: {})'.format(
+        ', '.join(VERSIONS)))
     sys.exit(1)
 
 
@@ -132,10 +105,10 @@ def main():
 
         metrics = metrics['global']['global']
         meta = create_settings(metrics, version)
-        savepath = os.path.join(
-            ROOT, 'website', 'fixtures', 'oracle-{}_metrics.json'.format(version))
-        with open(savepath, 'w') as f:
+        filename = 'oracle-{}_metrics.json'.format(version)
+        with open (filename, 'w') as f:
             json.dump(meta, f, indent=4)
+        shutil.copy(filename, "../../../../website/fixtures/{}".format(filename))
 
 
 if __name__ == '__main__':

server/website/website/db/oracle/target_objective.py

@@ -15,13 +15,15 @@ class DBTime(BaseTargetObjective):
                          improvement=LESS_IS_BETTER)
 
     def compute(self, metrics, observation_time):
-        metric_names = ('global.db cpu', 'global.cursor: pin s wait on x.time_waited',
-                        'global.user i/o wait time')
+        metric_names = (
+            'global.sys_time_model.db cpu',
+            'global.system_event.cursor: pin s wait on x.time_waited',
+            'global.sysstat.user i/o wait time')
         db_time = float(sum(metrics[mname] for mname in metric_names)) / observation_time
         return db_time
 
 
 target_objective_list = tuple((DBMSType.ORACLE, target_obj) for target_obj in [  # pylint: disable=invalid-name
-    BaseThroughput(transactions_counter='global.user commits'),
+    BaseThroughput(transactions_counter='global.sysstat.user commits'),
     DBTime(),
 ])

server/website/website/migrations/0003_load_initial_data.py

@@ -21,6 +21,8 @@ def load_initial_data(apps, schema_editor):
         "myrocks-5.6_metrics.json",
         "oracle-12_knobs.json",
         "oracle-12_metrics.json",
+        "oracle-121_knobs.json",
+        "oracle-121_metrics.json",
         "oracle-19_knobs.json",
         "oracle-19_metrics.json",
     ]