Update combine_traces() for schema changes

VIDA-NYU · Jun 1, 2017 · 5a934c5 · 5a934c5
1 parent 070d3f9
commit 5a934c5
Showing 1 changed file with 18 additions and 3 deletions.
diff --git a/reprozip/reprozip/traceutils.py b/reprozip/reprozip/traceutils.py
@@ -199,10 +199,11 @@ def combine_traces(traces, target):
         logging.info("Insert processes...")
         conn.execute(
             '''
-            INSERT INTO processes(id, run_id, parent,
-                                       timestamp, is_thread, exitcode)
+            INSERT INTO processes(id, run_id, parent, timestamp,
+                                  exit_timestamp, cpu_time, is_thread,
+                                  exitcode)
             SELECT p.new AS id, r.new AS run_id, parent,
-                   timestamp, is_thread, exitcode
+                   timestamp, exit_timestamp, cpu_time, is_thread, exitcode
             FROM trace.processes t
             INNER JOIN maps.map_runs r ON t.run_id = r.old
             INNER JOIN maps.map_processes p ON t.id = p.old
@@ -237,6 +238,20 @@ def combine_traces(traces, target):
             ORDER BY t.id;
             ''')
 
+        # connections
+        logging.info("Insert connections...")
+        conn.execute(
+            '''
+            INSERT INTO connections(run_id, timestamp, process, inbound,
+                                    family, protocol, address)
+            SELECT r.new AS run_id, timestamp, p.new AS process,
+                   inbound, family, protocol, address
+            FROM trace.connections t
+            INNER JOIN maps.map_runs r ON t.run_id = r.old
+            INNER JOIN maps.map_processes p ON t.process = p.old
+            ORDER BY t.id;
+            ''')
+
         # Flush maps
         conn.execute(
             '''