[Swift-commit] r2893 - provenancedb

[noreply at svn.ci.uchicago.edu]

Author: benc
Date: 2009-04-29 05:21:39 -0500 (Wed, 29 Apr 2009)
New Revision: 2893

Modified:
   provenancedb/prepare-for-import
   provenancedb/prepare-provenance-chart
   provenancedb/prov-to-sql.sh
Log:
Make provenancedb use log-processing compound stuff introduced in r2891

Modified: provenancedb/prepare-for-import
===================================================================
--- provenancedb/prepare-for-import	2009-04-29 09:58:49 UTC (rev 2892)
+++ provenancedb/prepare-for-import	2009-04-29 10:21:39 UTC (rev 2893)
@@ -4,7 +4,7 @@
 # workflow has finished and will do everything necessary to import all
 # of the provenance information into the SQL provenance database.
 
-swift-plot-log $1 execute.global.event execute2.event workflow.event execute2.global.event
+swift-plot-log $1 execute.global.event execute2.event workflow.event execute2.global.event compound.event
 
 prepare-provenance-chart $1
 

Modified: provenancedb/prepare-provenance-chart
===================================================================
--- provenancedb/prepare-provenance-chart	2009-04-29 09:58:49 UTC (rev 2892)
+++ provenancedb/prepare-provenance-chart	2009-04-29 10:21:39 UTC (rev 2893)
@@ -27,4 +27,3 @@
 
 info-to-extrainfo > extrainfo.txt
 
-cat $1 | grep ' STARTCOMPOUND ' | sed 's/^.* thread=\([^ ]*\) name=\([^ ]*\).*$/\1 \2/' > compounds.txt

Modified: provenancedb/prov-to-sql.sh
===================================================================
--- provenancedb/prov-to-sql.sh	2009-04-29 09:58:49 UTC (rev 2892)
+++ provenancedb/prov-to-sql.sh	2009-04-29 10:21:39 UTC (rev 2893)
@@ -59,11 +59,11 @@
 done < extrainfo.txt
 
 # TODO this could merge with other naming tables
-while read thread procname ; do
+while read start duration thread finalstate procname ; do
   compoundid=$WFID$thread
   echo "INSERT INTO processes (id, type) VALUES ('$compoundid', 'compound');" >> tmp-import.sql
   echo "INSERT INTO invocation_procedure_names (execute_id, procedure_name) VALUES ('$compoundid', '$procname');" >> tmp-import.sql
-done < compounds.txt
+done < compound.event
 
 echo Sending SQL to DB