Skip to content
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

Jump to bottom

feat(gms/search): Adding support for DOUBLE Searchable type #9369

Merged
merged 12 commits into from
Dec 6, 2023
Merged

feat(gms/search): Adding support for DOUBLE Searchable type #9369

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
9722c1f
feat(gms/search): Adding support for DOUBLE Searchable type
Dec 1, 2023
45332c6
Merge branch 'master' of https://github.com/datahub-project/datahub i…
Dec 1, 2023
85ba7f6
fix formatting
Dec 1, 2023
4073f4e
Merge branch 'master' into add-double-searchable-type
siladitya2 Dec 1, 2023
98f848c
adding unit test case
Dec 1, 2023
7868fa8
Merge branch 'add-double-searchable-type' of github.com:siladitya2/da…
Dec 1, 2023
ad57c3f
fix build failure
Dec 1, 2023
adab87a
fix build failure
Dec 1, 2023
48b56d8
updated test cases with more coverage
Dec 2, 2023
ecd1766
removed unused code.
Dec 2, 2023
65e5ba1
removed unused code.
Dec 4, 2023
99b5896
removed unused subfield mapping and updated with simple numeric doubl…
Dec 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion ...-registry/src/main/java/com/linkedin/metadata/models/annotation/SearchableAnnotation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,8 @@ public enum FieldType {
DATETIME,
OBJECT,
BROWSE_PATH_V2,
WORD_GRAM
WORD_GRAM,
DOUBLE
}

@Nonnull
Expand Down
6 changes: 5 additions & 1 deletion entity-registry/src/test/java/com/linkedin/metadata/models/EntitySpecBuilderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ private void validateTestEntityInfo(final AspectSpec testEntityInfo) {
assertEquals(new TestEntityInfo().schema().getFullName(), testEntityInfo.getPegasusSchema().getFullName());

// Assert on Searchable Fields
assertEquals(testEntityInfo.getSearchableFieldSpecs().size(), 10);
assertEquals(testEntityInfo.getSearchableFieldSpecs().size(), 11);
assertEquals("customProperties", testEntityInfo.getSearchableFieldSpecMap().get(
new PathSpec("customProperties").toString()).getSearchableAnnotation().getFieldName());
assertEquals(SearchableAnnotation.FieldType.KEYWORD, testEntityInfo.getSearchableFieldSpecMap().get(
Expand Down Expand Up @@ -189,6 +189,10 @@ private void validateTestEntityInfo(final AspectSpec testEntityInfo) {
new PathSpec("foreignKey").toString()).getSearchableAnnotation().getFieldName());
assertEquals(true, testEntityInfo.getSearchableFieldSpecMap().get(
new PathSpec("foreignKey").toString()).getSearchableAnnotation().isQueryByDefault());
assertEquals("doubleField", testEntityInfo.getSearchableFieldSpecMap().get(
new PathSpec("doubleField").toString()).getSearchableAnnotation().getFieldName());
assertEquals(SearchableAnnotation.FieldType.DOUBLE, testEntityInfo.getSearchableFieldSpecMap().get(
new PathSpec("doubleField").toString()).getSearchableAnnotation().getFieldType());


// Assert on Relationship Fields
Expand Down
2 changes: 2 additions & 0 deletions ...rc/main/java/com/linkedin/metadata/search/elasticsearch/indexbuilder/MappingsBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,8 @@ private static Map<String, Object> getMappingsForField(@Nonnull final Searchable
mappingForField.put(TYPE, ESUtils.DATE_FIELD_TYPE);
} else if (fieldType == FieldType.OBJECT) {
mappingForField.put(TYPE, ESUtils.OBJECT_FIELD_TYPE);
} else if (fieldType == FieldType.DOUBLE) {
mappingForField.put(TYPE, ESUtils.DOUBLE_FIELD_TYPE);
} else {
log.info("FieldType {} has no mappings implemented", fieldType);
}
Expand Down
6 changes: 5 additions & 1 deletion metadata-io/src/test/java/com/linkedin/metadata/search/indexbuilder/MappingsBuilderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ public void testMappingsBuilder() {
Map<String, Object> result = MappingsBuilder.getMappings(TestEntitySpecBuilder.getSpec());
assertEquals(result.size(), 1);
Map<String, Object> properties = (Map<String, Object>) result.get("properties");
assertEquals(properties.size(), 19);
assertEquals(properties.size(), 20);
assertEquals(properties.get("urn"), ImmutableMap.of("type", "keyword",
"fields",
ImmutableMap.of("delimited",
Expand Down Expand Up @@ -123,5 +123,9 @@ public void testMappingsBuilder() {
assertEquals(feature1.get("type"), "double");
Map<String, Object> feature2 = (Map<String, Object>) properties.get("feature2");
assertEquals(feature2.get("type"), "double");

// DOUBLE
Map<String, Object> doubleField = (Map<String, Object>) properties.get("doubleField");
assertEquals(doubleField.get("type"), "double");
}
}
6 changes: 6 additions & 0 deletions test-models/src/main/pegasus/com/datahub/test/TestEntityInfo.pdl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,4 +90,10 @@ record TestEntityInfo includes CustomProperties {
}
}
esObjectField: optional map[string, string]

@Searchable = {
"fieldName": "doubleField",
"fieldType": "DOUBLE"
}
doubleField: optional double
}