all: seperate db schemas into multiple parts to avoid deadlocks on st…

…artup
Moleculor · Jul 20, 2019 · f0749bf · f0749bf
1 parent 416740f
commit f0749bf
Show file tree

Hide file tree

Showing 28 changed files with 120 additions and 79 deletions.
diff --git a/automod/automod.go b/automod/automod.go
@@ -33,7 +33,7 @@ func (p *Plugin) PluginInfo() *common.PluginInfo {
 func RegisterPlugin() {
 	RegexCache = ccache.New(ccache.Configure())
 
-	common.InitSchema(DBSchema, "automod_v2")
+	common.InitSchemas("automod_v2", DBSchemas...)
 
 	p := &Plugin{}
 	common.RegisterPlugin(p)

diff --git a/automod/db_schema.go b/automod/db_schema.go
@@ -1,17 +1,18 @@
 package automod
 
-const DBSchema = `
+var DBSchemas = []string{`
 CREATE TABLE IF NOT EXISTS automod_rulesets (
 	id BIGSERIAL PRIMARY KEY,
 	guild_id BIGINT NOT NULL,
 
 	name TEXT NOT NULL,
 	enabled BOOLEAN NOT NULL
 );
-
+`, `
 CREATE INDEX IF NOT EXISTS automod_rulesets_guild_idx ON automod_rulesets(guild_id);
 
 
+`, `
 CREATE TABLE IF NOT EXISTS automod_rules (
 	id BIGSERIAL PRIMARY KEY,
 	guild_id BIGINT NOT NULL,
@@ -20,8 +21,10 @@ CREATE TABLE IF NOT EXISTS automod_rules (
 	trigger_counter BIGINT NOT NULL
 );
 
+`, `
 CREATE INDEX IF NOT EXISTS automod_rules_guild_idx ON automod_rules(guild_id);
 
+`, `
 CREATE TABLE IF NOT EXISTS automod_rule_data (
 	id BIGSERIAL PRIMARY KEY,
 	guild_id BIGINT NOT NULL,
@@ -32,8 +35,10 @@ CREATE TABLE IF NOT EXISTS automod_rule_data (
 	settings JSONB NOT NULL
 );
 
+`, `
 CREATE INDEX IF NOT EXISTS automod_rule_data_guild_idx ON automod_rule_data(guild_id);
 
+`, `
 CREATE TABLE IF NOT EXISTS automod_ruleset_conditions (
 	id BIGSERIAL PRIMARY KEY,
 	guild_id BIGINT NOT NULL,
@@ -44,8 +49,10 @@ CREATE TABLE IF NOT EXISTS automod_ruleset_conditions (
 	settings JSONB NOT NULL
 );
 
+`, `
 CREATE INDEX IF NOT EXISTS automod_ruleset_conditions_guild_idx ON automod_ruleset_conditions(guild_id);
 
+`, `
 CREATE TABLE IF NOT EXISTS automod_violations (
 	id BIGSERIAL PRIMARY KEY,
 	guild_id BIGINT NOT NULL,
@@ -57,9 +64,12 @@ CREATE TABLE IF NOT EXISTS automod_violations (
 	name TEXT NOT NULL
 );
 
+`, `
 CREATE INDEX IF NOT EXISTS automod_violations_guild_idx ON automod_violations(guild_id);
+`, `
 CREATE INDEX IF NOT EXISTS automod_violations_user_idx ON automod_violations(user_id);
 
+`, `
 CREATE TABLE IF NOT EXISTS automod_lists (
 	id BIGSERIAL PRIMARY KEY,
 	guild_id BIGINT NOT NULL,
@@ -69,8 +79,10 @@ CREATE TABLE IF NOT EXISTS automod_lists (
 	content TEXT[] NOT NULL
 );
 
+`, `
 CREATE INDEX IF NOT EXISTS automod_lists_guild_idx ON automod_lists(guild_id);
 
+`, `
 CREATE TABLE IF NOT EXISTS automod_triggered_rules (
 	id BIGSERIAL PRIMARY KEY,
 	created_at TIMESTAMP WITH TIME ZONE NOT NULL,
@@ -90,7 +102,9 @@ CREATE TABLE IF NOT EXISTS automod_triggered_rules (
 
 	extradata JSONB NOT NULL 
 );
+`, `
 
 CREATE INDEX IF NOT EXISTS automod_triggered_rules_guild_idx ON automod_triggered_rules(guild_id);
+`, `
 CREATE INDEX IF NOT EXISTS automod_triggered_rules_trigger_idx ON automod_triggered_rules(trigger_id);
-`
+`}
diff --git a/bot/bot.go b/bot/bot.go
@@ -57,7 +57,7 @@ var (
 )
 
 func setup() {
-	common.InitSchema(DBSchema, "core_bot")
+	common.InitSchemas("core_bot", DBSchema)
 
 	discordgo.IdentifyRatelimiter = &identifyRatelimiter{}
 

diff --git a/commands/commands.go b/commands/commands.go
@@ -43,7 +43,7 @@ func RegisterPlugin() {
 		logger.WithError(err).Fatal("Failed migrating logged commands database")
 	}
 
-	common.InitSchema(DBSchema, "commands")
+	common.InitSchemas("commands", DBSchemas...)
 }
 
 type CommandProvider interface {

diff --git a/commands/schema.go b/commands/schema.go
@@ -1,6 +1,6 @@
 package commands
 
-const DBSchema = `
+var DBSchemas = []string{`
 CREATE TABLE IF NOT EXISTS commands_channels_overrides (
 	id BIGSERIAL PRIMARY KEY,
 	guild_id BIGINT NOT NULL,
@@ -20,10 +20,11 @@ CREATE TABLE IF NOT EXISTS commands_channels_overrides (
 	require_roles BIGINT[] NOT NULL,
 	ignore_roles BIGINT[] NOT NULL
 );
-
+`, `
 CREATE INDEX IF NOT EXISTS commands_channels_overrides_guild_idx ON commands_channels_overrides(guild_id);
+`, `
 CREATE UNIQUE INDEX IF NOT EXISTS commands_channels_overrides_global_uniquex ON commands_channels_overrides (guild_id) WHERE global;
-
+`, `
 CREATE TABLE IF NOT EXISTS commands_command_overrides (
 	id BIGSERIAL PRIMARY KEY,
 	guild_id BIGINT NOT NULL,
@@ -42,7 +43,6 @@ CREATE TABLE IF NOT EXISTS commands_command_overrides (
 	require_roles BIGINT[] NOT NULL,
 	ignore_roles BIGINT[] NOT NULL
 );
-
+`, `
 CREATE INDEX IF NOT EXISTS commands_command_groups_channels_override_idx ON commands_command_overrides(commands_channels_overrides_id);
-
-`
+`}
diff --git a/common/common.go b/common/common.go
@@ -108,7 +108,7 @@ func Init() error {
 		panic(err)
 	}
 
-	InitSchema(CoreServerConfDBSchema, "core_configs")
+	InitSchemas("core_configs", CoreServerConfDBSchema)
 
 	return err
 }
@@ -236,7 +236,7 @@ func connectDB(host, user, pass, dbName string) error {
 	return err
 }
 
-func InitSchema(schema string, name string) {
+func initSchema(schema string, name string) {
 	_, err := PQ.Exec(schema)
 	if err != nil {
 		logger.WithError(err).Fatal("failed initializing postgres db schema for ", name)
@@ -248,7 +248,7 @@ func InitSchema(schema string, name string) {
 func InitSchemas(name string, schemas ...string) {
 	for i, v := range schemas {
 		actualName := fmt.Sprintf("%s[%d]", name, i)
-		InitSchema(v, actualName)
+		initSchema(v, actualName)
 	}
 
 	return

diff --git a/common/scheduledevents2/scheduledevents.go b/common/scheduledevents2/scheduledevents.go
@@ -43,7 +43,7 @@ func (p *ScheduledEvents) PluginInfo() *common.PluginInfo {
 }
 
 func RegisterPlugin() {
-	common.InitSchema(DBSchema, "scheduledevents2")
+	common.InitSchemas("scheduledevents2", DBSchemas...)
 
 	common.RegisterPlugin(newScheduledEventsPlugin())
 }

diff --git a/common/scheduledevents2/schema.go b/common/scheduledevents2/schema.go
@@ -1,6 +1,6 @@
 package scheduledevents2
 
-const DBSchema = `
+var DBSchemas = []string{`
 CREATE TABLE IF NOT EXISTS scheduled_events (
 	id BIGSERIAL PRIMARY KEY,
 
@@ -15,6 +15,6 @@ CREATE TABLE IF NOT EXISTS scheduled_events (
 
 	processed BOOL not null
 );
-
+`, `
 CREATE INDEX IF NOT EXISTS scheduled_events_triggers_at_idx ON scheduled_events(triggers_at);
-`
+`}
diff --git a/customcommands/customcommands.go b/customcommands/customcommands.go
@@ -30,7 +30,7 @@ func KeyCommands(guildID int64) string { return "custom_commands:" + discordgo.S
 type Plugin struct{}
 
 func RegisterPlugin() {
-	common.InitSchema(DBSchema, "customcommands")
+	common.InitSchemas("customcommands", DBSchemas...)
 
 	plugin := &Plugin{}
 	common.RegisterPlugin(plugin)

diff --git a/customcommands/schema.go b/customcommands/schema.go
@@ -1,6 +1,6 @@
 package customcommands
 
-const DBSchema = `
+var DBSchemas = []string{`
 
 CREATE TABLE IF NOT EXISTS custom_command_groups (
 	id BIGSERIAL PRIMARY KEY,
@@ -13,7 +13,7 @@ CREATE TABLE IF NOT EXISTS custom_command_groups (
 	whitelist_roles BIGINT[],
 	whitelist_channels BIGINT[]
 );
-
+`, `
 CREATE TABLE IF NOT EXISTS custom_commands (
 	local_id BIGINT NOT NULL,
 	guild_id BIGINT NOT NULL,
@@ -40,12 +40,16 @@ CREATE TABLE IF NOT EXISTS custom_commands (
 	
 	PRIMARY KEY(guild_id, local_id)
 );
+`, `
 
 CREATE INDEX IF NOT EXISTS custom_commands_guild_idx ON custom_commands(guild_id);
+`, `
 CREATE INDEX IF NOT EXISTS custom_commands_next_run_idx ON custom_commands(next_run);
 
+`, `
 ALTER TABLE custom_commands ADD COLUMN IF NOT EXISTS context_channel BIGINT NOT NULL DEFAULT 0;
 
+`, `
 CREATE TABLE IF NOT EXISTS templates_user_database (
 	id BIGSERIAL PRIMARY KEY,
 
@@ -63,6 +67,8 @@ CREATE TABLE IF NOT EXISTS templates_user_database (
 	UNIQUE(guild_id, user_id, key)
 );
 
+`, `
 CREATE INDEX IF NOT EXISTS templates_user_database_combined_idx ON templates_user_database (guild_id, user_id, key, value_num);
+`, `
 CREATE INDEX IF NOT EXISTS templates_user_database_expires_idx ON templates_user_database (expires_at);
-`
+`}
diff --git a/premium/premium.go b/premium/premium.go
@@ -38,7 +38,7 @@ func (p *Plugin) PluginInfo() *common.PluginInfo {
 }
 
 func RegisterPlugin() {
-	common.InitSchema(DBSchema, "premium")
+	common.InitSchemas("premium", DBSchemas...)
 
 	common.RegisterPlugin(&Plugin{})
 

diff --git a/premium/schema.go b/premium/schema.go
@@ -1,6 +1,6 @@
 package premium
 
-const DBSchema = `
+var DBSchemas = []string{`
 CREATE TABLE IF NOT EXISTS premium_slots (
 	id BIGSERIAL PRIMARY KEY,
 
@@ -19,7 +19,7 @@ CREATE TABLE IF NOT EXISTS premium_slots (
 	permanent BOOLEAN NOT NULL,
 	duration_remaining BIGINT NOT NULL
 );
-
+`, `
 CREATE TABLE IF NOT EXISTS premium_codes (
 	id BIGSERIAL PRIMARY KEY,
 
@@ -36,6 +36,6 @@ CREATE TABLE IF NOT EXISTS premium_codes (
 	permanent BOOLEAN NOT NULL,
 	duration BIGINT NOT NULL
 );
-
+`, `
 CREATE INDEX IF NOT EXISTS premium_codes_code_idx ON premium_codes(code);
-`
+`}
diff --git a/reddit/reddit.go b/reddit/reddit.go
@@ -64,7 +64,7 @@ func (p *Plugin) WebhookAvatar() string {
 }
 
 func RegisterPlugin() {
-	common.InitSchema(DBSchema, "reddit")
+	common.InitSchemas("reddit", DBSchemas...)
 
 	plugin := &Plugin{
 		stopFeedChan: make(chan *sync.WaitGroup),

diff --git a/reddit/schema.go b/reddit/schema.go
@@ -1,6 +1,6 @@
 package reddit
 
-const DBSchema = `
+var DBSchemas = []string{`
 CREATE TABLE IF NOT EXISTS reddit_feeds (
 	id BIGSERIAL PRIMARY KEY,
 	guild_id BIGINT NOT NULL,
@@ -14,10 +14,11 @@ CREATE TABLE IF NOT EXISTS reddit_feeds (
 	use_embeds BOOLEAN NOT NULL,
 	slow BOOLEAN NOT NULL
 );
-
+`, `
 CREATE INDEX IF NOT EXISTS redidt_feeds_guild_idx ON reddit_feeds(guild_id);
+`, `
 CREATE INDEX IF NOT EXISTS redidt_feeds_subreddit_idx ON reddit_feeds(subreddit);
 
+`, `
 ALTER TABLE reddit_feeds ADD COLUMN IF NOT EXISTS disabled BOOLEAN NOT NULL DEFAULT FALSE;
-
-`
+`}
diff --git a/reputation/reputation.go b/reputation/reputation.go
@@ -27,7 +27,7 @@ func RegisterPlugin() {
 
 	plugin := &Plugin{}
 
-	common.InitSchema(DBSchema, "reputation")
+	common.InitSchemas("reputation", DBSchemas...)
 
 	common.RegisterPlugin(plugin)
 }

diff --git a/reputation/schema.go b/reputation/schema.go
@@ -1,6 +1,6 @@
 package reputation
 
-const DBSchema = `
+var DBSchemas = []string{`
 CREATE TABLE IF NOT EXISTS reputation_configs (
 	guild_id        bigint PRIMARY KEY,
 	points_name     varchar(50) NOT NULL,
@@ -14,9 +14,9 @@ CREATE TABLE IF NOT EXISTS reputation_configs (
 	blacklisted_receive_role varchar(30),
 	admin_role               varchar(30)
 );
-
+`, `
 ALTER TABLE reputation_configs ADD COLUMN IF NOT EXISTS disable_thanks_detection BOOLEAN NOT NULL DEFAULT false;
-
+`, `
 DO $$
 BEGIN
 
@@ -54,11 +54,8 @@ IF (SELECT COUNT(*) FROM information_schema.columns WHERE table_name='reputation
 	UPDATE reputation_configs SET blacklisted_receive_roles=ARRAY[blacklisted_receive_role]::BIGINT[] WHERE blacklisted_receive_role IS NOT NULL AND blacklisted_receive_role != '';
 	
 END IF;
-
 END $$;
-
-
-
+`, `
 CREATE TABLE IF NOT EXISTS reputation_users (
 	user_id  bigint NOT NULL,
 	guild_id bigint NOT NULL,
@@ -68,7 +65,7 @@ CREATE TABLE IF NOT EXISTS reputation_users (
 
 	PRIMARY KEY(guild_id, user_id)
 );
-
+`, `
 CREATE TABLE IF NOT EXISTS reputation_log (
 	id bigserial 	 PRIMARY KEY,
 	created_at	     TIMESTAMP WITH TIME ZONE NOT NULL,
@@ -79,11 +76,14 @@ CREATE TABLE IF NOT EXISTS reputation_log (
 	set_fixed_amount bool NOT NULL,
 	amount 			 bigint NOT NULL
 );
-
+`, `
 ALTER TABLE reputation_log ADD COLUMN IF NOT EXISTS receiver_username TEXT NOT NULL DEFAULT '';
+`, `
 ALTER TABLE reputation_log ADD COLUMN IF NOT EXISTS sender_username TEXT NOT NULL DEFAULT '';
-
+`, `
 CREATE INDEX IF NOT EXISTS reputation_log_guild_idx ON reputation_log (guild_id);
+`, `
 CREATE INDEX IF NOT EXISTS reputation_log_sender_idx ON reputation_log (sender_id);
+`, `
 CREATE INDEX IF NOT EXISTS reputation_log_receiver_idx ON reputation_log (receiver_id);	
-`
+`}
diff --git a/rolecommands/rolecommands.go b/rolecommands/rolecommands.go
@@ -62,7 +62,7 @@ func RegisterPlugin() {
 	p := &Plugin{}
 	common.RegisterPlugin(p)
 
-	common.InitSchema(DBSchema, "rolecommands")
+	common.InitSchemas("rolecommands", DBSchemas...)
 }
 
 func FindToggleRole(ctx context.Context, ms *dstate.MemberState, name string) (gaveRole bool, err error) {