fix: bulk migration account linking test fixes (#256)

* fix: fixing possible transactional lockup while bulk migrating

* fix: add user_id index to user roles table

* fix: change user_id index to user roles table to compound index

* fix: change user id index in user roles to smaller one

* chore: build version number

Author: tamassoltesz

CHANGELOG.md

@@ -7,6 +7,16 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
 
+## [8.1.2]
+
+- Adds user_id index to the user roles table
+
+### Migration
+
+```sql
+CREATE INDEX IF NOT EXISTS user_roles_app_id_user_id_index ON user_roles (app_id, user_id);
+```
+
 ## [8.1.1]
 
 - Adds more null and empty checks for bulk migration

build.gradle

@@ -2,7 +2,7 @@ plugins {
     id 'java-library'
 }
 
-version = "8.1.1"
+version = "8.1.2"
 
 repositories {
     mavenCentral()

src/main/java/io/supertokens/storage/postgresql/queries/GeneralQueries.java

@@ -534,6 +534,7 @@ public static void createTablesIfNotExists(Start start, Connection con) throws S
                     update(con, UserRolesQueries.getQueryToCreateUserRolesRoleIndex(start), NO_OP_SETTER);
                     update(con, UserRolesQueries.getQueryToCreateTenantIdIndexForUserRolesTable(start), NO_OP_SETTER);
                     update(con, UserRolesQueries.getQueryToCreateRoleIndexForUserRolesTable(start), NO_OP_SETTER);
+                    update(con, UserRolesQueries.getQueryToCreateUserIdIndexForUserRolesTable(start), NO_OP_SETTER);
                 }
 
                 if (!doesTableExists(start, con, Config.getConfig(start).getUserIdMappingTable())) {
@@ -1567,13 +1568,6 @@ public static AuthRecipeUserInfo[] listPrimaryUsersByMultipleEmailsOrPhonesOrThi
             throws SQLException, StorageQueryException {
         Set<String> userIds = new HashSet<>();
 
-        //I am not really sure this is really needed..
-        EmailPasswordQueries.lockEmail_Transaction(start, sqlCon, appIdentifier, emails);
-        ThirdPartyQueries.lockEmail_Transaction(start, sqlCon, appIdentifier, emails);
-        PasswordlessQueries.lockEmail_Transaction(start, sqlCon, appIdentifier, emails);
-        PasswordlessQueries.lockPhoneAndTenant_Transaction(start, sqlCon, appIdentifier, phones);
-        ThirdPartyQueries.lockThirdPartyInfoAndTenant_Transaction(start, sqlCon, appIdentifier, thirdpartyUserIdToThirdpartyId);
-
         //collect ids by email
         userIds.addAll(EmailPasswordQueries.getPrimaryUserIdsUsingMultipleEmails_Transaction(start, sqlCon, appIdentifier,
                 emails));

src/main/java/io/supertokens/storage/postgresql/queries/UserRolesQueries.java

@@ -116,6 +116,11 @@ public static String getQueryToCreateUserRolesRoleIndex(Start start) {
                 + "(app_id, tenant_id, role);";
     }
 
+    public static String getQueryToCreateUserIdIndexForUserRolesTable(Start start) {
+        return "CREATE INDEX IF NOT EXISTS user_roles_app_id_user_id_index ON " + getConfig(start).getUserRolesTable() +
+                "(app_id, user_id);";
+    }
+
     public static boolean createNewRoleOrDoNothingIfExists_Transaction(Start start, Connection con,
                                                                        AppIdentifier appIdentifier, String role)
             throws SQLException, StorageQueryException {