feat: improve DB query performance

applications/credhub-api/src/main/resources/db/migration/h2/V59__add_lowercase_credential_name_column_and_index.sql

@@ -0,0 +1,5 @@
+ALTER TABLE credential
+    ADD COLUMN name_lowercase VARCHAR(1024) AS LOWER(name);
+
+CREATE INDEX credential_name_lowercase
+    ON credential(name_lowercase);

applications/credhub-api/src/main/resources/db/migration/mysql/V57__add_lowercase_credential_name_column.sql

@@ -0,0 +1,2 @@
+ALTER TABLE credential
+    ADD COLUMN name_lowercase VARCHAR(1024) GENERATED ALWAYS AS (lower(name)) STORED;

applications/credhub-api/src/main/resources/db/migration/mysql/V58__index_lowercase_credential_name.sql

@@ -0,0 +1,2 @@
+CREATE INDEX credential_name_lowercase
+    ON credential(name_lowercase);

applications/credhub-api/src/main/resources/db/migration/postgres/V60__add_lowercase_credential_name_column.sql

@@ -0,0 +1,2 @@
+ALTER TABLE credential
+    ADD COLUMN name_lowercase VARCHAR(1024) GENERATED ALWAYS AS (lower(name)) STORED;

applications/credhub-api/src/main/resources/db/migration/postgres/V61__index_lowercase_credential_name.sql

@@ -0,0 +1,2 @@
+CREATE INDEX CONCURRENTLY IF NOT EXISTS credential_name_lowercase
+    ON credential(name_lowercase);

components/credentials/src/main/java/org/cloudfoundry/credhub/services/CredentialDataService.java

@@ -23,7 +23,7 @@ public CredentialDataService(final CredentialRepository credentialRepository, fi
   }
 
   public Credential find(final String name) {
-    return credentialRepository.findOneByNameIgnoreCase(name);
+    return credentialRepository.findOneByNameLowercase(name.toLowerCase());
   }
 
   public Credential findByUUID(final UUID uuid) {
@@ -37,7 +37,7 @@ public Credential save(final Credential credential) {
   public boolean delete(final String credentialName) {
     final Credential cred = this.find(credentialName);
     auditRecord.setResource(cred);
-    return credentialRepository.deleteByNameIgnoreCase(credentialName) > 0;
+    return credentialRepository.deleteByNameLowercase(credentialName.toLowerCase()) > 0;
   }
 
 }

components/credentials/src/main/kotlin/org/cloudfoundry/credhub/entity/Credential.kt

@@ -41,6 +41,9 @@ class Credential : AuditableCredential {
             }
         }
 
+    @Column(name = "name_lowercase", nullable = false, insertable = false)
+    var nameLowercase: String? = null
+
     @Column(unique = true, nullable = false)
     var checksum: String? = null
 

components/credentials/src/main/kotlin/org/cloudfoundry/credhub/repositories/CredentialRepository.kt

@@ -8,23 +8,23 @@ import java.util.UUID
 
 interface CredentialRepository : JpaRepository<Credential?, UUID?> {
     @Transactional
-    fun deleteByNameIgnoreCase(name: String?): Long
+    fun deleteByNameLowercase(name: String?): Long
 
     fun findOneByUuid(uuid: UUID?): Credential?
 
     @Query(
-        value = "select credential.uuid, credential.name, credential.checksum from certificate_credential " +
+        value = "select credential.uuid, credential.name, credential.name_lowercase, credential.checksum from certificate_credential " +
             "left join credential_version on certificate_credential.uuid = credential_version.uuid " +
             "join credential on credential.uuid = credential_version.credential_uuid " +
             "where credential.uuid = ?1",
         nativeQuery = true,
     )
     fun findCertificateByUuid(uuid: UUID?): Credential?
 
-    fun findOneByNameIgnoreCase(name: String?): Credential?
+    fun findOneByNameLowercase(name: String?): Credential?
 
     @Query(
-        value = "select credential.uuid, credential.name, credential.checksum from certificate_credential " +
+        value = "select credential.uuid, credential.name, credential.name_lowercase, credential.checksum from certificate_credential " +
             "left join credential_version on certificate_credential.uuid = credential_version.uuid " +
             "join credential on credential.uuid = credential_version.credential_uuid " +
             "group by credential.uuid",
@@ -33,7 +33,7 @@ interface CredentialRepository : JpaRepository<Credential?, UUID?> {
     fun findAllCertificates(): List<Credential>
 
     @Query(
-        value = "select credential.uuid, credential.name, credential.checksum from certificate_credential " +
+        value = "select credential.uuid, credential.name, credential.name_lowercase, credential.checksum from certificate_credential " +
             "left join credential_version on certificate_credential.uuid = credential_version.uuid " +
             "join credential on credential.uuid = credential_version.credential_uuid " +
             "where credential.name = ?1 limit 1 ",

components/credentials/src/main/kotlin/org/cloudfoundry/credhub/services/DefaultCredentialVersionDataService.kt

@@ -264,11 +264,11 @@ constructor(
                     (select version_created_at, credential_uuid from credential_version LEFT OUTER JOIN
                         certificate_credential on credential_version.uuid = certificate_credential.uuid
                         WHERE (transitional is false or transitional IS NULL)
-                        and credential_uuid in (select uuid from credential where lower(name) like ?))
+                        and credential_uuid in (select uuid from credential where name_lowercase like ?))
                         as credential_version
                     group by credential_uuid ) as credential_version
                  inner join
-                    (select * from credential where lower(name) like ? )
+                    (select * from credential where name_lowercase like ? )
                     as name on credential_version.credential_uuid = name.uuid
                  order by version_created_at desc
                 """.trimMargin()

components/credentials/src/test/kotlin/org/cloudfoundry/credhub/services/CredentialDataServiceTest.kt

@@ -36,7 +36,7 @@ class CredentialDataServiceTest {
         credentialRepository.save(credential)
         MatcherAssert.assertThat(credentialRepository.count(), IsEqual.equalTo(1L))
         MatcherAssert.assertThat(
-            credentialRepository.findOneByNameIgnoreCase(CREDENTIAL_NAME)!!.name,
+            credentialRepository.findOneByNameLowercase(CREDENTIAL_NAME.lowercase())!!.name,
             IsEqual.equalTo(CREDENTIAL_NAME),
         )
     }