Overhauls and 2/28 sync (#244)

* map tweaks/shuttle engines * helpers and defines * global/onclick * controllers and datums * mapping * game folder * some other stuff * some modules * modules that aren't mobs * some mob stuff * new player stuff * mob living * silicon stuff * simple animal things * carbon/ayylmao * update_icons * carbon/human * sounds and tools * icons and stuff * hippie grinder changes + tgui * kitchen.dmi * compile issues fixed * mapfix * Mapfixes 2.0 * mapedit2.0 * mapmerger pls * Revert "mapedit2.0" This reverts commit 74139a3cacea10df7aafca06c0a10bd3daf3a481. * clean up vore folder + 2 hotfixes * admin ticket refinement * Blob tweaks and LAZYADD * LAZYADD IS LAZY * Magic strings purged * DEFINES NEED HIGHER PRIORITIES * Only a sleepless idiot deals in absolute TRUE|FALSE * u h g * progress bar fix * reverts ticket logs * there's always that one guy * fixes and stuff * 2/27 fixes * game folder stuff * stats * some modules again * clothing stuff gets vg clothing out of the main files * everything not mobs again * mob stuff * maps, tgui, sql stuff * icons * additional fixes and compile errors * don't need this anymore * Oh right this isn't needed anymore * maint bar re-added * that doesn't need to be here * stupid events * wtfeven * probably makes Travis happy * don't care to fix the grinder atm * fixes vending sprites, changes turret * lethal, not lethals * overylays are finicky creatures * lazy fix for bleeding edgy (#252) * map tweaks/shuttle engines * helpers and defines * global/onclick * controllers and datums * mapping * game folder * some other stuff * some modules * modules that aren't mobs * some mob stuff * new player stuff * mob living * silicon stuff * simple animal things * carbon/ayylmao * update_icons * carbon/human * sounds and tools * icons and stuff * hippie grinder changes + tgui * kitchen.dmi * compile issues fixed * mapfix * Mapfixes 2.0 * mapedit2.0 * mapmerger pls * Revert "mapedit2.0" This reverts commit 74139a3cacea10df7aafca06c0a10bd3daf3a481. * clean up vore folder + 2 hotfixes * admin ticket refinement * Blob tweaks and LAZYADD * LAZYADD IS LAZY * Magic strings purged * DEFINES NEED HIGHER PRIORITIES * Only a sleepless idiot deals in absolute TRUE|FALSE * u h g * progress bar fix * reverts ticket logs * there's always that one guy * fixes and stuff * 2/27 fixes * game folder stuff * stats * some modules again * clothing stuff gets vg clothing out of the main files * everything not mobs again * mob stuff * maps, tgui, sql stuff * icons * additional fixes and compile errors * don't need this anymore * Oh right this isn't needed anymore * maint bar re-added * that doesn't need to be here * stupid events * wtfeven * probably makes Travis happy * don't care to fix the grinder atm * fixes vending sprites, changes turret * lethal, not lethals * overylays are finicky creatures
ARF-SS13 · Feb 28, 2017 · 0bca862 · 0bca862
1 parent 93782cf
commit 0bca862
Show file tree

Hide file tree

Showing 544 changed files with 302,871 additions and 74,096 deletions.
diff --git a/CONTRIBUTING.md → .github/CONTRIBUTING.md b/CONTRIBUTING.md → .github/CONTRIBUTING.md
@@ -138,12 +138,15 @@ First, read the comments in this byond thread, starting here:http://www.byond.co
 
 There are two key points here:
 
-1) Defining a list in the type definition incurs a hidden proc call - init, if you must define a list at startup, do so in New() and avoid the overhead of a second call (init() and then new())
+1) Defining a list in the type definition incurs a hidden proc call - init, if you must define a list at startup, do so in New()/Initialize and avoid the overhead of a second call (init() and then new())
 
 2)Offsets list creation overhead to the point where the list is actually required (which for many objects, may be never at all). 
 
 Remember, this tradeoff makes sense in many cases but not all, you should think carefully about your implementation before deciding if this is an appropriate thing to do
 
+###Prefer `Initialize` over `New` for atoms
+Our game controller is pretty good at handling long operations and lag. But, it can't control what happens when the map is loaded, which calls `New` for all atoms on the map. If you're creating a new atom, use the `Initialize` proc to do what you would normally do in `New`. This cuts down on the number of proc calls needed when the world is loaded. See here for details on `Initialize`: https://github.com/tgstation/tgstation/blob/master/code/game/atoms.dm#L49
+
 ###No magic numbers or strings
 Make these #defines with a name that more clearly states what it's for.
 

diff --git a/ISSUE_TEMPLATE.md → .github/ISSUE_TEMPLATE.md b/ISSUE_TEMPLATE.md → .github/ISSUE_TEMPLATE.md
diff --git a/PULL_REQUEST_TEMPLATE.md → .github/PULL_REQUEST_TEMPLATE.md b/PULL_REQUEST_TEMPLATE.md → .github/PULL_REQUEST_TEMPLATE.md
diff --git a/SQL/database_changelog.txt b/SQL/database_changelog.txt
@@ -1,3 +1,13 @@
+19 February 2017, by Jordie0608
+
+Optimised and indexed significant portions of the schema.
+
+See the file 'optimisations_2017-02-19.sql' for instructions on how to apply these changes to your database.
+
+Remember to add a prefix to the table name if you use them
+
+----------------------------------------------------
+
 30 January 2017, by Lzimann
 
 Modified table 'death', adding the columns 'mapname' and 'server'.

diff --git a/SQL/optimisations_2017-02-19.sql b/SQL/optimisations_2017-02-19.sql
@@ -0,0 +1,207 @@
+/*
+It is recommended you do not perfom any of these queries while your server is live as they will lock the tables during execution.
+
+Backup your database before starting; Breaking errors may occur when old data is not be compatible with new column formats.
+i.e. A field that is null or empty due to rows existing before the column was added, data corruption or incorrect inputs will prevent altering the column to be NOT NULL.
+To account where this is likely to occur, these queries check if fields have valid data and if not will replace invalid data with 0.
+Some fields may be out of range for new column lengths, this will also cause a breaking error.
+For instance `death`.`bruteloss` is now SMALLINT and won't accept any values over 65535.
+Data in this table can thus be truncated using a query such as:
+UPDATE `[database]`.`[table]` SET `[column]` = LEAST(`[column]`, [max column size])
+To truncate a text field you would have to use SUBSTRING(), however I don't suggest you truncate any text fields.
+If you wish to instead preserve this data you will need to modify the schema and queries to accomodate.
+
+Take note some columns have been renamed, removed or changed type. Any services relying on these columns will have to be updated per changes.
+
+----------------------------------------------------*/
+
+START TRANSACTION;
+ALTER TABLE `feedback`.`ban`
+ DROP COLUMN `rounds`
+, CHANGE COLUMN `bantype` `bantype` ENUM('PERMABAN', 'TEMPBAN', 'JOB_PERMABAN', 'JOB_TEMPBAN', 'ADMIN_PERMABAN', 'ADMIN_TEMPBAN') NOT NULL
+, CHANGE COLUMN `reason` `reason` VARCHAR(2048) NOT NULL
+, CHANGE COLUMN `who` `who` VARCHAR(2048) NOT NULL
+, CHANGE COLUMN `adminwho` `adminwho` VARCHAR(2048) NOT NULL
+, CHANGE COLUMN `unbanned` `unbanned` TINYINT UNSIGNED NULL DEFAULT NULL
+, ADD COLUMN `server_ip` INT UNSIGNED NOT NULL AFTER `serverip`
+, ADD COLUMN `server_port` SMALLINT UNSIGNED NOT NULL AFTER `server_ip`
+, ADD COLUMN `ipTEMP` INT UNSIGNED NOT NULL AFTER `ip`
+, ADD COLUMN `a_ipTEMP` INT UNSIGNED NOT NULL AFTER `a_ip`
+, ADD COLUMN `unbanned_ipTEMP` INT UNSIGNED NULL DEFAULT NULL AFTER `unbanned_ip`;
+SET SQL_SAFE_UPDATES = 0;
+UPDATE `feedback`.`ban`
+ SET `server_ip` = COALESCE(NULLIF(INET_ATON(SUBSTRING_INDEX(`serverip`, ':', 1)), ''), INET_ATON('0.0.0.0'))
+, `server_port` = IF(`serverip` LIKE '%:_%', CAST(SUBSTRING_INDEX(`serverip`, ':', -1) AS UNSIGNED), '0')
+, `ipTEMP` = COALESCE(NULLIF(INET_ATON(SUBSTRING_INDEX(`ip`, ':', 1)), ''), INET_ATON('0.0.0.0'))
+, `a_ipTEMP` = COALESCE(NULLIF(INET_ATON(SUBSTRING_INDEX(`a_ip`, ':', 1)), ''), INET_ATON('0.0.0.0'))
+, `unbanned_ipTEMP` = COALESCE(NULLIF(INET_ATON(SUBSTRING_INDEX(`unbanned_ip`, ':', 1)), ''), INET_ATON('0.0.0.0'));
+SET SQL_SAFE_UPDATES = 1;
+ALTER TABLE `feedback`.`ban`
+ DROP COLUMN `unbanned_ip`
+, DROP COLUMN `a_ip`
+, DROP COLUMN `ip`
+, DROP COLUMN `serverip`
+, CHANGE COLUMN `ipTEMP` `ip` INT(10) UNSIGNED NOT NULL
+, CHANGE COLUMN `a_ipTEMP` `a_ip` INT(10) UNSIGNED NOT NULL
+, CHANGE COLUMN `unbanned_ipTEMP` `unbanned_ip` INT(10) UNSIGNED NULL DEFAULT NULL;
+COMMIT;
+
+START TRANSACTION;
+ALTER TABLE `feedback`.`connection_log`
+ ADD COLUMN `server_ip` INT UNSIGNED NOT NULL AFTER `serverip`
+, ADD COLUMN `server_port` SMALLINT UNSIGNED NOT NULL AFTER `server_ip`
+, ADD COLUMN `ipTEMP` INT UNSIGNED NOT NULL AFTER `ip`;
+SET SQL_SAFE_UPDATES = 0;
+UPDATE `feedback`.`connection_log`
+ SET `server_ip` = COALESCE(NULLIF(INET_ATON(SUBSTRING_INDEX(`serverip`, ':', 1)), ''), INET_ATON('0.0.0.0'))
+, `server_port` = IF(`serverip` LIKE '%:_%', CAST(SUBSTRING_INDEX(`serverip`, ':', -1) AS UNSIGNED), '0')
+, `ipTEMP` = COALESCE(NULLIF(INET_ATON(SUBSTRING_INDEX(`ip`, ':', 1)), ''), INET_ATON('0.0.0.0'));
+SET SQL_SAFE_UPDATES = 1;
+ALTER TABLE `feedback`.`connection_log`
+ DROP COLUMN `ip`
+, DROP COLUMN `serverip`
+, CHANGE COLUMN `ipTEMP` `ip` INT(10) UNSIGNED NOT NULL;
+COMMIT;
+
+START TRANSACTION;
+SET SQL_SAFE_UPDATES = 0;
+UPDATE `feedback`.`death`
+ SET `bruteloss` = LEAST(`bruteloss`, 65535)
+, `brainloss` = LEAST(`brainloss`, 65535)
+, `fireloss` = LEAST(`fireloss`, 65535)
+, `oxyloss` = LEAST(`oxyloss`, 65535);
+ALTER TABLE `feedback`.`death`
+ CHANGE COLUMN `pod` `pod` VARCHAR(50) NOT NULL
+, CHANGE COLUMN `coord` `coord` VARCHAR(32) NOT NULL
+, CHANGE COLUMN `mapname` `mapname` VARCHAR(32) NOT NULL
+, CHANGE COLUMN `job` `job` VARCHAR(32) NOT NULL
+, CHANGE COLUMN `special` `special` VARCHAR(32) NULL DEFAULT NULL
+, CHANGE COLUMN `name` `name` VARCHAR(96) NOT NULL
+, CHANGE COLUMN `byondkey` `byondkey` VARCHAR(32) NOT NULL
+, CHANGE COLUMN `laname` `laname` VARCHAR(96) NULL DEFAULT NULL
+, CHANGE COLUMN `lakey` `lakey` VARCHAR(32) NULL DEFAULT NULL
+, CHANGE COLUMN `gender` `gender` ENUM('neuter', 'male', 'female', 'plural') NOT NULL
+, CHANGE COLUMN `bruteloss` `bruteloss` SMALLINT UNSIGNED NOT NULL
+, CHANGE COLUMN `brainloss` `brainloss` SMALLINT UNSIGNED NOT NULL
+, CHANGE COLUMN `fireloss` `fireloss` SMALLINT UNSIGNED NOT NULL
+, CHANGE COLUMN `oxyloss` `oxyloss` SMALLINT UNSIGNED NOT NULL
+, ADD COLUMN `server_ip` INT UNSIGNED NOT NULL AFTER `server`
+, ADD COLUMN `server_port` SMALLINT UNSIGNED NOT NULL AFTER `server_ip`;
+UPDATE `feedback`.`death`
+ SET `server_ip` = COALESCE(NULLIF(INET_ATON(SUBSTRING_INDEX(`server`, ':', 1)), ''), INET_ATON('0.0.0.0'))
+, `server_port` = IF(`server` LIKE '%:_%', CAST(SUBSTRING_INDEX(`server`, ':', -1) AS UNSIGNED), '0');
+SET SQL_SAFE_UPDATES = 1;
+ALTER TABLE `feedback`.`death`
+ DROP COLUMN `server`;
+COMMIT;
+
+ALTER TABLE `feedback`.`library`
+ CHANGE COLUMN `category` `category` ENUM('Any', 'Fiction', 'Non-Fiction', 'Adult', 'Reference', 'Religion') NOT NULL
+, CHANGE COLUMN `ckey` `ckey` VARCHAR(32) NOT NULL DEFAULT 'LEGACY'
+, CHANGE COLUMN `datetime` `datetime` DATETIME NOT NULL
+, CHANGE COLUMN `deleted` `deleted` TINYINT(1) UNSIGNED NULL DEFAULT NULL;
+
+ALTER TABLE `feedback`.`messages`
+ CHANGE COLUMN `type` `type` ENUM('memo', 'message', 'message sent', 'note', 'watchlist entry') NOT NULL
+, CHANGE COLUMN `text` `text` VARCHAR(2048) NOT NULL
+, CHANGE COLUMN `secret` `secret` TINYINT(1) UNSIGNED NOT NULL;
+
+START TRANSACTION;
+ALTER TABLE `feedback`.`player`
+ ADD COLUMN `ipTEMP` INT UNSIGNED NOT NULL AFTER `ip`;
+SET SQL_SAFE_UPDATES = 0;
+UPDATE `feedback`.`player`
+ SET `ipTEMP` = COALESCE(NULLIF(INET_ATON(SUBSTRING_INDEX(`ip`, ':', 1)), ''), INET_ATON('0.0.0.0'));
+SET SQL_SAFE_UPDATES = 1;
+ALTER TABLE `feedback`.`player`
+ DROP COLUMN `ip`
+, CHANGE COLUMN `ipTEMP` `ip` INT(10) UNSIGNED NOT NULL;
+COMMIT;
+
+START TRANSACTION;
+ALTER TABLE `feedback`.`poll_question`
+ CHANGE COLUMN `polltype` `polltype` ENUM('OPTION', 'TEXT', 'NUMVAL', 'MULTICHOICE', 'IRV') NOT NULL
+, CHANGE COLUMN `adminonly` `adminonly` TINYINT(1) UNSIGNED NOT NULL
+, CHANGE COLUMN `createdby_ckey` `createdby_ckey` VARCHAR(32) NULL DEFAULT NULL
+, CHANGE COLUMN `dontshow` `dontshow` TINYINT(1) UNSIGNED NOT NULL
+, ADD COLUMN `createdby_ipTEMP` INT UNSIGNED NOT NULL AFTER `createdby_ip`
+, DROP COLUMN `for_trialmin`;
+SET SQL_SAFE_UPDATES = 0;
+UPDATE `feedback`.`poll_question`
+ SET `createdby_ipTEMP` = COALESCE(NULLIF(INET_ATON(SUBSTRING_INDEX(`createdby_ip`, ':', 1)), ''), INET_ATON('0.0.0.0'));
+SET SQL_SAFE_UPDATES = 1;
+ALTER TABLE `feedback`.`poll_question`
+ DROP COLUMN `createdby_ip`
+, CHANGE COLUMN `createdby_ipTEMP` `createdby_ip` INT(10) UNSIGNED NOT NULL;
+COMMIT;
+
+START TRANSACTION;
+ALTER TABLE `feedback`.`poll_textreply`
+ CHANGE COLUMN `replytext` `replytext` VARCHAR(2048) NOT NULL
+, ADD COLUMN `ipTEMP` INT UNSIGNED NOT NULL AFTER `ip`;
+SET SQL_SAFE_UPDATES = 0;
+UPDATE `feedback`.`poll_textreply`
+ SET `ipTEMP` = COALESCE(NULLIF(INET_ATON(SUBSTRING_INDEX(`ip`, ':', 1)), ''), INET_ATON('0.0.0.0'));
+SET SQL_SAFE_UPDATES = 1;
+ALTER TABLE `feedback`.`poll_textreply`
+ DROP COLUMN `ip`
+, CHANGE COLUMN `ipTEMP` `ip` INT(10) UNSIGNED NOT NULL;
+COMMIT;
+
+START TRANSACTION;
+ALTER TABLE `feedback`.`poll_vote`
+ CHANGE COLUMN `ckey` `ckey` VARCHAR(32) NOT NULL
+, ADD COLUMN `ipTEMP` INT UNSIGNED NOT NULL AFTER `ip`;
+SET SQL_SAFE_UPDATES = 0;
+UPDATE `feedback`.`poll_vote`
+ SET `ipTEMP` = COALESCE(NULLIF(INET_ATON(SUBSTRING_INDEX(`ip`, ':', 1)), ''), INET_ATON('0.0.0.0'));
+SET SQL_SAFE_UPDATES = 1;
+ALTER TABLE `feedback`.`poll_vote`
+ DROP COLUMN `ip`
+, CHANGE COLUMN `ipTEMP` `ip` INT(10) UNSIGNED NOT NULL;
+COMMIT;
+
+/*----------------------------------------------------
+
+These queries are to be run after the above.
+These indexes are designed with only the codebase queries in mind.
+You may find it helpful to modify or create your own indexes if you utilise additional queries for other services.
+
+----------------------------------------------------*/
+
+ALTER TABLE `feedback`.`ban`
+ ADD INDEX `idx_ban_checkban` (`ckey` ASC, `bantype` ASC, `expiration_time` ASC, `unbanned` ASC, `job` ASC)
+, ADD INDEX `idx_ban_isbanned` (`ckey` ASC, `ip` ASC, `computerid` ASC, `bantype` ASC, `expiration_time` ASC, `unbanned` ASC)
+, ADD INDEX `idx_ban_count` (`id` ASC, `a_ckey` ASC, `bantype` ASC, `expiration_time` ASC, `unbanned` ASC);
+
+ALTER TABLE `feedback`.`ipintel`
+ ADD INDEX `idx_ipintel` (`ip` ASC, `intel` ASC, `date` ASC);
+
+ALTER TABLE `feedback`.`library`
+ ADD INDEX `idx_lib_id_del` (`id` ASC, `deleted` ASC)
+, ADD INDEX `idx_lib_del_title` (`deleted` ASC, `title` ASC)
+, ADD INDEX `idx_lib_search` (`deleted` ASC, `author` ASC, `title` ASC, `category` ASC);
+
+ALTER TABLE `feedback`.`messages`
+ ADD INDEX `idx_msg_ckey_time` (`targetckey` ASC, `timestamp` ASC)
+, ADD INDEX `idx_msg_type_ckeys_time` (`type` ASC, `targetckey` ASC, `adminckey` ASC, `timestamp` ASC)
+, ADD INDEX `idx_msg_type_ckey_time_odr` (`type` ASC, `targetckey` ASC, `timestamp` ASC);
+
+ALTER TABLE `feedback`.`player`
+ ADD INDEX `idx_player_cid_ckey` (`computerid` ASC, `ckey` ASC)
+, ADD INDEX `idx_player_ip_ckey` (`ip` ASC, `ckey` ASC);
+
+ALTER TABLE `feedback`.`poll_option`
+ ADD INDEX `idx_pop_pollid` (`pollid` ASC);
+
+ALTER TABLE `feedback`.`poll_question`
+ ADD INDEX `idx_pquest_question_time_ckey` (`question` ASC, `starttime` ASC, `endtime` ASC, `createdby_ckey` ASC, `createdby_ip` ASC)
+, ADD INDEX `idx_pquest_time_admin` (`starttime` ASC, `endtime` ASC, `adminonly` ASC)
+, ADD INDEX `idx_pquest_id_time_type_admin` (`id` ASC, `starttime` ASC, `endtime` ASC, `polltype` ASC, `adminonly` ASC);
+
+ALTER TABLE `feedback`.`poll_vote`
+ ADD INDEX `idx_pvote_pollid_ckey` (`pollid` ASC, `ckey` ASC)
+, ADD INDEX `idx_pvote_optionid_ckey` (`optionid` ASC, `ckey` ASC);
+
+ALTER TABLE `feedback`.`poll_textreply`
+ ADD INDEX `idx_ptext_pollid_ckey` (`pollid` ASC, `ckey` ASC);