Skip to content

Commit b5c4ab4

Browse files
Remove redundant DELETE statements from remove_build() (#2068)
Follow-up to #1657 Remove DELETE statements that are now handled by cascading foreign keys instead.
1 parent 8e3737a commit b5c4ab4

1 file changed

Lines changed: 0 additions & 40 deletions

File tree

app/cdash/include/common.php

Lines changed: 0 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -480,23 +480,7 @@ function remove_build($buildid)
480480
$db = Database::getInstance();
481481
$buildid_prepare_array = $db->createPreparedArray(count($buildids));
482482

483-
DB::delete("DELETE FROM build2group WHERE buildid IN $buildid_prepare_array", $buildids);
484-
DB::delete("DELETE FROM builderror WHERE buildid IN $buildid_prepare_array", $buildids);
485-
DB::delete("DELETE FROM buildemail WHERE buildid IN $buildid_prepare_array", $buildids);
486-
DB::delete("DELETE FROM buildfile WHERE buildid IN $buildid_prepare_array", $buildids);
487-
488-
DB::delete("DELETE FROM buildinformation WHERE buildid IN $buildid_prepare_array", $buildids);
489-
DB::delete("DELETE FROM builderrordiff WHERE buildid IN $buildid_prepare_array", $buildids);
490-
DB::delete("DELETE FROM buildproperties WHERE buildid IN $buildid_prepare_array", $buildids);
491-
492-
DB::delete("DELETE FROM configureerrordiff WHERE buildid IN $buildid_prepare_array", $buildids);
493-
DB::delete("DELETE FROM coveragesummarydiff WHERE buildid IN $buildid_prepare_array", $buildids);
494-
DB::delete("DELETE FROM testdiff WHERE buildid IN $buildid_prepare_array", $buildids);
495-
DB::delete("DELETE FROM buildtesttime WHERE buildid IN $buildid_prepare_array", $buildids);
496-
DB::delete("DELETE FROM summaryemail WHERE buildid IN $buildid_prepare_array", $buildids);
497-
DB::delete("DELETE FROM related_builds WHERE buildid IN $buildid_prepare_array", $buildids);
498483
DB::delete("DELETE FROM related_builds WHERE relatedid IN $buildid_prepare_array", $buildids);
499-
DB::delete("DELETE FROM pending_submissions WHERE buildid IN $buildid_prepare_array", $buildids);
500484

501485
// Remove the buildfailureargument
502486
$buildfailureids = [];
@@ -526,9 +510,6 @@ function remove_build($buildid)
526510
)
527511
", array_merge($buildids, $buildids));
528512

529-
// Remove the buildfailure.
530-
DB::delete("DELETE FROM buildfailure WHERE buildid IN $buildid_prepare_array", $buildids);
531-
532513
// Delete the configure if not shared.
533514
$build2configure = DB::select("
534515
SELECT a.configureid
@@ -553,7 +534,6 @@ function remove_build($buildid)
553534
DB::delete("DELETE FROM configure WHERE id IN $configureids_prepare_array", $configureids);
554535
DB::delete("DELETE FROM configureerror WHERE configureid IN $configureids_prepare_array", $configureids);
555536
}
556-
DB::delete("DELETE FROM build2configure WHERE buildid IN $buildid_prepare_array", $buildids);
557537

558538
// coverage files are kept unless they are shared
559539
DB::delete("
@@ -580,11 +560,6 @@ function remove_build($buildid)
580560
)
581561
", array_merge($buildids, $buildids));
582562

583-
DB::delete("DELETE FROM label2coveragefile WHERE buildid IN $buildid_prepare_array", $buildids);
584-
DB::delete("DELETE FROM coverage WHERE buildid IN $buildid_prepare_array", $buildids);
585-
DB::delete("DELETE FROM coveragefilelog WHERE buildid IN $buildid_prepare_array", $buildids);
586-
DB::delete("DELETE FROM coveragesummary WHERE buildid IN $buildid_prepare_array", $buildids);
587-
588563
// dynamicanalysisdefect
589564
$dynamicanalysis = DB::select("
590565
SELECT id
@@ -602,8 +577,6 @@ function remove_build($buildid)
602577
DB::delete("DELETE FROM dynamicanalysisdefect WHERE dynamicanalysisid IN $dynids_prepare_array", $dynids);
603578
DB::delete("DELETE FROM label2dynamicanalysis WHERE dynamicanalysisid IN $dynids_prepare_array", $dynids);
604579
}
605-
DB::delete("DELETE FROM dynamicanalysis WHERE buildid IN $buildid_prepare_array", $buildids);
606-
DB::delete("DELETE FROM dynamicanalysissummary WHERE buildid IN $buildid_prepare_array", $buildids);
607580

608581
// Delete the note if not shared
609582
DB::delete("
@@ -629,8 +602,6 @@ function remove_build($buildid)
629602
)
630603
", array_merge($buildids, $buildids));
631604

632-
DB::delete("DELETE FROM build2note WHERE buildid IN $buildid_prepare_array", $buildids);
633-
634605
// Delete the update if not shared
635606
$build2update = DB::select("
636607
SELECT a.updateid
@@ -655,7 +626,6 @@ function remove_build($buildid)
655626
DB::delete("DELETE FROM buildupdate WHERE id IN $updateids_prepare_array", $updateids);
656627
DB::delete("DELETE FROM updatefile WHERE updateid IN $updateids_prepare_array", $updateids);
657628
}
658-
DB::delete("DELETE FROM build2update WHERE buildid IN $buildid_prepare_array", $buildids);
659629

660630
// Delete tests and testoutputs that are not shared.
661631
// First find all the tests and testoutputs from builds that are about to be deleted.
@@ -744,9 +714,6 @@ function remove_build($buildid)
744714
}
745715
}
746716

747-
DB::delete("DELETE FROM label2test WHERE buildid IN $buildid_prepare_array", $buildids);
748-
DB::delete("DELETE FROM build2test WHERE buildid IN $buildid_prepare_array", $buildids);
749-
750717
// Delete the uploaded files if not shared
751718
$build2uploadfiles = DB::select("
752719
SELECT a.fileid
@@ -772,13 +739,6 @@ function remove_build($buildid)
772739
DB::delete("DELETE FROM uploadfile WHERE id IN $fileids_prepare_array", $fileids);
773740
DB::delete("DELETE FROM build2uploadfile WHERE fileid IN $fileids_prepare_array", $fileids);
774741
}
775-
DB::delete("DELETE FROM build2uploadfile WHERE buildid IN $buildid_prepare_array", $buildids);
776-
777-
// Delete the subproject
778-
DB::delete("DELETE FROM subproject2build WHERE buildid IN $buildid_prepare_array", $buildids);
779-
780-
// Delete the labels
781-
DB::delete("DELETE FROM label2build WHERE buildid IN $buildid_prepare_array", $buildids);
782742

783743
// Remove any children of these builds.
784744
// In order to avoid making the list of builds to delete too large

0 commit comments

Comments
 (0)