Record linearization in database

cylc · Mar 22, 2017 · 4d20dff · 4d20dff
1 parent 7620af8
commit 4d20dff
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 4 deletions.
diff --git a/lib/cylc/config.py b/lib/cylc/config.py
@@ -954,9 +954,6 @@ def compute_family_tree(self):
                 if name not in self.runtime['first-parent descendants'][p]:
                     self.runtime['first-parent descendants'][p].append(name)
 
-        # for name in self.cfg['runtime']:
-        #     print name, self.runtime['linearized ancestors'][name]
-
     def compute_inheritance(self, use_simple_method=True):
         if cylc.flags.verbose:
             OUT.info("Parsing the runtime namespace hierarchy")

diff --git a/lib/cylc/rundb.py b/lib/cylc/rundb.py
@@ -173,6 +173,7 @@ class CylcSuiteDAO(object):
     TABLE_BROADCAST_EVENTS = "broadcast_events"
     TABLE_BROADCAST_STATES = "broadcast_states"
     TABLE_BROADCAST_STATES_CHECKPOINTS = "broadcast_states_checkpoints"
+    TABLE_LINEARIZATION = "linearization"
     TABLE_SUITE_PARAMS = "suite_params"
     TABLE_SUITE_PARAMS_CHECKPOINTS = "suite_params_checkpoints"
     TABLE_SUITE_TEMPLATE_VARS = "suite_template_vars"
@@ -211,6 +212,10 @@ class CylcSuiteDAO(object):
             ["time"],
             ["event"],
         ],
+        TABLE_LINEARIZATION: [
+            ["namespace", {"is_primary_key": True}],
+            ["linearization"],
+        ],
         TABLE_SUITE_PARAMS: [
             ["key", {"is_primary_key": True}],
             ["value"],

diff --git a/lib/cylc/scheduler.py b/lib/cylc/scheduler.py
@@ -1190,6 +1190,14 @@ def configure_suite(self, reconfigure=False):
             self.suite_state = StateSummaryServer.get_inst(self.run_mode)
             self.comms_daemon.connect(self.suite_state, COMMS_STATE_OBJ_NAME)
 
+        for namespace in self.config.cfg['runtime']:
+            ancestors = (' ').join(
+                self.config.runtime['linearized ancestors'][namespace])
+            self.pri_dao.add_insert_item(CylcSuiteDAO.TABLE_LINEARIZATION,
+                                         [namespace, ancestors])
+            self.pub_dao.add_insert_item(CylcSuiteDAO.TABLE_LINEARIZATION,
+                                         [namespace, ancestors])
+
     def configure_suite_environment(self):
         """Configure suite environment."""
         # Pass static cylc and suite variables to job script generation code

diff --git a/tests/database/00-simple.t b/tests/database/00-simple.t
@@ -17,7 +17,7 @@
 #-------------------------------------------------------------------------------
 # Suite database content, a basic non-cycling suite of 3 tasks
 . "$(dirname "$0")/test_header"
-set_test_number 8
+set_test_number 9
 install_suite "${TEST_NAME_BASE}" "${TEST_NAME_BASE}"
 
 run_ok "${TEST_NAME_BASE}-validate" cylc validate "${SUITE_NAME}"
@@ -60,5 +60,10 @@ sqlite3 "${DB_FILE}" 'SELECT name, cycle, status FROM task_states ORDER BY name'
     >"${NAME}"
 cmp_ok "${TEST_SOURCE_DIR}/${TEST_NAME_BASE}/${NAME}" "${NAME}"
 
+NAME='select-linearization.out'
+sqlite3 "${DB_FILE}" 'SELECT namespace, linearization FROM linearization ORDER BY namespace' \
+    >"${NAME}"
+cmp_ok "${TEST_SOURCE_DIR}/${TEST_NAME_BASE}/${NAME}" "${NAME}"
+
 purge_suite "${SUITE_NAME}"
 exit
diff --git a/tests/database/00-simple/schema.out b/tests/database/00-simple/schema.out
@@ -2,6 +2,7 @@ CREATE TABLE broadcast_events(time TEXT, change TEXT, point TEXT, namespace TEXT
 CREATE TABLE broadcast_states(point TEXT, namespace TEXT, key TEXT, value TEXT, PRIMARY KEY(point, namespace, key));
 CREATE TABLE broadcast_states_checkpoints(id INTEGER, point TEXT, namespace TEXT, key TEXT, value TEXT, PRIMARY KEY(id, point, namespace, key));
 CREATE TABLE checkpoint_id(id INTEGER, time TEXT, event TEXT, PRIMARY KEY(id));
+CREATE TABLE linearization(namespace TEXT, linearization TEXT, PRIMARY KEY(namespace));
 CREATE TABLE suite_params(key TEXT, value TEXT, PRIMARY KEY(key));
 CREATE TABLE suite_params_checkpoints(id INTEGER, key TEXT, value TEXT, PRIMARY KEY(id, key));
 CREATE TABLE suite_template_vars(key TEXT, value TEXT, PRIMARY KEY(key));

diff --git a/tests/database/00-simple/select-linearization.out b/tests/database/00-simple/select-linearization.out
@@ -0,0 +1,4 @@
+bar|bar root
+baz|baz root
+foo|foo root
+root|root