Skip to content

Fixes PID Collisions #476

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
PsyCommando merged 1 commit into from
Dec 7, 2023
Merged

Fixes PID Collisions #476

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion mods/persistence/code/__defines/persistent_id.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
#define PERSISTENT_ID uniqueness_repository.Generate(/datum/uniqueness_generator/hex)
// Does not use the uniqueness repository to eliminate unnecessary overhead
#define PERSISTENT_ID "[RANDBYTE]-[RANDBYTE]-[RANDBYTE]-[RANDBYTE]-[RANDBYTE]-[RANDBYTE]"
16 changes: 8 additions & 8 deletions sql/V100__Persistence.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ CREATE TABLE IF NOT EXISTS `list_element` (
-- Dumping structure for table persistent.thing
DROP TABLE IF EXISTS `thing`;
CREATE TABLE IF NOT EXISTS `thing` (
`p_id` varchar(12) NOT NULL,
`p_id` varchar(18) NOT NULL,
`type` varchar(256) NOT NULL,
`x` int DEFAULT NULL,
`y` int DEFAULT NULL,
Expand All @@ -39,7 +39,7 @@ CREATE TABLE IF NOT EXISTS `thing` (
DROP TABLE IF EXISTS `thing_var`;
CREATE TABLE IF NOT EXISTS `thing_var` (
`id` int NOT NULL AUTO_INCREMENT,
`thing_id` varchar(12) NOT NULL,
`thing_id` varchar(18) NOT NULL,
`key` varchar(256) NOT NULL,
`type` varchar(256) NOT NULL,
`value` longtext NOT NULL,
Expand Down Expand Up @@ -76,7 +76,7 @@ CREATE TABLE IF NOT EXISTS `limbo` (
`type` varchar(64) NOT NULL,
`p_ids` longtext NOT NULL,
`metadata` varchar(64) DEFAULT NULL,
`limbo_assoc` varchar(12) NOT NULL,
`limbo_assoc` varchar(18) NOT NULL,
`metadata2` varchar(64) DEFAULT NULL
) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;

Expand All @@ -88,20 +88,20 @@ CREATE TABLE IF NOT EXISTS `limbo_list_element` (
`key_type` varchar(256) NOT NULL,
`value` longtext NOT NULL,
`value_type` varchar(256) NOT NULL,
`limbo_assoc` varchar(12) NOT NULL,
`limbo_assoc` varchar(18) NOT NULL,
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;

-- Data exporting was unselected.
-- Dumping structure for table persistent.thing
DROP TABLE IF EXISTS `limbo_thing`;
CREATE TABLE IF NOT EXISTS `limbo_thing` (
`p_id` varchar(12) NOT NULL,
`p_id` varchar(18) NOT NULL,
`type` varchar(256) NOT NULL,
`x` int DEFAULT NULL,
`y` int DEFAULT NULL,
`z` int DEFAULT NULL,
`limbo_assoc` varchar(12) NOT NULL,
`limbo_assoc` varchar(18) NOT NULL,
PRIMARY KEY (`p_id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;

Expand All @@ -110,11 +110,11 @@ CREATE TABLE IF NOT EXISTS `limbo_thing` (
DROP TABLE IF EXISTS `limbo_thing_var`;
CREATE TABLE IF NOT EXISTS `limbo_thing_var` (
`id` int NOT NULL AUTO_INCREMENT,
`thing_id` varchar(12) NOT NULL,
`thing_id` varchar(18) NOT NULL,
`key` varchar(256) NOT NULL,
`type` varchar(256) NOT NULL,
`value` longtext NOT NULL,
`limbo_assoc` varchar(12) NOT NULL,
`limbo_assoc` varchar(18) NOT NULL,
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
-- Data exporting was unselected.
Expand Down
16 changes: 8 additions & 8 deletions sql/migrate/V100__Persistence.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ CREATE TABLE IF NOT EXISTS `list_element` (
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;

CREATE TABLE IF NOT EXISTS `thing` (
`p_id` varchar(12) NOT NULL,
`p_id` varchar(18) NOT NULL,
`type` varchar(256) NOT NULL,
`x` int DEFAULT NULL,
`y` int DEFAULT NULL,
Expand All @@ -31,7 +31,7 @@ CREATE TABLE IF NOT EXISTS `thing` (

CREATE TABLE IF NOT EXISTS `thing_var` (
`id` int NOT NULL AUTO_INCREMENT,
`thing_id` varchar(12) NOT NULL,
`thing_id` varchar(18) NOT NULL,
`key` varchar(256) NOT NULL,
`type` varchar(256) NOT NULL,
`value` longtext NOT NULL,
Expand Down Expand Up @@ -63,7 +63,7 @@ CREATE TABLE IF NOT EXISTS `limbo` (
`type` varchar(64) NOT NULL,
`p_ids` longtext NOT NULL,
`metadata` varchar(64) DEFAULT NULL,
`limbo_assoc` varchar(12) NOT NULL,
`limbo_assoc` varchar(18) NOT NULL,
`metadata2` varchar(64) DEFAULT NULL
) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;

Expand All @@ -74,26 +74,26 @@ CREATE TABLE IF NOT EXISTS `limbo_list_element` (
`key_type` varchar(256) NOT NULL,
`value` longtext NOT NULL,
`value_type` varchar(256) NOT NULL,
`limbo_assoc` varchar(12) NOT NULL,
`limbo_assoc` varchar(18) NOT NULL,
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;

CREATE TABLE IF NOT EXISTS `limbo_thing` (
`p_id` varchar(12) NOT NULL,
`p_id` varchar(18) NOT NULL,
`type` varchar(256) NOT NULL,
`x` int DEFAULT NULL,
`y` int DEFAULT NULL,
`z` int DEFAULT NULL,
`limbo_assoc` varchar(12) NOT NULL,
`limbo_assoc` varchar(18) NOT NULL,
PRIMARY KEY (`p_id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;

CREATE TABLE IF NOT EXISTS `limbo_thing_var` (
`id` int NOT NULL AUTO_INCREMENT,
`thing_id` varchar(12) NOT NULL,
`thing_id` varchar(18) NOT NULL,
`key` varchar(256) NOT NULL,
`type` varchar(256) NOT NULL,
`value` longtext NOT NULL,
`limbo_assoc` varchar(12) NOT NULL,
`limbo_assoc` varchar(18) NOT NULL,
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;