From 326900da091c9f94f17a77c993a0c68830078d42 Mon Sep 17 00:00:00 2001 From: Erich Eckner Date: Fri, 8 Jun 2018 13:10:09 +0200 Subject: new column `architecture_compatibilities`.`fully_compatible` to show wether all built packages will be compatible in the indicated way (in contrast to: instruction set of arch $x is a subset of arch $y) - beware of linking against libraries compiled for different architectures! --- bin/return-assignment | 1 + misc/database-layout.dmf | 1614 +++++++++++++++++++++++---------------------- misc/database-layout.dump | 7 +- 3 files changed, 815 insertions(+), 807 deletions(-) diff --git a/bin/return-assignment b/bin/return-assignment index fe63e69..0881bc0 100755 --- a/bin/return-assignment +++ b/bin/return-assignment @@ -480,6 +480,7 @@ fi printf ' JOIN `architecture_compatibilities`' printf ' ON `architecture_compatibilities`.`built_for`=`binary_packages`.`architecture`' printf ' AND `architecture_compatibilities`.`runs_for`=`t`.`architecture`' + printf ' AND `architecture_compatibilities`.`fully_compatible`' printf ' WHERE `repository_moves`.`from_repository`=%s' \ "${repository_ids__any_build_list}" printf ' AND `build_assignments`.`id`=from_base64("%s");\n' \ diff --git a/misc/database-layout.dmf b/misc/database-layout.dmf index d2a9e1b..e9fdc88 100644 --- a/misc/database-layout.dmf +++ b/misc/database-layout.dmf @@ -2,43 +2,55 @@ Relational - + - 360 - 400 + 543 + 182 - architecture_compatibilities + binary_packages_in_repositories#ffffff id - MEDIUMINT + BIGINT True True - built_for - SMALLINT + package + BIGINT True False - runs_on - SMALLINT + repository + MEDIUMINT + True + False + + + is_to_be_deleted + BIT + True + False + + + last_moved + TIMESTAMP True False
- + - 237 - 40 + -52 + 134 - ssh_keys + ssh_log#ffffff @@ -48,13 +60,25 @@ True - owner + date + TIMESTAMP + True + False + + + build_slave MEDIUMINT + False + False + + + action + VARCHAR(32) True False - fingerprint + parameters TEXT True False @@ -62,102 +86,108 @@
- + - -59 - 73 + -55 + -72 - email_actions + email_log#ffffff id - MEDIUMINT + BIGINT True True - name - VARCHAR(32) + date + TIMESTAMP True False - -
- - - - 68 - 49 - - - allowed_email_actions - #ffffff - - id - BIGINT + success + BIT True - True + False + + + action + MEDIUMINT + False + False + + + count + MEDIUMINT + False + False gpg_key BIGINT - True + False False - action - MEDIUMINT - True + comment + TEXT + False False
- + - 106 - -51 + 585 + 455 - gpg_keys + repository_moves#ffffff id - BIGINT + MEDIUMINT True True - fingerprint - VARCHAR(40) + from_repository + MEDIUMINT True False - owner + to_repository MEDIUMINT True False + + upstream_package_repository + SMALLINT + True + False +
- + - 258 - -44 + 856 + 280 - persons + repository_stabilities#ffffff id - MEDIUMINT + SMALLINT True True @@ -167,26 +197,38 @@ True False + + bugtracker_category + VARCHAR(32) + False + False +
- + - 788 - -60 + -21 + 537 - todo_links + build_dependency_loops#ffffff - dependent + id BIGINT True + True + + + loop + MEDIUMINT + True False - depending_on + build_assignment BIGINT True False @@ -194,55 +236,49 @@
- + - 945 - -70 + 540 + -64 - todos + dependency_types#ffffff id - BIGINT + SMALLINT True True - file - VARCHAR(64) + name + VARCHAR(32) True False - line - MEDIUMINT + relevant_for_building + BIT True False - description - TEXT + relevant_for_binary_packages + BIT True False - - importance - SMALLINT - False - False -
- + - 777 - 32 + 348 + -60 - statitstics + dependencies#ffffff @@ -252,111 +288,141 @@ True - date - TIMESTAMP + dependent + BIGINT True False - stable_packages_count - MEDIUMINT + depending_on + BIGINT True False - pending_tasks_count - MEDIUMINT + dependency_type + SMALLINT True False + +
+ + + + 557 + 30 + + + install_targets + #ffffff + - staging_packages_count - MEDIUMINT + id + BIGINT True - False + True - testing_packages_count - MEDIUMINT + name + VARCHAR(64) True False + +
+ + + + 399 + 289 + + + architectures + #ffffff + - broken_tasks_count - MEDIUMINT + id + SMALLINT True - False + True - dependency_loops_count - MEDIUMINT + name + VARCHAR(16) True False - - dependency_looped_tasks_count - MEDIUMINT + +
+ + + + 175 + 497 + + + package_sources + #ffffff + + + id + BIGINT + True + True + + + pkgbase + VARCHAR(64) True False - locked_tasks_count - MEDIUMINT + git_revision + VARCHAR(40) True False - blocked_tasks_count - MEDIUMINT + mod_git_revision + VARCHAR(40) True False - next_tasks_count - MEDIUMINT + upsream_package_repository + SMALLINT True False - -
- - - - 844 - 427 - - - repository_stability_relations - #ffffff - - id - MEDIUMINT + uses_upstream + BIT True - True + False - more_stable - MEDIUMINT + uses_modification + BIT True False - less_stable - MEDIUMINT + commit_time + TIMESTAMP True False
- + - -53 - 240 + 535 + 562 - fail_reasons + upstream_repositories#ffffff @@ -367,18 +433,12 @@ name - VARCHAR(32) - True - False - - - identifier VARCHAR(64) True False - severity + git_repository SMALLINT True False @@ -386,174 +446,114 @@
- + - -17 - 342 + 906 + 532 - failed_builds + git_repositories#ffffff id - MEDIUMINT + SMALLINT True True - build_slave - MEDIUMINT - True - False - - - build_assignment - BIGINT + name + VARCHAR(64) True False - date - TIMESTAMP + url + VARCHAR(128) True False - reason - SMALLINT + directory + VARCHAR(128) True False - log_file - VARCHAR(512) + head + VARCHAR(40) True False
- + - 187 - 311 + 625 + 307 - build_assignments + repositories#ffffff id - BIGINT + MEDIUMINT True True - package_source - BIGINT + name + VARCHAR(64) True False - architecture + stability SMALLINT True False - is_blocked - VARCHAR(128) - False - False - - - is_black_listed - VARCHAR(128) - False - False - - - is_broken + is_on_master_mirror BIT True False - priority + architecture SMALLINT True False - - return_date - TIMESTAMP - False - False -
- + - 185 - 122 + 549 + 105 - build_slaves + install_target_providers#ffffff id - MEDIUMINT - True - True - - - name - VARCHAR(32) - True - False - - - ssh_key BIGINT True - False + True - currently_building + package BIGINT - False - False - - - last_connection - TIME True False - logged_lines + install_target BIGINT - False - False - - - last_action - VARCHAR(32) - False - False - - - trials - MEDIUMINT - False - False - - - is_sane - BIT True False @@ -644,217 +644,187 @@
- + - 549 - 105 + 185 + 122 - install_target_providers + build_slaves#ffffff id - BIGINT + MEDIUMINT True True - package - BIGINT + name + VARCHAR(32) True False - install_target + ssh_key BIGINT True False - -
- - - - 625 - 307 - - - repositories - #ffffff - - id - MEDIUMINT - True - True + currently_building + BIGINT + False + False - name - VARCHAR(64) + last_connection + TIME True False - stability - SMALLINT - True + logged_lines + BIGINT + False False - is_on_master_mirror - BIT - True + last_action + VARCHAR(32) + False False - architecture - SMALLINT - True + trials + MEDIUMINT + False False - -
+ + is_sane + BIT + True + False + + + - + - 906 - 532 + 187 + 311 - git_repositories + build_assignments#ffffff id - SMALLINT + BIGINT True True - name - VARCHAR(64) + package_source + BIGINT True False - url - VARCHAR(128) + architecture + SMALLINT True False - directory + is_blocked VARCHAR(128) - True + False False - head - VARCHAR(40) - True + is_black_listed + VARCHAR(128) + False False - -
- - - - 535 - 562 - - - upstream_repositories - #ffffff - - id - SMALLINT + is_broken + BIT True - True + False - name - VARCHAR(64) + priority + SMALLINT True False - git_repository - SMALLINT - True + return_date + TIMESTAMP + False False
- + - 175 - 497 + -17 + 342 - package_sources + failed_builds#ffffff id - BIGINT + MEDIUMINT True True - pkgbase - VARCHAR(64) + build_slave + MEDIUMINT True False - git_revision - VARCHAR(40) + build_assignment + BIGINT True False - mod_git_revision - VARCHAR(40) + date + TIMESTAMP True False - upsream_package_repository + reason SMALLINT True False - uses_upstream - BIT - True - False - - - uses_modification - BIT - True - False - - - commit_time - TIMESTAMP + log_file + VARCHAR(512) True False
- + - 399 - 289 + -53 + 240 - architectures + fail_reasons#ffffff @@ -865,44 +835,62 @@ name - VARCHAR(16) + VARCHAR(32) + True + False + + + identifier + VARCHAR(64) + True + False + + + severity + SMALLINT True False
- + - 557 - 30 + 844 + 427 - install_targets + repository_stability_relations#ffffff id - BIGINT + MEDIUMINT True True - name - VARCHAR(64) + more_stable + MEDIUMINT + True + False + + + less_stable + MEDIUMINT True False
- + - 348 - -60 + 777 + 32 - dependencies + statitstics#ffffff @@ -912,165 +900,171 @@ True - dependent - BIGINT + date + TIMESTAMP True False - depending_on - BIGINT + stable_packages_count + MEDIUMINT True False - dependency_type - SMALLINT + pending_tasks_count + MEDIUMINT True False - -
- - - - 540 - -64 - - - dependency_types - #ffffff - - id - SMALLINT + staging_packages_count + MEDIUMINT True - True + False - name - VARCHAR(32) + testing_packages_count + MEDIUMINT True False - relevant_for_building - BIT + broken_tasks_count + MEDIUMINT True False - relevant_for_binary_packages - BIT + dependency_loops_count + MEDIUMINT True False - -
- - - - -21 - 537 - - - build_dependency_loops - #ffffff - - id - BIGINT + dependency_looped_tasks_count + MEDIUMINT True - True + False - loop + locked_tasks_count MEDIUMINT True False - build_assignment - BIGINT + blocked_tasks_count + MEDIUMINT + True + False + + + next_tasks_count + MEDIUMINT True False
- + - 856 - 280 + 945 + -70 - repository_stabilities + todos#ffffff id - SMALLINT + BIGINT True True - name - VARCHAR(32) + file + VARCHAR(64) True False - bugtracker_category - VARCHAR(32) + line + MEDIUMINT + True + False + + + description + TEXT + True + False + + + importance + SMALLINT False False
- + - 585 - 455 + 788 + -60 - repository_moves + todo_links#ffffff - id - MEDIUMINT + dependent + BIGINT True - True + False - from_repository - MEDIUMINT + depending_on + BIGINT True False + +
+ + + + 258 + -44 + + + persons + #ffffff + - to_repository + id MEDIUMINT True - False + True - upstream_package_repository - SMALLINT + name + VARCHAR(32) True False
- + - -55 - -72 + 106 + -51 - email_log + gpg_keys#ffffff @@ -1080,79 +1074,97 @@ True - date - TIMESTAMP - True - False - - - success - BIT + fingerprint + VARCHAR(40) True False - action + owner MEDIUMINT - False + True False + +
+ + + + 68 + 49 + + + allowed_email_actions + #ffffff + - count - MEDIUMINT - False - False + id + BIGINT + True + True gpg_key BIGINT - False + True False - comment - TEXT - False + action + MEDIUMINT + True False
- + - -52 - 134 + -59 + 73 - ssh_log + email_actions#ffffff id - BIGINT + MEDIUMINT True True - date - TIMESTAMP + name + VARCHAR(32) True False + +
+ + + + 237 + 40 + + + ssh_keys + #ffffff + - build_slave - MEDIUMINT - False - False + id + BIGINT + True + True - action - VARCHAR(32) + owner + MEDIUMINT True False - parameters + fingerprint TEXT True False @@ -1160,99 +1172,93 @@
- + - 543 - 182 + 360 + 400 - binary_packages_in_repositories + architecture_compatibilities#ffffff id - BIGINT + MEDIUMINT True True - package - BIGINT + built_for + SMALLINT True False - repository - MEDIUMINT + runs_on + SMALLINT True False - is_to_be_deleted + fully_compatible BIT True False - - last_moved - TIMESTAMP - True - False -
- + - 420.714 - 400 + 647.922 + 273.812 - 90 - + 270 + - 430.516 - 338.812 + 709.703 + 307 - 270 - + 90 + - OneToOne + OneToMany - Mandatory - Mandatory + Optional + Optional - 1 + 2 0 - + - 481.427 - 400 + 543 + 227.906 - 90 - + 180 + - 462.031 - 338.812 + 525.859 + 182.542 - 270 - + 0 + @@ -1263,29 +1269,29 @@ Mandatory - 2 + 1 0 - + - 625 - 352.906 + 59.5312 + 179.906 - 180 - + 0 + - 493.547 - 313.906 + 185 + 171.271 - 0 - + 180 + @@ -1296,29 +1302,29 @@ Mandatory - 4 + 2 0 - + - 290.109 - 40 + 703.133 + 532.812 - 90 - + 270 + - 293.289 - 5.8125 + 609.727 + 562 - 270 - + 90 + @@ -1329,29 +1335,29 @@ Mandatory - 1 + 3 0 - + - 255.727 - 122 + 663.755 + 455 90 - + - 290.109 - 103.812 + 681.469 + 398.812 270 - + @@ -1362,29 +1368,29 @@ Mandatory - 2 + 1 0 - + - -9.85156 - 47.8125 + 742.51 + 455 - 270 - + 90 + - -10.2734 - 73 + 737.938 + 398.812 - 90 - + 270 + @@ -1395,29 +1401,29 @@ Mandatory - 3 + 2 0 - + - 68 - 80.9062 + 470.573 + 245.812 - 180 - + 270 + - 38.4531 - 97.9062 + 446.273 + 289 - 0 - + 90 + @@ -1428,29 +1434,29 @@ Mandatory - 2 + 9 0 - + - 142.789 - 49 + 499.672 + -34.0625 - 90 - + 0 + - 159.109 - 12.8125 + 540 + -25.0938 - 270 - + 180 + @@ -1461,29 +1467,29 @@ Mandatory - 1 + 3 0 - + - 35.2969 - -12.0938 + 794.406 + 352.906 0 - + - 106 - -19.0938 + 856 + 311.906 180 - + @@ -1494,29 +1500,29 @@ Mandatory - 5 + 2 0 - + - 212.219 - -19.0938 + 499.672 + -8.125 0 - + - 258 - -19.0938 + 557 + 54.9062 180 - + @@ -1532,24 +1538,24 @@ - + - 915.234 - -43.3958 + 627.109 + 105 - 0 - + 90 + - 945 - -39.3958 + 607.016 + 79.8125 - 180 - + 270 + @@ -1560,29 +1566,29 @@ Mandatory - 0 + 2 0 - + - 915.234 - -26.7917 + 423.836 + 17.8125 - 0 - + 270 + - 945 - -8.79167 + 442.93 + 56 - 180 - + 90 + @@ -1598,24 +1604,24 @@ - + - 906.656 - 427 + 549 + 136.906 - 90 - + 180 + - 908.635 - 343.812 + 525.859 + 119.271 - 270 - + 0 + @@ -1626,29 +1632,29 @@ Mandatory - 2 + 1 0 - + - 969.312 - 427 + 405.531 + 563.906 - 90 - + 0 + - 961.271 - 343.812 + 535 + 593.906 - 270 - + 180 + @@ -1659,29 +1665,29 @@ Mandatory - 1 + 4 0 - + - 33.5729 - 342 + 684.453 + 593.906 - 90 - + 0 + - -5.28125 - 317.812 + 906 + 577.906 - 270 - + 180 + @@ -1692,29 +1698,29 @@ Mandatory - 4 + 2 0 - + - 134.719 - 394.906 + 280.948 + 444.812 - 0 - + 270 + - 187 - 377.906 + 290.266 + 497 - 180 - + 90 + @@ -1725,29 +1731,29 @@ Mandatory - 2 + 1 0 - + - 84.1458 - 342 + 327.922 + 377.906 - 90 - + 0 + - 185 - 220.542 + 399 + 313.906 180 - + @@ -1758,28 +1764,28 @@ Mandatory - 1 + 2 0 - + - 60.1953 - 537 + 415.286 + 245.812 - 90 - + 270 + - 233.974 - 444.812 + 280.948 + 311 - 270 + 90 @@ -1791,7 +1797,7 @@ Mandatory - 2 + 1 0 @@ -1829,23 +1835,23 @@ - + - 415.286 - 245.812 + 60.1953 + 537 - 270 - + 90 + - 280.948 - 311 + 233.974 + 444.812 - 90 + 270 @@ -1857,29 +1863,29 @@ Mandatory - 1 + 2 0 - + - 327.922 - 377.906 + 84.1458 + 342 - 0 - + 90 + - 399 - 313.906 + 185 + 220.542 180 - + @@ -1890,29 +1896,29 @@ Mandatory - 2 + 1 0 - + - 280.948 - 444.812 + 134.719 + 394.906 - 270 - + 0 + - 290.266 - 497 + 187 + 377.906 - 90 - + 180 + @@ -1923,29 +1929,29 @@ Mandatory - 1 + 2 0 - + - 684.453 - 593.906 + 33.5729 + 342 - 0 - + 90 + - 906 - 577.906 + -5.28125 + 317.812 - 180 - + 270 + @@ -1956,29 +1962,29 @@ Mandatory - 2 + 4 0 - + - 405.531 - 563.906 + 906.656 + 427 - 0 - + 90 + - 535 - 593.906 + 908.635 + 343.812 - 180 - + 270 + @@ -1989,29 +1995,29 @@ Mandatory - 4 + 1 0 - + - 549 - 136.906 + 969.312 + 427 - 180 - + 90 + - 525.859 - 119.271 + 961.271 + 343.812 - 0 - + 270 + @@ -2022,29 +2028,29 @@ Mandatory - 1 + 2 0 - + - 423.836 - 17.8125 + 915.234 + -43.3958 - 270 - + 0 + - 442.93 - 56 + 945 + -39.3958 - 90 - + 180 + @@ -2060,24 +2066,24 @@ - + - 627.109 - 105 + 915.234 + -26.7917 - 90 - + 0 + - 607.016 - 79.8125 + 945 + -8.79167 - 270 - + 180 + @@ -2088,29 +2094,29 @@ Mandatory - 2 + 0 0 - + - 499.672 - -8.125 + 212.219 + -19.0938 0 - + - 557 - 54.9062 + 258 + -19.0938 180 - + @@ -2126,24 +2132,24 @@ - + - 794.406 - 352.906 + 35.2969 + -12.0938 0 - + - 856 - 311.906 + 106 + -19.0938 180 - + @@ -2154,29 +2160,29 @@ Mandatory - 2 + 5 0 - + - 499.672 - -34.0625 + 142.789 + 49 - 0 - + 90 + - 540 - -25.0938 + 159.109 + 12.8125 - 180 - + 270 + @@ -2187,29 +2193,29 @@ Mandatory - 3 + 1 0 - + - 470.573 - 245.812 + 68 + 80.9062 - 270 - + 180 + - 446.273 - 289 + 38.4531 + 97.9062 - 90 - + 0 + @@ -2220,29 +2226,29 @@ Mandatory - 9 + 2 0 - + - 663.755 - 455 + -9.85156 + 47.8125 - 90 - + 270 + - 681.469 - 398.812 + -10.2734 + 73 - 270 - + 90 + @@ -2253,29 +2259,29 @@ Mandatory - 2 + 3 0 - + - 742.51 - 455 + 255.727 + 122 90 - + - 737.938 - 398.812 + 290.109 + 103.812 270 - + @@ -2286,29 +2292,29 @@ Mandatory - 1 + 2 0 - + - 703.133 - 532.812 + 290.109 + 40 - 270 - + 90 + - 609.727 - 562 + 293.289 + 5.8125 - 90 - + 270 + @@ -2319,29 +2325,29 @@ Mandatory - 3 + 1 0 - + - 59.5312 - 179.906 + 625 + 352.906 - 0 - + 180 + - 185 - 171.271 + 493.547 + 313.906 - 180 - + 0 + @@ -2352,29 +2358,29 @@ Mandatory - 2 + 4 0 - + - 543 - 227.906 + 481.427 + 400 - 180 - + 90 + - 525.859 - 182.542 + 462.031 + 338.812 - 0 - + 270 + @@ -2385,40 +2391,40 @@ Mandatory - 1 + 2 0 - + - 647.922 - 273.812 + 420.714 + 400 - 270 - + 90 + - 709.703 - 307 + 430.516 + 338.812 - 90 - + 270 + - OneToMany + OneToOne - Optional - Optional + Mandatory + Mandatory - 2 + 1 0 diff --git a/misc/database-layout.dump b/misc/database-layout.dump index 1e67bda..1aef0c2 100644 --- a/misc/database-layout.dump +++ b/misc/database-layout.dump @@ -339,6 +339,7 @@ architecture_compatibilities CREATE TABLE `architecture_compatibilities` ( `id` mediumint(9) NOT NULL AUTO_INCREMENT, `built_for` smallint(6) NOT NULL, `runs_on` smallint(6) NOT NULL, + `fully_compatible` bit(1) NOT NULL, PRIMARY KEY (`id`), UNIQUE KEY `content` (`built_for`,`runs_on`), KEY `architecture_compatibilities_ibfk_2` (`runs_on`), @@ -651,9 +652,9 @@ INSERT INTO `architectures` VALUES (1,'any'), (2,'i686'); INSERT INTO `architecture_compatibilities` VALUES - (1,1,1), - (3,1,2), - (2,2,2); + (1,1,1,'1'), + (2,2,2,'1'), + (3,1,2,'1'); INSERT INTO `dependency_types` VALUES (2,'run','1','1'), (3,'check','\0','\0'), -- cgit v1.2.3