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

Co-authored-by: si-chakraborty <si.chakraborty@adevinta.com>
datahub-project · Dec 6, 2023 · 7fb6086 · 7fb6086
1 parent c66619c
commit 7fb6086
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 3 deletions.
diff --git a/...-registry/src/main/java/com/linkedin/metadata/models/annotation/SearchableAnnotation.java b/...-registry/src/main/java/com/linkedin/metadata/models/annotation/SearchableAnnotation.java
@@ -66,7 +66,8 @@ public enum FieldType {
     DATETIME,
     OBJECT,
     BROWSE_PATH_V2,
-    WORD_GRAM
+    WORD_GRAM,
+    DOUBLE
   }
 
   @Nonnull

diff --git a/entity-registry/src/test/java/com/linkedin/metadata/models/EntitySpecBuilderTest.java b/entity-registry/src/test/java/com/linkedin/metadata/models/EntitySpecBuilderTest.java
@@ -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(
@@ -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

diff --git a/...rc/main/java/com/linkedin/metadata/search/elasticsearch/indexbuilder/MappingsBuilder.java b/...rc/main/java/com/linkedin/metadata/search/elasticsearch/indexbuilder/MappingsBuilder.java
@@ -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);
     }

diff --git a/metadata-io/src/test/java/com/linkedin/metadata/search/indexbuilder/MappingsBuilderTest.java b/metadata-io/src/test/java/com/linkedin/metadata/search/indexbuilder/MappingsBuilderTest.java
@@ -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",
@@ -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");
   }
 }
diff --git a/test-models/src/main/pegasus/com/datahub/test/TestEntityInfo.pdl b/test-models/src/main/pegasus/com/datahub/test/TestEntityInfo.pdl
@@ -90,4 +90,10 @@ record TestEntityInfo includes CustomProperties {
     }
   }
   esObjectField: optional map[string, string]
+
+    @Searchable = {
+      "fieldName": "doubleField",
+      "fieldType": "DOUBLE"
+    }
+    doubleField: optional double
 }