Changeset 39165 for trunk/ippToPsps/test

Timestamp:

Nov 19, 2015, 11:22:36 AM (11 years ago)

Author:

eugene

Message:

diffSkyfile does not have diff_skyfile_id or tess_id in the true gpc1 schema; remove from the test schema; fix query for getDiffStagePathBase to just join on diffSkyfile and diffInputSkyfile using diff_id, skycell_id

Location:

trunk/ippToPsps/test

Files:

• fulltest.sh (modified) (1 diff)
• gpc1schema.sql (modified) (1 diff)
• mkgpc1data.dvo (modified) (1 diff)

trunk/ippToPsps/test/fulltest.sh

@@ -561 +561 @@
 
   rm -rf $OUTDIR/FO
+  rm -rf $OUTDIR/FG
 
   ippjython loader.py $options $forcedobjqueuename once -simtest < /dev/null

trunk/ippToPsps/test/gpc1schema.sql

@@ -21 +21 @@
   CREATE TABLE diffRun             ( diff_id INT, tess_id CHAR(64), state CHAR(16), diff_mode INT, software_ver CHAR(16) );
   CREATE TABLE diffInputSkyfile    ( diff_id INT, warp1 INT, stack2 INT, diff_skyfile_id INT, tess_id CHAR(64), skycell_id CHAR(64) );
-  CREATE TABLE diffSkyfile         ( diff_id INT, diff_skyfile_id INT, tess_id CHAR(64), skycell_id CHAR(64), path_base CHAR(255) );
+  CREATE TABLE diffSkyfile         ( diff_id INT, skycell_id CHAR(64), path_base CHAR(255) );
 
   CREATE TABLE addRun              ( add_id INT, stage CHAR(64), stage_extra1 INT, state CHAR(64), stage_id INT, minidvodb_name CHAR(64) );

trunk/ippToPsps/test/mkgpc1data.dvo

@@ -654 +654 @@
   dbinsert diffRun (diff_id, tess_id, state, diff_mode, software_ver) values ($difID, $TESS_ID, "full", 2, "38000M")
   dbinsert diffInputSkyfile (diff_id, warp1, stack2, diff_skyfile_id, tess_id, skycell_id) values ($difID, $wrpID, $stkID, $diffSkyfileID, $TESS_ID,  $SKYCELL )
-  dbinsert diffSkyfile (diff_id, diff_skyfile_id, tess_id, skycell_id, path_base) values ($difID, $diffSkyfileID, $TESS_ID, $SKYCELL, "$filename")
+  dbinsert diffSkyfile (diff_id, skycell_id, path_base) values ($difID, $SKYCELL, "$filename")
 end