[Swift-commit] r2991 - provenancedb

[noreply at svn.ci.uchicago.edu]

Author: benc
Date: 2009-06-30 07:39:09 -0500 (Tue, 30 Jun 2009)
New Revision: 2991

Modified:
   provenancedb/prov-to-sql.sh
Log:
Make operator import use thread ID (which should be unique now)

this is not strictly necessary but fits in with the idea of other
processes using thread ID

Modified: provenancedb/prov-to-sql.sh
===================================================================
--- provenancedb/prov-to-sql.sh	2009-06-30 12:38:49 UTC (rev 2990)
+++ provenancedb/prov-to-sql.sh	2009-06-30 12:39:09 UTC (rev 2991)
@@ -27,17 +27,14 @@
   echo "INSERT INTO execute2s (id, execute_id, starttime, duration, finalstate, site) VALUES ('$globalid', '$execute_id', '$starttime', '$duration', '$endstate', '$site');" >> tmp-import.sql
 done < execute2.global.event
 
-# for fabricating operator IDs
-OPERATORIDCOUNTER=0
 while read thread name lhs rhs result; do
-  operatorid="${WFID}operator:$OPERATORIDCOUNTER"
+  operatorid="${WFID}operator:$thread"
   echo "INSERT INTO processes (id, type) VALUES ('$operatorid', 'operator');" >> tmp-import.sql
   echo "INSERT INTO invocation_procedure_names (execute_id, procedure_name) VALUES ('$operatorid','$name'); " >> tmp-import.sql
   echo "INSERT INTO processes_in_workflows (process_id, workflow_id) VALUES ('$operatorid', '$WF');" >> tmp-import.sql
   echo "INSERT INTO dataset_usage (process_id, direction, dataset_id, param_name) VALUES ('$operatorid', 'I', '$lhs', 'lhs');" >> tmp-import.sql
   echo "INSERT INTO dataset_usage (process_id, direction, dataset_id, param_name) VALUES ('$operatorid', 'I', '$rhs', 'rhs');" >> tmp-import.sql
   echo "INSERT INTO dataset_usage (process_id, direction, dataset_id, param_name) VALUES ('$operatorid', 'O', '$result', 'result');" >> tmp-import.sql
-  OPERATORIDCOUNTER=$(( $OPERATORIDCOUNTER + 1))
 done < operators.txt
 
 while read id name output; do