[Swift-commit] r3727 - in trunk: libexec libexec/log-processing src/org/griphyn/vdl/mapping tests/log-processing/make-targets

[noreply at svn.ci.uchicago.edu]

Author: lgadelha
Date: 2010-11-27 07:04:29 -0600 (Sat, 27 Nov 2010)
New Revision: 3727

Modified:
   trunk/libexec/log-processing/add-runid-as-prefix
   trunk/libexec/log-processing/whole-workflow-event
   trunk/libexec/vdl.k
   trunk/src/org/griphyn/vdl/mapping/AbstractDataNode.java
   trunk/src/org/griphyn/vdl/mapping/ExternalDataNode.java
   trunk/tests/log-processing/make-targets/execute.global.event.first-r2522.expected
Log:
- Re-enable the generation of provenance information in the log files.
- Simplification of provenance identifiers, this makes the output of provenance queries cleaner. 
  tag URIs can be used when exporting provenance information, to OPM for instance.


Modified: trunk/libexec/log-processing/add-runid-as-prefix
===================================================================
--- trunk/libexec/log-processing/add-runid-as-prefix	2010-11-27 02:23:51 UTC (rev 3726)
+++ trunk/libexec/log-processing/add-runid-as-prefix	2010-11-27 13:04:29 UTC (rev 3727)
@@ -4,7 +4,7 @@
 
 export EVENTSTREAM=$(basename $1 .event)
 
-export WFID="tag:benc at ci.uchicago.edu,2008:swiftlogs:${EVENTSTREAM}:${RUNID}:"
+export WFID="${EVENTSTREAM}:${RUNID}:"
 
 while read one two thread rest; do
   echo $one $two ${WFID}$thread $thread $rest

Modified: trunk/libexec/log-processing/whole-workflow-event
===================================================================
--- trunk/libexec/log-processing/whole-workflow-event	2010-11-27 02:23:51 UTC (rev 3726)
+++ trunk/libexec/log-processing/whole-workflow-event	2010-11-27 13:04:29 UTC (rev 3727)
@@ -3,7 +3,7 @@
 export st=$(cat start-time.tmp)
 export et=$(cat end-time.tmp)
 
-#2008-08-30 08:59:26,994-0500 INFO  unknown RUNID id=tag:benc at ci.uchicago.edu,2007:swift:run:20080830-0859-q9bqd8r4
+#2008-08-30 08:59:26,994-0500 INFO  unknown RUNID id=run:20080830-0859-q9bqd8r4
 
 WFID=$(grep -E '^[^ ]* [^ ]* INFO  unknown RUNID id=' $1 | sed 's/^.*INFO  unknown RUNID id=\(.*\)$/\1/')
 

Modified: trunk/libexec/vdl.k
===================================================================
--- trunk/libexec/vdl.k	2010-11-27 02:23:51 UTC (rev 3726)
+++ trunk/libexec/vdl.k	2010-11-27 13:04:29 UTC (rev 3727)
@@ -20,11 +20,18 @@
 		log("info",sys:file:read("{swift.home}/libexec/version.txt"))
 		echo(sys:file:read("{swift.home}/libexec/version.txt"))
 
-		log("info","RUNID id=tag:benc at ci.uchicago.edu,2007:swift:run:{VDL:RUNID}")
+		log("info","RUNID id=run:{VDL:RUNID}")
 		echo("RunID: {VDL:RUNID}")
 	)
 
 	export(
+	
+		element(parameterlog, [direction, variable, id, thread], 
+			if( 
+				vdl:configProperty("provenance.log") == "true" 
+				log("info","PARAM thread={thread} direction={direction} variable={variable} provenanceid={id}") 
+			) 
+		) 
 		element(split, [var], each(str:split(vdl:getFieldValue(var), " ")))
 
 		element(quote, [var, optional(path)],

Modified: trunk/src/org/griphyn/vdl/mapping/AbstractDataNode.java
===================================================================
--- trunk/src/org/griphyn/vdl/mapping/AbstractDataNode.java	2010-11-27 02:23:51 UTC (rev 3726)
+++ trunk/src/org/griphyn/vdl/mapping/AbstractDataNode.java	2010-11-27 13:04:29 UTC (rev 3727)
@@ -25,7 +25,7 @@
 
 public abstract class AbstractDataNode implements DSHandle {
 
-    static final String DATASET_URI_PREFIX = "tag:benc at ci.uchicago.edu,2008:swift:dataset:";
+    static final String DATASET_URI_PREFIX = "dataset:";
 
     public static final Logger logger = Logger
     .getLogger(AbstractDataNode.class);

Modified: trunk/src/org/griphyn/vdl/mapping/ExternalDataNode.java
===================================================================
--- trunk/src/org/griphyn/vdl/mapping/ExternalDataNode.java	2010-11-27 02:23:51 UTC (rev 3726)
+++ trunk/src/org/griphyn/vdl/mapping/ExternalDataNode.java	2010-11-27 13:04:29 UTC (rev 3727)
@@ -22,7 +22,7 @@
                 this.params = params;
 	}
 
-	static final String DATASET_URI_PREFIX = "tag:benc at ci.uchicago.edu,2008:swift:dataset:external:";
+	static final String DATASET_URI_PREFIX = "dataset:external:";
 
 	public static final Logger logger = Logger.getLogger(ExternalDataNode.class);
 	

Modified: trunk/tests/log-processing/make-targets/execute.global.event.first-r2522.expected
===================================================================
--- trunk/tests/log-processing/make-targets/execute.global.event.first-r2522.expected	2010-11-27 02:23:51 UTC (rev 3726)
+++ trunk/tests/log-processing/make-targets/execute.global.event.first-r2522.expected	2010-11-27 13:04:29 UTC (rev 3727)
@@ -1 +1 @@
-1236540520.203 0.352999925613403 tag:benc at ci.uchicago.edu,2008:swiftlogs:execute:first-r2522:0 0 END_SUCCESS echo
+1236540520.203 0.352999925613403 execute:first-r2522:0 0 END_SUCCESS echo