yujunjun/OpenMetadata
1
0
Fork 0
mirror of https://github.com/open-metadata/OpenMetadata.git synced 2025-10-04 13:26:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix batchFetchClassification for tags (#23581)

Browse Source
This commit is contained in:
sonika-shah 2025-09-27 20:19:28 +05:30 committed by GitHub
parent f72dc826bf
commit 77a8b2335d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 107 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/TagRepository.java
View File

@ -379,7 +379,8 @@ public class TagRepository extends EntityRepository<Tag> {
var records =
daoCollection
.relationshipDAO()
.findToBatch(entityIds, Relationship.CONTAINS.ordinal(), Entity.CLASSIFICATION);
.findFromBatch(
entityIds, Relationship.CONTAINS.ordinal(), Entity.CLASSIFICATION, NON_DELETED);
if (records.isEmpty()) {
return Map.of();
@ -422,7 +423,7 @@ public class TagRepository extends EntityRepository<Tag> {
var records =
daoCollection
.relationshipDAO()
.findToBatch(entityIds, Relationship.CONTAINS.ordinal(), TAG);
.findFromBatch(entityIds, Relationship.CONTAINS.ordinal(), TAG, NON_DELETED);
if (records.isEmpty()) {
return Map.of();

104
openmetadata-service/src/test/java/org/openmetadata/service/resources/tags/TagResourceTest.java
View File

@ -793,4 +793,108 @@ public class TagResourceTest extends EntityResourceTest<Tag, CreateTag> {
return classificationResourceTest.getEntityByName(
name, classificationResourceTest.getAllowedFields(), ADMIN_AUTH_HEADERS);
}
@Test
@Order(100) // Run this test later to ensure environment is ready
void test_bulkSetFieldsForTags(TestInfo test) throws IOException {
// This test verifies that bulk operations (like those used during reindexing)
// correctly set classification and parent relationships for tags
// Create a classification
String classificationName =
"BulkTestClassification_" + UUID.randomUUID().toString().substring(0, 8);
Classification classification = createClassification(classificationName);
// Create a parent tag
String parentTagName = "BulkParentTag_" + UUID.randomUUID().toString().substring(0, 8);
CreateTag createParent =
createRequest(parentTagName).withClassification(classification.getFullyQualifiedName());
Tag parentTag = createEntity(createParent, ADMIN_AUTH_HEADERS);
// Create multiple child tags
List<Tag> childTags = new ArrayList<>();
for (int i = 0; i < 5; i++) {
String childTagName =
"BulkChildTag_" + i + "_" + UUID.randomUUID().toString().substring(0, 8);
CreateTag createChild =
createRequest(childTagName)
.withClassification(classification.getFullyQualifiedName())
.withParent(parentTag.getFullyQualifiedName());
Tag childTag = createEntity(createChild, ADMIN_AUTH_HEADERS);
childTags.add(childTag);
}
// Get TagRepository to test bulk operations
org.openmetadata.service.jdbi3.TagRepository tagRepository =
(org.openmetadata.service.jdbi3.TagRepository) Entity.getEntityRepository(Entity.TAG);
// Fetch tags without fields (simulating initial reindexing fetch)
// During reindexing, tags are fetched without relationships populated
List<Tag> tagsWithoutFields = new ArrayList<>();
for (Tag childTag : childTags) {
// Create a minimal tag object to simulate what happens during reindexing
// when tags are fetched in bulk without relationship fields
Tag tagWithoutFields = new Tag();
tagWithoutFields.setId(childTag.getId());
tagWithoutFields.setName(childTag.getName());
tagWithoutFields.setFullyQualifiedName(childTag.getFullyQualifiedName());
tagWithoutFields.setDescription(childTag.getDescription());
// Classification and parent are intentionally not set - simulating bulk fetch without
// relationships
tagsWithoutFields.add(tagWithoutFields);
}
// Test setFieldsInBulk method
org.openmetadata.service.util.EntityUtil.Fields fields =
new org.openmetadata.service.util.EntityUtil.Fields(
java.util.Set.of("classification", "parent", "usageCount"));
tagRepository.setFieldsInBulk(fields, tagsWithoutFields);
// Verify all tags now have their classification and parent set correctly
for (Tag tag : tagsWithoutFields) {
assertNotNull(tag.getClassification(), "Classification should be set after bulk operation");
assertEquals(
classification.getId(),
tag.getClassification().getId(),
"Classification ID should match");
assertEquals(
classification.getFullyQualifiedName(),
tag.getClassification().getFullyQualifiedName(),
"Classification FQN should match");
assertNotNull(tag.getParent(), "Parent should be set after bulk operation");
assertEquals(parentTag.getId(), tag.getParent().getId(), "Parent ID should match");
assertEquals(
parentTag.getFullyQualifiedName(),
tag.getParent().getFullyQualifiedName(),
"Parent FQN should match");
assertNotNull(tag.getUsageCount(), "Usage count should be set");
assertTrue(tag.getUsageCount() >= 0, "Usage count should be non-negative");
}
// Test edge case: empty list
List<Tag> emptyList = new ArrayList<>();
tagRepository.setFieldsInBulk(fields, emptyList);
assertTrue(emptyList.isEmpty(), "Empty list should remain empty");
// Test with parent tag (which has no parent)
List<Tag> parentTagList = new ArrayList<>();
Tag parentWithoutFields = new Tag();
parentWithoutFields.setId(parentTag.getId());
parentWithoutFields.setName(parentTag.getName());
parentWithoutFields.setFullyQualifiedName(parentTag.getFullyQualifiedName());
parentWithoutFields.setDescription(parentTag.getDescription());
parentTagList.add(parentWithoutFields);
tagRepository.setFieldsInBulk(fields, parentTagList);
assertNotNull(
parentWithoutFields.getClassification(), "Parent tag should have classification set");
assertEquals(
classification.getId(),
parentWithoutFields.getClassification().getId(),
"Parent tag classification should match");
assertNull(parentWithoutFields.getParent(), "Parent tag should not have a parent");
}
}