Skip to content

fix(content): replace unbounded query loop with LIMIT-1 DB call in validateRelationships() (#35489) #35491

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
fabrizzio-dotCMS wants to merge 5 commits into
base: main
Choose a base branch
from
+22 −25
Open

fix(content): replace unbounded query loop with LIMIT-1 DB call in validateRelationships() (#35489) #35491

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
af754df
fix(content): replace unbounded getRelatedContent() with LIMIT-1 DB q…
fabrizzio-dotCMS Apr 28, 2026
72057ff
Merge branch 'main' into fix/issue-35489-validate-relationships-limit
fabrizzio-dotCMS Apr 28, 2026
812c9cb
fix(content): clean up catch clause and size check after dbRelatedCon…
fabrizzio-dotCMS Apr 28, 2026
748f037
Merge branch 'main' into fix/issue-35489-validate-relationships-limit
fabrizzio-dotCMS Apr 28, 2026
34b1e2c
Merge branch 'main' into fix/issue-35489-validate-relationships-limit
fabrizzio-dotCMS Apr 29, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 22 additions & 25 deletions dotCMS/src/main/java/com/dotcms/content/elasticsearch/business/ESContentletAPIImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8629,14 +8629,14 @@ private void validateRelationships(final Contentlet contentlet,
if (!foundInRelationships && UtilMethods.isSet(contentlet.getIdentifier())) {
// Check if there are existing related content records for this relationship
try {
final List<Contentlet> existingRelatedContent = getRelatedContent(contentlet, rel,
checkParent, APILocator.systemUser(), false);
hasExistingRelatedContent = existingRelatedContent != null && !existingRelatedContent.isEmpty();
hasExistingRelatedContent = !FactoryLocator.getRelationshipFactory()
.dbRelatedContent(rel, contentlet, checkParent, false, null, 1, 0)
.isEmpty();
if (hasExistingRelatedContent) {
Logger.debug(this, String.format("Required %s relationship [%s] not present in contentRelationships but found existing related content for contentlet [%s]",
(checkParent ? "child" : "parent"), rel.getRelationTypeValue(), contentletId));
}
} catch (final DotDataException | DotSecurityException e) {
} catch (final DotDataException e) {
Logger.error(this, String.format("Could not check existing related content for relationship [%s] and contentlet [%s]",
rel.getRelationTypeValue(), contentletId), e);
}
Expand All @@ -8662,7 +8662,7 @@ private void validateRelationships(final Contentlet contentlet,
}

if (relationship.getCardinality() == RELATIONSHIP_CARDINALITY.ONE_TO_ONE
.ordinal() && contentsInRelationship.size() > 0) {
.ordinal() && !contentsInRelationship.isEmpty()) {
hasError |= !isValidOneToOneRelationship(contentlet, builder, relationship,
contentsInRelationship);

Expand Down Expand Up @@ -8696,27 +8696,24 @@ private void validateRelationships(final Contentlet contentlet,
}
for (final Contentlet contentInRelationship : contentsInRelationship) {
try {
// In order to get the related content we should use method getRelatedContent
// that has -boolean pullByParent- as parameter so we can pass -false-
// to get related content where we are parents.
final List<Contentlet> relatedContents = getRelatedContent(
contentInRelationship, relationship, false,
APILocator.getUserAPI()
.getSystemUser(), true, 1, 0, null);
// If there's a 1-N relationship and the parent
// content is relating to a child that already has
// a parent...
// For ONE_TO_MANY, check if the child already has a different parent.
// Skip for other cardinalities — avoids N×M query explosion via the relationship cache.
if (relationship.getCardinality()
== RELATIONSHIP_CARDINALITY.ONE_TO_MANY.ordinal()
&& !relatedContents.isEmpty()
&& !relatedContents.get(0).getIdentifier()
.equals(contentlet.getIdentifier())) {
final String errorMessage = String.format("ERROR! Parent content [%s] cannot be related to child content [%s] because it is already related to parent content [%s]",
contentletId, contentInRelationship.getIdentifier(), relatedContents.get(0).getIdentifier());
Logger.error(this, errorMessage);
hasError = true;
builder.addBadCardinalityRelationship(relationship,
contentsInRelationship);
== RELATIONSHIP_CARDINALITY.ONE_TO_MANY.ordinal()) {
final List<Contentlet> relatedContents = FactoryLocator
.getRelationshipFactory()
.dbRelatedContent(relationship, contentInRelationship,
false, false, null, 1, 0);
if (!relatedContents.isEmpty()
&& !relatedContents.get(0).getIdentifier()
.equals(contentlet.getIdentifier())) {
final String errorMessage = String.format("ERROR! Parent content [%s] cannot be related to child content [%s] because it is already related to parent content [%s]",
contentletId, contentInRelationship.getIdentifier(), relatedContents.get(0).getIdentifier());
Logger.error(this, errorMessage);
hasError = true;
builder.addBadCardinalityRelationship(relationship,
contentsInRelationship);
}
}

if (!contentInRelationship.getContentTypeId()
Expand Down
Loading