From 8f225a5f2844a14c038d1820fe1b894e6a99f600 Mon Sep 17 00:00:00 2001 From: Erich Eckner Date: Thu, 25 Jul 2019 13:28:40 +0200 Subject: buildmaster/build-list.php: skip makedependency-check - it's too slow (and mostly irelevant anyways) --- buildmaster/build-list.php | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) (limited to 'buildmaster') diff --git a/buildmaster/build-list.php b/buildmaster/build-list.php index 1962c07..2eaf08a 100644 --- a/buildmaster/build-list.php +++ b/buildmaster/build-list.php @@ -85,8 +85,10 @@ $single_select_search_criteria = array( "title" => "can be built", "options" => array( "All" => "1", - "Can" => "(`l_q`.`loops` IS NOT NULL OR (`rd_q`.`run_dependencies_pending` IS NULL AND `md_q`.`make_dependencies_pending` IS NULL))", - "Can't" => "NOT (`l_q`.`loops` IS NOT NULL OR (`rd_q`.`run_dependencies_pending` IS NULL AND `md_q`.`make_dependencies_pending` IS NULL))" +// "Can" => "(`l_q`.`loops` IS NOT NULL OR (`rd_q`.`run_dependencies_pending` IS NULL AND `md_q`.`make_dependencies_pending` IS NULL))", + "Can" => "(`l_q`.`loops` IS NOT NULL OR `rd_q`.`run_dependencies_pending` IS NULL)", +// "Can't" => "NOT (`l_q`.`loops` IS NOT NULL OR (`rd_q`.`run_dependencies_pending` IS NULL AND `md_q`.`make_dependencies_pending` IS NULL))" + "Can't" => "NOT (`l_q`.`loops` IS NOT NULL OR `rd_q`.`run_dependencies_pending` IS NULL)" ) ) ); @@ -107,7 +109,8 @@ $columns = array( "deps" => array( "label" => "Deps", "mysql_name" => "dependencies_pending", - "mysql_query" => "IFNULL(`rd_q`.`run_dependencies_pending`,0)+IFNULL(`md_q`.`make_dependencies_pending`,0)", +// "mysql_query" => "IFNULL(`rd_q`.`run_dependencies_pending`,0)+IFNULL(`md_q`.`make_dependencies_pending`,0)", + "mysql_query" => "IFNULL(`rd_q`.`run_dependencies_pending`,0)", "sort" => "deps", "title" => "number of dependencies on the build-list" ), @@ -350,7 +353,7 @@ mysql_run_query( ' AND `repositories`.`name`="build-list"' . ' GROUP BY `dependent_bp`.`build_assignment`' ); - +/* mysql_run_query( 'CREATE TEMPORARY TABLE `md_q`(' . '`build_assignment` BIGINT,' . @@ -390,7 +393,7 @@ mysql_run_query( ' AND NOT `dependency_types`.`relevant_for_binary_packages`' . ' GROUP BY `dependent_bp`.`build_assignment`' ); - +*/ mysql_run_query( 'CREATE TEMPORARY TABLE `l_q`(' . '`build_assignment` BIGINT,' . @@ -504,8 +507,8 @@ $result = mysql_run_query( ' FROM `ba_q`'. ' LEFT JOIN `rd_q`' . ' ON `rd_q`.`build_assignment`=`ba_q`.`id`' . - ' LEFT JOIN `md_q`' . - ' ON `md_q`.`build_assignment`=`ba_q`.`id`' . +// ' LEFT JOIN `md_q`' . +// ' ON `md_q`.`build_assignment`=`ba_q`.`id`' . ' LEFT JOIN `l_q`' . ' ON `l_q`.`build_assignment`=`ba_q`.`id`' . ' LEFT JOIN `fr_q`' . -- cgit v1.2.3-70-g09d2