support oracle v12 in ottertune server

server/website/website/fixtures/dbms_catalog.json

@@ -1,51 +1,59 @@
-[
-  {
-    "model":"website.DBMSCatalog",
-    "pk":2,
-    "fields":{
-        "type":2,
-        "version":"9.2"
-     }
-  },
-  {
-    "model":"website.DBMSCatalog",
-    "pk":3,
-    "fields":{
-        "type":2,
-        "version":"9.3"
-     }
-  },
-  {
-    "model":"website.DBMSCatalog",
-    "pk":4,
-    "fields":{
-        "type":2,
-        "version":"9.4"
-     }
-  },
-  {
-    "model":"website.DBMSCatalog",
-    "pk":1,
-    "fields":{
-        "type":2,
-        "version":"9.6"
-     }
-  },
-  {
-    "model":"website.DBMSCatalog",
-    "pk":9,
-    "fields":{
-        "type":9,
-        "version":"5.6"
-     }
-  },
-    {
-    "model":"website.DBMSCatalog",
-    "pk":18,
-    "fields":{
-        "type":4,
-        "version":"19.0.0.0.0"
-     }
-  }
-
-]
+[
+  {
+    "model":"website.DBMSCatalog",
+    "pk":2,
+    "fields":{
+        "type":2,
+        "version":"9.2"
+     }
+  },
+  {
+    "model":"website.DBMSCatalog",
+    "pk":3,
+    "fields":{
+        "type":2,
+        "version":"9.3"
+     }
+  },
+  {
+    "model":"website.DBMSCatalog",
+    "pk":4,
+    "fields":{
+        "type":2,
+        "version":"9.4"
+     }
+  },
+  {
+    "model":"website.DBMSCatalog",
+    "pk":1,
+    "fields":{
+        "type":2,
+        "version":"9.6"
+     }
+  },
+  {
+    "model":"website.DBMSCatalog",
+    "pk":9,
+    "fields":{
+        "type":9,
+        "version":"5.6"
+     }
+  },
+  {
+    "model":"website.DBMSCatalog",
+    "pk":12,
+    "fields":{
+        "type":4,
+        "version":"12.2.0.1.0"
+     }
+  },
+  {
+    "model":"website.DBMSCatalog",
+    "pk":19,
+    "fields":{
+        "type":4,
+        "version":"19.0.0.0.0"
+     }
+  }
+
+]

server/website/website/migrations/0004_load_initial_data.py

@@ -19,8 +19,10 @@ def load_initial_data(apps, schema_editor):
         "postgres-94_metrics.json",
         "myrocks-5.6_knobs.json",
         "myrocks-5.6_metrics.json",
-        "oracle_knobs.json",
-        "oracle_metrics.json"
+        "oracle-12_knobs.json",
+        "oracle-12_metrics.json",
+        "oracle-19_knobs.json",
+        "oracle-19_metrics.json",
     ]
     for fixture in initial_data_fixtures:
         call_command("loaddata", fixture, app_label="website")

server/website/website/tasks/async_tasks.py

@@ -98,7 +98,7 @@ class ConfigurationRecommendation(UpdateTask):  # pylint: disable=abstract-metho
     def on_success(self, retval, task_id, args, kwargs):
         super(ConfigurationRecommendation, self).on_success(retval, task_id, args, kwargs)
 
-        result_id = args[0][0]['newest_result_id']
+        result_id = retval['result_id']
         result = Result.objects.get(pk=result_id)
 
         # Replace result with formatted result
@@ -324,6 +324,7 @@ def configuration_recommendation_ddpg(result_info):  # pylint: disable=invalid-n
     conf_map = {k: knob_data[i] for i, k in enumerate(knob_labels)}
     conf_map_res = {}
     conf_map_res['status'] = 'good'
+    conf_map_res['result_id'] = result_id
     conf_map_res['recommendation'] = conf_map
     conf_map_res['info'] = 'INFO: ddpg'
     for k in knob_labels:
@@ -340,6 +341,7 @@ def configuration_recommendation(recommendation_input):
     if target_data['bad'] is True:
         target_data_res = {}
         target_data_res['status'] = 'bad'
+        target_data_res['result_id'] = target_data['newest_result_id']
         target_data_res['info'] = 'WARNING: no training data, the config is generated randomly'
         target_data_res['recommendation'] = target_data['config_recommend']
         return target_data_res
@@ -595,6 +597,7 @@ def configuration_recommendation(recommendation_input):
     conf_map = {k: best_config[i] for i, k in enumerate(X_columnlabels)}
     conf_map_res = {}
     conf_map_res['status'] = 'good'
+    conf_map_res['result_id'] = target_data['newest_result_id']
     conf_map_res['recommendation'] = conf_map
     conf_map_res['info'] = 'INFO: training data size is {}'.format(X_scaled.shape[0])
     return conf_map_res