bin/bootstrap-mysql,misc/database-layout.dump: do not move packages commited to svn within 10 seconds separately

2 files changed, 110 insertions, 0 deletions

diff --git a/bin/bootstrap-mysql b/bin/bootstrap-mysql
index 8ccb2a2..2bcd212 100755
--- a/bin/bootstrap-mysql
+++ b/bin/bootstrap-mysql
@@ -367,6 +367,25 @@ if [ ! "$1" = 'slim' ]; then
       printf 'CREATE TEMPORARY TABLE `moveable_binary_packages%s` (`id` BIGINT, `to_repository` MEDIUMINT, UNIQUE KEY (`id`));\n' \
         "${copy}"
     done
+    printf 'DROP TEMPORARY TABLE IF EXISTS `package_blobs`;\n'
+    printf 'CREATE TEMPORARY TABLE `package_blobs` (`ps_a` BIGINT, `ps_b` BIGINT, UNIQUE KEY `content` (`ps_a`,`ps_b`));\n'
+    # all packages being vaguely relevant enter `package_blobs`, because
+    # they might block any other package from moving
+    printf 'INSERT IGNORE INTO `package_blobs` (`ps_a`,`ps_b`)'
+    printf ' SELECT `a_ps`.`id`,`b_ps`.`id`'
+    printf ' FROM `package_sources` AS `a_ps`'
+    printf ' JOIN `package_sources` AS `b_ps`'
+    printf ' ON UNIX_TIMESTAMP(`a_ps`.`commit_time`) - UNIX_TIMESTAMP(`b_ps`.`commit_time`) BETWEEN -10 AND 10'
+    mysql_join_package_sources_build_assignments 'a_ps' 'a_ba'
+    mysql_join_package_sources_build_assignments 'b_ps' 'b_ba'
+    mysql_join_build_assignments_binary_packages 'a_ba' 'a_bp'
+    mysql_join_build_assignments_binary_packages 'b_ba' 'b_bp'
+    mysql_join_binary_packages_repositories 'a_bp' 'a_r'
+    mysql_join_binary_packages_repositories 'b_bp' 'b_r'
+    mysql_join_repositories_repository_stabilities 'a_r' 'a_rs'
+    mysql_join_repositories_repository_stabilities 'b_r' 'b_rs'
+    printf ' WHERE `a_rs`.`name` = `from_stability`'
+    printf ' AND `b_rs`.`name` = `from_stability`;\n'
     # these packages are considered for moving:
     printf 'INSERT IGNORE INTO `moveable_binary_packages` (`id`,`to_repository`)'
     printf ' SELECT `binary_packages`.`id`,`repository_moves`.`to_repository`'
@@ -409,6 +428,7 @@ if [ ! "$1" = 'slim' ]; then
     # list until no further changes are required
     printf 'REPEAT\n'
     printf 'SET row_count_saved = 0;\n'
+
     # create copies of our temporary tables *yuck*
     for table in 'replaced' 'moveable'; do
       for copy in '' '2'; do
@@ -531,6 +551,38 @@ if [ ! "$1" = 'slim' ]; then
       # b) 2) ^
     printf ');\n'
     printf 'SET row_count_saved = row_count_saved + ROW_COUNT();\n'
+
+    # refresh copies of our temporary tables *yuck*
+    for table in 'replaced' 'moveable'; do
+      for copy in '' '2'; do
+        if [ "${table}" = 'moveable' ] && \
+          [ "${copy}" = '2' ]; then
+          continue
+        fi
+        printf 'DELETE FROM `%s_binary_packages_copy%s`;\n' "${table}" "${copy}"
+        printf 'INSERT IGNORE INTO `%s_binary_packages_copy%s`' "${table}" "${copy}"
+        printf ' SELECT `%s_binary_packages`.*' "${table}"
+        printf ' FROM `%s_binary_packages`;\n' "${table}"
+      done
+    done
+
+    printf 'DELETE `replaced_binary_packages`,`moveable_binary_packages` FROM `replaced_binary_packages`'
+    printf ' RIGHT JOIN `moveable_binary_packages`'
+    printf ' ON `replaced_binary_packages`.`replaced_by`=`moveable_binary_packages`.`id`'
+    printf ' JOIN `binary_packages`'
+    printf ' ON `binary_packages`.`id`=`moveable_binary_packages`.`id`'
+    mysql_join_binary_packages_build_assignments
+    printf ' JOIN `package_blobs`'
+    printf ' ON `build_assignments`.`package_source`=`package_blobs`.`ps_a`'
+    printf ' JOIN `build_assignments` AS `bl_ba`'
+    printf ' ON `bl_ba`.`package_source`=`package_blobs`.`ps_b`'
+    mysql_join_build_assignments_binary_packages 'bl_ba' 'bl_bp'
+    printf ' WHERE NOT EXISTS ('
+      printf 'SELECT 1 FROM `moveable_binary_packages_copy`'
+      printf ' WHERE `moveable_binary_packages_copy`.`id`=`bl_bp`.`id`'
+    printf ');\n'
+    printf 'SET row_count_saved = row_count_saved + ROW_COUNT();\n'
+
     printf 'UNTIL row_count_saved=0\n'
     printf 'END REPEAT;\n'
     for table in 'moveable' 'replaced'; do
diff --git a/misc/database-layout.dump b/misc/database-layout.dump
index 33c4e4a..d35d100 100644
--- a/misc/database-layout.dump
+++ b/misc/database-layout.dump
@@ -44,6 +44,30 @@ CREATE TEMPORARY TABLE `moveable_binary_packages_copy` (`id` BIGINT, `to_reposit
 DROP TEMPORARY TABLE IF EXISTS `moveable_binary_packages_copy2`;
 DROP TEMPORARY TABLE IF EXISTS `replaced_binary_packages_copy2`;
 CREATE TEMPORARY TABLE `replaced_binary_packages_copy2` (`id` BIGINT, `replaced_by` BIGINT, UNIQUE KEY (`id`));
+DROP TEMPORARY TABLE IF EXISTS `package_blobs`;
+CREATE TEMPORARY TABLE `package_blobs` (`ps_a` BIGINT, `ps_b` BIGINT, UNIQUE KEY `content` (`ps_a`,`ps_b`));
+INSERT IGNORE INTO `package_blobs` (`ps_a`,`ps_b`)
+	SELECT `a_ps`.`id`,`b_ps`.`id`
+	FROM `package_sources` AS `a_ps`
+	JOIN `package_sources` AS `b_ps`
+	ON UNIX_TIMESTAMP(`a_ps`.`commit_time`) - UNIX_TIMESTAMP(`b_ps`.`commit_time`) BETWEEN -10 AND 10
+	JOIN `build_assignments` AS `a_ba`
+	ON `a_ps`.`id`=`a_ba`.`package_source`
+	JOIN `build_assignments` AS `b_ba`
+	ON `b_ps`.`id`=`b_ba`.`package_source`
+	JOIN `binary_packages` AS `a_bp`
+	ON `a_ba`.`id`=`a_bp`.`build_assignment`
+	JOIN `binary_packages` AS `b_bp`
+	ON `b_ba`.`id`=`b_bp`.`build_assignment`
+	JOIN `repositories` AS `a_r`
+	ON `a_bp`.`repository`=`a_r`.`id`
+	JOIN `repositories` AS `b_r`
+	ON `b_bp`.`repository`=`b_r`.`id`
+	JOIN `repository_stabilities` AS `a_rs`
+	ON `a_r`.`stability`=`a_rs`.`id`
+	JOIN `repository_stabilities` AS `b_rs`
+	ON `b_r`.`stability`=`b_rs`.`id`
+	WHERE `a_rs`.`name` = `from_stability` AND `b_rs`.`name` = `from_stability`;
 INSERT IGNORE INTO `moveable_binary_packages` (`id`,`to_repository`)
 	SELECT `binary_packages`.`id`,`repository_moves`.`to_repository`
 	FROM `binary_packages`
@@ -184,6 +208,40 @@ SELECT *
 	FROM `replaced_binary_packages_copy2`
 	WHERE `replaced_binary_packages_copy2`.`id`=`subst_bp`.`id`) AND `subst_itp`.`install_target`=`install_target_providers`.`install_target`);
 SET row_count_saved = row_count_saved + ROW_COUNT();
+DELETE
+	FROM `replaced_binary_packages_copy`;
+INSERT IGNORE INTO `replaced_binary_packages_copy`
+	SELECT `replaced_binary_packages`.*
+	FROM `replaced_binary_packages`;
+DELETE
+	FROM `replaced_binary_packages_copy2`;
+INSERT IGNORE INTO `replaced_binary_packages_copy2`
+	SELECT `replaced_binary_packages`.*
+	FROM `replaced_binary_packages`;
+DELETE
+	FROM `moveable_binary_packages_copy`;
+INSERT IGNORE INTO `moveable_binary_packages_copy`
+	SELECT `moveable_binary_packages`.*
+	FROM `moveable_binary_packages`;
+DELETE `replaced_binary_packages`,`moveable_binary_packages`
+	FROM `replaced_binary_packages`
+	RIGHT JOIN `moveable_binary_packages`
+	ON `replaced_binary_packages`.`replaced_by`=`moveable_binary_packages`.`id`
+	JOIN `binary_packages`
+	ON `binary_packages`.`id`=`moveable_binary_packages`.`id`
+	JOIN `build_assignments`
+	ON `binary_packages`.`build_assignment`=`build_assignments`.`id`
+	JOIN `package_blobs`
+	ON `build_assignments`.`package_source`=`package_blobs`.`ps_a`
+	JOIN `build_assignments` AS `bl_ba`
+	ON `bl_ba`.`package_source`=`package_blobs`.`ps_b`
+	JOIN `binary_packages` AS `bl_bp`
+	ON `bl_ba`.`id`=`bl_bp`.`build_assignment`
+	WHERE NOT EXISTS (
+SELECT 1
+	FROM `moveable_binary_packages_copy`
+	WHERE `moveable_binary_packages_copy`.`id`=`bl_bp`.`id`);
+SET row_count_saved = row_count_saved + ROW_COUNT();
 UNTIL row_count_saved=0
 END REPEAT;
 DROP TEMPORARY TABLE `moveable_binary_packages_copy`;