Changeset 9591 for trunk

Timestamp:

06/17/10 14:25:10 (15 years ago)

Author:

Daniela Dorner

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• datacenter/scripts/sourcefile (modified) (10 diffs)
• resources/steps_fact.rc (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -19 +19 @@
                                                  -*-*- END OF LINE -*-*-
 
+ 2010/06/17 Daniela Dorner
+
+   * resources/steps_fact.rc:
+     - removed step CPRun
+     - split 'Joins' to 'Joins' and 'SpecialJoins' depending on 
+       whether the join is with a different table
+
+   * datacenter/scripts/sourcefile:
+     - bugfix in query
+     - included new type of join from steps.rc
+     - added comments
+
+
+
  2010/06/16 Daniela Dorner
 

trunk/MagicSoft/Mars/datacenter/scripts/sourcefile

@@ -253 +253 @@
 }
 
-# function to get the join of a step from the dependencies-file steps.rc
+# function to get the join of a step 
+#  (normal join but using different primaries)
+#  from the dependencies-file steps.rc
 function getjoin()
 {
    getdbsetup
    grep $@"[.]Join:" $steps | sed -e "s/$@[.]Join://"
+}
+
+# function to get the special join of a step 
+#  (i.e. join with a different table) 
+#  from the dependencies-file steps.rc
+function getspecialjoin()
+{
+   getdbsetup
+   grep $@"[.]SpecialJoin:" $steps | sed -e "s/$@[.]SpecialJoin://"
+}
+
+# function to get the needs of a step from the dependencies-file steps.rc
+function getneeds()
+{
+   getdbsetup
+   grep $@"[.]Needs:" $steps | sed -e "s/$@[.]Needs://"
 }
 
@@ -270 +288 @@
    do
       needprims=( `getprimary $need` )
+      # make sure that the correct joins are used
+      # in case the primaries of the step and the need are 
+      #   the same, the tables are join with these primaries
+      # otherwise it is checked whether there has to be a 
+      #   join with different primaries (indicated as 'Join'
+      #   in the steps.rc
+      # 'SpecialJoins' do not have to be taken into account here
       if [ "`echo ${needprims[@]}`" == "`echo ${prims[@]}`" ]
       then 
          query=$query" LEFT JOIN "$need"Status USING (${prims[@]}) "
+      else 
+         stdjoin=`getjoin $need`
+         if ! [ "$stdjoin" = "" ]
+         then
+            query=$query" "$stdjoin" "
+         fi
       fi
    done
@@ -287 +318 @@
       needprims=( `getprimary $need` )
       # in case the primaries of the tables agree
-      #   only the condition is given
-      # for tables with differing primaries a special query 
-      #   is needed
-      if [ "`echo ${needprims[@]}`" == "`echo ${prims[@]}`" ]
+      #   or there is just a normal 'Join' needed
+      #   only the condition is added to the query
+      # for tables which need a join with a different
+      #   table, a special query is added using the
+      #   'SpecialJoin' from the steps.rc
+      if [ "`echo ${needprims[@]}`" == "`echo ${prims[@]}`" ] || ! [ "$stdjoin" = "" ]
       then 
          query=$query" NOT ISNULL("$need"Status.fStartTime) AND "
@@ -297 +330 @@
       else 
          query=$query" (SELECT COUNT(*) FROM "$need"Status "
-         query=$query" "`getjoin $need`" "
+         query=$query" "`getspecialjoin $need`" "
          query=$query" WHERE "$step"Status."`echo ${prims[0]} | sed -e 's/,//g'`"="$step"Status."`echo ${prims[0]} | sed -e 's/,//g'`
          for (( j=1 ; j < ${#prims[@]} ; j++ ))
@@ -304 +337 @@
          done
          query=$query") = (SELECT COUNT(*) FROM "$need"Status "
-         query=$query" "`getjoin $need`" "
+         query=$query" "`getspecialjoin $need`" "
          query=$query" WHERE "$step"Status."`echo ${prims[0]} | sed -e 's/,//g'`"="$step"Status."`echo ${prims[0]} | sed -e 's/,//g'`
          for (( j=1 ; j < ${#prims[@]} ; j++ ))
@@ -356 +389 @@
    fi
    # print query 
-   echo " gettodo QUERY: "$query
+   #echo " gettodo QUERY: "$query
    printprocesslog "INFO gettodo QUERY: "$query
    # execute query 
@@ -393 +426 @@
    query=$query" GROUP BY 2 "
    # printing query
-   echo " getstatus QUERY: "$query
+   #echo " getstatus QUERY: "$query
    printprocesslog "INFO getstatus QUERY: "$query
    # execute query
@@ -462 +495 @@
    
    # get the influences from the steps.rc by evaluating the needs of all steps
-   influences=`grep $step $rc | grep "Needs" | grep -v "$step[.]Needs" | cut -d'.' -f1`
+   influences=`grep $step $steps | grep "Needs" | grep -v "$step[.]Needs" | cut -d'.' -f1`
    
    # get query
@@ -469 +502 @@
    for influence in $influences
    do
-      query=$query" LEFT JOIN $influence USING("`getprimary $influence`") "
-      specialjoin=`getjoin $influence`
-      if ! [ "$specialjoin" = "" ]
+      # make sure that the right join is done 
+      #   in case the is a 'Join' given for the 
+      #   influenced step, this is added
+      # otherwise it is checked whether the executed step
+      #   itself needs a 'Join' (i.e. has different primaries)
+      #   if yes, the tables are joined with the primaries of the influenced step
+      #   else with the primaries of the executed step itself
+      stdjoin=`getjoin $influence`
+      if ! [ "$stdjoin" = "" ]
       then 
-         query=$query$specialjoin
+         query=$query" "$stdjoin" "
+      else
+         stdjoin2=`getjoin $step`
+         if [ "$stdjoin2" == "" ]
+         then
+            query=$query" LEFT JOIN "$influence"Status USING("`getprimary $influence`") "
+         else
+            query=$query" LEFT JOIN "$influence"Status USING("`getprimary $step`") "
+         fi
       fi
    done
@@ -502 +549 @@
    done   
    # print query
-   echo " setstatus QUERY: "$query
+   #echo " setstatus QUERY: "$query
    printprocesslog "INFO setstatus QUERY: "$query
    # execute query

trunk/MagicSoft/Mars/resources/steps_fact.rc

@@ -1 +1 @@
 
 Corsika.Primaries: fRunNumber, fFileNumber
-Corsika.Join: LEFT JOIN CeresInfo USING(fRunNumber, fFileNumber)
+Corsika.SpecialJoin: LEFT JOIN CeresInfo USING(fRunNumber, fFileNumber)
 
 Ceres.Primaries: fRunNumber, fFileNumber, fCeresSetupKEY
-Ceres.Join: LEFT JOIN CeresInfo USING(fRunNumber, fFileNumber)
+Ceres.SpecialJoin: LEFT JOIN CeresInfo USING(fRunNumber, fFileNumber)
+Ceres.Join: LEFT JOIN CeresStatus USING(fRunNumber, fFileNumber) LEFT JOIN CeresInfo USING(fRunNumber, fFileNumber, fCeresSetupKEY)
 Ceres.Needs: Corsika
 
 SequenceFile.Primaries: fSequenceNumber
 SequenceFile.Join: LEFT JOIN SequenceFile USING(fSequenceNumber)
-
-CPRun.Primaries: fSequenceNumber, fCeresSetupKEY
-CPRun.Needs: Corsika Ceres
 
 Callisto.Primaries: fSequenceNumber, fCeresSetupKEY