yujunjun/OpenMetadata
1
0
Fork 0
mirror of https://github.com/open-metadata/OpenMetadata.git synced 2025-12-14 00:57:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix: setInheritedFields for spreadsheet, worksheet, file, directory (#23262)

Browse Source
This commit is contained in:
Ram Narayan Balaji 2025-09-05 02:54:01 +05:30 committed by GitHub
parent d926ed9dad
commit 0b56562e2b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/DirectoryRepository.java
View File

@ -133,12 +133,10 @@ public class DirectoryRepository extends EntityRepository<Directory> {
// Inherit domain from parent or service if needed // Inherit domain from parent or service if needed
if (nullOrEmpty(directory.getDomains())) { if (nullOrEmpty(directory.getDomains())) {
if (directory.getParent() != null) { if (directory.getParent() != null) {
Directory parent = Directory parent = Entity.getEntity(directory.getParent(), FIELD_DOMAINS, Include.ALL);
Entity.getEntity(directory.getParent(), FIELD_DOMAINS, Include.NON_DELETED);
inheritDomains(directory, fields, parent); inheritDomains(directory, fields, parent);
} else { } else {
DriveService service = DriveService service = Entity.getEntity(directory.getService(), FIELD_DOMAINS, Include.ALL);
Entity.getEntity(directory.getService(), FIELD_DOMAINS, Include.NON_DELETED);
inheritDomains(directory, fields, service); inheritDomains(directory, fields, service);
} }
} }

6
openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/FileRepository.java
View File

@ -136,12 +136,10 @@ public class FileRepository extends EntityRepository<File> {
// Inherit domain from directory if available, otherwise from service // Inherit domain from directory if available, otherwise from service
if (nullOrEmpty(file.getDomains())) { if (nullOrEmpty(file.getDomains())) {
if (file.getDirectory() != null) { if (file.getDirectory() != null) {
Directory directory = Directory directory = Entity.getEntity(file.getDirectory(), "domains,service", Include.ALL);
Entity.getEntity(file.getDirectory(), "domains,service", Include.NON_DELETED);
inheritDomains(file, fields, directory); inheritDomains(file, fields, directory);
} else { } else {
DriveService service = DriveService service = Entity.getEntity(file.getService(), FIELD_DOMAINS, Include.ALL);
Entity.getEntity(file.getService(), FIELD_DOMAINS, Include.NON_DELETED);
inheritDomains(file, fields, service); inheritDomains(file, fields, service);
} }
} }

4
openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/SpreadsheetRepository.java
View File

@ -145,11 +145,11 @@ public class SpreadsheetRepository extends EntityRepository<Spreadsheet> {
if (nullOrEmpty(spreadsheet.getDomains())) { if (nullOrEmpty(spreadsheet.getDomains())) {
if (spreadsheet.getDirectory() != null) { if (spreadsheet.getDirectory() != null) {
Directory directory = Directory directory =
Entity.getEntity(spreadsheet.getDirectory(), "domains,service", Include.NON_DELETED); Entity.getEntity(spreadsheet.getDirectory(), "domains,service", Include.ALL);
inheritDomains(spreadsheet, fields, directory); inheritDomains(spreadsheet, fields, directory);
} else { } else {
DriveService service = DriveService service =
Entity.getEntity(spreadsheet.getService(), FIELD_DOMAINS, Include.NON_DELETED); Entity.getEntity(spreadsheet.getService(), FIELD_DOMAINS, Include.ALL);
inheritDomains(spreadsheet, fields, service); inheritDomains(spreadsheet, fields, service);
} }
} }

2
openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/WorksheetRepository.java
View File

@ -130,7 +130,7 @@ public class WorksheetRepository extends EntityRepository<Worksheet> {
// Inherit domain from spreadsheet if not set // Inherit domain from spreadsheet if not set
if (nullOrEmpty(worksheet.getDomains())) { if (nullOrEmpty(worksheet.getDomains())) {
Spreadsheet spreadsheet = Spreadsheet spreadsheet =
Entity.getEntity(worksheet.getSpreadsheet(), "domains", Include.NON_DELETED); Entity.getEntity(worksheet.getSpreadsheet(), "domains", Include.ALL);
inheritDomains(worksheet, fields, spreadsheet); inheritDomains(worksheet, fields, spreadsheet);
} }
} }