Changeset 18760

Timestamp:

02/18/17 13:46:29 (8 years ago)

Author:

Daniela Dorner

Message:

optimized status/processing queries and settings

Location:

trunk/DataCheck

Files:

• Setup/steps_fact_isdc.rc (modified) (1 diff)
• Sourcefile.sh (modified) (1 diff)

trunk/DataCheck/Setup/steps_fact_isdc.rc

@@ -47 +47 @@
 Callisto.MainTable: Callisto
 Callisto.Primaries: fNight, fSequenceID
-Callisto.Needs: RawFileAvailISDC SequenceFileAvailISDC
-Callisto.SpecialJoin: LEFT JOIN RunInfo USING(fNight, fSequenceID)
+#Callisto.Needs: RawFileAvailISDC SequenceFileAvailISDC
+Callisto.Needs: SequenceFileAvailISDC
+#Callisto.SpecialJoin: LEFT JOIN RunInfo USING(fNight, fSequenceID) LEFT JOIN SequenceInfo USING(fNight, fSequenceID) 
+Callisto.SpecialJoin: LEFT JOIN SequenceInfo USING(fNight, fSequenceID) 
+Callisto.SpecialWhere: AND fNumRuns=fNumRawfilesAvailISDC
 
 Star.MainTable: Star
 Star.Primaries: fNight, fSequenceID
 Star.Needs: RawFileAvailISDC Callisto DriveFileAvailISDC RatesFileAvailISDC SequenceFileAvailISDC
-Star.SpecialJoin: LEFT JOIN RunInfo USING(fNight, fSequenceID)
+Star.SpecialJoin: LEFT JOIN RunInfo USING(fNight, fSequenceID) LEFT JOIN SequenceInfo USING(fNight, fSequenceID) 
 
 #Merpp.MainTable: Merpp

trunk/DataCheck/Sourcefile.sh

@@ -266 +266 @@
       query=$query" AND fProductionHostKEY=$2 "
    fi
-   if ! echo $query | grep UPDATE >/dev/null 2>&1
-   then 
-      query=$query" GROUP BY "${prims[@]}
-   fi
+   query=$query`getfromsetup $step "SpecialWhere"`
    # add condition for needs, i.e. that step is done
    for (( k=0 ; k < ${#needs[@]} ; k++ ))
    do
-      if [ $k -eq 0 ]
-      then 
-         query=$query" HAVING "
-      else
+#      if [ $k -eq 0 ]
+#      then 
+#         query=$query" HAVING "
+#      else
          query=$query" AND "
-      fi
-      query=$query" COUNT(*)=COUNT(IF("
+#      fi
+#      query=$query" COUNT(*)=COUNT(IF("
       query=$query" NOT ISNULL("${needs[$k]}"Status.fStartTime) "
       query=$query" AND NOT ISNULL("${needs[$k]}"Status.fStopTime) "
       query=$query" AND NOT ISNULL("${needs[$k]}"Status.fAvailable) "
       query=$query" AND ISNULL("${needs[$k]}"Status.fReturnCode) "
-      query=$query" , 1, NULL)) "
+#      query=$query" , 1, NULL)) "
    done
+#   if ! echo $query | grep UPDATE >/dev/null 2>&1
+#   then 
+#      query=$query" GROUP BY "${prims[@]}
+#   fi
 }