Index: trunk/ippTools/share/Makefile.am =================================================================== --- trunk/ippTools/share/Makefile.am (revision 33024) +++ trunk/ippTools/share/Makefile.am (revision 33030) @@ -310,4 +310,14 @@ minidvodbtool_queue_minidvodb_id.sql \ minidvodbtool_revertminidvodbcopy.sql \ + mergetool_find_minidvodb_id.sql \ + mergetool_find_mergedvodbcopy.sql \ + mergetool_find_merge_id_dvo.sql \ + mergetool_find_pendingmergeprocess.sql \ + mergetool_find_pending_merge.sql \ + mergetool_find_processed.sql \ + mergetool_queue_mergecopy_id.sql \ + mergetool_queue_merge_id.sql \ + mergetool_revertmergedvodbcopy.sql \ + mergetool_revertmergedvodbprocessed.sql \ pstamptool_completedreq.sql \ pstamptool_datastore.sql \ Index: trunk/ippTools/share/addtool_checkminidvodbaddrun.sql =================================================================== --- trunk/ippTools/share/addtool_checkminidvodbaddrun.sql (revision 33024) +++ trunk/ippTools/share/addtool_checkminidvodbaddrun.sql (revision 33030) @@ -1,4 +1,4 @@ -- this selects the minidvodbs that have complete addRuns -SELECT minidvodb_id, minidvodb_name, minidvodb_path, mergedvodb_path, state, minidbg +SELECT minidvodb_id, minidvodb_name, minidvodb_path, state, minidbg AS minidvodb_group, (cnt - cnt2) as not_full, cnt as addRun_count FROM minidvodbRun Index: trunk/ippTools/share/addtool_find_minidvodbrun2.sql =================================================================== --- trunk/ippTools/share/addtool_find_minidvodbrun2.sql (revision 33024) +++ trunk/ippTools/share/addtool_find_minidvodbrun2.sql (revision 33030) @@ -1,4 +1,4 @@ -- this selects the minidvodbs that have complete addRuns -SELECT minidvodb_name, minidvodb_path, mergedvodb_path, state, minidbg +SELECT minidvodb_name, minidvodb_path, state, minidbg AS minidvodb_group FROM minidvodbRun Index: trunk/ippTools/share/addtool_queue_minidvodbrun.sql =================================================================== --- trunk/ippTools/share/addtool_queue_minidvodbrun.sql (revision 33024) +++ trunk/ippTools/share/addtool_queue_minidvodbrun.sql (revision 33030) @@ -4,5 +4,4 @@ minidvodb_name, minidvodb_path, - mergedvodb_path, 'new' Index: trunk/ippTools/share/mergetool_find_merge_id_dvo.sql =================================================================== --- trunk/ippTools/share/mergetool_find_merge_id_dvo.sql (revision 33030) +++ trunk/ippTools/share/mergetool_find_merge_id_dvo.sql (revision 33030) @@ -0,0 +1,9 @@ +SELECT mergedvodbRun.* FROM mergedvodbRun +JOIN mergedvodbProcessed USING(merge_id) +WHERE ( mergedvodbRun.state = 'merged' OR mergedvodbRun.state = 'full') + AND mergedvodbProcessed.fault = 0 + AND merge_id NOT IN (SELECT merge_id + FROM mergedvodbCopy + JOIN mergedvodbRun USING(mergedvodb_id) + WHERE %s + ) Index: trunk/ippTools/share/mergetool_find_mergedvodbcopy.sql =================================================================== --- trunk/ippTools/share/mergetool_find_mergedvodbcopy.sql (revision 33030) +++ trunk/ippTools/share/mergetool_find_mergedvodbcopy.sql (revision 33030) @@ -0,0 +1,7 @@ +SELECT + mergedvodbCopy.*, + mergedvodbRun.mergedvodb_path +FROM mergedvodbCopy + JOIN mergedvodbRun using (mergedvodb_id) + + Index: trunk/ippTools/share/mergetool_find_minidvodb_id.sql =================================================================== --- trunk/ippTools/share/mergetool_find_minidvodb_id.sql (revision 33030) +++ trunk/ippTools/share/mergetool_find_minidvodb_id.sql (revision 33030) @@ -0,0 +1,8 @@ +SELECT minidvodbRun.* FROM minidvodbRun +JOIN minidvodbProcessed USING(minidvodb_id) +WHERE minidvodbRun.state = 'merged' and minidvodbProcessed.fault = 0 + AND minidvodb_id NOT IN (SELECT minidvodb_id + FROM mergedvodbRun + JOIN minidvodbRun USING(minidvodb_id) + WHERE %s + ) Index: trunk/ippTools/share/mergetool_find_pending_merge.sql =================================================================== --- trunk/ippTools/share/mergetool_find_pending_merge.sql (revision 33030) +++ trunk/ippTools/share/mergetool_find_pending_merge.sql (revision 33030) @@ -0,0 +1,14 @@ +SELECT + mergedvodbRun.*, + minidvodbRun.minidvodb_path +FROM minidvodbRun +JOIN mergedvodbRun + USING(minidvodb_id) +LEFT JOIN mergedvodbProcessed + USING(merge_id) +WHERE + (mergedvodbRun.state = 'new' AND mergedvodbProcessed.merge_id IS NULL) + AND mergedvodbRun.mergedvodb IS NOT NULL + AND mergedvodbRun.mergedvodb_path IS NOT NULL + + Index: trunk/ippTools/share/mergetool_find_pendingmergeprocess.sql =================================================================== --- trunk/ippTools/share/mergetool_find_pendingmergeprocess.sql (revision 33030) +++ trunk/ippTools/share/mergetool_find_pendingmergeprocess.sql (revision 33030) @@ -0,0 +1,5 @@ +SELECT mergedvodbRun.* +FROM mergedvodbRun +LEFT JOIN mergedvodbProcessed +USING(merge_id) +WHERE (mergedvodbRun.state = 'new' AND mergedvodbProcessed.merge_id IS NULL) Index: trunk/ippTools/share/mergetool_find_processed.sql =================================================================== --- trunk/ippTools/share/mergetool_find_processed.sql (revision 33030) +++ trunk/ippTools/share/mergetool_find_processed.sql (revision 33030) @@ -0,0 +1,7 @@ +SELECT + mergedvodbProcessed.*, + mergedvodbRun.mergedvodb_path +FROM mergedvodbProcessed +JOIN mergedvodbRun + USING(merge_id) + Index: trunk/ippTools/share/mergetool_queue_merge_id.sql =================================================================== --- trunk/ippTools/share/mergetool_queue_merge_id.sql (revision 33030) +++ trunk/ippTools/share/mergetool_queue_merge_id.sql (revision 33030) @@ -0,0 +1,11 @@ +INSERT INTO mergedvodbRun + SELECT + 0, -- merge_id + minidvodb_id, -- minidvodb_id + '%s', -- mergedvodb + '%s', -- mergedvodb_path + '%s', -- state + FROM minidvodbRun join minidvodbProcessed using (minidvodb_id) + WHERE + minidvodbRun.state = 'merged' and minidvodbProcessed.fault = 0 + AND minidvodbRun.minidvodb_id = %lld Index: trunk/ippTools/share/mergetool_queue_mergecopy_id.sql =================================================================== --- trunk/ippTools/share/mergetool_queue_mergecopy_id.sql (revision 33030) +++ trunk/ippTools/share/mergetool_queue_mergecopy_id.sql (revision 33030) @@ -0,0 +1,16 @@ +INSERT INTO mergedvodbCopy + SELECT + 0, -- mergedvodbcopy_id + merge_id, -- merge_id + '%s', -- mergedvodb_rsync_path + '%s', -- destination_host + %d, -- fault + '%s', -- state + %s, -- epoch + %f -- dtime + + FROM mergedvodbRun + WHERE + (mergedvodbRun.state = 'merged' + OR mergedvodbRun.state = 'full') + AND mergedvodbRun.merge_id = %lld Index: trunk/ippTools/share/mergetool_queue_minidvodb_id.sql =================================================================== --- trunk/ippTools/share/mergetool_queue_minidvodb_id.sql (revision 33030) +++ trunk/ippTools/share/mergetool_queue_minidvodb_id.sql (revision 33030) @@ -0,0 +1,15 @@ +INSERT INTO minidvodbCopy + SELECT + 0, -- minidvodbcopy_id + minidvodb_id, -- minidvodb_id + '%s', -- minidvodb_rsync_path + '%s', -- destination_host + %d, -- fault + '%s', -- state + %s, -- epoch + %f -- dtime + + FROM minidvodbRun + WHERE + minidvodbRun.state = 'merged' + AND minidvodbRun.minidvodb_id = %lld Index: trunk/ippTools/share/mergetool_revertmergedvodbcopy.sql =================================================================== --- trunk/ippTools/share/mergetool_revertmergedvodbcopy.sql (revision 33030) +++ trunk/ippTools/share/mergetool_revertmergedvodbcopy.sql (revision 33030) @@ -0,0 +1,7 @@ +UPDATE mergedvodbCopy + -- SET minidvodbCopy.state = 'new', + SET mergedvodbCopy.fault = 0 +WHERE + mergedvodbCopy.state = 'new' + AND mergedvodbCopy.fault >0 + Index: trunk/ippTools/share/mergetool_revertmergedvodbprocessed.sql =================================================================== --- trunk/ippTools/share/mergetool_revertmergedvodbprocessed.sql (revision 33030) +++ trunk/ippTools/share/mergetool_revertmergedvodbprocessed.sql (revision 33030) @@ -0,0 +1,6 @@ +DELETE FROM mergedvodbProcessed +USING mergedvodbProcessed, mergedvodbRun +WHERE + mergedvodbProcessed.merge_id = mergedvodbRun.merge_id + AND mergedvodbProcessed.fault != 0 + AND mergedvodbRun.state = 'new' Index: trunk/ippTools/share/minidvodbtool_find_minidvodb_id_dvo.sql =================================================================== --- trunk/ippTools/share/minidvodbtool_find_minidvodb_id_dvo.sql (revision 33024) +++ trunk/ippTools/share/minidvodbtool_find_minidvodb_id_dvo.sql (revision 33030) @@ -1,5 +1,6 @@ SELECT minidvodbRun.* FROM minidvodbRun JOIN minidvodbProcessed USING(minidvodb_id) -WHERE minidvodbRun.state = 'merged' +WHERE minidvodbRun.state = 'merged' + AND minidvodbProcessed.fault = 0 AND minidvodb_id NOT IN (SELECT minidvodb_id FROM minidvodbCopy Index: trunk/ippTools/share/pxadmin_create_tables.sql =================================================================== --- trunk/ippTools/share/pxadmin_create_tables.sql (revision 33024) +++ trunk/ippTools/share/pxadmin_create_tables.sql (revision 33030) @@ -1964,5 +1964,4 @@ minidvodb_group VARCHAR(64) NOT NULL, minidvodb_path VARCHAR(255) NOT NULL, - mergedvodb_path VARCHAR(255) NOT NULL, state VARCHAR(64) NOT NULL, creation_date TIMESTAMP, @@ -1972,12 +1971,8 @@ CREATE TABLE minidvodbProcessed ( minidvodb_id BIGINT, - merge_order BIGINT, dtime_resort FLOAT, dtime_relphot FLOAT, - dtime_verify FLOAT, - dtime_merge FLOAT, dtime_script FLOAT, epoch timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, - mergedvodb_path VARCHAR(255) NOT NULL, fault SMALLINT NOT NULL, UNIQUE KEY (minidvodb_id), @@ -2000,4 +1995,41 @@ FOREIGN KEY(minidvodb_id) REFERENCES minidvodbRun(minidvodb_id) ) ENGINE=innodb DEFAULT CHARSET=latin1; + +CREATE TABLE mergedvodbRun ( + merge_id BIGINT AUTO_INCREMENT, + minidvodb_id BIGINT, + mergedvodb VARCHAR(64) NOT NULL, + mergedvodb_path VARCHAR(255) NOT NULL, + state VARCHAR(64) NOT NULL, + creation_date TIMESTAMP, + PRIMARY KEY(merge_id), KEY(minidvodb_id), KEY(mergedvodb), INDEX(merge_id) +) ENGINE=innodb DEFAULT CHARSET=latin1; + +CREATE TABLE mergedvodbProcessed ( + merge_id BIGINT, + dtime_verify FLOAT, + dtime_merge FLOAT, + dtime_script FLOAT, + epoch timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + fault SMALLINT NOT NULL, + UNIQUE KEY (merge_id), + KEY(merge_id), + FOREIGN KEY(merge_id) REFERENCES mergedvodbRun(merge_id) +) ENGINE=innodb DEFAULT CHARSET=latin1; + +CREATE TABLE mergedvodbCopy ( + mergedvodbcopy_id BIGINT AUTO_INCREMENT, + merge_id BIGINT, + mergedvodb_rsync_path VARCHAR(255) NOT NULL, + destination_host VARCHAR(255) NOT NULL, + fault SMALLINT NOT NULL, + state VARCHAR(64) NOT NULL, + epoch TIMESTAMP, + dtime FLOAT, + PRIMARY KEY(mergedvodbcopy_id), + KEY(merge_id), + FOREIGN KEY(merge_id) REFERENCES mergedvodbRun(merge_id) +) ENGINE=innodb DEFAULT CHARSET=latin1; + CREATE TABLE vpRun ( vp_id BIGINT AUTO_INCREMENT,