Changeset 42579

Timestamp:

Jan 10, 2024, 12:37:20 PM (3 years ago)

Author:

eugene

Message:

fix xcskytools mysql code (support for mysql >5.7.5)

Location:

branches/eam_branches/ipp-20230313/ippTools

Files:

• share/xcskytool_result.sql (modified) (1 diff)
• share/xcskytool_todo.sql (modified) (1 diff)
• src/xcskytool.c (modified) (2 diffs)

branches/eam_branches/ipp-20230313/ippTools/share/xcskytool_result.sql

@@ -4 +4 @@
     xcskyRun.workdir,
     xcskyRun.label,
-    xcstackRun.tess_id,
-    xcstackRun.skycell_id,
+    MIN(xcstackRun.tess_id) as tess_id, -- we implicitly assume that all xcstackRuns used for a xcskyRun have the same tess_id
+    MIN(xcstackRun.skycell_id) as skycell_id, -- and skycell_id 
     count(xcstackRun.filter) AS num_filters,
-    TRUNCATE(skycell.radeg/15., 4) AS rahours,
-    skycell.radeg,
-    skycell.decdeg,
-    skycell.glong,
-    skycell.glat
+    TRUNCATE(MIN(skycell.radeg)/15., 4) as rahours,
+    MIN(skycell.radeg) as radeg,
+    MIN(skycell.decdeg) as decdeg,
+    MIN(skycell.glong) as glong,
+    MIN(skycell.glat) as glat
 FROM xcskyRun
 JOIN xcskyResult USING(xcsky_id)

branches/eam_branches/ipp-20230313/ippTools/share/xcskytool_todo.sql

@@ -5 +5 @@
     xcskyRun.label,
     xcskyRun.state,
-    xcstackRun.tess_id,
-    xcstackRun.skycell_id,
-    TRUNCATE(skycell.radeg/15., 4) as rahours,
-    skycell.radeg,
-    skycell.decdeg,
-    skycell.glong,
-    skycell.glat,
+    MIN(xcstackRun.tess_id) as tess_id, -- we implicitly assume that all xcstackRuns used for a xcskyRun have the same tess_id
+    MIN(xcstackRun.skycell_id) as skycell_id, -- and skycell_id 
+    TRUNCATE(MIN(skycell.radeg)/15., 4) as rahours,
+    MIN(skycell.radeg) as radeg,
+    MIN(skycell.decdeg) as decdeg,
+    MIN(skycell.glong) as glong,
+    MIN(skycell.glat) as glat,
     xcskyResult.path_base,
     IFNULL(Label.priority, 10000) AS priority

branches/eam_branches/ipp-20230313/ippTools/src/xcskytool.c

@@ -116 +116 @@
     PXOPT_LOOKUP_STR(note,        config->args, "-set_note", false, false);
     PXOPT_LOOKUP_TIME(registered, config->args, "-set_registered", false, false);
+    //    fprintf (stderr, "%s\n", registered);
 
     psMetadata *whereMD = psMetadataAlloc();
@@ -333 +334 @@
                                 dist_group,
                                 reduction,
-                                registered,
+                            NULL, // XXX : broken like xcstacktool : is this due to the mysql version?
                                 note
                 )