From ffd45418f044f1ca4b212d822d8a86bb6da6664a Mon Sep 17 00:00:00 2001 From: lalr Date: Wed, 30 Jun 2021 09:24:33 +0000 Subject: [PATCH 1/4] 2805 | glossary term linked to dataset is not displayed --- .../graphql/types/dataset/mappers/DatasetSnapshotMapper.java | 5 ++++- .../pegasus/com/linkedin/common/GlossaryTermAssociation.pdl | 5 +++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/dataset/mappers/DatasetSnapshotMapper.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/dataset/mappers/DatasetSnapshotMapper.java index de4d977d3a9bc0..bd4287a856e8e2 100644 --- a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/dataset/mappers/DatasetSnapshotMapper.java +++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/dataset/mappers/DatasetSnapshotMapper.java @@ -1,7 +1,7 @@ package com.linkedin.datahub.graphql.types.dataset.mappers; import com.linkedin.common.GlobalTags; - +import com.linkedin.common.GlossaryTerms; import com.linkedin.common.InstitutionalMemory; import com.linkedin.common.Ownership; import com.linkedin.common.Status; @@ -13,6 +13,7 @@ import com.linkedin.datahub.graphql.types.common.mappers.OwnershipMapper; import com.linkedin.datahub.graphql.types.common.mappers.StatusMapper; import com.linkedin.datahub.graphql.types.common.mappers.StringMapMapper; +import com.linkedin.datahub.graphql.types.glossary.mappers.GlossaryTermsMapper; import com.linkedin.datahub.graphql.types.mappers.ModelMapper; import com.linkedin.datahub.graphql.types.tag.mappers.GlobalTagsMapper; import com.linkedin.dataset.DatasetDeprecation; @@ -79,6 +80,8 @@ public Dataset apply(@Nonnull final DatasetSnapshot dataset) { result.setGlobalTags(GlobalTagsMapper.map((GlobalTags) aspect)); } else if (aspect instanceof EditableSchemaMetadata) { result.setEditableSchemaMetadata(EditableSchemaMetadataMapper.map((EditableSchemaMetadata) aspect)); + } else if(aspect instanceof GlossaryTerms) { + result.setGlossaryTerms(GlossaryTermsMapper.map((GlossaryTerms) aspect )); } result.setTags(new ArrayList<>()); }); diff --git a/metadata-models/src/main/pegasus/com/linkedin/common/GlossaryTermAssociation.pdl b/metadata-models/src/main/pegasus/com/linkedin/common/GlossaryTermAssociation.pdl index 631d940cab25c6..d02f9f6c3402f8 100644 --- a/metadata-models/src/main/pegasus/com/linkedin/common/GlossaryTermAssociation.pdl +++ b/metadata-models/src/main/pegasus/com/linkedin/common/GlossaryTermAssociation.pdl @@ -7,5 +7,10 @@ record GlossaryTermAssociation { /** * Urn of the applied glossary term */ + @Searchable = { + "fieldName": "glossaryTerms", + "fieldType": "TEXT_PARTIAL", + "hasValuesFieldName": "hasTerms" + } urn: GlossaryTermUrn } From fa9092553bcabcad8962a0c05dd42c97617fcfb8 Mon Sep 17 00:00:00 2001 From: Lal Rishav <80503855+saxo-lalrishav@users.noreply.github.com> Date: Tue, 6 Jul 2021 10:19:10 +0530 Subject: [PATCH 2/4] style fix --- .../graphql/types/dataset/mappers/DatasetSnapshotMapper.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/dataset/mappers/DatasetSnapshotMapper.java b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/dataset/mappers/DatasetSnapshotMapper.java index 0ae4edc5c8010b..4afad0d8aaa203 100644 --- a/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/dataset/mappers/DatasetSnapshotMapper.java +++ b/datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/dataset/mappers/DatasetSnapshotMapper.java @@ -83,8 +83,8 @@ public Dataset apply(@Nonnull final DatasetSnapshot dataset) { result.setGlobalTags(GlobalTagsMapper.map((GlobalTags) aspect)); } else if (aspect instanceof EditableSchemaMetadata) { result.setEditableSchemaMetadata(EditableSchemaMetadataMapper.map((EditableSchemaMetadata) aspect)); - } else if(aspect instanceof GlossaryTerms) { - result.setGlossaryTerms(GlossaryTermsMapper.map((GlossaryTerms) aspect )); + } else if (aspect instanceof GlossaryTerms) { + result.setGlossaryTerms(GlossaryTermsMapper.map((GlossaryTerms) aspect)); } else if (aspect instanceof EditableDatasetProperties) { final EditableDatasetProperties editableDatasetProperties = (EditableDatasetProperties) aspect; final DatasetEditableProperties editableProperties = new DatasetEditableProperties(); From 7903df08f053a3dcb2a7be4c0accde643bf5586e Mon Sep 17 00:00:00 2001 From: Lal Rishav <80503855+saxo-lalrishav@users.noreply.github.com> Date: Tue, 6 Jul 2021 10:32:01 +0530 Subject: [PATCH 3/4] remove has terms --- .../pegasus/com/linkedin/common/GlossaryTermAssociation.pdl | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/metadata-models/src/main/pegasus/com/linkedin/common/GlossaryTermAssociation.pdl b/metadata-models/src/main/pegasus/com/linkedin/common/GlossaryTermAssociation.pdl index d02f9f6c3402f8..9342a03cf42f38 100644 --- a/metadata-models/src/main/pegasus/com/linkedin/common/GlossaryTermAssociation.pdl +++ b/metadata-models/src/main/pegasus/com/linkedin/common/GlossaryTermAssociation.pdl @@ -9,8 +9,7 @@ record GlossaryTermAssociation { */ @Searchable = { "fieldName": "glossaryTerms", - "fieldType": "TEXT_PARTIAL", - "hasValuesFieldName": "hasTerms" + "fieldType": "TEXT_PARTIAL" } urn: GlossaryTermUrn } From eeef4ab5f301109334ac8ff4b64921897f921f80 Mon Sep 17 00:00:00 2001 From: lalr Date: Mon, 19 Jul 2021 10:41:22 +0000 Subject: [PATCH 4/4] updated new schema --- metadata-ingestion/src/datahub/metadata/schema.avsc | 4 ++++ .../src/datahub/metadata/schemas/MetadataAuditEvent.avsc | 4 ++++ .../src/datahub/metadata/schemas/MetadataChangeEvent.avsc | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/metadata-ingestion/src/datahub/metadata/schema.avsc b/metadata-ingestion/src/datahub/metadata/schema.avsc index b9b0eea9e82dd7..bad4676ae03957 100644 --- a/metadata-ingestion/src/datahub/metadata/schema.avsc +++ b/metadata-ingestion/src/datahub/metadata/schema.avsc @@ -2738,6 +2738,10 @@ "namespace": "com.linkedin.pegasus2avro.common", "fields": [ { + "Searchable": { + "fieldName": "glossaryTerms", + "fieldType": "TEXT_PARTIAL" + }, "java": { "class": "com.linkedin.pegasus2avro.common.urn.GlossaryTermUrn" }, diff --git a/metadata-ingestion/src/datahub/metadata/schemas/MetadataAuditEvent.avsc b/metadata-ingestion/src/datahub/metadata/schemas/MetadataAuditEvent.avsc index 8ad368a6f43e12..4b245ea815befe 100644 --- a/metadata-ingestion/src/datahub/metadata/schemas/MetadataAuditEvent.avsc +++ b/metadata-ingestion/src/datahub/metadata/schemas/MetadataAuditEvent.avsc @@ -2700,6 +2700,10 @@ "name": "urn", "type": "string", "doc": "Urn of the applied glossary term", + "Searchable": { + "fieldName": "glossaryTerms", + "fieldType": "TEXT_PARTIAL" + }, "java": { "class": "com.linkedin.pegasus2avro.common.urn.GlossaryTermUrn" } diff --git a/metadata-ingestion/src/datahub/metadata/schemas/MetadataChangeEvent.avsc b/metadata-ingestion/src/datahub/metadata/schemas/MetadataChangeEvent.avsc index e507e311471a81..43d005fd44cdca 100644 --- a/metadata-ingestion/src/datahub/metadata/schemas/MetadataChangeEvent.avsc +++ b/metadata-ingestion/src/datahub/metadata/schemas/MetadataChangeEvent.avsc @@ -2699,6 +2699,10 @@ "name": "urn", "type": "string", "doc": "Urn of the applied glossary term", + "Searchable": { + "fieldName": "glossaryTerms", + "fieldType": "TEXT_PARTIAL" + }, "java": { "class": "com.linkedin.pegasus2avro.common.urn.GlossaryTermUrn" }