Skip to content

Commit

Permalink
fix: resolve index naming issues
Browse files Browse the repository at this point in the history
  • Loading branch information
@aeneasr
aeneasr committed May 13, 2022
1 parent 6613a02 commit d5550b5
Show file tree
Hide file tree
Showing 5 changed files with 200 additions and 207 deletions.
79 changes: 38 additions & 41 deletions persistence/sql/migrations/sql/20220512102703000000_missing_indices.down.sql
View file
Original file line number Diff line number Diff line change
@@ -1,40 +1,41 @@
DROP INDEX `sessions_identity_id_nid_idx`;
DROP INDEX `identities_id_nid_idx`;
DROP INDEX `identities_nid_id_idx`;
DROP INDEX `continuity_containers_nid_id_idx`;
DROP INDEX `continuity_containers_id_nid_idx`;
DROP INDEX `courier_message_nid_id_idx`;
DROP INDEX `courier_message_id_nid_idx`;
DROP INDEX `courier_message_nid_id_idx`;
DROP INDEX `courier_message_id_nid_idx`;
DROP INDEX `identity_credential_identifiers_nid_id_idx`;
DROP INDEX `identity_credential_identifiers_id_nid_idx`;
DROP INDEX `identity_credentials_nid_id_idx`;
DROP INDEX `identity_credentials_id_nid_idx`;
DROP INDEX `identity_recovery_addresses_nid_id_idx`;
DROP INDEX `identity_recovery_addresses_id_nid_idx`;
DROP INDEX `identity_recovery_tokens_nid_id_idx`;
DROP INDEX `identity_recovery_tokens_id_nid_idx`;
DROP INDEX `identity_recovery_tokens_selfservice_recovery_flow_id_idx`;
DROP INDEX `identity_recovery_tokens_identity_recovery_address_id_idx`;
DROP INDEX `identity_verification_tokens_nid_id_idx`;
DROP INDEX `identity_verification_tokens_id_nid_idx`;
DROP INDEX `identity_verification_tokens_token_nid_used_idx`;
DROP INDEX `identity_recovery_addresses_nid_id_idx`;
DROP INDEX `identity_recovery_addresses_id_nid_idx`;
DROP INDEX `selfservice_login_flows_nid_id_idx`;
DROP INDEX `selfservice_login_flows_id_nid_idx`;
DROP INDEX `selfservice_recovery_flows_nid_id_idx`;
DROP INDEX `selfservice_recovery_flows_id_nid_idx`;
DROP INDEX `selfservice_registration_flows_nid_id_idx`;
DROP INDEX `selfservice_registration_flows_id_nid_idx`;
DROP INDEX `selfservice_settings_flows_nid_id_idx`;
DROP INDEX `selfservice_settings_flows_id_nid_idx`;
DROP INDEX `selfservice_verification_flows_nid_id_idx`;
DROP INDEX `selfservice_verification_flows_id_nid_idx`;
DROP INDEX `sessions_nid_id_identity_id_idx`;
DROP INDEX `sessions_id_nid_idx`;
DROP INDEX `sessions_token_nid_idx`;
CREATE INDEX sessions_nid_idx ON sessions (id, nid);
CREATE INDEX sessions_token_idx ON sessions (token);
CREATE INDEX sessions_logout_token_idx ON sessions (logout_token);

DROP INDEX sessions_identity_id_nid_idx;
DROP INDEX sessions_nid_id_identity_id_idx;
DROP INDEX sessions_id_nid_idx;
DROP INDEX sessions_token_nid_idx;

DROP INDEX identities_id_nid_idx;
DROP INDEX identities_nid_id_idx;
DROP INDEX continuity_containers_nid_id_idx;
DROP INDEX continuity_containers_id_nid_idx;
DROP INDEX courier_messages_nid_id_idx;
DROP INDEX courier_messages_id_nid_idx;
DROP INDEX identity_credential_identifiers_nid_id_idx;
DROP INDEX identity_credential_identifiers_id_nid_idx;
DROP INDEX identity_credentials_nid_id_idx;
DROP INDEX identity_credentials_id_nid_idx;
DROP INDEX identity_recovery_addresses_nid_id_idx;
DROP INDEX identity_recovery_addresses_id_nid_idx;
DROP INDEX identity_recovery_tokens_nid_id_idx;
DROP INDEX identity_recovery_tokens_id_nid_idx;
DROP INDEX identity_recovery_tokens_selfservice_recovery_flow_id_idx;
DROP INDEX identity_recovery_tokens_identity_recovery_address_id_idx;
DROP INDEX identity_verification_tokens_nid_id_idx;
DROP INDEX identity_verification_tokens_id_nid_idx;
DROP INDEX identity_verification_tokens_token_nid_used_idx;
DROP INDEX selfservice_login_flows_nid_id_idx;
DROP INDEX selfservice_login_flows_id_nid_idx;
DROP INDEX selfservice_recovery_flows_nid_id_idx;
DROP INDEX selfservice_recovery_flows_id_nid_idx;
DROP INDEX selfservice_registration_flows_nid_id_idx;
DROP INDEX selfservice_registration_flows_id_nid_idx;
DROP INDEX selfservice_settings_flows_nid_id_idx;
DROP INDEX selfservice_settings_flows_id_nid_idx;
DROP INDEX selfservice_verification_flows_nid_id_idx;
DROP INDEX selfservice_verification_flows_id_nid_idx;

CREATE INDEX identities_nid_idx ON identities (id, nid);

Expand All @@ -61,7 +62,3 @@ CREATE INDEX selfservice_recovery_flows_nid_idx ON selfservice_recovery_flows (i
CREATE INDEX selfservice_registration_flows_nid_idx ON selfservice_registration_flows (id,nid);
CREATE INDEX selfservice_settings_flows_nid_idx ON selfservice_settings_flows (id,nid);
CREATE INDEX selfservice_verification_flows_nid_idx ON selfservice_verification_flows (id,nid);

CREATE INDEX sessions_nid_idx ON sessions (id, nid);
CREATE INDEX sessions_token_idx ON sessions (token);
CREATE INDEX sessions_logout_token_idx ON sessions (logout_token);
78 changes: 37 additions & 41 deletions persistence/sql/migrations/sql/20220512102703000000_missing_indices.mysql.down.sql
View file
Original file line number Diff line number Diff line change
@@ -1,40 +1,40 @@
DROP INDEX `sessions_identity_id_nid_idx` ON sessions;
DROP INDEX `identities_id_nid_idx` ON identities;
DROP INDEX `identities_nid_id_idx` ON identities;
DROP INDEX `continuity_containers_nid_id_idx` ON continuity_containers;
DROP INDEX `continuity_containers_id_nid_idx` ON continuity_containers;
DROP INDEX `courier_message_nid_id_idx` ON courier_message;
DROP INDEX `courier_message_id_nid_idx` ON courier_message;
DROP INDEX `courier_message_nid_id_idx` ON courier_message;
DROP INDEX `courier_message_id_nid_idx` ON courier_message;
DROP INDEX `identity_credential_identifiers_nid_id_idx` ON identity_credential_identifiers;
DROP INDEX `identity_credential_identifiers_id_nid_idx` ON identity_credential_identifiers;
DROP INDEX `identity_credentials_nid_id_idx`ON identity_credentials;
DROP INDEX `identity_credentials_id_nid_idx`ON identity_credentials;
DROP INDEX `identity_recovery_addresses_nid_id_idx` ON identity_recovery_addresses;
DROP INDEX `identity_recovery_addresses_id_nid_idx` ON identity_recovery_addresses;
DROP INDEX `identity_recovery_tokens_nid_id_idx` ON identity_recovery_tokens;
DROP INDEX `identity_recovery_tokens_id_nid_idx` ON identity_recovery_tokens;
DROP INDEX `identity_recovery_tokens_selfservice_recovery_flow_id_idx` ON identity_recovery_tokens;
DROP INDEX `identity_recovery_tokens_identity_recovery_address_id_idx` ON identity_recovery_tokens;
DROP INDEX `identity_verification_tokens_nid_id_idx` ON identity_verification_tokens;
DROP INDEX `identity_verification_tokens_id_nid_idx` ON identity_verification_tokens;
DROP INDEX `identity_verification_tokens_token_nid_used_idx` ON identity_verification_tokens;
DROP INDEX `identity_recovery_addresses_nid_id_idx` ON identity_recovery_addresses;
DROP INDEX `identity_recovery_addresses_id_nid_idx` ON identity_recovery_addresses;
DROP INDEX `selfservice_login_flows_nid_id_idx` ON selfservice_login_flows;
DROP INDEX `selfservice_login_flows_id_nid_idx` ON selfservice_login_flows;
DROP INDEX `selfservice_recovery_flows_nid_id_idx` ON selfservice_recovery_flows;
DROP INDEX `selfservice_recovery_flows_id_nid_idx` ON selfservice_recovery_flows;
DROP INDEX `selfservice_registration_flows_nid_id_idx` ON selfservice_registration_flows;
DROP INDEX `selfservice_registration_flows_id_nid_idx` ON selfservice_registration_flows;
DROP INDEX `selfservice_settings_flows_nid_id_idx` ON selfservice_settings_flows;
DROP INDEX `selfservice_settings_flows_id_nid_idx` ON selfservice_settings_flows;
DROP INDEX `selfservice_verification_flows_nid_id_idx` ON selfservice_verification_flows;
DROP INDEX `selfservice_verification_flows_id_nid_idx` ON selfservice_verification_flows;
DROP INDEX `sessions_nid_id_identity_id_idx` ON sessions;
DROP INDEX `sessions_id_nid_idx` ON sessions;
DROP INDEX `sessions_token_nid_idx` ON sessions;
CREATE INDEX sessions_nid_idx ON sessions (id, nid);
CREATE INDEX sessions_token_idx ON sessions (token);
CREATE INDEX sessions_logout_token_idx ON sessions (logout_token);
DROP INDEX sessions_nid_id_identity_id_idx ON sessions;
DROP INDEX sessions_id_nid_idx ON sessions;
DROP INDEX sessions_token_nid_idx ON sessions;

DROP INDEX sessions_identity_id_nid_idx ON sessions;
DROP INDEX identities_id_nid_idx ON identities;
DROP INDEX identities_nid_id_idx ON identities;
DROP INDEX continuity_containers_nid_id_idx ON continuity_containers;
DROP INDEX continuity_containers_id_nid_idx ON continuity_containers;
DROP INDEX courier_messages_nid_id_idx ON courier_message;
DROP INDEX courier_messages_id_nid_idx ON courier_message;
DROP INDEX identity_credential_identifiers_nid_id_idx ON identity_credential_identifiers;
DROP INDEX identity_credential_identifiers_id_nid_idx ON identity_credential_identifiers;
DROP INDEX identity_credentials_nid_id_idx ON identity_credentials;
DROP INDEX identity_credentials_id_nid_idx ON identity_credentials;
DROP INDEX identity_recovery_addresses_nid_id_idx ON identity_recovery_addresses;
DROP INDEX identity_recovery_addresses_id_nid_idx ON identity_recovery_addresses;
DROP INDEX identity_recovery_tokens_nid_id_idx ON identity_recovery_tokens;
DROP INDEX identity_recovery_tokens_id_nid_idx ON identity_recovery_tokens;
DROP INDEX identity_recovery_tokens_selfservice_recovery_flow_id_idx ON identity_recovery_tokens;
DROP INDEX identity_recovery_tokens_identity_recovery_address_id_idx ON identity_recovery_tokens;
DROP INDEX identity_verification_tokens_nid_id_idx ON identity_verification_tokens;
DROP INDEX identity_verification_tokens_id_nid_idx ON identity_verification_tokens;
DROP INDEX identity_verification_tokens_token_nid_used_idx ON identity_verification_tokens;
DROP INDEX selfservice_login_flows_nid_id_idx ON selfservice_login_flows;
DROP INDEX selfservice_login_flows_id_nid_idx ON selfservice_login_flows;
DROP INDEX selfservice_recovery_flows_nid_id_idx ON selfservice_recovery_flows;
DROP INDEX selfservice_recovery_flows_id_nid_idx ON selfservice_recovery_flows;
DROP INDEX selfservice_registration_flows_nid_id_idx ON selfservice_registration_flows;
DROP INDEX selfservice_registration_flows_id_nid_idx ON selfservice_registration_flows;
DROP INDEX selfservice_settings_flows_nid_id_idx ON selfservice_settings_flows;
DROP INDEX selfservice_settings_flows_id_nid_idx ON selfservice_settings_flows;
DROP INDEX selfservice_verification_flows_nid_id_idx ON selfservice_verification_flows;
DROP INDEX selfservice_verification_flows_id_nid_idx ON selfservice_verification_flows;

CREATE INDEX identities_nid_idx ON identities (id, nid);

Expand All @@ -61,7 +61,3 @@ CREATE INDEX selfservice_recovery_flows_nid_idx ON selfservice_recovery_flows (i
CREATE INDEX selfservice_registration_flows_nid_idx ON selfservice_registration_flows (id,nid);
CREATE INDEX selfservice_settings_flows_nid_idx ON selfservice_settings_flows (id,nid);
CREATE INDEX selfservice_verification_flows_nid_idx ON selfservice_verification_flows (id,nid);

CREATE INDEX sessions_nid_idx ON sessions (id, nid);
CREATE INDEX sessions_token_idx ON sessions (token);
CREATE INDEX sessions_logout_token_idx ON sessions (logout_token);
110 changes: 55 additions & 55 deletions persistence/sql/migrations/sql/20220512102703000000_missing_indices.mysql.up.sql
View file
Original file line number Diff line number Diff line change
@@ -1,70 +1,70 @@
CREATE INDEX `sessions_identity_id_nid_idx` ON `sessions` (identity_id, nid);
CREATE INDEX sessions_identity_id_nid_idx ON sessions (identity_id, nid);

DROP INDEX `identities_nid_idx`;
CREATE INDEX `identities_id_nid_idx` ON `identities` (id, nid);
CREATE INDEX `identities_nid_id_idx` ON `identities` (nid, id);
DROP INDEX identities_nid_idx ON identities;
CREATE INDEX identities_id_nid_idx ON identities (id, nid);
CREATE INDEX identities_nid_id_idx ON identities (nid, id);

DROP INDEX `continuity_containers_nid_idx`;
CREATE INDEX `continuity_containers_nid_id_idx` ON `continuity_containers` (nid, id);
CREATE INDEX `continuity_containers_id_nid_idx` ON `continuity_containers` (id, nid);
DROP INDEX continuity_containers_nid_idx ON continuity_containers;
CREATE INDEX continuity_containers_nid_id_idx ON continuity_containers (nid, id);
CREATE INDEX continuity_containers_id_nid_idx ON continuity_containers (id, nid);

DROP INDEX `courier_message_nid_idx`;
CREATE INDEX `courier_message_nid_id_idx` ON `courier_message` (nid, id);
CREATE INDEX `courier_message_id_nid_idx` ON `courier_message` (id, nid);
DROP INDEX courier_messages_nid_idx ON courier_messages;
CREATE INDEX courier_messages_nid_id_idx ON courier_messages (nid, id);
CREATE INDEX courier_messages_id_nid_idx ON courier_messages (id, nid);

DROP INDEX `identity_credential_identifiers_nid_idx`;
CREATE INDEX `identity_credential_identifiers_nid_id_idx` ON `identity_credential_identifiers` (nid, id);
CREATE INDEX `identity_credential_identifiers_id_nid_idx` ON `identity_credential_identifiers` (id, nid);
DROP INDEX identity_credential_identifiers_nid_idx ON identity_credential_identifiers;
CREATE INDEX identity_credential_identifiers_nid_id_idx ON identity_credential_identifiers (nid, id);
CREATE INDEX identity_credential_identifiers_id_nid_idx ON identity_credential_identifiers (id, nid);

DROP INDEX `identity_credentials_nid_idx`;
CREATE INDEX `identity_credentials_nid_id_idx` ON `identity_credentials` (nid, id);
CREATE INDEX `identity_credentials_id_nid_idx` ON `identity_credentials` (id, nid);
DROP INDEX identity_credentials_nid_idx ON identity_credentials;
CREATE INDEX identity_credentials_nid_id_idx ON identity_credentials (nid, id);
CREATE INDEX identity_credentials_id_nid_idx ON identity_credentials (id, nid);

DROP INDEX `identity_recovery_addresses_nid_idx`;
CREATE INDEX `identity_recovery_addresses_nid_id_idx` ON `identity_recovery_addresses` (nid, id);
CREATE INDEX `identity_recovery_addresses_id_nid_idx` ON `identity_recovery_addresses` (id, nid);
DROP INDEX identity_recovery_addresses_nid_idx ON identity_recovery_addresses;
CREATE INDEX identity_recovery_addresses_nid_id_idx ON identity_recovery_addresses (nid, id);
CREATE INDEX identity_recovery_addresses_id_nid_idx ON identity_recovery_addresses (id, nid);

DROP INDEX `identity_recovery_tokens_nid_idx`;
CREATE INDEX `identity_recovery_tokens_nid_id_idx` ON `identity_recovery_tokens` (nid, id);
CREATE INDEX `identity_recovery_tokens_id_nid_idx` ON `identity_recovery_tokens` (id, nid);
CREATE INDEX `identity_recovery_tokens_selfservice_recovery_flow_id_idx` ON `identity_recovery_tokens` (selfservice_recovery_flow_id);
CREATE INDEX `identity_recovery_tokens_identity_recovery_address_id_idx` ON `identity_recovery_tokens` (identity_recovery_address_id);
CREATE INDEX `identity_recovery_tokens_token_nid_used_idx` ON `identity_recovery_tokens` (nid, token, used);
DROP INDEX `identity_recovery_addresses_code_idx`;
DROP INDEX identity_recovery_tokens_nid_idx ON identity_recovery_tokens;
DROP INDEX identity_recovery_addresses_code_idx ON identity_recovery_tokens;
CREATE INDEX identity_recovery_tokens_nid_id_idx ON identity_recovery_tokens (nid, id);
CREATE INDEX identity_recovery_tokens_id_nid_idx ON identity_recovery_tokens (id, nid);
CREATE INDEX identity_recovery_tokens_selfservice_recovery_flow_id_idx ON identity_recovery_tokens (selfservice_recovery_flow_id);
CREATE INDEX identity_recovery_tokens_identity_recovery_address_id_idx ON identity_recovery_tokens (identity_recovery_address_id);
CREATE INDEX identity_recovery_tokens_token_nid_used_idx ON identity_recovery_tokens (nid, token, used);

DROP INDEX `identity_verifiable_addresses_nid_idx`;
CREATE INDEX `identity_verifiable_addresses_nid_id_idx` ON `identity_verifiable_addresses` (nid, id);
CREATE INDEX `identity_verifiable_addresses_id_nid_idx` ON `identity_verifiable_addresses` (id, nid);
DROP INDEX identity_verifiable_addresses_nid_idx ON identity_verifiable_addresses;
CREATE INDEX identity_verifiable_addresses_nid_id_idx ON identity_verifiable_addresses (nid, id);
CREATE INDEX identity_verifiable_addresses_id_nid_idx ON identity_verifiable_addresses (id, nid);

DROP INDEX `identity_verification_tokens_nid_idx`;
DROP INDEX `identity_verification_tokens_token_idx`;
CREATE INDEX `identity_verification_tokens_nid_id_idx` ON `identity_verification_tokens` (nid, id);
CREATE INDEX `identity_verification_tokens_id_nid_idx` ON `identity_verification_tokens` (id, nid);
CREATE INDEX `identity_verification_tokens_token_nid_used_idx` ON `identity_verification_tokens` (nid, token, used);
DROP INDEX identity_verification_tokens_nid_idx ON identity_verification_tokens;
DROP INDEX identity_verification_tokens_token_idx ON identity_verification_tokens;
CREATE INDEX identity_verification_tokens_nid_id_idx ON identity_verification_tokens (nid, id);
CREATE INDEX identity_verification_tokens_id_nid_idx ON identity_verification_tokens (id, nid);
CREATE INDEX identity_verification_tokens_token_nid_used_idx ON identity_verification_tokens (nid, token, used);

DROP INDEX `selfservice_login_flows_nid_idx`;
CREATE INDEX `selfservice_login_flows_nid_id_idx` ON `selfservice_login_flows` (nid, id);
CREATE INDEX `selfservice_login_flows_id_nid_idx` ON `selfservice_login_flows` (id, nid);
DROP INDEX selfservice_login_flows_nid_idx ON selfservice_login_flows;
CREATE INDEX selfservice_login_flows_nid_id_idx ON selfservice_login_flows (nid, id);
CREATE INDEX selfservice_login_flows_id_nid_idx ON selfservice_login_flows (id, nid);

DROP INDEX `selfservice_recovery_flows_nid_idx`;
CREATE INDEX `selfservice_recovery_flows_nid_id_idx` ON `selfservice_recovery_flows` (nid, id);
CREATE INDEX `selfservice_recovery_flows_id_nid_idx` ON `selfservice_recovery_flows` (id, nid);
DROP INDEX selfservice_recovery_flows_nid_idx ON selfservice_recovery_flows;
CREATE INDEX selfservice_recovery_flows_nid_id_idx ON selfservice_recovery_flows (nid, id);
CREATE INDEX selfservice_recovery_flows_id_nid_idx ON selfservice_recovery_flows (id, nid);

DROP INDEX `selfservice_registration_flows_nid_idx`;
CREATE INDEX `selfservice_registration_flows_nid_id_idx` ON `selfservice_registration_flows` (nid, id);
CREATE INDEX `selfservice_registration_flows_id_nid_idx` ON `selfservice_registration_flows` (id, nid);
DROP INDEX selfservice_registration_flows_nid_idx ON selfservice_registration_flows;
CREATE INDEX selfservice_registration_flows_nid_id_idx ON selfservice_registration_flows (nid, id);
CREATE INDEX selfservice_registration_flows_id_nid_idx ON selfservice_registration_flows (id, nid);

DROP INDEX `selfservice_settings_flows_nid_idx`;
CREATE INDEX `selfservice_settings_flows_nid_id_idx` ON `selfservice_settings_flows` (nid, id);
CREATE INDEX `selfservice_settings_flows_id_nid_idx` ON `selfservice_settings_flows` (id, nid);
DROP INDEX selfservice_settings_flows_nid_idx ON selfservice_settings_flows;
CREATE INDEX selfservice_settings_flows_nid_id_idx ON selfservice_settings_flows (nid, id);
CREATE INDEX selfservice_settings_flows_id_nid_idx ON selfservice_settings_flows (id, nid);

DROP INDEX `selfservice_verification_flows_nid_idx`;
CREATE INDEX `selfservice_verification_flows_nid_id_idx` ON `selfservice_verification_flows` (nid, id);
CREATE INDEX `selfservice_verification_flows_id_nid_idx` ON `selfservice_verification_flows` (id, nid);
DROP INDEX selfservice_verification_flows_nid_idx ON selfservice_verification_flows;
CREATE INDEX selfservice_verification_flows_nid_id_idx ON selfservice_verification_flows (nid, id);
CREATE INDEX selfservice_verification_flows_id_nid_idx ON selfservice_verification_flows (id, nid);

DROP INDEX `sessions_nid_idx`;
DROP INDEX sessions_token_idx;
DROP INDEX sessions_logout_token_idx;
CREATE INDEX `sessions_nid_id_identity_id_idx` ON `sessions` (nid, identity_id, id);
CREATE INDEX `sessions_id_nid_idx` ON `sessions` (id, nid);
CREATE INDEX `sessions_token_nid_idx` ON `sessions` (nid, token);
DROP INDEX sessions_nid_idx ON sessions;
DROP INDEX sessions_token_idx ON sessions;
DROP INDEX sessions_logout_token_idx ON sessions;
CREATE INDEX sessions_nid_id_identity_id_idx ON sessions (nid, identity_id, id);
CREATE INDEX sessions_id_nid_idx ON sessions (id, nid);
CREATE INDEX sessions_token_nid_idx ON sessions (nid, token);

0 comments on commit d5550b5

Please sign in to comment.