Changeset 42757

Timestamp:

Dec 6, 2024, 1:31:41 PM (20 months ago)

Author:

eugene

Message:

merge from trunk : addstar updates

Location:

branches/eam_branches/ipp-20230313/ippTools

Files:

• . (modified) (1 prop)
• share (modified) (1 prop)
• share/addtool_find_pendingexp_cam.sql (modified) (1 diff)
• src (modified) (1 prop)
• src/addtool.c (modified) (4 diffs)
• src/addtoolConfig.c (modified) (2 diffs)

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

@@ -8 +8 @@
     rawExp.telescope,
     rawExp.filelevel,
-    minidvodbRun.minidvodb_host as dvodbhost
+    minidvodbRun.minidvodb_host as addrun_host
 FROM addRun
 JOIN minidvodbRun

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

@@ -140 +140 @@
     PXOPT_LOOKUP_BOOL(uncensored, config->args, "-uncensored", false);
     PXOPT_LOOKUP_U64(limit, config->args, "-limit", false, false);
+    PXOPT_LOOKUP_BOOL(addrand, config->args,  "-addrand", false);
 
     PXOPT_LOOKUP_BOOL(pretend,    config->args, "-pretend", false);
@@ -424 +425 @@
     else if (strcmp(stage,"fullforce_summary") == 0) {
       psStringAppend(&query, " GROUP BY ff_id ");  //needs to be checked, but should be fine: want 1 ff summary cmf.
+    }
+
+    // random order of pending files
+    if (addrand) {
+      psStringAppend(&query, " order by rand()");
     }
 
@@ -1089 +1095 @@
     PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false);
     PXOPT_LOOKUP_BOOL(multiadd, config->args, "-multiadd", false);
+    PXOPT_LOOKUP_BOOL(addrand, config->args,  "-addrand", false);
     
     psString query = NULL;
@@ -1125 +1132 @@
         psStringAppend(&query, " AND %s", whereClause);
         psFree(whereClause);
+    }
+    // random order of pending files
+    if (addrand) {
+      psStringAppend(&query, " ORDER BY RAND()");
     }
     psFree(where);

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

@@ -71 +71 @@
     psMetadataAddBool(definebyqueryArgs, PS_LIST_TAIL, "-simple",            0, "use the simple output format", false);
     psMetadataAddU64(definebyqueryArgs, PS_LIST_TAIL, "-limit",              0, "limit result set to N items", 0);
+    psMetadataAddBool(definebyqueryArgs, PS_LIST_TAIL, "-addrand",           0, "set pending add_id randomly processing", false);
 
     psMetadataAddBool(definebyqueryArgs, PS_LIST_TAIL, "-set_minidvodb",            0, "use minidvodb", false);
@@ -127 +128 @@
     psMetadataAddBool(pendingexpArgs, PS_LIST_TAIL, "-simple",           0, "use the simple output format", false);
     psMetadataAddBool(pendingexpArgs, PS_LIST_TAIL, "-multiadd",           0, "for addstar multi mode, group by stage_id ", false);
+    psMetadataAddBool(pendingexpArgs, PS_LIST_TAIL, "-addrand",           0, "set pending add_id randomly processing", false);
 
     // -addprocessedexp