Changeset 26519 for trunk/ippTools

Timestamp:

Jan 5, 2010, 11:59:46 AM (17 years ago)

Author:

bills

Message:

Add dist_group to distRun. It is needed for the data store and joining
back to the original Run's data_group is too complicated

Location:

trunk/ippTools

Files:

• share/disttool_definebyquery_camera.sql (modified) (1 diff)
• share/disttool_definebyquery_chip.sql (modified) (1 diff)
• share/disttool_definebyquery_diff.sql (modified) (1 diff)
• share/disttool_definebyquery_fake.sql (modified) (1 diff)
• share/disttool_definebyquery_raw.sql (modified) (1 diff)
• share/disttool_definebyquery_stack.sql (modified) (1 diff)
• share/disttool_definebyquery_warp.sql (modified) (1 diff)
• share/disttool_pendingfileset.sql (modified) (1 diff)
• share/pxadmin_create_tables.sql (modified) (1 diff)
• src/disttool.c (modified) (2 diffs)

trunk/ippTools/share/disttool_definebyquery_camera.sql

@@ -5 +5 @@
     camRun.magicked,
     camRun.label,
+    camRun.data_group,
     distTarget.dist_group,
     distTarget.target_id,

trunk/ippTools/share/disttool_definebyquery_chip.sql

@@ -5 +5 @@
     rawExp.exp_name as run_tag,
     chipRun.label,
+    chipRun.data_group,
     chipRun.dist_group,
     distTarget.target_id,

trunk/ippTools/share/disttool_definebyquery_diff.sql

@@ -5 +5 @@
     rawExp.exp_name as run_tag,
     diffRun.label,
+    diffRun.data_group,
     distTarget.dist_group,
     distTarget.target_id,

trunk/ippTools/share/disttool_definebyquery_fake.sql

@@ -5 +5 @@
     rawExp.exp_name as run_tag,
     fakeRun.label,
+    fakeRun.data_group,
     distTarget.dist_group,
     distTarget.target_id,

trunk/ippTools/share/disttool_definebyquery_raw.sql

@@ -5 +5 @@
     rawExp.magicked,
     chipRun.label,
+    chipRun.data_group,
     distTarget.dist_group,
     distTarget.target_id,

trunk/ippTools/share/disttool_definebyquery_stack.sql

@@ -6 +6 @@
     CONCAT_WS('.', 'stack', stackRun.skycell_id, convert(stackRun.stack_id, CHAR)) as run_tag,
     stackRun.label,
+    stackRun.data_group,
     distTarget.dist_group,
     distTarget.target_id,

trunk/ippTools/share/disttool_definebyquery_warp.sql

@@ -5 +5 @@
     rawExp.exp_name as run_tag,
     warpRun.label,
+    warpRun.data_group,
     distTarget.dist_group,
     distTarget.target_id,

trunk/ippTools/share/disttool_pendingfileset.sql

@@ -5 +5 @@
     distRun.outdir as dist_dir,
     stage_id,
-    -- we need to get data_group here but we don't have
-    -- the right tables joined. Perhaps we need to add that column to distRun
-    distRun.label as data_group,
+    distRun.data_group,
     distTarget.filter,
     rcDestination.name AS product_name,

trunk/ippTools/share/pxadmin_create_tables.sql

@@ -1352 +1352 @@
     time_stamp  TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
     fault       SMALLINT,
+    data_group  VARCHAR(64),
     note        VARCHAR(255),
     PRIMARY KEY(dist_id),

trunk/ippTools/src/disttool.c

@@ -358 +358 @@
         psS64 target_id = psMetadataLookupS64(NULL, md, "target_id");
         psString stage_label = psMetadataLookupStr(NULL, md, "label");
+        psString data_group = psMetadataLookupStr(NULL, md, "data_group");
         bool clean = psMetadataLookupBool(NULL, md, "clean");
 
@@ -383 +384 @@
                 NULL,    // time_stamp
                 0,       // fault
+                data_group,
                 set_note // note does not propagate
                 );