From 47f469a780207bcb89ac64f1770133e0bcad9b90 Mon Sep 17 00:00:00 2001 From: Eric Wittmann Date: Thu, 8 Feb 2024 11:22:05 -0500 Subject: [PATCH 1/6] Switch to cascading deletes in the DB layer where possible. --- .../registry/storage/RegistryStorage.java | 2 +- .../impl/sql/AbstractSqlRegistryStorage.java | 160 ++++-------------- .../storage/impl/sql/CommonSqlStatements.java | 157 +++++++---------- .../storage/impl/sql/H2SqlStatements.java | 26 +-- .../impl/sql/PostgreSQLSqlStatements.java | 12 +- .../impl/sql/SQLServerSqlStatements.java | 41 ++--- .../storage/impl/sql/SqlStatements.java | 104 ++++-------- .../impl/sql/mappers/ContentEntityMapper.java | 4 +- .../impl/sql/mappers/ContentMapper.java | 2 +- .../sql/mappers/StoredArtifactMapper.java | 2 +- .../apicurio/registry/storage/impl/sql/h2.ddl | 104 ++++++------ .../registry/storage/impl/sql/mssql.ddl | 110 ++++++------ .../registry/storage/impl/sql/postgresql.ddl | 106 ++++++------ 13 files changed, 332 insertions(+), 498 deletions(-) diff --git a/app/src/main/java/io/apicurio/registry/storage/RegistryStorage.java b/app/src/main/java/io/apicurio/registry/storage/RegistryStorage.java index 59c3814493..01536fcab2 100644 --- a/app/src/main/java/io/apicurio/registry/storage/RegistryStorage.java +++ b/app/src/main/java/io/apicurio/registry/storage/RegistryStorage.java @@ -568,7 +568,7 @@ void updateArtifactRule(String groupId, String artifactId, RuleType rule, RuleCo void updateGroupMetaData(GroupMetaDataDto group) throws GroupNotFoundException, RegistryStorageException; /** - * Deletes a group intified by the given groupId and DELETES ALL resources related to this group + * Deletes a group identified by the given groupId and DELETES ALL resources related to this group * * @param groupId (optional) * @throws GroupNotFoundException diff --git a/app/src/main/java/io/apicurio/registry/storage/impl/sql/AbstractSqlRegistryStorage.java b/app/src/main/java/io/apicurio/registry/storage/impl/sql/AbstractSqlRegistryStorage.java index 272f96032d..a976319beb 100644 --- a/app/src/main/java/io/apicurio/registry/storage/impl/sql/AbstractSqlRegistryStorage.java +++ b/app/src/main/java/io/apicurio/registry/storage/impl/sql/AbstractSqlRegistryStorage.java @@ -4,8 +4,8 @@ import static io.apicurio.registry.storage.impl.sql.RegistryStorageContentUtils.notEmpty; import static io.apicurio.registry.storage.impl.sql.SqlUtil.convert; import static io.apicurio.registry.storage.impl.sql.SqlUtil.normalizeGroupId; -import static io.apicurio.registry.utils.StringUtil.limitStr; import static io.apicurio.registry.utils.StringUtil.asLowerCase; +import static io.apicurio.registry.utils.StringUtil.limitStr; import static java.util.stream.Collectors.toList; import java.sql.ResultSet; @@ -46,7 +46,6 @@ import io.apicurio.registry.model.BranchId; import io.apicurio.registry.model.GA; import io.apicurio.registry.model.GAV; -import io.apicurio.registry.model.GroupId; import io.apicurio.registry.model.VersionId; import io.apicurio.registry.storage.ArtifactStateExt; import io.apicurio.registry.storage.RegistryStorage; @@ -301,7 +300,7 @@ private void initializeDatabase(Handle handle) { log.debug("---"); statements.forEach(statement -> { - log.debug(statement); + log.info(statement); handle.createUpdate(statement).execute(); }); log.debug("---"); @@ -607,7 +606,7 @@ private ArtifactVersionMetaDataDto createArtifactVersionRaw(boolean firstVersion handle.createUpdate(sqlStatements.insertVersionLabel()) .bind(0, globalId) .bind(1, limitStr(k.toLowerCase(), 256)) - .bind(2, limitStr(v.toLowerCase(), 1024)) + .bind(2, limitStr(v.toLowerCase(), 512)) .execute(); }); } @@ -699,7 +698,7 @@ private Long getOrCreateContentRaw(ContentHandle content, String contentHash, St } if (insertReferences) { - //Finally, insert references into the "artifactreferences" table if the content wasn't present yet. + //Finally, insert references into the "content_references" table if the content wasn't present yet. insertReferences(contentId, references); } return contentId; @@ -715,7 +714,7 @@ private void insertReferences(Long contentId, List referen references.forEach(reference -> { handles.withHandleNoException(handle -> { try { - handle.createUpdate(sqlStatements.upsertReference()) + handle.createUpdate(sqlStatements.upsertContentReference()) .bind(0, contentId) .bind(1, normalizeGroupId(reference.getGroupId())) .bind(2, reference.getArtifactId()) @@ -822,35 +821,19 @@ public List deleteArtifact(String groupId, String artifactId) log.debug("Deleting an artifact: {} {}", groupId, artifactId); return handles.withHandle(handle -> { // Get the list of versions of the artifact (will be deleted) - List versions = handle.createQuery(sqlStatements.selectArtifactVersions()) .bind(0, normalizeGroupId(groupId)) .bind(1, artifactId) .mapTo(String.class) .list(); - - // TODO use CASCADE when deleting rows from the "versions" table - - // Delete labels - handle.createUpdate(sqlStatements.deleteVersionLabelsByGA()) - .bind(0, normalizeGroupId(groupId)) - .bind(1, artifactId) - .execute(); - - deleteAllArtifactBranchesInArtifact(new GA(groupId, artifactId)); - - // Delete versions - handle.createUpdate(sqlStatements.deleteVersions()) - .bind(0, normalizeGroupId(groupId)) - .bind(1, artifactId) - .execute(); - - // Delete artifact rules + + // Note: delete artifact rules as well. Artifact rules are not set to cascade on delete + // because the Confluent API allows users to configure rules for artifacts that don't exist. :( handle.createUpdate(sqlStatements.deleteArtifactRules()) .bind(0, normalizeGroupId(groupId)) .bind(1, artifactId) .execute(); - + // Delete artifact row (should be just one) int rowCount = handle.createUpdate(sqlStatements.deleteArtifact()) .bind(0, normalizeGroupId(groupId)) @@ -873,28 +856,13 @@ public List deleteArtifact(String groupId, String artifactId) public void deleteArtifacts(String groupId) throws RegistryStorageException { log.debug("Deleting all artifacts in group: {}", groupId); handles.withHandle(handle -> { - - // TODO use CASCADE when deleting rows from the "versions" table - - // Delete labels - handle.createUpdate(sqlStatements.deleteVersionLabelsByGroupId()) - .bind(0, normalizeGroupId(groupId)) - .execute(); - - // Delete branches - deleteAllArtifactBranchesInGroup(new GroupId(groupId)); - - // Delete versions - handle.createUpdate(sqlStatements.deleteVersionsByGroupId()) - .bind(0, normalizeGroupId(groupId)) - .execute(); - - // Delete artifact rules + // Note: delete artifact rules separately. Artifact rules are not set to cascade on delete + // because the Confluent API allows users to configure rules for artifacts that don't exist. :( handle.createUpdate(sqlStatements.deleteArtifactRulesByGroupId()) .bind(0, normalizeGroupId(groupId)) .execute(); - - // Delete artifact row (should be just one) + + // Delete all artifacts in the group int rowCount = handle.createUpdate(sqlStatements.deleteArtifactsByGroupId()) .bind(0, normalizeGroupId(groupId)) .execute(); @@ -1047,22 +1015,6 @@ public Set getArtifactIds(Integer limit) { // TODO Paging and order by } - /** - * IMPORTANT: Private methods can't be @Transactional. Callers MUST have started a transaction. - * - * @param groupId may be null to indicate the default group - */ - private Set getArtifactIds(String groupId, Integer limit) { // TODO Paging and order by - //Set limit to max integer in case limit is null (not allowed) - final Integer adjustedLimit = limit == null ? Integer.MAX_VALUE : limit; - return handles.withHandleNoException(handle -> { - Query query = handle.createQuery(sqlStatements.selectArtifactIdsInGroup()); - query.bind(1, adjustedLimit).bind(0, normalizeGroupId(groupId)); - return new HashSet<>(query.mapTo(String.class).list()); - }); - } - - @Override @Transactional public ArtifactSearchResultsDto searchArtifacts(Set filters, OrderBy orderBy, OrderDirection orderDirection, @@ -1634,30 +1586,6 @@ public void deleteArtifactVersion(String groupId, String artifactId, String vers } handles.withHandle(handle -> { - - // TODO use CASCADE when deleting rows from the "versions" table - - // Delete labels - handle.createUpdate(sqlStatements.deleteVersionLabelsByGAV()) - .bind(0, normalizeGroupId(groupId)) - .bind(1, artifactId) - .bind(2, version) - .execute(); - - // Delete comments - handle.createUpdate(sqlStatements.deleteVersionComments()) - .bind(0, normalizeGroupId(groupId)) - .bind(1, artifactId) - .bind(2, version) - .execute(); - - // Delete version in branches - handle.createUpdate(sqlStatements.deleteVersionInArtifactBranches()) - .bind(0, normalizeGroupId(groupId)) - .bind(1, artifactId) - .bind(2, version) - .execute(); - // Delete version int rows = handle.createUpdate(sqlStatements.deleteVersion()) .bind(0, normalizeGroupId(groupId)) @@ -1738,7 +1666,7 @@ private void updateArtifactVersionMetadataRaw(long globalId, String groupId, Str handle.createUpdate(sqli) .bind(0, globalId) .bind(1, limitStr(k.toLowerCase(), 256)) - .bind(2, limitStr(asLowerCase(v), 1024)) + .bind(2, limitStr(asLowerCase(v), 512)) .execute(); }); } @@ -1837,7 +1765,7 @@ public List getArtifactVersionComments(String groupId, String artifa try { return handles.withHandle(handle -> { - return handle.createQuery(sqlStatements.selectComments()) + return handle.createQuery(sqlStatements.selectVersionComments()) .bind(0, normalizeGroupId(groupId)) .bind(1, artifactId) .bind(2, version) @@ -1867,7 +1795,7 @@ public void deleteArtifactVersionComment(String groupId, String artifactId, Stri .findOne(); ArtifactVersionMetaDataDto avmdd = res.orElseThrow(() -> new VersionNotFoundException(groupId, artifactId, version)); - int rowCount = handle.createUpdate(sqlStatements.deleteComment()) + int rowCount = handle.createUpdate(sqlStatements.deleteVersionComment()) .bind(0, avmdd.getGlobalId()) .bind(1, commentId) .bind(2, deletedBy) @@ -1895,7 +1823,7 @@ public void updateArtifactVersionComment(String groupId, String artifactId, Stri .findOne(); ArtifactVersionMetaDataDto avmdd = res.orElseThrow(() -> new VersionNotFoundException(groupId, artifactId, version)); - int rowCount = handle.createUpdate(sqlStatements.updateComment()) + int rowCount = handle.createUpdate(sqlStatements.updateVersionComment()) .bind(0, value) .bind(1, avmdd.getGlobalId()) .bind(2, commentId) @@ -2145,21 +2073,26 @@ public void updateGroupMetaData(GroupMetaDataDto group) throws GroupNotFoundExce } + /** + * Deletes a group and all artifacts in that group. + * @see io.apicurio.registry.storage.RegistryStorage#deleteGroup(java.lang.String) + */ @Override @Transactional public void deleteGroup(String groupId) throws GroupNotFoundException, RegistryStorageException { handles.withHandleNoException(handle -> { + // Note: delete artifact rules separately. Artifact rules are not set to cascade on delete + // because the Confluent API allows users to configure rules for artifacts that don't exist. :( + handle.createUpdate(sqlStatements.deleteArtifactRulesByGroupId()) + .bind(0, normalizeGroupId(groupId)) + .execute(); + int rows = handle.createUpdate(sqlStatements.deleteGroup()) .bind(0, groupId) .execute(); if (rows == 0) { throw new GroupNotFoundException(groupId); } - // We have to perform an explicit check, otherwise an unchecked exception - // would roll the transaction back. - if (!getArtifactIds(groupId, 1).isEmpty()) { - deleteArtifacts(groupId); - } return null; }); } @@ -2253,7 +2186,7 @@ public void exportData(Function handler) throws RegistryStorageExc // Export all artifact comments ///////////////////////////////// handles.withHandle(handle -> { - Stream stream = handle.createQuery(sqlStatements.exportComments()) + Stream stream = handle.createQuery(sqlStatements.exportVersionComments()) .setFetchSize(50) .map(CommentEntityMapper.instance) .stream(); @@ -2520,13 +2453,13 @@ public void deleteAllUserData() { handles.withHandleNoException(handle -> { // Delete all artifacts and related data - handle.createUpdate(sqlStatements.deleteAllReferences()) + handle.createUpdate(sqlStatements.deleteAllContentReferences()) .execute(); handle.createUpdate(sqlStatements.deleteVersionLabelsByAll()) .execute(); - handle.createUpdate(sqlStatements.deleteAllComments()) + handle.createUpdate(sqlStatements.deleteAllVersionComments()) .execute(); handle.createUpdate(sqlStatements.deleteAllArtifactBranches()) @@ -2635,7 +2568,7 @@ public List getGlobalIdsReferencingArtifact(String groupId, String artifac @Transactional public List getInboundArtifactReferences(String groupId, String artifactId, String version) { return handles.withHandleNoException(handle -> { - return handle.createQuery(sqlStatements().selectInboundReferencesByGAV()) + return handle.createQuery(sqlStatements().selectInboundContentReferencesByGAV()) .bind(0, normalizeGroupId(groupId)) .bind(1, artifactId) .bind(2, version) @@ -2791,7 +2724,7 @@ private void deleteAllOrphanedContent() { handles.withHandleNoException(handle -> { // Delete orphaned references - handle.createUpdate(sqlStatements.deleteOrphanedReferences()) + handle.createUpdate(sqlStatements.deleteOrphanedContentReferences()) .execute(); // Delete orphaned content @@ -2820,7 +2753,7 @@ public void resetContentId() { @Override @Transactional public void resetCommentId() { - resetSequence(COMMENT_ID_SEQUENCE, sqlStatements.selectMaxCommentId()); + resetSequence(COMMENT_ID_SEQUENCE, sqlStatements.selectMaxVersionCommentId()); } @@ -3015,7 +2948,7 @@ public void importGroup(GroupEntity entity) { @Transactional public void importComment(CommentEntity entity) { handles.withHandleNoException(handle -> { - handle.createUpdate(sqlStatements.insertComment()) + handle.createUpdate(sqlStatements.insertVersionComment()) .bind(0, entity.commentId) .bind(1, entity.globalId) .bind(2, entity.createdBy) @@ -3444,31 +3377,6 @@ private GAV getGAVByGlobalId(long globalId) { } - /** - * IMPORTANT: Private methods can't be @Transactional. Callers MUST have started a transaction. - */ - private void deleteAllArtifactBranchesInArtifact(GA ga) { - handles.withHandleNoException(handle -> { - handle.createUpdate(sqlStatements.deleteAllArtifactBranchesInArtifact()) - .bind(0, ga.getRawGroupId()) - .bind(1, ga.getRawArtifactId()) - .execute(); - }); - } - - - /** - * IMPORTANT: Private methods can't be @Transactional. Callers MUST have started a transaction. - */ - private void deleteAllArtifactBranchesInGroup(GroupId groupId) { - handles.withHandleNoException(handle -> { - handle.createUpdate(sqlStatements.deleteAllArtifactBranchesInGroup()) - .bind(0, groupId.getRawGroupId()) - .execute(); - }); - } - - /** * Delete an artifact branch without version cleanup. *

diff --git a/app/src/main/java/io/apicurio/registry/storage/impl/sql/CommonSqlStatements.java b/app/src/main/java/io/apicurio/registry/storage/impl/sql/CommonSqlStatements.java index 6182435f49..2472ec7f1b 100644 --- a/app/src/main/java/io/apicurio/registry/storage/impl/sql/CommonSqlStatements.java +++ b/app/src/main/java/io/apicurio/registry/storage/impl/sql/CommonSqlStatements.java @@ -64,7 +64,7 @@ public String getDatabaseVersion() { */ @Override public String insertGlobalRule() { - return "INSERT INTO globalrules (type, configuration) VALUES (?, ?)"; + return "INSERT INTO global_rules (type, configuration) VALUES (?, ?)"; } /** @@ -72,7 +72,7 @@ public String insertGlobalRule() { */ @Override public String selectGlobalRules() { - return "SELECT r.type FROM globalrules r "; + return "SELECT r.type FROM global_rules r "; } /** @@ -80,7 +80,7 @@ public String selectGlobalRules() { */ @Override public String selectGlobalRuleByType() { - return "SELECT r.* FROM globalrules r WHERE r.type = ?"; + return "SELECT r.* FROM global_rules r WHERE r.type = ?"; } /** @@ -88,7 +88,7 @@ public String selectGlobalRuleByType() { */ @Override public String deleteGlobalRule() { - return "DELETE FROM globalrules WHERE type = ?"; + return "DELETE FROM global_rules WHERE type = ?"; } /** @@ -96,7 +96,7 @@ public String deleteGlobalRule() { */ @Override public String deleteGlobalRules() { - return "DELETE FROM globalrules"; + return "DELETE FROM global_rules"; } /** @@ -104,7 +104,7 @@ public String deleteGlobalRules() { */ @Override public String updateGlobalRule() { - return "UPDATE globalrules SET configuration = ? WHERE type = ?"; + return "UPDATE global_rules SET configuration = ? WHERE type = ?"; } /** @@ -159,14 +159,6 @@ public String selectArtifactVersions() { return "SELECT version FROM versions WHERE groupId = ? AND artifactId = ?"; } - /** - * @see io.apicurio.registry.storage.impl.sql.SqlStatements#selectArtifactVersions() - */ - @Override - public String selectArtifactVersionsSkipDisabled() { - return "SELECT version FROM versions WHERE groupId = ? AND artifactId = ? AND state != 'DISABLED'"; - } - /** * @see io.apicurio.registry.storage.impl.sql.SqlStatements#selectArtifactVersionMetaData() */ @@ -212,7 +204,7 @@ public String selectArtifactVersionMetaDataByCanonicalHash() { */ @Override public String selectArtifactVersionContentByGlobalId() { - return "SELECT v.globalId, v.version, v.versionOrder, v.contentId, c.content, c.artifactreferences FROM versions v " + return "SELECT v.globalId, v.version, v.versionOrder, v.contentId, c.content, c.refs FROM versions v " + "JOIN content c ON v.contentId = c.contentId " + "WHERE v.globalId = ?"; } @@ -222,7 +214,7 @@ public String selectArtifactVersionContentByGlobalId() { */ @Override public String selectArtifactVersionContent() { - return "SELECT v.globalId, v.version, v.versionOrder, c.contentId, c.content, c.artifactreferences FROM versions v " + return "SELECT v.globalId, v.version, v.versionOrder, c.contentId, c.content, c.refs FROM versions v " + "JOIN content c ON v.contentId = c.contentId " + "WHERE v.groupId = ? AND v.artifactId = ? AND v.version = ?"; } @@ -258,7 +250,7 @@ public String selectContentIdByHash() { */ @Override public String selectArtifactRules() { - return "SELECT r.* FROM rules r WHERE r.groupId = ? AND r.artifactId = ?"; + return "SELECT r.* FROM artifact_rules r WHERE r.groupId = ? AND r.artifactId = ?"; } /** @@ -266,7 +258,7 @@ public String selectArtifactRules() { */ @Override public String insertArtifactRule() { - return "INSERT INTO rules (groupId, artifactId, type, configuration) VALUES (?, ?, ?, ?)"; + return "INSERT INTO artifact_rules (groupId, artifactId, type, configuration) VALUES (?, ?, ?, ?)"; } /** @@ -274,7 +266,7 @@ public String insertArtifactRule() { */ @Override public String selectArtifactRuleByType() { - return "SELECT r.* FROM rules r WHERE r.groupId = ? AND r.artifactId = ? AND r.type = ?"; + return "SELECT r.* FROM artifact_rules r WHERE r.groupId = ? AND r.artifactId = ? AND r.type = ?"; } /** @@ -282,7 +274,7 @@ public String selectArtifactRuleByType() { */ @Override public String updateArtifactRule() { - return "UPDATE rules SET configuration = ? WHERE groupId = ? AND artifactId = ? AND type = ?"; + return "UPDATE artifact_rules SET configuration = ? WHERE groupId = ? AND artifactId = ? AND type = ?"; } @Override @@ -295,7 +287,7 @@ public String updateArtifactOwner() { */ @Override public String deleteArtifactRule() { - return "DELETE FROM rules WHERE groupId = ? AND artifactId = ? AND type = ?"; + return "DELETE FROM artifact_rules WHERE groupId = ? AND artifactId = ? AND type = ?"; } /** @@ -303,36 +295,31 @@ public String deleteArtifactRule() { */ @Override public String deleteArtifactRules() { - return "DELETE FROM rules WHERE groupId = ? AND artifactId = ?"; + return "DELETE FROM artifact_rules WHERE groupId = ? AND artifactId = ?"; } /** - * @see SqlStatements#deleteAllArtifactRules() + * @see io.apicurio.registry.storage.impl.sql.SqlStatements#deleteArtifactRulesByGroupId() */ - @Override - public String deleteAllArtifactRules() { - return "DELETE FROM rules"; - } - @Override public String deleteArtifactRulesByGroupId() { - return "DELETE FROM rules WHERE groupId = ?"; + return "DELETE FROM artifact_rules WHERE groupId = ?"; } /** - * @see io.apicurio.registry.storage.impl.sql.SqlStatements#updateArtifactVersionMetaData() + * @see SqlStatements#deleteAllArtifactRules() */ @Override - public String updateArtifactVersionMetaData() { - return "UPDATE versions SET name = ?, description = ?, labels = ? WHERE groupId = ? AND artifactId = ? AND version = ?"; + public String deleteAllArtifactRules() { + return "DELETE FROM artifact_rules"; } /** - * @see io.apicurio.registry.storage.impl.sql.SqlStatements#deleteVersionLabelsByGA() + * @see io.apicurio.registry.storage.impl.sql.SqlStatements#updateArtifactVersionMetaData() */ @Override - public String deleteVersionLabelsByGA() { - return "DELETE FROM version_labels WHERE globalId IN (SELECT globalId FROM versions WHERE groupId = ? AND artifactId = ?)"; + public String updateArtifactVersionMetaData() { + return "UPDATE versions SET name = ?, description = ?, labels = ? WHERE groupId = ? AND artifactId = ? AND version = ?"; } /** @@ -343,29 +330,14 @@ public String deleteVersionLabelsByGlobalId() { return "DELETE FROM version_labels WHERE globalId = ?"; } - @Override - public String deleteVersionLabelsByGroupId() { - return "DELETE FROM version_labels WHERE globalId IN (SELECT globalId FROM versions WHERE groupId = ?)"; - } - @Override public String deleteVersionLabelsByAll() { return "DELETE FROM version_labels WHERE globalId IN (SELECT globalId FROM versions)"; } @Override - public String deleteAllComments() { - return "DELETE FROM comments WHERE globalId IN (SELECT globalId FROM versions)"; - } - - @Override - public String deleteVersions() { - return "DELETE FROM versions WHERE groupId = ? AND artifactId = ?"; - } - - @Override - public String deleteVersionsByGroupId() { - return "DELETE FROM versions WHERE groupId = ?"; + public String deleteAllVersionComments() { + return "DELETE FROM version_comments WHERE globalId IN (SELECT globalId FROM versions)"; } @Override @@ -399,11 +371,6 @@ public String selectArtifactIds() { return "SELECT artifactId FROM artifacts LIMIT ?"; } - @Override - public String selectArtifactIdsInGroup() { - return "SELECT artifactId FROM artifacts WHERE groupId = ? LIMIT ?"; - } - /** * @see io.apicurio.registry.storage.impl.sql.SqlStatements#selectArtifactMetaDataByGlobalId() */ @@ -439,14 +406,6 @@ public String deleteVersionLabelsByGAV() { return "DELETE FROM version_labels WHERE globalId IN (SELECT v.globalId FROM versions v WHERE v.groupId = ? AND v.artifactId = ? AND v.version = ?)"; } - /** - * @see io.apicurio.registry.storage.impl.sql.SqlStatements#deleteVersionComments() - */ - @Override - public String deleteVersionComments() { - return "DELETE FROM comments WHERE globalId IN (SELECT v.globalId FROM versions v WHERE v.groupId = ? AND v.artifactId = ? AND v.version = ?)"; - } - /** * @see io.apicurio.registry.storage.impl.sql.SqlStatements#insertVersionLabel() */ @@ -530,7 +489,7 @@ public String selectGroupCountById() { */ @Override public String selectArtifactRuleCountByType() { - return "SELECT COUNT(r.type) FROM rules r WHERE r.groupId = ? AND r.artifactId = ? AND r.type = ?"; + return "SELECT COUNT(r.type) FROM artifact_rules r WHERE r.groupId = ? AND r.artifactId = ? AND r.type = ?"; } /** @@ -538,7 +497,7 @@ public String selectArtifactRuleCountByType() { */ @Override public String selectGlobalRuleCountByType() { - return "SELECT COUNT(r.type) FROM globalrules r WHERE r.type = ?"; + return "SELECT COUNT(r.type) FROM global_rules r WHERE r.type = ?"; } /** @@ -554,7 +513,7 @@ public String selectContentCountByHash() { */ @Override public String selectContentById() { - return "SELECT c.content, c.artifactreferences FROM content c " + return "SELECT c.content, c.refs FROM content c " + "WHERE c.contentId = ?"; } @@ -563,7 +522,7 @@ public String selectContentById() { */ @Override public String selectContentByContentHash() { - return "SELECT c.content, c.artifactreferences FROM content c " + return "SELECT c.content, c.refs FROM content c " + "WHERE c.contentHash = ?"; } @@ -645,7 +604,7 @@ public String selectGroupByGroupId() { */ @Override public String exportArtifactRules() { - return "SELECT * FROM rules r"; + return "SELECT * FROM artifact_rules r"; } /** @@ -659,11 +618,11 @@ public String exportArtifactVersions() { } /** - * @see io.apicurio.registry.storage.impl.sql.SqlStatements#exportComments() + * @see io.apicurio.registry.storage.impl.sql.SqlStatements#exportVersionComments() */ @Override - public String exportComments() { - return "SELECT * FROM comments c "; + public String exportVersionComments() { + return "SELECT * FROM version_comments c "; } /** @@ -671,7 +630,7 @@ public String exportComments() { */ @Override public String exportContent() { - return "SELECT c.contentId, c.canonicalHash, c.contentHash, c.content, c.artifactreferences FROM content c "; + return "SELECT c.contentId, c.canonicalHash, c.contentHash, c.content, c.refs FROM content c "; } /** @@ -679,7 +638,7 @@ public String exportContent() { */ @Override public String exportGlobalRules() { - return "SELECT * FROM globalrules r "; + return "SELECT * FROM global_rules r "; } /** @@ -702,7 +661,7 @@ public String exportArtifactBranches() { */ @Override public String importArtifactRule() { - return "INSERT INTO rules (groupId, artifactId, type, configuration) VALUES (?, ?, ?, ?)"; + return "INSERT INTO artifact_rules (groupId, artifactId, type, configuration) VALUES (?, ?, ?, ?)"; } /** @@ -719,7 +678,7 @@ public String importArtifactVersion() { */ @Override public String importContent() { - return "INSERT INTO content (contentId, canonicalHash, contentHash, content, artifactreferences) VALUES (?, ?, ?, ?, ?)"; + return "INSERT INTO content (contentId, canonicalHash, contentHash, content, refs) VALUES (?, ?, ?, ?, ?)"; } /** @@ -727,7 +686,7 @@ public String importContent() { */ @Override public String importGlobalRule() { - return "INSERT INTO globalrules (type, configuration) VALUES (?, ?)"; + return "INSERT INTO global_rules (type, configuration) VALUES (?, ?)"; } /** @@ -756,11 +715,11 @@ public String selectMaxGlobalId() { } /** - * @see io.apicurio.registry.storage.impl.sql.SqlStatements#selectMaxCommentId() + * @see io.apicurio.registry.storage.impl.sql.SqlStatements#selectMaxVersionCommentId() */ @Override - public String selectMaxCommentId() { - return "SELECT MAX(commentId) FROM comments "; + public String selectMaxVersionCommentId() { + return "SELECT MAX(commentId) FROM version_comments "; } /** @@ -924,60 +883,60 @@ public String selectStaleConfigProperties() { } @Override - public String deleteAllReferences() { - return "DELETE FROM artifactreferences "; + public String deleteAllContentReferences() { + return "DELETE FROM content_references "; } @Override - public String deleteOrphanedReferences() { - return "DELETE FROM artifactreferences WHERE NOT EXISTS (SELECT 1 FROM versions v WHERE v.contentId = contentId)"; + public String deleteOrphanedContentReferences() { + return "DELETE FROM content_references WHERE NOT EXISTS (SELECT 1 FROM versions v WHERE v.contentId = contentId)"; } @Override public String selectContentIdsReferencingArtifactBy() { - return "SELECT contentId FROM artifactreferences WHERE groupId=? AND artifactId=? AND version=?"; + return "SELECT contentId FROM content_references WHERE groupId=? AND artifactId=? AND version=?"; } @Override public String selectGlobalIdsReferencingArtifactBy() { - return "SELECT DISTINCT v.globalId FROM versions v JOIN artifactreferences ar ON v.contentId=ar.contentId WHERE ar.groupId=? AND ar.artifactId=? AND ar.version=?"; + return "SELECT DISTINCT v.globalId FROM versions v JOIN content_references ar ON v.contentId=ar.contentId WHERE ar.groupId=? AND ar.artifactId=? AND ar.version=?"; } @Override - public String selectInboundReferencesByGAV() { - return "SELECT DISTINCT v.groupId, v.artifactId, v.version, ar.name as name FROM versions v JOIN artifactreferences ar ON v.contentId=ar.contentId WHERE ar.groupId=? AND ar.artifactId=? AND ar.version=?"; + public String selectInboundContentReferencesByGAV() { + return "SELECT DISTINCT v.groupId, v.artifactId, v.version, ar.name as name FROM versions v JOIN content_references ar ON v.contentId=ar.contentId WHERE ar.groupId=? AND ar.artifactId=? AND ar.version=?"; } @Override public String insertSequenceValue() { - return "INSERT INTO sequences (name, value) VALUES (?, ?)"; + return "INSERT INTO sequences (seq_name, seq_value) VALUES (?, ?)"; } @Override public String selectCurrentSequenceValue() { - return "SELECT value FROM sequences WHERE name = ? "; + return "SELECT seq_value FROM sequences WHERE seq_name = ? "; } @Override - public String insertComment() { - return "INSERT INTO comments (commentId, globalId, createdBy, createdOn, cvalue) VALUES (?, ?, ?, ?, ?)"; + public String insertVersionComment() { + return "INSERT INTO version_comments (commentId, globalId, createdBy, createdOn, cvalue) VALUES (?, ?, ?, ?, ?)"; } @Override - public String selectComments() { + public String selectVersionComments() { return "SELECT c.* " - + "FROM comments c JOIN versions v ON v.globalId = c.globalId " + + "FROM version_comments c JOIN versions v ON v.globalId = c.globalId " + "WHERE v.groupId = ? AND v.artifactId = ? AND v.version = ? ORDER BY c.createdOn DESC"; } @Override - public String deleteComment() { - return "DELETE FROM comments WHERE globalId = ? AND commentId = ? AND createdBy = ?"; + public String deleteVersionComment() { + return "DELETE FROM version_comments WHERE globalId = ? AND commentId = ? AND createdBy = ?"; } @Override - public String updateComment() { - return "UPDATE comments SET cvalue = ? WHERE globalId = ? AND commentId = ? AND createdBy = ?"; + public String updateVersionComment() { + return "UPDATE version_comments SET cvalue = ? WHERE globalId = ? AND commentId = ? AND createdBy = ?"; } diff --git a/app/src/main/java/io/apicurio/registry/storage/impl/sql/H2SqlStatements.java b/app/src/main/java/io/apicurio/registry/storage/impl/sql/H2SqlStatements.java index 620b48eafb..36c186de79 100644 --- a/app/src/main/java/io/apicurio/registry/storage/impl/sql/H2SqlStatements.java +++ b/app/src/main/java/io/apicurio/registry/storage/impl/sql/H2SqlStatements.java @@ -49,7 +49,7 @@ public String isDatabaseInitialized() { */ @Override public String upsertContent() { - return "INSERT INTO content (contentId, canonicalHash, contentHash, content, artifactreferences) VALUES (?, ?, ?, ?, ?)"; + return "INSERT INTO content (contentId, canonicalHash, contentHash, content, refs) VALUES (?, ?, ?, ?, ?)"; } /** @@ -60,35 +60,19 @@ public String getNextSequenceValue() { throw new RuntimeException("Not applicable when using H2 as the database kind."); } - /** - * @see io.apicurio.registry.storage.impl.sql.SqlStatements#selectCurrentSequenceValue() - */ - @Override - public String selectCurrentSequenceValue() { - return "SELECT seq_value FROM sequences WHERE name = ? "; - } - /** * @see io.apicurio.registry.storage.impl.sql.SqlStatements#resetSequenceValue() */ @Override public String resetSequenceValue() { - return "MERGE INTO sequences (name, seq_value) KEY (name) VALUES(?, ?)"; - } - - /** - * @see io.apicurio.registry.storage.impl.sql.SqlStatements#insertSequenceValue() - */ - @Override - public String insertSequenceValue() { - return "INSERT INTO sequences (name, seq_value) VALUES (?, ?)"; + return "MERGE INTO sequences (seq_name, seq_value) KEY (seq_name) VALUES(?, ?)"; } /** - * @see SqlStatements#upsertReference() + * @see SqlStatements#upsertContentReference() */ @Override - public String upsertReference() { - return "INSERT INTO artifactreferences (contentId, groupId, artifactId, version, name) VALUES (?, ?, ?, ?, ?)"; + public String upsertContentReference() { + return "INSERT INTO content_references (contentId, groupId, artifactId, version, name) VALUES (?, ?, ?, ?, ?)"; } } diff --git a/app/src/main/java/io/apicurio/registry/storage/impl/sql/PostgreSQLSqlStatements.java b/app/src/main/java/io/apicurio/registry/storage/impl/sql/PostgreSQLSqlStatements.java index 507530a204..de1a15a1a0 100644 --- a/app/src/main/java/io/apicurio/registry/storage/impl/sql/PostgreSQLSqlStatements.java +++ b/app/src/main/java/io/apicurio/registry/storage/impl/sql/PostgreSQLSqlStatements.java @@ -49,7 +49,7 @@ public String isDatabaseInitialized() { */ @Override public String upsertContent() { - return "INSERT INTO content (contentId, canonicalHash, contentHash, content, artifactreferences) VALUES (?, ?, ?, ?, ?) ON CONFLICT (contentHash) DO NOTHING"; + return "INSERT INTO content (contentId, canonicalHash, contentHash, content, refs) VALUES (?, ?, ?, ?, ?) ON CONFLICT (contentHash) DO NOTHING"; } /** @@ -57,7 +57,7 @@ public String upsertContent() { */ @Override public String getNextSequenceValue() { - return "INSERT INTO sequences (name, value) VALUES (?, 1) ON CONFLICT (name) DO UPDATE SET value = sequences.value + 1 RETURNING value"; + return "INSERT INTO sequences (seq_name, seq_value) VALUES (?, 1) ON CONFLICT (seq_name) DO UPDATE SET seq_value = sequences.seq_value + 1 RETURNING seq_value"; } /** @@ -65,14 +65,14 @@ public String getNextSequenceValue() { */ @Override public String resetSequenceValue() { - return "INSERT INTO sequences (name, value) VALUES (?, ?) ON CONFLICT (name) DO UPDATE SET value = ?"; + return "INSERT INTO sequences (seq_name, seq_value) VALUES (?, ?) ON CONFLICT (seq_name) DO UPDATE SET seq_value = ?"; } /** - * @see SqlStatements#upsertReference() + * @see SqlStatements#upsertContentReference() */ @Override - public String upsertReference() { - return "INSERT INTO artifactreferences (contentId, groupId, artifactId, version, name) VALUES (?, ?, ?, ?, ?) ON CONFLICT (contentId, name) DO NOTHING"; + public String upsertContentReference() { + return "INSERT INTO content_references (contentId, groupId, artifactId, version, name) VALUES (?, ?, ?, ?, ?) ON CONFLICT (contentId, name) DO NOTHING"; } } \ No newline at end of file diff --git a/app/src/main/java/io/apicurio/registry/storage/impl/sql/SQLServerSqlStatements.java b/app/src/main/java/io/apicurio/registry/storage/impl/sql/SQLServerSqlStatements.java index dae0fad3a5..e4a51f2c08 100644 --- a/app/src/main/java/io/apicurio/registry/storage/impl/sql/SQLServerSqlStatements.java +++ b/app/src/main/java/io/apicurio/registry/storage/impl/sql/SQLServerSqlStatements.java @@ -52,11 +52,11 @@ public String isDatabaseInitialized() { public String upsertContent() { return String.join(" ", "MERGE INTO content AS target", - "USING (VALUES (?, ?, ?, ?, ?)) AS source (contentId, canonicalHash, contentHash, content, artifactreferences)", + "USING (VALUES (?, ?, ?, ?, ?)) AS source (contentId, canonicalHash, contentHash, content, refs)", "ON (target.contentHash = source.contentHash)", "WHEN NOT MATCHED THEN", - "INSERT (contentId, canonicalHash, contentHash, content, artifactreferences)", - "VALUES (source.contentId, source.canonicalHash, source.contentHash, source.content, source.artifactreferences);"); + "INSERT (contentId, canonicalHash, contentHash, content, refs)", + "VALUES (source.contentId, source.canonicalHash, source.contentHash, source.content, source.refs);"); } /** @@ -66,14 +66,14 @@ public String upsertContent() { public String getNextSequenceValue() { return String.join(" ", "MERGE INTO sequences AS target", - "USING (VALUES (?)) AS source (name)", - "ON (target.name = source.name)", + "USING (VALUES (?)) AS source (seq_name)", + "ON (target.seq_name = source.seq_name)", "WHEN MATCHED THEN", - "UPDATE SET value = target.value + 1", + "UPDATE SET seq_value = target.seq_value + 1", "WHEN NOT MATCHED THEN", - "INSERT (name, value)", - "VALUES (source.name, 1)", - "OUTPUT INSERTED.value;"); + "INSERT (seq_name, seq_value)", + "VALUES (source.seq_name, 1)", + "OUTPUT INSERTED.seq_value;"); } /** @@ -83,23 +83,23 @@ public String getNextSequenceValue() { public String resetSequenceValue() { return String.join(" ", "MERGE INTO sequences AS target", - "USING (VALUES (?, ?)) AS source (name, value)", - "ON (target.name = source.name)", + "USING (VALUES (?, ?)) AS source (seq_name, seq_value)", + "ON (target.seq_name = source.seq_name)", "WHEN MATCHED THEN", - "UPDATE SET value = ?", + "UPDATE SET seq_value = ?", "WHEN NOT MATCHED THEN", - "INSERT (name, value)", - "VALUES (source.name, source.value)", - "OUTPUT INSERTED.value;"); + "INSERT (seq_name, seq_value)", + "VALUES (source.seq_name, source.seq_value)", + "OUTPUT INSERTED.seq_value;"); } /** - * @see SqlStatements#upsertReference() + * @see SqlStatements#upsertContentReference() */ @Override - public String upsertReference() { + public String upsertContentReference() { return String.join(" ", - "MERGE INTO artifactreferences AS target", + "MERGE INTO content_references AS target", "USING (VALUES (?, ?, ?, ?, ?)) AS source (contentId, groupId, artifactId, version, name)", "ON (target.contentId = source.contentId AND target.name = source.name)", "WHEN NOT MATCHED THEN", @@ -115,11 +115,6 @@ public String selectArtifactIds() { return "SELECT TOP (?) artifactId FROM artifacts "; } - @Override - public String selectArtifactIdsInGroup() { - return "SELECT TOP (?) artifactId FROM artifacts WHERE groupId = ?"; - } - /** * @see io.apicurio.registry.storage.impl.sql.SqlStatements#selectAllArtifactVersions() */ diff --git a/app/src/main/java/io/apicurio/registry/storage/impl/sql/SqlStatements.java b/app/src/main/java/io/apicurio/registry/storage/impl/sql/SqlStatements.java index d9190576bd..659e74ebc2 100644 --- a/app/src/main/java/io/apicurio/registry/storage/impl/sql/SqlStatements.java +++ b/app/src/main/java/io/apicurio/registry/storage/impl/sql/SqlStatements.java @@ -86,7 +86,6 @@ public interface SqlStatements { */ public String insertArtifact(); - /** * A statement used to update the 'version' column of the 'versions' table by globalId. The value of the "versionOrder" * column is copied into the "version" column. @@ -128,11 +127,6 @@ public interface SqlStatements { */ public String selectArtifactVersions(); - /** - * A statement used to select all version #s for a given artifactId. - */ - public String selectArtifactVersionsSkipDisabled(); - /** * A statement used to select all versions for a given artifactId. */ @@ -182,7 +176,7 @@ public interface SqlStatements { /** * A statement to get a single artifact (latest version) meta-data by artifactId. */ - String selectArtifactMetaData(); + public String selectArtifactMetaData(); /** @@ -228,12 +222,7 @@ public interface SqlStatements { /** * A statement to delete all rules for a all artifacts. */ - String deleteAllArtifactRules(); - - /** - * A statement to delete all rules for all artifacts in a groupId. - */ - public String deleteArtifactRulesByGroupId(); + public String deleteAllArtifactRules(); /** * A statement to update the meta-data of a specific artifact version. @@ -245,21 +234,11 @@ public interface SqlStatements { */ public String deleteVersionLabelsByGAV(); - /** - * A statement to delete all labels for all versions for a single artifact. - */ - public String deleteVersionLabelsByGA(); - /** * A statement to delete all labels for a single artifact version by globalId */ public String deleteVersionLabelsByGlobalId(); - /** - * A statement to delete all labels for all versions for all artifacts in a groupId. - */ - public String deleteVersionLabelsByGroupId(); - /** * A statement to delete all labels for all versions for all artifacts */ @@ -268,22 +247,12 @@ public interface SqlStatements { /** * A statement to delete all comments for all versions for all artifacts */ - public String deleteAllComments(); - - /** - * A statement to delete all versions for a single artifact. - */ - public String deleteVersions(); - - /** - * A statement to delete all versions for all artifacts in a groupId. - */ - public String deleteVersionsByGroupId(); + public String deleteAllVersionComments(); /** * A statement to delete all versions for all artifacts. */ - String deleteAllVersions(); + public String deleteAllVersions(); /** * A statement to delete a single row from the artifacts table by artifactId. @@ -295,18 +264,21 @@ public interface SqlStatements { */ public String deleteArtifactsByGroupId(); + /** + * A statement to delete a all artifact rules by groupId. + */ + public String deleteArtifactRulesByGroupId(); + /** * A statement to delete a all artifacts. */ - String deleteAllArtifacts(); + public String deleteAllArtifacts(); /** * A statement to get all artifacts IDs. */ public String selectArtifactIds(); - String selectArtifactIdsInGroup(); - /** * A statement to get an artifact's meta-data by version globalId. */ @@ -316,10 +288,6 @@ public interface SqlStatements { * A statement to update the state of an artifact version (by globalId); */ public String updateArtifactVersionState(); - /** - * A statement to delete the comments for a single artifact version. - */ - public String deleteVersionComments(); /** * A statement to delete a single artifact version. @@ -344,7 +312,7 @@ public interface SqlStatements { /** * A statement to insert a row in the "references" table. */ - public String upsertReference(); + public String upsertContentReference(); /** * A statement to select ids of content referencing artifact @@ -359,7 +327,7 @@ public interface SqlStatements { /** * A statement to select GAV info of artifact versions with content referencing an artifact */ - public String selectInboundReferencesByGAV(); + public String selectInboundContentReferencesByGAV(); /** * A statement to select the number of artifacts with a given artifactId (should be 0 or 1). @@ -460,11 +428,11 @@ public interface SqlStatements { public String exportArtifactRules(); - public String exportComments(); + public String exportVersionComments(); public String exportArtifactVersions(); - String exportArtifactBranches(); + public String exportArtifactBranches(); /* * The next few statements support importing data into the DB. @@ -480,13 +448,13 @@ public interface SqlStatements { public String importArtifactVersion(); - String importArtifactBranch(); + public String importArtifactBranch(); public String selectMaxContentId(); public String selectMaxGlobalId(); - public String selectMaxCommentId(); + public String selectMaxVersionCommentId(); public String selectContentExists(); @@ -501,7 +469,7 @@ public interface SqlStatements { public String deleteRoleMapping(); - String deleteAllRoleMappings(); + public String deleteAllRoleMappings(); public String selectRoleMappingByPrincipalId(); @@ -543,49 +511,49 @@ public interface SqlStatements { public String selectStaleConfigProperties(); - public String deleteAllReferences(); + public String deleteAllContentReferences(); - public String deleteOrphanedReferences(); + public String deleteOrphanedContentReferences(); /* * The next statements relate to comments. */ - String insertComment(); + public String insertVersionComment(); - String selectComments(); + public String selectVersionComments(); - String deleteComment(); + public String deleteVersionComment(); - String updateComment(); + public String updateVersionComment(); // ========== Branches ========== - String selectGAVByGlobalId(); + public String selectGAVByGlobalId(); - String selectArtifactBranches(); + public String selectArtifactBranches(); - String selectArtifactBranchOrdered(); + public String selectArtifactBranchOrdered(); - String selectArtifactBranchOrderedNotDisabled(); + public String selectArtifactBranchOrderedNotDisabled(); - String insertArtifactBranch(); + public String insertArtifactBranch(); - String selectArtifactBranchTip(); + public String selectArtifactBranchTip(); - String selectArtifactBranchTipNotDisabled(); + public String selectArtifactBranchTipNotDisabled(); - String deleteArtifactBranch(); + public String deleteArtifactBranch(); - String deleteVersionInArtifactBranches(); + public String deleteVersionInArtifactBranches(); - String deleteAllArtifactBranchesInArtifact(); + public String deleteAllArtifactBranchesInArtifact(); - String deleteAllArtifactBranchesInGroup(); + public String deleteAllArtifactBranchesInGroup(); - String deleteAllArtifactBranches(); + public String deleteAllArtifactBranches(); - String selectVersionsWithoutArtifactBranch(); + public String selectVersionsWithoutArtifactBranch(); } diff --git a/app/src/main/java/io/apicurio/registry/storage/impl/sql/mappers/ContentEntityMapper.java b/app/src/main/java/io/apicurio/registry/storage/impl/sql/mappers/ContentEntityMapper.java index 0d40e5f7f1..074d069b65 100644 --- a/app/src/main/java/io/apicurio/registry/storage/impl/sql/mappers/ContentEntityMapper.java +++ b/app/src/main/java/io/apicurio/registry/storage/impl/sql/mappers/ContentEntityMapper.java @@ -27,9 +27,9 @@ public ContentEntity map(ResultSet rs) throws SQLException { entity.contentHash = rs.getString("contentHash"); entity.contentBytes = rs.getBytes("content"); try { - entity.serializedReferences = rs.getString("artifactreferences"); + entity.serializedReferences = rs.getString("refs"); } catch (Exception e) { - //The old database does not have te artifactreferences column, just ignore; + //The old database does not have te references column, just ignore; } return entity; } diff --git a/app/src/main/java/io/apicurio/registry/storage/impl/sql/mappers/ContentMapper.java b/app/src/main/java/io/apicurio/registry/storage/impl/sql/mappers/ContentMapper.java index c58869be09..9d9c456ea2 100644 --- a/app/src/main/java/io/apicurio/registry/storage/impl/sql/mappers/ContentMapper.java +++ b/app/src/main/java/io/apicurio/registry/storage/impl/sql/mappers/ContentMapper.java @@ -27,7 +27,7 @@ public ContentWrapperDto map(ResultSet rs) throws SQLException { byte[] contentBytes = rs.getBytes("content"); ContentHandle content = ContentHandle.create(contentBytes); contentWrapperDto.setContent(content); - contentWrapperDto.setReferences(SqlUtil.deserializeReferences(rs.getString("artifactreferences"))); + contentWrapperDto.setReferences(SqlUtil.deserializeReferences(rs.getString("refs"))); return contentWrapperDto; } diff --git a/app/src/main/java/io/apicurio/registry/storage/impl/sql/mappers/StoredArtifactMapper.java b/app/src/main/java/io/apicurio/registry/storage/impl/sql/mappers/StoredArtifactMapper.java index 7ef93281a0..0fc6ec2bcb 100644 --- a/app/src/main/java/io/apicurio/registry/storage/impl/sql/mappers/StoredArtifactMapper.java +++ b/app/src/main/java/io/apicurio/registry/storage/impl/sql/mappers/StoredArtifactMapper.java @@ -29,7 +29,7 @@ public StoredArtifactDto map(ResultSet rs) throws SQLException { .globalId(rs.getLong("globalId")) .version(rs.getString("version")) .versionOrder(rs.getInt("versionOrder")) - .references(SqlUtil.deserializeReferences(rs.getString("artifactreferences"))) + .references(SqlUtil.deserializeReferences(rs.getString("refs"))) .build(); } } diff --git a/app/src/main/resources/io/apicurio/registry/storage/impl/sql/h2.ddl b/app/src/main/resources/io/apicurio/registry/storage/impl/sql/h2.ddl index 0eed34f0c4..6711fe4e8d 100644 --- a/app/src/main/resources/io/apicurio/registry/storage/impl/sql/h2.ddl +++ b/app/src/main/resources/io/apicurio/registry/storage/impl/sql/h2.ddl @@ -6,11 +6,44 @@ CREATE TABLE apicurio (prop_name VARCHAR(255) NOT NULL, prop_value VARCHAR(255)) ALTER TABLE apicurio ADD PRIMARY KEY (prop_name); INSERT INTO apicurio (prop_name, prop_value) VALUES ('db_version', 100); -CREATE TABLE sequences (name VARCHAR(32) NOT NULL, seq_value BIGINT NOT NULL); -ALTER TABLE sequences ADD PRIMARY KEY (name); +CREATE TABLE sequences (seq_name VARCHAR(32) NOT NULL, seq_value BIGINT NOT NULL); +ALTER TABLE sequences ADD PRIMARY KEY (seq_name); -CREATE TABLE globalrules (type VARCHAR(32) NOT NULL, configuration TEXT NOT NULL); -ALTER TABLE globalrules ADD PRIMARY KEY (type); +CREATE TABLE config (pname VARCHAR(255) NOT NULL, pvalue VARCHAR(1024) NOT NULL, modifiedOn BIGINT NOT NULL); +ALTER TABLE config ADD PRIMARY KEY (pname); +CREATE INDEX IDX_config_1 ON config(modifiedOn); + +CREATE TABLE acls (principalId VARCHAR(256) NOT NULL, role VARCHAR(32) NOT NULL, principalName VARCHAR(256)); +ALTER TABLE acls ADD PRIMARY KEY (principalId); + +CREATE TABLE downloads (downloadId VARCHAR(128) NOT NULL, expires BIGINT NOT NULL, context VARCHAR(1024)); +ALTER TABLE downloads ADD PRIMARY KEY (downloadId); +CREATE HASH INDEX IDX_down_1 ON downloads(expires); + +CREATE TABLE global_rules (type VARCHAR(32) NOT NULL, configuration TEXT NOT NULL); +ALTER TABLE global_rules ADD PRIMARY KEY (type); + +CREATE TABLE content (contentId BIGINT NOT NULL, canonicalHash VARCHAR(64) NOT NULL, contentHash VARCHAR(64) NOT NULL, content BYTEA NOT NULL, refs TEXT); +ALTER TABLE content ADD PRIMARY KEY (contentId); +ALTER TABLE content ADD CONSTRAINT UQ_content_1 UNIQUE (contentHash); +CREATE HASH INDEX IDX_content_1 ON content(canonicalHash); +CREATE HASH INDEX IDX_content_2 ON content(contentHash); + +CREATE TABLE content_references (contentId BIGINT NOT NULL, groupId VARCHAR(512), artifactId VARCHAR(512) NOT NULL, version VARCHAR(256), name VARCHAR(512) NOT NULL); +ALTER TABLE content_references ADD PRIMARY KEY (contentId, name); +ALTER TABLE content_references ADD CONSTRAINT FK_content_references_1 FOREIGN KEY (contentId) REFERENCES content(contentId) ON DELETE CASCADE; + +CREATE TABLE groups (groupId VARCHAR(512) NOT NULL, description VARCHAR(1024), artifactsType VARCHAR(32), createdBy VARCHAR(256), createdOn TIMESTAMP WITHOUT TIME ZONE NOT NULL, modifiedBy VARCHAR(256), modifiedOn TIMESTAMP WITHOUT TIME ZONE, labels TEXT); +ALTER TABLE groups ADD PRIMARY KEY (groupId); + +CREATE TABLE group_labels (groupId VARCHAR(512) NOT NULL, pkey VARCHAR(256) NOT NULL, pvalue VARCHAR(512)); +ALTER TABLE group_labels ADD CONSTRAINT FK_glabels_1 FOREIGN KEY (groupId) REFERENCES groups(groupId) ON DELETE CASCADE; +CREATE INDEX IDX_glabels_1 ON group_labels(pkey); +CREATE INDEX IDX_glabels_2 ON group_labels(pvalue); + +CREATE TABLE group_rules (groupId VARCHAR(512) NOT NULL, type VARCHAR(32) NOT NULL, configuration VARCHAR(1024) NOT NULL); +ALTER TABLE group_rules ADD PRIMARY KEY (groupId, type); +ALTER TABLE group_rules ADD CONSTRAINT FK_grules_1 FOREIGN KEY (groupId) REFERENCES groups(groupId) ON DELETE CASCADE; CREATE TABLE artifacts (groupId VARCHAR(512) NOT NULL, artifactId VARCHAR(512) NOT NULL, type VARCHAR(32) NOT NULL, createdBy VARCHAR(256), createdOn TIMESTAMP WITHOUT TIME ZONE NOT NULL, labels TEXT); ALTER TABLE artifacts ADD PRIMARY KEY (groupId, artifactId); @@ -18,19 +51,15 @@ CREATE HASH INDEX IDX_artifacts_0 ON artifacts(type); CREATE HASH INDEX IDX_artifacts_1 ON artifacts(createdBy); CREATE INDEX IDX_artifacts_2 ON artifacts(createdOn); -CREATE TABLE artifact_labels (groupId VARCHAR(512) NOT NULL, artifactId VARCHAR(512) NOT NULL, pkey VARCHAR(256) NOT NULL, pvalue VARCHAR(1024)); -ALTER TABLE artifact_labels ADD CONSTRAINT FK_alabels_1 FOREIGN KEY (groupId, artifactId) REFERENCES artifacts(groupId, artifactId); +CREATE TABLE artifact_labels (groupId VARCHAR(512) NOT NULL, artifactId VARCHAR(512) NOT NULL, pkey VARCHAR(256) NOT NULL, pvalue VARCHAR(512)); +ALTER TABLE artifact_labels ADD CONSTRAINT FK_alabels_1 FOREIGN KEY (groupId, artifactId) REFERENCES artifacts(groupId, artifactId) ON DELETE CASCADE; CREATE INDEX IDX_alabels_1 ON artifact_labels(pkey); CREATE INDEX IDX_alabels_2 ON artifact_labels(pvalue); -CREATE TABLE rules (groupId VARCHAR(512) NOT NULL, artifactId VARCHAR(512) NOT NULL, type VARCHAR(32) NOT NULL, configuration VARCHAR(1024) NOT NULL); -ALTER TABLE rules ADD PRIMARY KEY (groupId, artifactId, type); - -CREATE TABLE content (contentId BIGINT NOT NULL, canonicalHash VARCHAR(64) NOT NULL, contentHash VARCHAR(64) NOT NULL, content BYTEA NOT NULL, artifactreferences TEXT); -ALTER TABLE content ADD PRIMARY KEY (contentId); -ALTER TABLE content ADD CONSTRAINT UQ_content_1 UNIQUE (contentHash); -CREATE HASH INDEX IDX_content_1 ON content(canonicalHash); -CREATE HASH INDEX IDX_content_2 ON content(contentHash); +CREATE TABLE artifact_rules (groupId VARCHAR(512) NOT NULL, artifactId VARCHAR(512) NOT NULL, type VARCHAR(32) NOT NULL, configuration VARCHAR(1024) NOT NULL); +ALTER TABLE artifact_rules ADD PRIMARY KEY (groupId, artifactId, type); +-- Note: no FK constraint between artifact_rules and artifacts because the Confluent API allows +-- rules to be configured for Artifacts that do not yet exist. -- The "versionOrder" field is needed to generate "version" when it is not provided. -- It contains the same information as the "branchOrder" in the "latest" branch, but we cannot use it because of a chicken-and-egg problem. @@ -39,7 +68,7 @@ CREATE TABLE versions (globalId BIGINT NOT NULL, groupId VARCHAR(512) NOT NULL, ALTER TABLE versions ADD PRIMARY KEY (globalId); ALTER TABLE versions ADD CONSTRAINT UQ_versions_1 UNIQUE (groupId, artifactId, version); ALTER TABLE versions ADD CONSTRAINT UQ_versions_2 UNIQUE (globalId, versionOrder); -ALTER TABLE versions ADD CONSTRAINT FK_versions_1 FOREIGN KEY (groupId, artifactId) REFERENCES artifacts(groupId, artifactId); +ALTER TABLE versions ADD CONSTRAINT FK_versions_1 FOREIGN KEY (groupId, artifactId) REFERENCES artifacts(groupId, artifactId) ON DELETE CASCADE; ALTER TABLE versions ADD CONSTRAINT FK_versions_2 FOREIGN KEY (contentId) REFERENCES content(contentId); CREATE INDEX IDX_versions_1 ON versions(version); CREATE HASH INDEX IDX_versions_2 ON versions(state); @@ -49,40 +78,19 @@ CREATE HASH INDEX IDX_versions_5 ON versions(createdBy); CREATE INDEX IDX_versions_6 ON versions(createdOn); CREATE HASH INDEX IDX_versions_7 ON versions(contentId); -CREATE TABLE artifact_branches (groupId VARCHAR(512) NOT NULL, artifactId VARCHAR(512) NOT NULL, branchId VARCHAR(256) NOT NULL, branchOrder INT NOT NULL, version VARCHAR(256) NOT NULL); -ALTER TABLE artifact_branches ADD PRIMARY KEY (groupId, artifactId, branchId, branchOrder); -ALTER TABLE artifact_branches ADD CONSTRAINT FK_artifact_branches_1 FOREIGN KEY (groupId, artifactId, version) REFERENCES versions(groupId, artifactId, version); -CREATE INDEX IDX_artifact_branches_1 ON artifact_branches(groupId, artifactId, branchId, branchOrder); - -CREATE TABLE version_labels (globalId BIGINT NOT NULL, pkey VARCHAR(256) NOT NULL, pvalue VARCHAR(1024)); -ALTER TABLE version_labels ADD CONSTRAINT FK_vlabels_1 FOREIGN KEY (globalId) REFERENCES versions(globalId); +CREATE TABLE version_labels (globalId BIGINT NOT NULL, pkey VARCHAR(256) NOT NULL, pvalue VARCHAR(512)); +ALTER TABLE version_labels ADD CONSTRAINT FK_vlabels_1 FOREIGN KEY (globalId) REFERENCES versions(globalId) ON DELETE CASCADE; CREATE INDEX IDX_vlabels_1 ON version_labels(pkey); CREATE INDEX IDX_vlabels_2 ON version_labels(pvalue); -CREATE TABLE comments (commentId VARCHAR(128) NOT NULL, globalId BIGINT NOT NULL, createdBy VARCHAR(256), createdOn TIMESTAMP WITHOUT TIME ZONE NOT NULL, cvalue VARCHAR(1024) NOT NULL); -ALTER TABLE comments ADD PRIMARY KEY (commentId); -ALTER TABLE comments ADD CONSTRAINT FK_comments_1 FOREIGN KEY (globalId) REFERENCES versions(globalId); -CREATE INDEX IDX_comments_1 ON comments(createdBy); +CREATE TABLE version_comments (commentId VARCHAR(128) NOT NULL, globalId BIGINT NOT NULL, createdBy VARCHAR(256), createdOn TIMESTAMP WITHOUT TIME ZONE NOT NULL, cvalue VARCHAR(1024) NOT NULL); +ALTER TABLE version_comments ADD PRIMARY KEY (commentId); +ALTER TABLE version_comments ADD CONSTRAINT FK_version_comments_1 FOREIGN KEY (globalId) REFERENCES versions(globalId) ON DELETE CASCADE; +CREATE INDEX IDX_version_comments_1 ON version_comments(createdBy); -CREATE TABLE groups (groupId VARCHAR(512) NOT NULL, description VARCHAR(1024), artifactsType VARCHAR(32), createdBy VARCHAR(256), createdOn TIMESTAMP WITHOUT TIME ZONE NOT NULL, modifiedBy VARCHAR(256), modifiedOn TIMESTAMP WITHOUT TIME ZONE, labels TEXT); -ALTER TABLE groups ADD PRIMARY KEY (groupId); - -CREATE TABLE group_labels (groupId VARCHAR(512) NOT NULL, pkey VARCHAR(256) NOT NULL, pvalue VARCHAR(1024)); -ALTER TABLE group_labels ADD CONSTRAINT FK_glabels_1 FOREIGN KEY (groupId) REFERENCES groups(groupId); -CREATE INDEX IDX_glabels_1 ON group_labels(pkey); -CREATE INDEX IDX_glabels_2 ON group_labels(pvalue); - -CREATE TABLE acls (principalId VARCHAR(256) NOT NULL, role VARCHAR(32) NOT NULL, principalName VARCHAR(256)); -ALTER TABLE acls ADD PRIMARY KEY (principalId); - -CREATE TABLE downloads (downloadId VARCHAR(128) NOT NULL, expires BIGINT NOT NULL, context VARCHAR(1024)); -ALTER TABLE downloads ADD PRIMARY KEY (downloadId); -CREATE HASH INDEX IDX_down_1 ON downloads(expires); - -CREATE TABLE config (pname VARCHAR(255) NOT NULL, pvalue VARCHAR(1024), modifiedOn BIGINT NOT NULL); -ALTER TABLE config ADD PRIMARY KEY (pname); -CREATE INDEX IDX_config_1 ON config(modifiedOn); - -CREATE TABLE artifactreferences (contentId BIGINT NOT NULL, groupId VARCHAR(512), artifactId VARCHAR(512) NOT NULL, version VARCHAR(256), name VARCHAR(512) NOT NULL); -ALTER TABLE artifactreferences ADD PRIMARY KEY (contentId, name); -ALTER TABLE artifactreferences ADD CONSTRAINT FK_artifactreferences_1 FOREIGN KEY (contentId) REFERENCES content(contentId) ON DELETE CASCADE; +-- This table is defined way down here because it has a FK to the artifacts table *and* the versions table +CREATE TABLE artifact_branches (groupId VARCHAR(512) NOT NULL, artifactId VARCHAR(512) NOT NULL, branchId VARCHAR(256) NOT NULL, branchOrder INT NOT NULL, version VARCHAR(256) NOT NULL); +ALTER TABLE artifact_branches ADD PRIMARY KEY (groupId, artifactId, branchId, branchOrder); +ALTER TABLE artifact_branches ADD CONSTRAINT FK_artifact_branches_1 FOREIGN KEY (groupId, artifactId) REFERENCES artifacts(groupId, artifactId) ON DELETE CASCADE; +ALTER TABLE artifact_branches ADD CONSTRAINT FK_artifact_branches_2 FOREIGN KEY (groupId, artifactId, version) REFERENCES versions(groupId, artifactId, version) ON DELETE CASCADE; +CREATE INDEX IDX_artifact_branches_1 ON artifact_branches(groupId, artifactId, branchId, branchOrder); diff --git a/app/src/main/resources/io/apicurio/registry/storage/impl/sql/mssql.ddl b/app/src/main/resources/io/apicurio/registry/storage/impl/sql/mssql.ddl index 44dfef76df..a61c18e0ed 100644 --- a/app/src/main/resources/io/apicurio/registry/storage/impl/sql/mssql.ddl +++ b/app/src/main/resources/io/apicurio/registry/storage/impl/sql/mssql.ddl @@ -6,12 +6,44 @@ CREATE TABLE apicurio (prop_name NVARCHAR(255) NOT NULL, prop_value NVARCHAR(255 ALTER TABLE apicurio ADD PRIMARY KEY (prop_name); INSERT INTO apicurio (prop_name, prop_value) VALUES ('db_version', 100); --- TODO: Different column name in h2 -CREATE TABLE sequences (name NVARCHAR(32) NOT NULL, value BIGINT NOT NULL); -ALTER TABLE sequences ADD PRIMARY KEY (name); +CREATE TABLE sequences (seq_name NVARCHAR(32) NOT NULL, seq_value BIGINT NOT NULL); +ALTER TABLE sequences ADD PRIMARY KEY (seq_name); -CREATE TABLE globalrules (type NVARCHAR(32) NOT NULL, configuration TEXT NOT NULL); -ALTER TABLE globalrules ADD PRIMARY KEY (type); +CREATE TABLE config (pname NVARCHAR(255) NOT NULL, pvalue NVARCHAR(1024) NOT NULL, modifiedOn BIGINT NOT NULL); +ALTER TABLE config ADD PRIMARY KEY (pname); +CREATE INDEX IDX_config_1 ON config(modifiedOn); + +CREATE TABLE acls (principalId NVARCHAR(256) NOT NULL, role NVARCHAR(32) NOT NULL, principalName NVARCHAR(256)); +ALTER TABLE acls ADD PRIMARY KEY (principalId); + +CREATE TABLE downloads (downloadId NVARCHAR(128) NOT NULL, expires BIGINT NOT NULL, context NVARCHAR(1024)); +ALTER TABLE downloads ADD PRIMARY KEY (downloadId); +CREATE INDEX IDX_down_1 ON downloads(expires); + +CREATE TABLE global_rules (type NVARCHAR(32) NOT NULL, configuration TEXT NOT NULL); +ALTER TABLE global_rules ADD PRIMARY KEY (type); + +CREATE TABLE content (contentId BIGINT NOT NULL, canonicalHash NVARCHAR(64) NOT NULL, contentHash NVARCHAR(64) NOT NULL, content VARBINARY(MAX) NOT NULL, refs TEXT); +ALTER TABLE content ADD PRIMARY KEY (contentId); +ALTER TABLE content ADD CONSTRAINT UQ_content_1 UNIQUE (contentHash); +CREATE INDEX IDX_content_1 ON content(canonicalHash); +CREATE INDEX IDX_content_2 ON content(contentHash); + +CREATE TABLE content_references (contentId BIGINT NOT NULL, groupId NVARCHAR(512), artifactId NVARCHAR(512) NOT NULL, version NVARCHAR(256), name NVARCHAR(512) NOT NULL); +ALTER TABLE content_references ADD PRIMARY KEY (contentId, name); +ALTER TABLE content_references ADD CONSTRAINT FK_content_references_1 FOREIGN KEY (contentId) REFERENCES content(contentId) ON DELETE CASCADE; + +CREATE TABLE groups (groupId NVARCHAR(512) NOT NULL, description NVARCHAR(1024), artifactsType NVARCHAR(32), createdBy NVARCHAR(256), createdOn DATETIME2(6) NOT NULL, modifiedBy NVARCHAR(256), modifiedOn DATETIME2(6), labels TEXT); +ALTER TABLE groups ADD PRIMARY KEY (groupId); + +CREATE TABLE group_labels (groupId NVARCHAR(512) NOT NULL, pkey NVARCHAR(256) NOT NULL, pvalue NVARCHAR(512)); +ALTER TABLE group_labels ADD CONSTRAINT FK_glabels_1 FOREIGN KEY (groupId) REFERENCES groups(groupId) ON DELETE CASCADE; +CREATE INDEX IDX_glabels_1 ON group_labels(pkey); +CREATE INDEX IDX_glabels_2 ON group_labels(pvalue); + +CREATE TABLE group_rules (groupId NVARCHAR(512) NOT NULL, type NVARCHAR(32) NOT NULL, configuration NVARCHAR(1024) NOT NULL); +ALTER TABLE group_rules ADD PRIMARY KEY (groupId, type); +ALTER TABLE group_rules ADD CONSTRAINT FK_grules_1 FOREIGN KEY (groupId) REFERENCES groups(groupId) ON DELETE CASCADE; CREATE TABLE artifacts (groupId NVARCHAR(512) NOT NULL, artifactId NVARCHAR(512) NOT NULL, type NVARCHAR(32) NOT NULL, createdBy NVARCHAR(256), createdOn DATETIME2(6) NOT NULL, labels TEXT); ALTER TABLE artifacts ADD PRIMARY KEY (groupId, artifactId); @@ -19,18 +51,15 @@ CREATE INDEX IDX_artifacts_0 ON artifacts(type); CREATE INDEX IDX_artifacts_1 ON artifacts(createdBy); CREATE INDEX IDX_artifacts_2 ON artifacts(createdOn); -CREATE TABLE artifact_labels (groupId NVARCHAR(512) NOT NULL, artifactId NVARCHAR(512) NOT NULL, pkey NVARCHAR(256) NOT NULL, pvalue NVARCHAR(1024)); -ALTER TABLE artifact_labels ADD CONSTRAINT FK_alabels_1 FOREIGN KEY (groupId, artifactId) REFERENCES artifacts(groupId, artifactId); +CREATE TABLE artifact_labels (groupId NVARCHAR(512) NOT NULL, artifactId NVARCHAR(512) NOT NULL, pkey NVARCHAR(256) NOT NULL, pvalue NVARCHAR(512)); +ALTER TABLE artifact_labels ADD CONSTRAINT FK_alabels_1 FOREIGN KEY (groupId, artifactId) REFERENCES artifacts(groupId, artifactId) ON DELETE CASCADE; CREATE INDEX IDX_alabels_1 ON artifact_labels(pkey); +CREATE INDEX IDX_alabels_2 ON artifact_labels(pvalue); -CREATE TABLE rules (groupId NVARCHAR(512) NOT NULL, artifactId NVARCHAR(512) NOT NULL, type NVARCHAR(32) NOT NULL, configuration NVARCHAR(1024) NOT NULL); -ALTER TABLE rules ADD PRIMARY KEY (groupId, artifactId, type); - -CREATE TABLE content (contentId BIGINT NOT NULL, canonicalHash NVARCHAR(64) NOT NULL, contentHash NVARCHAR(64) NOT NULL, content VARBINARY(MAX) NOT NULL, artifactreferences TEXT); -ALTER TABLE content ADD PRIMARY KEY (contentId); -ALTER TABLE content ADD CONSTRAINT UQ_content_1 UNIQUE (contentHash); -CREATE INDEX IDX_content_1 ON content(canonicalHash); -CREATE INDEX IDX_content_2 ON content(contentHash); +CREATE TABLE artifact_rules (groupId NVARCHAR(512) NOT NULL, artifactId NVARCHAR(512) NOT NULL, type NVARCHAR(32) NOT NULL, configuration NVARCHAR(1024) NOT NULL); +ALTER TABLE artifact_rules ADD PRIMARY KEY (groupId, artifactId, type); +-- Note: no FK constraint between artifact_rules and artifacts because the Confluent API allows +-- rules to be configured for Artifacts that do not yet exist. -- The "versionOrder" field is needed to generate "version" when it is not provided. -- It contains the same information as the "branchOrder" in the "latest" branch, but we cannot use it because of a chicken-and-egg problem. @@ -39,7 +68,7 @@ CREATE TABLE versions (globalId BIGINT NOT NULL, groupId NVARCHAR(512) NOT NULL, ALTER TABLE versions ADD PRIMARY KEY (globalId); ALTER TABLE versions ADD CONSTRAINT UQ_versions_1 UNIQUE (groupId, artifactId, version); ALTER TABLE versions ADD CONSTRAINT UQ_versions_2 UNIQUE (globalId, versionOrder); -ALTER TABLE versions ADD CONSTRAINT FK_versions_1 FOREIGN KEY (groupId, artifactId) REFERENCES artifacts(groupId, artifactId); +ALTER TABLE versions ADD CONSTRAINT FK_versions_1 FOREIGN KEY (groupId, artifactId) REFERENCES artifacts(groupId, artifactId) ON DELETE CASCADE; ALTER TABLE versions ADD CONSTRAINT FK_versions_2 FOREIGN KEY (contentId) REFERENCES content(contentId); CREATE INDEX IDX_versions_1 ON versions(version); CREATE INDEX IDX_versions_2 ON versions(state); @@ -49,42 +78,19 @@ CREATE INDEX IDX_versions_5 ON versions(createdBy); CREATE INDEX IDX_versions_6 ON versions(createdOn); CREATE INDEX IDX_versions_7 ON versions(contentId); -CREATE TABLE artifact_branches (groupId NVARCHAR(512) NOT NULL, artifactId NVARCHAR(512) NOT NULL, branchId NVARCHAR(256) NOT NULL, branchOrder INT NOT NULL, version NVARCHAR(256) NOT NULL); -ALTER TABLE artifact_branches ADD PRIMARY KEY (groupId, artifactId, branchId, branchOrder); -ALTER TABLE artifact_branches ADD CONSTRAINT FK_artifact_branches_1 FOREIGN KEY (groupId, artifactId, version) REFERENCES versions(groupId, artifactId, version); -CREATE INDEX IDX_artifact_branches_1 ON artifact_branches(groupId, artifactId, branchId, branchOrder); - -CREATE TABLE version_labels (globalId BIGINT NOT NULL, pkey NVARCHAR(256) NOT NULL, pvalue NVARCHAR(1024)); -ALTER TABLE version_labels ADD CONSTRAINT FK_vlabels_1 FOREIGN KEY (globalId) REFERENCES versions(globalId); +CREATE TABLE version_labels (globalId BIGINT NOT NULL, pkey NVARCHAR(256) NOT NULL, pvalue NVARCHAR(512)); +ALTER TABLE version_labels ADD CONSTRAINT FK_vlabels_1 FOREIGN KEY (globalId) REFERENCES versions(globalId) ON DELETE CASCADE; CREATE INDEX IDX_vlabels_1 ON version_labels(pkey); --- MSSQL may have a limit on the size of indexed value: --- com.microsoft.sqlserver.jdbc.SQLServerException: Operation failed. The index entry of length 2048 bytes for the index 'IDX_props_2' exceeds the maximum length of 1700 bytes for nonclustered indexes. --- CREATE INDEX IDX_vlabels_2 ON version_labels(pvalue); +CREATE INDEX IDX_vlabels_2 ON version_labels(pvalue); -CREATE TABLE comments (commentId NVARCHAR(128) NOT NULL, globalId BIGINT NOT NULL, createdBy NVARCHAR(256), createdOn DATETIME2(6) NOT NULL, cvalue NVARCHAR(1024) NOT NULL); -ALTER TABLE comments ADD PRIMARY KEY (commentId); -ALTER TABLE comments ADD CONSTRAINT FK_comments_1 FOREIGN KEY (globalId) REFERENCES versions(globalId); -CREATE INDEX IDX_comments_1 ON comments(createdBy); +CREATE TABLE version_comments (commentId NVARCHAR(128) NOT NULL, globalId BIGINT NOT NULL, createdBy NVARCHAR(256), createdOn DATETIME2(6) NOT NULL, cvalue NVARCHAR(1024) NOT NULL); +ALTER TABLE version_comments ADD PRIMARY KEY (commentId); +ALTER TABLE version_comments ADD CONSTRAINT FK_version_comments_1 FOREIGN KEY (globalId) REFERENCES versions(globalId) ON DELETE CASCADE; +CREATE INDEX IDX_version_comments_1 ON version_comments(createdBy); -CREATE TABLE groups (groupId NVARCHAR(512) NOT NULL, description NVARCHAR(1024), artifactsType NVARCHAR(32), createdBy NVARCHAR(256), createdOn DATETIME2(6) NOT NULL, modifiedBy NVARCHAR(256), modifiedOn DATETIME2(6), labels TEXT); -ALTER TABLE groups ADD PRIMARY KEY (groupId); - -CREATE TABLE group_labels (groupId NVARCHAR(512) NOT NULL, pkey NVARCHAR(256) NOT NULL, pvalue NVARCHAR(1024)); -ALTER TABLE group_labels ADD CONSTRAINT FK_glabels_1 FOREIGN KEY (groupId) REFERENCES groups(groupId); -CREATE INDEX IDX_glabels_1 ON group_labels(pkey); - -CREATE TABLE acls (principalId NVARCHAR(256) NOT NULL, role NVARCHAR(32) NOT NULL, principalName NVARCHAR(256)); -ALTER TABLE acls ADD PRIMARY KEY (principalId); - -CREATE TABLE downloads (downloadId NVARCHAR(128) NOT NULL, expires BIGINT NOT NULL, context NVARCHAR(1024)); -ALTER TABLE downloads ADD PRIMARY KEY (downloadId); -CREATE INDEX IDX_down_1 ON downloads(expires); - --- TODO: Missing NOT NULL in h2 -CREATE TABLE config (pname NVARCHAR(255) NOT NULL, pvalue NVARCHAR(1024) NOT NULL, modifiedOn BIGINT NOT NULL); -ALTER TABLE config ADD PRIMARY KEY (pname); -CREATE INDEX IDX_config_1 ON config(modifiedOn); - -CREATE TABLE artifactreferences (contentId BIGINT NOT NULL, groupId NVARCHAR(512), artifactId NVARCHAR(512) NOT NULL, version NVARCHAR(256), name NVARCHAR(512) NOT NULL); -ALTER TABLE artifactreferences ADD PRIMARY KEY (contentId, name); -ALTER TABLE artifactreferences ADD CONSTRAINT FK_artifactreferences_1 FOREIGN KEY (contentId) REFERENCES content(contentId) ON DELETE CASCADE; +-- This table is defined way down here because it has a FK to the artifacts table *and* the versions table +CREATE TABLE artifact_branches (groupId NVARCHAR(512) NOT NULL, artifactId NVARCHAR(512) NOT NULL, branchId NVARCHAR(256) NOT NULL, branchOrder INT NOT NULL, version NVARCHAR(256) NOT NULL); +ALTER TABLE artifact_branches ADD PRIMARY KEY (groupId, artifactId, branchId, branchOrder); +ALTER TABLE artifact_branches ADD CONSTRAINT FK_artifact_branches_1 FOREIGN KEY (groupId, artifactId) REFERENCES artifacts(groupId, artifactId); +ALTER TABLE artifact_branches ADD CONSTRAINT FK_artifact_branches_2 FOREIGN KEY (groupId, artifactId, version) REFERENCES versions(groupId, artifactId, version) ON DELETE CASCADE; +CREATE INDEX IDX_artifact_branches_1 ON artifact_branches(groupId, artifactId, branchId, branchOrder); diff --git a/app/src/main/resources/io/apicurio/registry/storage/impl/sql/postgresql.ddl b/app/src/main/resources/io/apicurio/registry/storage/impl/sql/postgresql.ddl index a811780678..0544ef7c8a 100644 --- a/app/src/main/resources/io/apicurio/registry/storage/impl/sql/postgresql.ddl +++ b/app/src/main/resources/io/apicurio/registry/storage/impl/sql/postgresql.ddl @@ -6,12 +6,44 @@ CREATE TABLE apicurio (prop_name VARCHAR(255) NOT NULL, prop_value VARCHAR(255)) ALTER TABLE apicurio ADD PRIMARY KEY (prop_name); INSERT INTO apicurio (prop_name, prop_value) VALUES ('db_version', 100); --- TODO: Different column name in h2 -CREATE TABLE sequences (name VARCHAR(32) NOT NULL, value BIGINT NOT NULL); -ALTER TABLE sequences ADD PRIMARY KEY (name); +CREATE TABLE sequences (seq_name VARCHAR(32) NOT NULL, seq_value BIGINT NOT NULL); +ALTER TABLE sequences ADD PRIMARY KEY (seq_name); -CREATE TABLE globalrules (type VARCHAR(32) NOT NULL, configuration TEXT NOT NULL); -ALTER TABLE globalrules ADD PRIMARY KEY (type); +CREATE TABLE config (pname VARCHAR(255) NOT NULL, pvalue VARCHAR(1024) NOT NULL, modifiedOn BIGINT NOT NULL); +ALTER TABLE config ADD PRIMARY KEY (pname); +CREATE INDEX IDX_config_1 ON config(modifiedOn); + +CREATE TABLE acls (principalId VARCHAR(256) NOT NULL, role VARCHAR(32) NOT NULL, principalName VARCHAR(256)); +ALTER TABLE acls ADD PRIMARY KEY (principalId); + +CREATE TABLE downloads (downloadId VARCHAR(128) NOT NULL, expires BIGINT NOT NULL, context VARCHAR(1024)); +ALTER TABLE downloads ADD PRIMARY KEY (downloadId); +CREATE INDEX IDX_down_1 ON downloads USING HASH (expires); + +CREATE TABLE global_rules (type VARCHAR(32) NOT NULL, configuration TEXT NOT NULL); +ALTER TABLE global_rules ADD PRIMARY KEY (type); + +CREATE TABLE content (contentId BIGINT NOT NULL, canonicalHash VARCHAR(64) NOT NULL, contentHash VARCHAR(64) NOT NULL, content BYTEA NOT NULL, refs TEXT); +ALTER TABLE content ADD PRIMARY KEY (contentId); +ALTER TABLE content ADD CONSTRAINT UQ_content_1 UNIQUE (contentHash); +CREATE INDEX IDX_content_1 ON content USING HASH (canonicalHash); +CREATE INDEX IDX_content_2 ON content USING HASH (contentHash); + +CREATE TABLE content_references (contentId BIGINT NOT NULL, groupId VARCHAR(512), artifactId VARCHAR(512) NOT NULL, version VARCHAR(256), name VARCHAR(512) NOT NULL); +ALTER TABLE content_references ADD PRIMARY KEY (contentId, name); +ALTER TABLE content_references ADD CONSTRAINT FK_content_references_1 FOREIGN KEY (contentId) REFERENCES content(contentId) ON DELETE CASCADE; + +CREATE TABLE groups (groupId VARCHAR(512) NOT NULL, description VARCHAR(1024), artifactsType VARCHAR(32), createdBy VARCHAR(256), createdOn TIMESTAMP WITHOUT TIME ZONE NOT NULL, modifiedBy VARCHAR(256), modifiedOn TIMESTAMP WITHOUT TIME ZONE, labels TEXT); +ALTER TABLE groups ADD PRIMARY KEY (groupId); + +CREATE TABLE group_labels (groupId VARCHAR(512) NOT NULL, pkey VARCHAR(256) NOT NULL, pvalue VARCHAR(512)); +ALTER TABLE group_labels ADD CONSTRAINT FK_glabels_1 FOREIGN KEY (groupId) REFERENCES groups(groupId) ON DELETE CASCADE; +CREATE INDEX IDX_glabels_1 ON group_labels(pkey); +CREATE INDEX IDX_glabels_2 ON group_labels(pvalue); + +CREATE TABLE group_rules (groupId VARCHAR(512) NOT NULL, type VARCHAR(32) NOT NULL, configuration VARCHAR(1024) NOT NULL); +ALTER TABLE group_rules ADD PRIMARY KEY (groupId, type); +ALTER TABLE group_rules ADD CONSTRAINT FK_grules_1 FOREIGN KEY (groupId) REFERENCES groups(groupId) ON DELETE CASCADE; CREATE TABLE artifacts (groupId VARCHAR(512) NOT NULL, artifactId VARCHAR(512) NOT NULL, type VARCHAR(32) NOT NULL, createdBy VARCHAR(256), createdOn TIMESTAMP WITHOUT TIME ZONE NOT NULL, labels TEXT); ALTER TABLE artifacts ADD PRIMARY KEY (groupId, artifactId); @@ -19,19 +51,15 @@ CREATE INDEX IDX_artifacts_0 ON artifacts USING HASH (type); CREATE INDEX IDX_artifacts_1 ON artifacts USING HASH (createdBy); CREATE INDEX IDX_artifacts_2 ON artifacts(createdOn); -CREATE TABLE artifact_labels (groupId VARCHAR(512) NOT NULL, artifactId VARCHAR(512) NOT NULL, pkey VARCHAR(256) NOT NULL, pvalue VARCHAR(1024)); -ALTER TABLE artifact_labels ADD CONSTRAINT FK_alabels_1 FOREIGN KEY (groupId, artifactId) REFERENCES artifacts(groupId, artifactId); +CREATE TABLE artifact_labels (groupId VARCHAR(512) NOT NULL, artifactId VARCHAR(512) NOT NULL, pkey VARCHAR(256) NOT NULL, pvalue VARCHAR(512)); +ALTER TABLE artifact_labels ADD CONSTRAINT FK_alabels_1 FOREIGN KEY (groupId, artifactId) REFERENCES artifacts(groupId, artifactId) ON DELETE CASCADE; CREATE INDEX IDX_alabels_1 ON artifact_labels(pkey); CREATE INDEX IDX_alabels_2 ON artifact_labels(pvalue); -CREATE TABLE rules (groupId VARCHAR(512) NOT NULL, artifactId VARCHAR(512) NOT NULL, type VARCHAR(32) NOT NULL, configuration VARCHAR(1024) NOT NULL); -ALTER TABLE rules ADD PRIMARY KEY (groupId, artifactId, type); - -CREATE TABLE content (contentId BIGINT NOT NULL, canonicalHash VARCHAR(64) NOT NULL, contentHash VARCHAR(64) NOT NULL, content BYTEA NOT NULL, artifactreferences TEXT); -ALTER TABLE content ADD PRIMARY KEY (contentId); -ALTER TABLE content ADD CONSTRAINT UQ_content_1 UNIQUE (contentHash); -CREATE INDEX IDX_content_1 ON content USING HASH (canonicalHash); -CREATE INDEX IDX_content_2 ON content USING HASH (contentHash); +CREATE TABLE artifact_rules (groupId VARCHAR(512) NOT NULL, artifactId VARCHAR(512) NOT NULL, type VARCHAR(32) NOT NULL, configuration VARCHAR(1024) NOT NULL); +ALTER TABLE artifact_rules ADD PRIMARY KEY (groupId, artifactId, type); +-- Note: no FK constraint between artifact_rules and artifacts because the Confluent API allows +-- rules to be configured for Artifacts that do not yet exist. -- The "versionOrder" field is needed to generate "version" when it is not provided. -- It contains the same information as the "branchOrder" in the "latest" branch, but we cannot use it because of a chicken-and-egg problem. @@ -40,7 +68,7 @@ CREATE TABLE versions (globalId BIGINT NOT NULL, groupId VARCHAR(512) NOT NULL, ALTER TABLE versions ADD PRIMARY KEY (globalId); ALTER TABLE versions ADD CONSTRAINT UQ_versions_1 UNIQUE (groupId, artifactId, version); ALTER TABLE versions ADD CONSTRAINT UQ_versions_2 UNIQUE (globalId, versionOrder); -ALTER TABLE versions ADD CONSTRAINT FK_versions_1 FOREIGN KEY (groupId, artifactId) REFERENCES artifacts(groupId, artifactId); +ALTER TABLE versions ADD CONSTRAINT FK_versions_1 FOREIGN KEY (groupId, artifactId) REFERENCES artifacts(groupId, artifactId) ON DELETE CASCADE; ALTER TABLE versions ADD CONSTRAINT FK_versions_2 FOREIGN KEY (contentId) REFERENCES content(contentId); CREATE INDEX IDX_versions_1 ON versions(version); CREATE INDEX IDX_versions_2 ON versions USING HASH (state); @@ -50,41 +78,19 @@ CREATE INDEX IDX_versions_5 ON versions USING HASH (createdBy); CREATE INDEX IDX_versions_6 ON versions(createdOn); CREATE INDEX IDX_versions_7 ON versions USING HASH (contentId); -CREATE TABLE artifact_branches (groupId VARCHAR(512) NOT NULL, artifactId VARCHAR(512) NOT NULL, branchId VARCHAR(256) NOT NULL, branchOrder INT NOT NULL, version VARCHAR(256) NOT NULL); -ALTER TABLE artifact_branches ADD PRIMARY KEY (groupId, artifactId, branchId, branchOrder); -ALTER TABLE artifact_branches ADD CONSTRAINT FK_artifact_branches_1 FOREIGN KEY (groupId, artifactId, version) REFERENCES versions(groupId, artifactId, version); -CREATE INDEX IDX_artifact_branches_1 ON artifact_branches(groupId, artifactId, branchId, branchOrder); - -CREATE TABLE version_labels (globalId BIGINT NOT NULL, pkey VARCHAR(256) NOT NULL, pvalue VARCHAR(1024)); -ALTER TABLE version_labels ADD CONSTRAINT FK_vlabels_1 FOREIGN KEY (globalId) REFERENCES versions(globalId); +CREATE TABLE version_labels (globalId BIGINT NOT NULL, pkey VARCHAR(256) NOT NULL, pvalue VARCHAR(512)); +ALTER TABLE version_labels ADD CONSTRAINT FK_vlabels_1 FOREIGN KEY (globalId) REFERENCES versions(globalId) ON DELETE CASCADE; CREATE INDEX IDX_vlabels_1 ON version_labels(pkey); CREATE INDEX IDX_vlabels_2 ON version_labels(pvalue); -CREATE TABLE comments (commentId VARCHAR(128) NOT NULL, globalId BIGINT NOT NULL, createdBy VARCHAR(256), createdOn TIMESTAMP WITHOUT TIME ZONE NOT NULL, cvalue VARCHAR(1024) NOT NULL); -ALTER TABLE comments ADD PRIMARY KEY (commentId); -ALTER TABLE comments ADD CONSTRAINT FK_comments_1 FOREIGN KEY (globalId) REFERENCES versions(globalId); -CREATE INDEX IDX_comments_1 ON comments(createdBy); - -CREATE TABLE groups (groupId VARCHAR(512) NOT NULL, description VARCHAR(1024), artifactsType VARCHAR(32), createdBy VARCHAR(256), createdOn TIMESTAMP WITHOUT TIME ZONE NOT NULL, modifiedBy VARCHAR(256), modifiedOn TIMESTAMP WITHOUT TIME ZONE, labels TEXT); -ALTER TABLE groups ADD PRIMARY KEY (groupId); - -CREATE TABLE group_labels (groupId VARCHAR(512) NOT NULL, pkey VARCHAR(256) NOT NULL, pvalue VARCHAR(1024)); -ALTER TABLE group_labels ADD CONSTRAINT FK_glabels_1 FOREIGN KEY (groupId) REFERENCES groups(groupId); -CREATE INDEX IDX_glabels_1 ON group_labels(pkey); -CREATE INDEX IDX_glabels_2 ON group_labels(pvalue); - -CREATE TABLE acls (principalId VARCHAR(256) NOT NULL, role VARCHAR(32) NOT NULL, principalName VARCHAR(256)); -ALTER TABLE acls ADD PRIMARY KEY (principalId); +CREATE TABLE version_comments (commentId VARCHAR(128) NOT NULL, globalId BIGINT NOT NULL, createdBy VARCHAR(256), createdOn TIMESTAMP WITHOUT TIME ZONE NOT NULL, cvalue VARCHAR(1024) NOT NULL); +ALTER TABLE version_comments ADD PRIMARY KEY (commentId); +ALTER TABLE version_comments ADD CONSTRAINT FK_version_comments_1 FOREIGN KEY (globalId) REFERENCES versions(globalId) ON DELETE CASCADE; +CREATE INDEX IDX_version_comments_1 ON version_comments(createdBy); -CREATE TABLE downloads (downloadId VARCHAR(128) NOT NULL, expires BIGINT NOT NULL, context VARCHAR(1024)); -ALTER TABLE downloads ADD PRIMARY KEY (downloadId); -CREATE INDEX IDX_down_1 ON downloads USING HASH (expires); - --- TODO: Missing NOT NULL in h2 -CREATE TABLE config (pname VARCHAR(255) NOT NULL, pvalue VARCHAR(1024) NOT NULL, modifiedOn BIGINT NOT NULL); -ALTER TABLE config ADD PRIMARY KEY (pname); -CREATE INDEX IDX_config_1 ON config(modifiedOn); - -CREATE TABLE artifactreferences (contentId BIGINT NOT NULL, groupId VARCHAR(512), artifactId VARCHAR(512) NOT NULL, version VARCHAR(256), name VARCHAR(512) NOT NULL); -ALTER TABLE artifactreferences ADD PRIMARY KEY (contentId, name); -ALTER TABLE artifactreferences ADD CONSTRAINT FK_artifactreferences_1 FOREIGN KEY (contentId) REFERENCES content(contentId) ON DELETE CASCADE; +-- This table is defined way down here because it has a FK to the artifacts table *and* the versions table +CREATE TABLE artifact_branches (groupId VARCHAR(512) NOT NULL, artifactId VARCHAR(512) NOT NULL, branchId VARCHAR(256) NOT NULL, branchOrder INT NOT NULL, version VARCHAR(256) NOT NULL); +ALTER TABLE artifact_branches ADD PRIMARY KEY (groupId, artifactId, branchId, branchOrder); +ALTER TABLE artifact_branches ADD CONSTRAINT FK_artifact_branches_1 FOREIGN KEY (groupId, artifactId) REFERENCES artifacts(groupId, artifactId) ON DELETE CASCADE; +ALTER TABLE artifact_branches ADD CONSTRAINT FK_artifact_branches_2 FOREIGN KEY (groupId, artifactId, version) REFERENCES versions(groupId, artifactId, version) ON DELETE CASCADE; +CREATE INDEX IDX_artifact_branches_1 ON artifact_branches(groupId, artifactId, branchId, branchOrder); From aec3c74a9152e61e30b470828d53b8cf0c7e5f2b Mon Sep 17 00:00:00 2001 From: Eric Wittmann Date: Thu, 8 Feb 2024 11:29:33 -0500 Subject: [PATCH 2/6] Remove extra ON DELETE CASCADE from artifact_branches table. --- .../main/resources/io/apicurio/registry/storage/impl/sql/h2.ddl | 2 +- .../io/apicurio/registry/storage/impl/sql/postgresql.ddl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/resources/io/apicurio/registry/storage/impl/sql/h2.ddl b/app/src/main/resources/io/apicurio/registry/storage/impl/sql/h2.ddl index 6711fe4e8d..688e2c58fe 100644 --- a/app/src/main/resources/io/apicurio/registry/storage/impl/sql/h2.ddl +++ b/app/src/main/resources/io/apicurio/registry/storage/impl/sql/h2.ddl @@ -91,6 +91,6 @@ CREATE INDEX IDX_version_comments_1 ON version_comments(createdBy); -- This table is defined way down here because it has a FK to the artifacts table *and* the versions table CREATE TABLE artifact_branches (groupId VARCHAR(512) NOT NULL, artifactId VARCHAR(512) NOT NULL, branchId VARCHAR(256) NOT NULL, branchOrder INT NOT NULL, version VARCHAR(256) NOT NULL); ALTER TABLE artifact_branches ADD PRIMARY KEY (groupId, artifactId, branchId, branchOrder); -ALTER TABLE artifact_branches ADD CONSTRAINT FK_artifact_branches_1 FOREIGN KEY (groupId, artifactId) REFERENCES artifacts(groupId, artifactId) ON DELETE CASCADE; +ALTER TABLE artifact_branches ADD CONSTRAINT FK_artifact_branches_1 FOREIGN KEY (groupId, artifactId) REFERENCES artifacts(groupId, artifactId); ALTER TABLE artifact_branches ADD CONSTRAINT FK_artifact_branches_2 FOREIGN KEY (groupId, artifactId, version) REFERENCES versions(groupId, artifactId, version) ON DELETE CASCADE; CREATE INDEX IDX_artifact_branches_1 ON artifact_branches(groupId, artifactId, branchId, branchOrder); diff --git a/app/src/main/resources/io/apicurio/registry/storage/impl/sql/postgresql.ddl b/app/src/main/resources/io/apicurio/registry/storage/impl/sql/postgresql.ddl index 0544ef7c8a..0138a3d490 100644 --- a/app/src/main/resources/io/apicurio/registry/storage/impl/sql/postgresql.ddl +++ b/app/src/main/resources/io/apicurio/registry/storage/impl/sql/postgresql.ddl @@ -91,6 +91,6 @@ CREATE INDEX IDX_version_comments_1 ON version_comments(createdBy); -- This table is defined way down here because it has a FK to the artifacts table *and* the versions table CREATE TABLE artifact_branches (groupId VARCHAR(512) NOT NULL, artifactId VARCHAR(512) NOT NULL, branchId VARCHAR(256) NOT NULL, branchOrder INT NOT NULL, version VARCHAR(256) NOT NULL); ALTER TABLE artifact_branches ADD PRIMARY KEY (groupId, artifactId, branchId, branchOrder); -ALTER TABLE artifact_branches ADD CONSTRAINT FK_artifact_branches_1 FOREIGN KEY (groupId, artifactId) REFERENCES artifacts(groupId, artifactId) ON DELETE CASCADE; +ALTER TABLE artifact_branches ADD CONSTRAINT FK_artifact_branches_1 FOREIGN KEY (groupId, artifactId) REFERENCES artifacts(groupId, artifactId); ALTER TABLE artifact_branches ADD CONSTRAINT FK_artifact_branches_2 FOREIGN KEY (groupId, artifactId, version) REFERENCES versions(groupId, artifactId, version) ON DELETE CASCADE; CREATE INDEX IDX_artifact_branches_1 ON artifact_branches(groupId, artifactId, branchId, branchOrder); From cb71d07c68476d162ed596bc3cbaeb08633fa104 Mon Sep 17 00:00:00 2001 From: Eric Wittmann Date: Thu, 8 Feb 2024 11:48:36 -0500 Subject: [PATCH 3/6] Restore ON CASCADE DELETE for h2 and pg on FK_artifact_branches_1 --- .../main/resources/io/apicurio/registry/storage/impl/sql/h2.ddl | 2 +- .../io/apicurio/registry/storage/impl/sql/postgresql.ddl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/resources/io/apicurio/registry/storage/impl/sql/h2.ddl b/app/src/main/resources/io/apicurio/registry/storage/impl/sql/h2.ddl index 688e2c58fe..6711fe4e8d 100644 --- a/app/src/main/resources/io/apicurio/registry/storage/impl/sql/h2.ddl +++ b/app/src/main/resources/io/apicurio/registry/storage/impl/sql/h2.ddl @@ -91,6 +91,6 @@ CREATE INDEX IDX_version_comments_1 ON version_comments(createdBy); -- This table is defined way down here because it has a FK to the artifacts table *and* the versions table CREATE TABLE artifact_branches (groupId VARCHAR(512) NOT NULL, artifactId VARCHAR(512) NOT NULL, branchId VARCHAR(256) NOT NULL, branchOrder INT NOT NULL, version VARCHAR(256) NOT NULL); ALTER TABLE artifact_branches ADD PRIMARY KEY (groupId, artifactId, branchId, branchOrder); -ALTER TABLE artifact_branches ADD CONSTRAINT FK_artifact_branches_1 FOREIGN KEY (groupId, artifactId) REFERENCES artifacts(groupId, artifactId); +ALTER TABLE artifact_branches ADD CONSTRAINT FK_artifact_branches_1 FOREIGN KEY (groupId, artifactId) REFERENCES artifacts(groupId, artifactId) ON DELETE CASCADE; ALTER TABLE artifact_branches ADD CONSTRAINT FK_artifact_branches_2 FOREIGN KEY (groupId, artifactId, version) REFERENCES versions(groupId, artifactId, version) ON DELETE CASCADE; CREATE INDEX IDX_artifact_branches_1 ON artifact_branches(groupId, artifactId, branchId, branchOrder); diff --git a/app/src/main/resources/io/apicurio/registry/storage/impl/sql/postgresql.ddl b/app/src/main/resources/io/apicurio/registry/storage/impl/sql/postgresql.ddl index 0138a3d490..0544ef7c8a 100644 --- a/app/src/main/resources/io/apicurio/registry/storage/impl/sql/postgresql.ddl +++ b/app/src/main/resources/io/apicurio/registry/storage/impl/sql/postgresql.ddl @@ -91,6 +91,6 @@ CREATE INDEX IDX_version_comments_1 ON version_comments(createdBy); -- This table is defined way down here because it has a FK to the artifacts table *and* the versions table CREATE TABLE artifact_branches (groupId VARCHAR(512) NOT NULL, artifactId VARCHAR(512) NOT NULL, branchId VARCHAR(256) NOT NULL, branchOrder INT NOT NULL, version VARCHAR(256) NOT NULL); ALTER TABLE artifact_branches ADD PRIMARY KEY (groupId, artifactId, branchId, branchOrder); -ALTER TABLE artifact_branches ADD CONSTRAINT FK_artifact_branches_1 FOREIGN KEY (groupId, artifactId) REFERENCES artifacts(groupId, artifactId); +ALTER TABLE artifact_branches ADD CONSTRAINT FK_artifact_branches_1 FOREIGN KEY (groupId, artifactId) REFERENCES artifacts(groupId, artifactId) ON DELETE CASCADE; ALTER TABLE artifact_branches ADD CONSTRAINT FK_artifact_branches_2 FOREIGN KEY (groupId, artifactId, version) REFERENCES versions(groupId, artifactId, version) ON DELETE CASCADE; CREATE INDEX IDX_artifact_branches_1 ON artifact_branches(groupId, artifactId, branchId, branchOrder); From 6fde2ce9c944a2d85a7dd630af75eda6b74aba8d Mon Sep 17 00:00:00 2001 From: Eric Wittmann Date: Fri, 9 Feb 2024 10:03:45 -0500 Subject: [PATCH 4/6] Restore functionality of deleteGroup: there is no FK from artifacts to groups yet --- .../impl/sql/AbstractSqlRegistryStorage.java | 7 +++ .../noprofile/rest/v3/GroupsResourceTest.java | 53 +++++++++++++++---- 2 files changed, 51 insertions(+), 9 deletions(-) diff --git a/app/src/main/java/io/apicurio/registry/storage/impl/sql/AbstractSqlRegistryStorage.java b/app/src/main/java/io/apicurio/registry/storage/impl/sql/AbstractSqlRegistryStorage.java index a976319beb..062c661511 100644 --- a/app/src/main/java/io/apicurio/registry/storage/impl/sql/AbstractSqlRegistryStorage.java +++ b/app/src/main/java/io/apicurio/registry/storage/impl/sql/AbstractSqlRegistryStorage.java @@ -2087,6 +2087,12 @@ public void deleteGroup(String groupId) throws GroupNotFoundException, RegistryS .bind(0, normalizeGroupId(groupId)) .execute(); + // Delete all artifacts in the group (TODO there is currently no FK from artifacts to groups) + handle.createUpdate(sqlStatements.deleteArtifactsByGroupId()) + .bind(0, normalizeGroupId(groupId)) + .execute(); + + // Now delete the group (labels and rules etc will cascade) int rows = handle.createUpdate(sqlStatements.deleteGroup()) .bind(0, groupId) .execute(); @@ -2719,6 +2725,7 @@ private void resolveReferences(Map resolvedReferences, Li /** * IMPORTANT: Private methods can't be @Transactional. Callers MUST have started a transaction. */ + // TODO call this in a cleanup cron job instead? private void deleteAllOrphanedContent() { log.debug("Deleting all orphaned content"); handles.withHandleNoException(handle -> { diff --git a/app/src/test/java/io/apicurio/registry/noprofile/rest/v3/GroupsResourceTest.java b/app/src/test/java/io/apicurio/registry/noprofile/rest/v3/GroupsResourceTest.java index b06dc52cea..9ac33a7e48 100644 --- a/app/src/test/java/io/apicurio/registry/noprofile/rest/v3/GroupsResourceTest.java +++ b/app/src/test/java/io/apicurio/registry/noprofile/rest/v3/GroupsResourceTest.java @@ -986,15 +986,50 @@ public void testDeleteArtifactsInGroup() throws Exception { .statusCode(204); // Verify that all 3 artifacts were deleted - TestUtils.retry(() -> { - given() - .when() - .queryParam("group", group) - .get("/registry/v3/search/artifacts") - .then() - .statusCode(200) - .body("count", equalTo(0)); - }); + given() + .when() + .queryParam("group", group) + .get("/registry/v3/search/artifacts") + .then() + .statusCode(200) + .body("count", equalTo(0)); + } + + @Test + public void testDeleteGroupWithArtifacts() throws Exception { + String group = "testDeleteGroupWithArtifacts"; + String artifactContent = resourceToString("openapi-empty.json"); + + // Create several artifacts in the group. + createArtifact(group, "EmptyAPI-1", ArtifactType.OPENAPI, artifactContent); + createArtifact(group, "EmptyAPI-2", ArtifactType.OPENAPI, artifactContent); + createArtifact(group, "EmptyAPI-3", ArtifactType.OPENAPI, artifactContent); + + // Make sure we can search for all three artifacts in the group. + given() + .when() + .queryParam("group", group) + .get("/registry/v3/search/artifacts") + .then() + .statusCode(200) + .body("count", equalTo(3)); + + // Delete the *group* (should delete all artifacts) + given() + .when() + .pathParam("groupId", group) + .delete("/registry/v3/groups/{groupId}") + .then() + .statusCode(204); + + // Verify that all 3 artifacts were deleted + given() + .when() + .queryParam("group", group) + .get("/registry/v3/search/artifacts") + .then() + .statusCode(200) + .body("count", equalTo(0)); } @Test From 670fb0e5b166e209ca67ce1a79eebb26c904ec05 Mon Sep 17 00:00:00 2001 From: Eric Wittmann Date: Tue, 13 Feb 2024 06:52:30 -0700 Subject: [PATCH 5/6] Use consistent column names for names/keys and values --- .../impl/sql/AbstractSqlRegistryStorage.java | 8 ++--- .../storage/impl/sql/CommonSqlStatements.java | 18 +++++------ .../storage/impl/sql/H2SqlStatements.java | 2 +- .../impl/sql/PostgreSQLSqlStatements.java | 4 +-- .../impl/sql/SQLServerSqlStatements.java | 24 +++++++------- .../DynamicConfigPropertyDtoMapper.java | 4 +-- .../apicurio/registry/storage/impl/sql/h2.ddl | 32 +++++++++---------- .../registry/storage/impl/sql/mssql.ddl | 32 +++++++++---------- .../registry/storage/impl/sql/postgresql.ddl | 32 +++++++++---------- 9 files changed, 78 insertions(+), 78 deletions(-) diff --git a/app/src/main/java/io/apicurio/registry/storage/impl/sql/AbstractSqlRegistryStorage.java b/app/src/main/java/io/apicurio/registry/storage/impl/sql/AbstractSqlRegistryStorage.java index 062c661511..e45b22c9ae 100644 --- a/app/src/main/java/io/apicurio/registry/storage/impl/sql/AbstractSqlRegistryStorage.java +++ b/app/src/main/java/io/apicurio/registry/storage/impl/sql/AbstractSqlRegistryStorage.java @@ -300,7 +300,7 @@ private void initializeDatabase(Handle handle) { log.debug("---"); statements.forEach(statement -> { - log.info(statement); + log.debug(statement); handle.createUpdate(statement).execute(); }); log.debug("---"); @@ -1055,7 +1055,7 @@ public ArtifactSearchResultsDto searchArtifacts(Set filters, Order + "v.groupId LIKE ? OR " + "a.artifactId LIKE ? OR " + "v.description LIKE ? OR " - + "EXISTS(SELECT l.globalId FROM version_labels l WHERE l.pkey = ? AND l.globalId = v.globalId)"); + + "EXISTS(SELECT l.globalId FROM version_labels l WHERE l.labelKey = ? AND l.globalId = v.globalId)"); binders.add((query, idx) -> { query.bind(idx, "%" + filter.getStringValue() + "%"); }); @@ -1104,13 +1104,13 @@ public ArtifactSearchResultsDto searchArtifacts(Set filters, Order Pair label = filter.getLabelFilterValue(); // Note: convert search to lowercase when searching for labels (case-insensitivity support). String labelKey = label.getKey().toLowerCase(); - where.append("EXISTS(SELECT l.globalId FROM version_labels l WHERE l.pkey = ?"); + where.append("EXISTS(SELECT l.globalId FROM version_labels l WHERE l.labelKey = ?"); binders.add((query, idx) -> { query.bind(idx, labelKey); }); if (label.getValue() != null) { String labelValue = label.getValue().toLowerCase(); - where.append(" AND l.pvalue = ?"); + where.append(" AND l.labelValue = ?"); binders.add((query, idx) -> { query.bind(idx, labelValue); }); diff --git a/app/src/main/java/io/apicurio/registry/storage/impl/sql/CommonSqlStatements.java b/app/src/main/java/io/apicurio/registry/storage/impl/sql/CommonSqlStatements.java index 2472ec7f1b..fe1909a605 100644 --- a/app/src/main/java/io/apicurio/registry/storage/impl/sql/CommonSqlStatements.java +++ b/app/src/main/java/io/apicurio/registry/storage/impl/sql/CommonSqlStatements.java @@ -56,7 +56,7 @@ public List databaseUpgrade(int fromVersion, int toVersion) { */ @Override public String getDatabaseVersion() { - return "SELECT a.prop_value FROM apicurio a WHERE a.prop_name = ?"; + return "SELECT a.propValue FROM apicurio a WHERE a.propName = ?"; } /** @@ -411,7 +411,7 @@ public String deleteVersionLabelsByGAV() { */ @Override public String insertVersionLabel() { - return "INSERT INTO version_labels (globalId, pkey, pvalue) VALUES (?, ?, ?)"; + return "INSERT INTO version_labels (globalId, labelKey, labelValue) VALUES (?, ?, ?)"; } /** @@ -419,7 +419,7 @@ public String insertVersionLabel() { */ @Override public String insertArtifactLabel() { - return "INSERT INTO artifact_labels (globalId, pkey, pvalue) VALUES (?, ?, ?)"; + return "INSERT INTO artifact_labels (globalId, labelKey, labelValue) VALUES (?, ?, ?)"; } /** @@ -427,7 +427,7 @@ public String insertArtifactLabel() { */ @Override public String insertGroupLabel() { - return "INSERT INTO group_labels (globalId, pkey, pvalue) VALUES (?, ?, ?)"; + return "INSERT INTO group_labels (globalId, labelKey, labelValue) VALUES (?, ?, ?)"; } /** @@ -847,7 +847,7 @@ public String selectConfigProperties() { */ @Override public String selectConfigPropertyByName() { - return "SELECT c.* FROM config c WHERE c.pname = ?"; + return "SELECT c.* FROM config c WHERE c.propName = ?"; } /** @@ -855,7 +855,7 @@ public String selectConfigPropertyByName() { */ @Override public String deleteConfigProperty() { - return "DELETE FROM config WHERE pname = ?"; + return "DELETE FROM config WHERE propName = ?"; } /** @@ -863,7 +863,7 @@ public String deleteConfigProperty() { */ @Override public String insertConfigProperty() { - return "INSERT INTO config (pname, pvalue, modifiedOn) VALUES (?, ?, ?)"; + return "INSERT INTO config (propName, propValue, modifiedOn) VALUES (?, ?, ?)"; } /** @@ -909,12 +909,12 @@ public String selectInboundContentReferencesByGAV() { @Override public String insertSequenceValue() { - return "INSERT INTO sequences (seq_name, seq_value) VALUES (?, ?)"; + return "INSERT INTO sequences (seqName, seqValue) VALUES (?, ?)"; } @Override public String selectCurrentSequenceValue() { - return "SELECT seq_value FROM sequences WHERE seq_name = ? "; + return "SELECT seqValue FROM sequences WHERE seqName = ? "; } @Override diff --git a/app/src/main/java/io/apicurio/registry/storage/impl/sql/H2SqlStatements.java b/app/src/main/java/io/apicurio/registry/storage/impl/sql/H2SqlStatements.java index 36c186de79..900e559831 100644 --- a/app/src/main/java/io/apicurio/registry/storage/impl/sql/H2SqlStatements.java +++ b/app/src/main/java/io/apicurio/registry/storage/impl/sql/H2SqlStatements.java @@ -65,7 +65,7 @@ public String getNextSequenceValue() { */ @Override public String resetSequenceValue() { - return "MERGE INTO sequences (seq_name, seq_value) KEY (seq_name) VALUES(?, ?)"; + return "MERGE INTO sequences (seqName, seqValue) KEY (seqName) VALUES(?, ?)"; } /** diff --git a/app/src/main/java/io/apicurio/registry/storage/impl/sql/PostgreSQLSqlStatements.java b/app/src/main/java/io/apicurio/registry/storage/impl/sql/PostgreSQLSqlStatements.java index de1a15a1a0..0292feb69d 100644 --- a/app/src/main/java/io/apicurio/registry/storage/impl/sql/PostgreSQLSqlStatements.java +++ b/app/src/main/java/io/apicurio/registry/storage/impl/sql/PostgreSQLSqlStatements.java @@ -57,7 +57,7 @@ public String upsertContent() { */ @Override public String getNextSequenceValue() { - return "INSERT INTO sequences (seq_name, seq_value) VALUES (?, 1) ON CONFLICT (seq_name) DO UPDATE SET seq_value = sequences.seq_value + 1 RETURNING seq_value"; + return "INSERT INTO sequences (seqName, seqValue) VALUES (?, 1) ON CONFLICT (seqName) DO UPDATE SET seqValue = sequences.seqValue + 1 RETURNING seqValue"; } /** @@ -65,7 +65,7 @@ public String getNextSequenceValue() { */ @Override public String resetSequenceValue() { - return "INSERT INTO sequences (seq_name, seq_value) VALUES (?, ?) ON CONFLICT (seq_name) DO UPDATE SET seq_value = ?"; + return "INSERT INTO sequences (seqName, seqValue) VALUES (?, ?) ON CONFLICT (seqName) DO UPDATE SET seqValue = ?"; } /** diff --git a/app/src/main/java/io/apicurio/registry/storage/impl/sql/SQLServerSqlStatements.java b/app/src/main/java/io/apicurio/registry/storage/impl/sql/SQLServerSqlStatements.java index e4a51f2c08..e51d2543e1 100644 --- a/app/src/main/java/io/apicurio/registry/storage/impl/sql/SQLServerSqlStatements.java +++ b/app/src/main/java/io/apicurio/registry/storage/impl/sql/SQLServerSqlStatements.java @@ -66,14 +66,14 @@ public String upsertContent() { public String getNextSequenceValue() { return String.join(" ", "MERGE INTO sequences AS target", - "USING (VALUES (?)) AS source (seq_name)", - "ON (target.seq_name = source.seq_name)", + "USING (VALUES (?)) AS source (seqName)", + "ON (target.seqName = source.seqName)", "WHEN MATCHED THEN", - "UPDATE SET seq_value = target.seq_value + 1", + "UPDATE SET seqValue = target.seqValue + 1", "WHEN NOT MATCHED THEN", - "INSERT (seq_name, seq_value)", - "VALUES (source.seq_name, 1)", - "OUTPUT INSERTED.seq_value;"); + "INSERT (seqName, seqValue)", + "VALUES (source.seqName, 1)", + "OUTPUT INSERTED.seqValue;"); } /** @@ -83,14 +83,14 @@ public String getNextSequenceValue() { public String resetSequenceValue() { return String.join(" ", "MERGE INTO sequences AS target", - "USING (VALUES (?, ?)) AS source (seq_name, seq_value)", - "ON (target.seq_name = source.seq_name)", + "USING (VALUES (?, ?)) AS source (seqName, seqValue)", + "ON (target.seqName = source.seqName)", "WHEN MATCHED THEN", - "UPDATE SET seq_value = ?", + "UPDATE SET seqValue = ?", "WHEN NOT MATCHED THEN", - "INSERT (seq_name, seq_value)", - "VALUES (source.seq_name, source.seq_value)", - "OUTPUT INSERTED.seq_value;"); + "INSERT (seqName, seqValue)", + "VALUES (source.seqName, source.seqValue)", + "OUTPUT INSERTED.seqValue;"); } /** diff --git a/app/src/main/java/io/apicurio/registry/storage/impl/sql/mappers/DynamicConfigPropertyDtoMapper.java b/app/src/main/java/io/apicurio/registry/storage/impl/sql/mappers/DynamicConfigPropertyDtoMapper.java index fa4a5d41a2..147f473544 100644 --- a/app/src/main/java/io/apicurio/registry/storage/impl/sql/mappers/DynamicConfigPropertyDtoMapper.java +++ b/app/src/main/java/io/apicurio/registry/storage/impl/sql/mappers/DynamicConfigPropertyDtoMapper.java @@ -21,8 +21,8 @@ private DynamicConfigPropertyDtoMapper() { */ @Override public DynamicConfigPropertyDto map(ResultSet rs) throws SQLException { - String name = rs.getString("pname"); - String value = rs.getString("pvalue"); + String name = rs.getString("propName"); + String value = rs.getString("propValue"); return new DynamicConfigPropertyDto(name, value); } diff --git a/app/src/main/resources/io/apicurio/registry/storage/impl/sql/h2.ddl b/app/src/main/resources/io/apicurio/registry/storage/impl/sql/h2.ddl index 6711fe4e8d..123348f555 100644 --- a/app/src/main/resources/io/apicurio/registry/storage/impl/sql/h2.ddl +++ b/app/src/main/resources/io/apicurio/registry/storage/impl/sql/h2.ddl @@ -2,15 +2,15 @@ -- DDL for the Apicurio Registry - Database: H2 -- ********************************************************************* -CREATE TABLE apicurio (prop_name VARCHAR(255) NOT NULL, prop_value VARCHAR(255)); -ALTER TABLE apicurio ADD PRIMARY KEY (prop_name); -INSERT INTO apicurio (prop_name, prop_value) VALUES ('db_version', 100); +CREATE TABLE apicurio (propName VARCHAR(255) NOT NULL, propValue VARCHAR(255)); +ALTER TABLE apicurio ADD PRIMARY KEY (propName); +INSERT INTO apicurio (propName, propValue) VALUES ('db_version', 100); -CREATE TABLE sequences (seq_name VARCHAR(32) NOT NULL, seq_value BIGINT NOT NULL); -ALTER TABLE sequences ADD PRIMARY KEY (seq_name); +CREATE TABLE sequences (seqName VARCHAR(32) NOT NULL, seqValue BIGINT NOT NULL); +ALTER TABLE sequences ADD PRIMARY KEY (seqName); -CREATE TABLE config (pname VARCHAR(255) NOT NULL, pvalue VARCHAR(1024) NOT NULL, modifiedOn BIGINT NOT NULL); -ALTER TABLE config ADD PRIMARY KEY (pname); +CREATE TABLE config (propName VARCHAR(255) NOT NULL, propValue VARCHAR(1024) NOT NULL, modifiedOn BIGINT NOT NULL); +ALTER TABLE config ADD PRIMARY KEY (propName); CREATE INDEX IDX_config_1 ON config(modifiedOn); CREATE TABLE acls (principalId VARCHAR(256) NOT NULL, role VARCHAR(32) NOT NULL, principalName VARCHAR(256)); @@ -36,10 +36,10 @@ ALTER TABLE content_references ADD CONSTRAINT FK_content_references_1 FOREIGN KE CREATE TABLE groups (groupId VARCHAR(512) NOT NULL, description VARCHAR(1024), artifactsType VARCHAR(32), createdBy VARCHAR(256), createdOn TIMESTAMP WITHOUT TIME ZONE NOT NULL, modifiedBy VARCHAR(256), modifiedOn TIMESTAMP WITHOUT TIME ZONE, labels TEXT); ALTER TABLE groups ADD PRIMARY KEY (groupId); -CREATE TABLE group_labels (groupId VARCHAR(512) NOT NULL, pkey VARCHAR(256) NOT NULL, pvalue VARCHAR(512)); +CREATE TABLE group_labels (groupId VARCHAR(512) NOT NULL, labelKey VARCHAR(256) NOT NULL, labelValue VARCHAR(512)); ALTER TABLE group_labels ADD CONSTRAINT FK_glabels_1 FOREIGN KEY (groupId) REFERENCES groups(groupId) ON DELETE CASCADE; -CREATE INDEX IDX_glabels_1 ON group_labels(pkey); -CREATE INDEX IDX_glabels_2 ON group_labels(pvalue); +CREATE INDEX IDX_glabels_1 ON group_labels(labelKey); +CREATE INDEX IDX_glabels_2 ON group_labels(labelValue); CREATE TABLE group_rules (groupId VARCHAR(512) NOT NULL, type VARCHAR(32) NOT NULL, configuration VARCHAR(1024) NOT NULL); ALTER TABLE group_rules ADD PRIMARY KEY (groupId, type); @@ -51,10 +51,10 @@ CREATE HASH INDEX IDX_artifacts_0 ON artifacts(type); CREATE HASH INDEX IDX_artifacts_1 ON artifacts(createdBy); CREATE INDEX IDX_artifacts_2 ON artifacts(createdOn); -CREATE TABLE artifact_labels (groupId VARCHAR(512) NOT NULL, artifactId VARCHAR(512) NOT NULL, pkey VARCHAR(256) NOT NULL, pvalue VARCHAR(512)); +CREATE TABLE artifact_labels (groupId VARCHAR(512) NOT NULL, artifactId VARCHAR(512) NOT NULL, labelKey VARCHAR(256) NOT NULL, labelValue VARCHAR(512)); ALTER TABLE artifact_labels ADD CONSTRAINT FK_alabels_1 FOREIGN KEY (groupId, artifactId) REFERENCES artifacts(groupId, artifactId) ON DELETE CASCADE; -CREATE INDEX IDX_alabels_1 ON artifact_labels(pkey); -CREATE INDEX IDX_alabels_2 ON artifact_labels(pvalue); +CREATE INDEX IDX_alabels_1 ON artifact_labels(labelKey); +CREATE INDEX IDX_alabels_2 ON artifact_labels(labelValue); CREATE TABLE artifact_rules (groupId VARCHAR(512) NOT NULL, artifactId VARCHAR(512) NOT NULL, type VARCHAR(32) NOT NULL, configuration VARCHAR(1024) NOT NULL); ALTER TABLE artifact_rules ADD PRIMARY KEY (groupId, artifactId, type); @@ -78,10 +78,10 @@ CREATE HASH INDEX IDX_versions_5 ON versions(createdBy); CREATE INDEX IDX_versions_6 ON versions(createdOn); CREATE HASH INDEX IDX_versions_7 ON versions(contentId); -CREATE TABLE version_labels (globalId BIGINT NOT NULL, pkey VARCHAR(256) NOT NULL, pvalue VARCHAR(512)); +CREATE TABLE version_labels (globalId BIGINT NOT NULL, labelKey VARCHAR(256) NOT NULL, labelValue VARCHAR(512)); ALTER TABLE version_labels ADD CONSTRAINT FK_vlabels_1 FOREIGN KEY (globalId) REFERENCES versions(globalId) ON DELETE CASCADE; -CREATE INDEX IDX_vlabels_1 ON version_labels(pkey); -CREATE INDEX IDX_vlabels_2 ON version_labels(pvalue); +CREATE INDEX IDX_vlabels_1 ON version_labels(labelKey); +CREATE INDEX IDX_vlabels_2 ON version_labels(labelValue); CREATE TABLE version_comments (commentId VARCHAR(128) NOT NULL, globalId BIGINT NOT NULL, createdBy VARCHAR(256), createdOn TIMESTAMP WITHOUT TIME ZONE NOT NULL, cvalue VARCHAR(1024) NOT NULL); ALTER TABLE version_comments ADD PRIMARY KEY (commentId); diff --git a/app/src/main/resources/io/apicurio/registry/storage/impl/sql/mssql.ddl b/app/src/main/resources/io/apicurio/registry/storage/impl/sql/mssql.ddl index a61c18e0ed..a52c2dbf71 100644 --- a/app/src/main/resources/io/apicurio/registry/storage/impl/sql/mssql.ddl +++ b/app/src/main/resources/io/apicurio/registry/storage/impl/sql/mssql.ddl @@ -2,15 +2,15 @@ -- DDL for the Apicurio Registry - Database: MS SQL Server -- ********************************************************************* -CREATE TABLE apicurio (prop_name NVARCHAR(255) NOT NULL, prop_value NVARCHAR(255)); -ALTER TABLE apicurio ADD PRIMARY KEY (prop_name); -INSERT INTO apicurio (prop_name, prop_value) VALUES ('db_version', 100); +CREATE TABLE apicurio (propName NVARCHAR(255) NOT NULL, propValue NVARCHAR(255)); +ALTER TABLE apicurio ADD PRIMARY KEY (propName); +INSERT INTO apicurio (propName, propValue) VALUES ('db_version', 100); -CREATE TABLE sequences (seq_name NVARCHAR(32) NOT NULL, seq_value BIGINT NOT NULL); -ALTER TABLE sequences ADD PRIMARY KEY (seq_name); +CREATE TABLE sequences (seqName NVARCHAR(32) NOT NULL, seqValue BIGINT NOT NULL); +ALTER TABLE sequences ADD PRIMARY KEY (seqName); -CREATE TABLE config (pname NVARCHAR(255) NOT NULL, pvalue NVARCHAR(1024) NOT NULL, modifiedOn BIGINT NOT NULL); -ALTER TABLE config ADD PRIMARY KEY (pname); +CREATE TABLE config (propName NVARCHAR(255) NOT NULL, propValue NVARCHAR(1024) NOT NULL, modifiedOn BIGINT NOT NULL); +ALTER TABLE config ADD PRIMARY KEY (propName); CREATE INDEX IDX_config_1 ON config(modifiedOn); CREATE TABLE acls (principalId NVARCHAR(256) NOT NULL, role NVARCHAR(32) NOT NULL, principalName NVARCHAR(256)); @@ -36,10 +36,10 @@ ALTER TABLE content_references ADD CONSTRAINT FK_content_references_1 FOREIGN KE CREATE TABLE groups (groupId NVARCHAR(512) NOT NULL, description NVARCHAR(1024), artifactsType NVARCHAR(32), createdBy NVARCHAR(256), createdOn DATETIME2(6) NOT NULL, modifiedBy NVARCHAR(256), modifiedOn DATETIME2(6), labels TEXT); ALTER TABLE groups ADD PRIMARY KEY (groupId); -CREATE TABLE group_labels (groupId NVARCHAR(512) NOT NULL, pkey NVARCHAR(256) NOT NULL, pvalue NVARCHAR(512)); +CREATE TABLE group_labels (groupId NVARCHAR(512) NOT NULL, labelKey NVARCHAR(256) NOT NULL, labelValue NVARCHAR(512)); ALTER TABLE group_labels ADD CONSTRAINT FK_glabels_1 FOREIGN KEY (groupId) REFERENCES groups(groupId) ON DELETE CASCADE; -CREATE INDEX IDX_glabels_1 ON group_labels(pkey); -CREATE INDEX IDX_glabels_2 ON group_labels(pvalue); +CREATE INDEX IDX_glabels_1 ON group_labels(labelKey); +CREATE INDEX IDX_glabels_2 ON group_labels(labelValue); CREATE TABLE group_rules (groupId NVARCHAR(512) NOT NULL, type NVARCHAR(32) NOT NULL, configuration NVARCHAR(1024) NOT NULL); ALTER TABLE group_rules ADD PRIMARY KEY (groupId, type); @@ -51,10 +51,10 @@ CREATE INDEX IDX_artifacts_0 ON artifacts(type); CREATE INDEX IDX_artifacts_1 ON artifacts(createdBy); CREATE INDEX IDX_artifacts_2 ON artifacts(createdOn); -CREATE TABLE artifact_labels (groupId NVARCHAR(512) NOT NULL, artifactId NVARCHAR(512) NOT NULL, pkey NVARCHAR(256) NOT NULL, pvalue NVARCHAR(512)); +CREATE TABLE artifact_labels (groupId NVARCHAR(512) NOT NULL, artifactId NVARCHAR(512) NOT NULL, labelKey NVARCHAR(256) NOT NULL, labelValue NVARCHAR(512)); ALTER TABLE artifact_labels ADD CONSTRAINT FK_alabels_1 FOREIGN KEY (groupId, artifactId) REFERENCES artifacts(groupId, artifactId) ON DELETE CASCADE; -CREATE INDEX IDX_alabels_1 ON artifact_labels(pkey); -CREATE INDEX IDX_alabels_2 ON artifact_labels(pvalue); +CREATE INDEX IDX_alabels_1 ON artifact_labels(labelKey); +CREATE INDEX IDX_alabels_2 ON artifact_labels(labelValue); CREATE TABLE artifact_rules (groupId NVARCHAR(512) NOT NULL, artifactId NVARCHAR(512) NOT NULL, type NVARCHAR(32) NOT NULL, configuration NVARCHAR(1024) NOT NULL); ALTER TABLE artifact_rules ADD PRIMARY KEY (groupId, artifactId, type); @@ -78,10 +78,10 @@ CREATE INDEX IDX_versions_5 ON versions(createdBy); CREATE INDEX IDX_versions_6 ON versions(createdOn); CREATE INDEX IDX_versions_7 ON versions(contentId); -CREATE TABLE version_labels (globalId BIGINT NOT NULL, pkey NVARCHAR(256) NOT NULL, pvalue NVARCHAR(512)); +CREATE TABLE version_labels (globalId BIGINT NOT NULL, labelKey NVARCHAR(256) NOT NULL, labelValue NVARCHAR(512)); ALTER TABLE version_labels ADD CONSTRAINT FK_vlabels_1 FOREIGN KEY (globalId) REFERENCES versions(globalId) ON DELETE CASCADE; -CREATE INDEX IDX_vlabels_1 ON version_labels(pkey); -CREATE INDEX IDX_vlabels_2 ON version_labels(pvalue); +CREATE INDEX IDX_vlabels_1 ON version_labels(labelKey); +CREATE INDEX IDX_vlabels_2 ON version_labels(labelValue); CREATE TABLE version_comments (commentId NVARCHAR(128) NOT NULL, globalId BIGINT NOT NULL, createdBy NVARCHAR(256), createdOn DATETIME2(6) NOT NULL, cvalue NVARCHAR(1024) NOT NULL); ALTER TABLE version_comments ADD PRIMARY KEY (commentId); diff --git a/app/src/main/resources/io/apicurio/registry/storage/impl/sql/postgresql.ddl b/app/src/main/resources/io/apicurio/registry/storage/impl/sql/postgresql.ddl index 0544ef7c8a..3baef8ece7 100644 --- a/app/src/main/resources/io/apicurio/registry/storage/impl/sql/postgresql.ddl +++ b/app/src/main/resources/io/apicurio/registry/storage/impl/sql/postgresql.ddl @@ -2,15 +2,15 @@ -- DDL for the Apicurio Registry - Database: PostgreSQL 10+ -- ********************************************************************* -CREATE TABLE apicurio (prop_name VARCHAR(255) NOT NULL, prop_value VARCHAR(255)); -ALTER TABLE apicurio ADD PRIMARY KEY (prop_name); -INSERT INTO apicurio (prop_name, prop_value) VALUES ('db_version', 100); +CREATE TABLE apicurio (propName VARCHAR(255) NOT NULL, propValue VARCHAR(255)); +ALTER TABLE apicurio ADD PRIMARY KEY (propName); +INSERT INTO apicurio (propName, propValue) VALUES ('db_version', 100); -CREATE TABLE sequences (seq_name VARCHAR(32) NOT NULL, seq_value BIGINT NOT NULL); -ALTER TABLE sequences ADD PRIMARY KEY (seq_name); +CREATE TABLE sequences (seqName VARCHAR(32) NOT NULL, seqValue BIGINT NOT NULL); +ALTER TABLE sequences ADD PRIMARY KEY (seqName); -CREATE TABLE config (pname VARCHAR(255) NOT NULL, pvalue VARCHAR(1024) NOT NULL, modifiedOn BIGINT NOT NULL); -ALTER TABLE config ADD PRIMARY KEY (pname); +CREATE TABLE config (propName VARCHAR(255) NOT NULL, propValue VARCHAR(1024) NOT NULL, modifiedOn BIGINT NOT NULL); +ALTER TABLE config ADD PRIMARY KEY (propName); CREATE INDEX IDX_config_1 ON config(modifiedOn); CREATE TABLE acls (principalId VARCHAR(256) NOT NULL, role VARCHAR(32) NOT NULL, principalName VARCHAR(256)); @@ -36,10 +36,10 @@ ALTER TABLE content_references ADD CONSTRAINT FK_content_references_1 FOREIGN KE CREATE TABLE groups (groupId VARCHAR(512) NOT NULL, description VARCHAR(1024), artifactsType VARCHAR(32), createdBy VARCHAR(256), createdOn TIMESTAMP WITHOUT TIME ZONE NOT NULL, modifiedBy VARCHAR(256), modifiedOn TIMESTAMP WITHOUT TIME ZONE, labels TEXT); ALTER TABLE groups ADD PRIMARY KEY (groupId); -CREATE TABLE group_labels (groupId VARCHAR(512) NOT NULL, pkey VARCHAR(256) NOT NULL, pvalue VARCHAR(512)); +CREATE TABLE group_labels (groupId VARCHAR(512) NOT NULL, labelKey VARCHAR(256) NOT NULL, labelValue VARCHAR(512)); ALTER TABLE group_labels ADD CONSTRAINT FK_glabels_1 FOREIGN KEY (groupId) REFERENCES groups(groupId) ON DELETE CASCADE; -CREATE INDEX IDX_glabels_1 ON group_labels(pkey); -CREATE INDEX IDX_glabels_2 ON group_labels(pvalue); +CREATE INDEX IDX_glabels_1 ON group_labels(labelKey); +CREATE INDEX IDX_glabels_2 ON group_labels(labelValue); CREATE TABLE group_rules (groupId VARCHAR(512) NOT NULL, type VARCHAR(32) NOT NULL, configuration VARCHAR(1024) NOT NULL); ALTER TABLE group_rules ADD PRIMARY KEY (groupId, type); @@ -51,10 +51,10 @@ CREATE INDEX IDX_artifacts_0 ON artifacts USING HASH (type); CREATE INDEX IDX_artifacts_1 ON artifacts USING HASH (createdBy); CREATE INDEX IDX_artifacts_2 ON artifacts(createdOn); -CREATE TABLE artifact_labels (groupId VARCHAR(512) NOT NULL, artifactId VARCHAR(512) NOT NULL, pkey VARCHAR(256) NOT NULL, pvalue VARCHAR(512)); +CREATE TABLE artifact_labels (groupId VARCHAR(512) NOT NULL, artifactId VARCHAR(512) NOT NULL, labelKey VARCHAR(256) NOT NULL, labelValue VARCHAR(512)); ALTER TABLE artifact_labels ADD CONSTRAINT FK_alabels_1 FOREIGN KEY (groupId, artifactId) REFERENCES artifacts(groupId, artifactId) ON DELETE CASCADE; -CREATE INDEX IDX_alabels_1 ON artifact_labels(pkey); -CREATE INDEX IDX_alabels_2 ON artifact_labels(pvalue); +CREATE INDEX IDX_alabels_1 ON artifact_labels(labelKey); +CREATE INDEX IDX_alabels_2 ON artifact_labels(labelValue); CREATE TABLE artifact_rules (groupId VARCHAR(512) NOT NULL, artifactId VARCHAR(512) NOT NULL, type VARCHAR(32) NOT NULL, configuration VARCHAR(1024) NOT NULL); ALTER TABLE artifact_rules ADD PRIMARY KEY (groupId, artifactId, type); @@ -78,10 +78,10 @@ CREATE INDEX IDX_versions_5 ON versions USING HASH (createdBy); CREATE INDEX IDX_versions_6 ON versions(createdOn); CREATE INDEX IDX_versions_7 ON versions USING HASH (contentId); -CREATE TABLE version_labels (globalId BIGINT NOT NULL, pkey VARCHAR(256) NOT NULL, pvalue VARCHAR(512)); +CREATE TABLE version_labels (globalId BIGINT NOT NULL, labelKey VARCHAR(256) NOT NULL, labelValue VARCHAR(512)); ALTER TABLE version_labels ADD CONSTRAINT FK_vlabels_1 FOREIGN KEY (globalId) REFERENCES versions(globalId) ON DELETE CASCADE; -CREATE INDEX IDX_vlabels_1 ON version_labels(pkey); -CREATE INDEX IDX_vlabels_2 ON version_labels(pvalue); +CREATE INDEX IDX_vlabels_1 ON version_labels(labelKey); +CREATE INDEX IDX_vlabels_2 ON version_labels(labelValue); CREATE TABLE version_comments (commentId VARCHAR(128) NOT NULL, globalId BIGINT NOT NULL, createdBy VARCHAR(256), createdOn TIMESTAMP WITHOUT TIME ZONE NOT NULL, cvalue VARCHAR(1024) NOT NULL); ALTER TABLE version_comments ADD PRIMARY KEY (commentId); From 453a13c88e6c2dc1f1893051f3812da18280e331 Mon Sep 17 00:00:00 2001 From: Eric Wittmann Date: Tue, 13 Feb 2024 08:46:19 -0700 Subject: [PATCH 6/6] Rename prop_name and prop_value in validate-files.sh --- scripts/validate-files.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/validate-files.sh b/scripts/validate-files.sh index 4b00606013..c8cbff311c 100755 --- a/scripts/validate-files.sh +++ b/scripts/validate-files.sh @@ -8,7 +8,7 @@ DDLS="app/src/main/resources/io/apicurio/registry/storage/impl/sql/postgresql.dd for ddl in $DDLS do echo "Processing DDL $ddl" - DB_VERSION_INSERT=$(grep "INSERT INTO apicurio (prop_name, prop_value) VALUES ('db_version'" $ddl) + DB_VERSION_INSERT=$(grep "INSERT INTO apicurio (propName, propValue) VALUES ('db_version'" $ddl) DB_VERSION_IN_DDL=$(echo $DB_VERSION_INSERT | awk '{ print $8 }' - | awk -F ")" '{ print $1}' -) echo "DB version in DDL is $DB_VERSION_IN_DDL"