Changeset 33003 for branches/haf_add201112/ippTools/share

Timestamp:

Dec 22, 2011, 2:21:40 PM (15 years ago)

Author:

heather

Message:

whoo hooo! mergetool changes, now to test on maui

Location:

branches/haf_add201112/ippTools/share

Files:

• Makefile.am (modified) (1 diff)
• addtool_find_minidvodbrun2.sql (modified) (1 diff)
• addtool_queue_minidvodbrun.sql (modified) (1 diff)
• mergetool_find_merge_id_dvo.sql (added)
• mergetool_find_mergedvodbcopy.sql (added)
• mergetool_find_pending_merge.sql (modified) (1 diff)
• mergetool_queue_mergecopy_id.sql (added)
• mergetool_revertmergedvodbcopy.sql (added)
• minidvodbtool_find_minidvodb_id_dvo.sql (modified) (1 diff)

branches/haf_add201112/ippTools/share/Makefile.am

@@ -311 +311 @@
         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 \

branches/haf_add201112/ippTools/share/addtool_find_minidvodbrun2.sql

@@ -1 +1 @@
 -- 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 

branches/haf_add201112/ippTools/share/addtool_queue_minidvodbrun.sql

@@ -4 +4 @@
     minidvodb_name,
     minidvodb_path,
-    mergedvodb_path,
     'new'
 

branches/haf_add201112/ippTools/share/mergetool_find_pending_merge.sql

@@ -1 +1 @@
 SELECT
     mergedvodbRun.*
-FROM mergedvodbRun
+    minidvodbRun.minidvodb_path
+FROM minidvodbRun 
+JOIN mergedvodbRun 
+    USING(minidvodb_id)
 LEFT JOIN mergedvodbProcessed
     USING(merge_id)

branches/haf_add201112/ippTools/share/minidvodbtool_find_minidvodb_id_dvo.sql

@@ -1 +1 @@
 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