[Swift-commit] r3726 - provenancedb

[noreply at svn.ci.uchicago.edu]

Author: lgadelha
Date: 2010-11-26 20:23:51 -0600 (Fri, 26 Nov 2010)
New Revision: 3726

Modified:
   provenancedb/pql_functions.sql
   provenancedb/prepare-provenance-chart
   provenancedb/prov-to-sql.sh
   provenancedb/swift-prov-import-all-logs
Log:
Simplification of the provenance identifiers.


Modified: provenancedb/pql_functions.sql
===================================================================
--- provenancedb/pql_functions.sql	2010-11-25 22:57:39 UTC (rev 3725)
+++ provenancedb/pql_functions.sql	2010-11-27 02:23:51 UTC (rev 3726)
@@ -27,7 +27,12 @@
 
 -- correlate a parameter with workflow runtime statistics
 DROP TYPE correlate_param_runtime_type CASCADE;
-CREATE TYPE correlate_param_runtime_type AS (workflow VARCHAR, workflow_starttime TIMESTAMP WITH TIME ZONE, workflow_duration NUMERIC, parameter VARCHAR, parameter_value VARCHAR);
+CREATE TYPE correlate_param_runtime_type 
+AS (workflow VARCHAR, 
+    workflow_starttime TIMESTAMP WITH TIME ZONE, 
+    workflow_duration NUMERIC, 
+    parameter VARCHAR, 
+    parameter_value VARCHAR);
 
 CREATE OR REPLACE FUNCTION correlate_param_runtime(param_name VARCHAR) RETURNS SETOF correlate_param_runtime_type AS $$
 	SELECT A.workflow,to_timestamp(B.start_time),B.duration,A.parameter,A.value

Modified: provenancedb/prepare-provenance-chart
===================================================================
--- provenancedb/prepare-provenance-chart	2010-11-25 22:57:39 UTC (rev 3725)
+++ provenancedb/prepare-provenance-chart	2010-11-27 02:23:51 UTC (rev 3726)
@@ -8,8 +8,8 @@
 
 export RUNID=$(basename $1 .log)
 
-export WFID="tag:ci.uchicago.edu,2008:swiftlogs:execute:${RUNID}:"
-export EXECUTE2PREFIX="tag:ci.uchicago.edu,2008:swiftlogs:execute2:${RUNID}:"
+export WFID="execute:${RUNID}:"
+export EXECUTE2PREFIX="execute2:${RUNID}:"
 
 # will output log information about datasets from a log file passed as $1
 
@@ -30,8 +30,8 @@
 cat $1 | grep ' OPERATOR ' | sed 's/^.*thread=\([^ ]*\) operator="\([^ ]*\)" lhs=\([^ ]*\) rhs=\([^ ]*\) result=\([^ ]*\).*$/\1 \2 \3 \4 \5/' > operators.txt
 
 
-# 2009-03-19 19:15:35,244+0100 INFO  vdl:arguments FUNCTION id=88000-0-4-4 name="f ilename" result=tag:ci.uchicago.edu,2008:swift:dataset:20090319-1915-xj8flg 13:720000000060
-# 2009-03-19 19:15:35,246+0100 INFO  vdl:arguments FUNCTIONPARAMETER id=88001-0-4- 4 input=tag:ci.uchicago.edu,2008:swift:dataset:20090319-1915-xj8flg13:72000 0000058
+# 2009-03-19 19:15:35,244+0100 INFO  vdl:arguments FUNCTION id=88000-0-4-4 name="f ilename" result=dataset:20090319-1915-xj8flg 13:720000000060
+# 2009-03-19 19:15:35,246+0100 INFO  vdl:arguments FUNCTIONPARAMETER id=88001-0-4- 4 input=dataset:20090319-1915-xj8flg13:72000 0000058
 
 cat $1 | grep ' FUNCTION ' | sed "s/^.*id=\([^ ]*\) name=\([^ ]*\) result=\([^ ]*\).*\$/$WFID\1 \2 \3/" > functions.txt
 # the IDs in functions.txt should be unique...

Modified: provenancedb/prov-to-sql.sh
===================================================================
--- provenancedb/prov-to-sql.sh	2010-11-25 22:57:39 UTC (rev 3725)
+++ provenancedb/prov-to-sql.sh	2010-11-27 02:23:51 UTC (rev 3726)
@@ -2,10 +2,10 @@
 
 export RUNID=$(basename $1 .log)
 
-export WFID="tag:ci.uchicago.edu,2008:swiftlogs:execute:${RUNID}:"
+export WFID="execute:${RUNID}:"
 
 # TODO is there already a URI form for identifying workflows?
-export WF="tag:ci.uchicago.edu,2008:swiftlogs:execute:${RUNID}:run"
+export WF="execute:${RUNID}:run"
 
 echo Generating SQL for $RUNID
 

Modified: provenancedb/swift-prov-import-all-logs
===================================================================
--- provenancedb/swift-prov-import-all-logs	2010-11-25 22:57:39 UTC (rev 3725)
+++ provenancedb/swift-prov-import-all-logs	2010-11-27 02:23:51 UTC (rev 3726)
@@ -50,7 +50,7 @@
 	    fi
 
 	    export RUNID=$(basename $filename .log)
-	    export WF="tag:ci.uchicago.edu,2008:swiftlogs:execute:${RUNID}:run"
+	    export WF="execute:${RUNID}:run"
 	    
 	    echo "INSERT INTO workflow (id, log_filename, swift_version, import_status) VALUES ('$WF','$filename','$version','$wfstatus');" | $SQLCMD