fix testcases

datahub-project · Feb 8, 2025 · 6d50d30 · 6d50d30
1 parent bf1faaa
commit 6d50d30
Show file tree

Hide file tree

Showing 6 changed files with 53 additions and 25 deletions.
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
@@ -278,13 +278,8 @@ private static Map<String, Object> getMappingsForField(
         .ifPresent(
             fieldName -> mappings.put(fieldName, ImmutableMap.of(TYPE, ESUtils.LONG_FIELD_TYPE)));
 
-    final String fieldName = searchableFieldSpec.getSearchableAnnotation().getFieldName();
-    if (searchableFieldSpec.getSearchableAnnotation().isIncludeSystemModifiedAt()) {
-      String modifiedAtFieldName =
-          searchableFieldSpec
-              .getSearchableAnnotation()
-              .getSystemModifiedAtFieldName()
-              .orElse(String.format("%sSystemModifiedAt", fieldName));
+    if (ESUtils.getSystemModifiedAtFieldName(searchableFieldSpec).isPresent()) {
+      String modifiedAtFieldName = ESUtils.getSystemModifiedAtFieldName(searchableFieldSpec).get();
       mappings.put(modifiedAtFieldName, ImmutableMap.of(TYPE, ESUtils.DATE_FIELD_TYPE));
     }
 

diff --git a/...-io/src/main/java/com/linkedin/metadata/search/transformer/SearchDocumentTransformer.java b/...-io/src/main/java/com/linkedin/metadata/search/transformer/SearchDocumentTransformer.java
@@ -31,6 +31,7 @@
 import com.linkedin.metadata.models.annotation.SearchableAnnotation.FieldType;
 import com.linkedin.metadata.models.extractor.FieldExtractor;
 import com.linkedin.metadata.models.registry.EntityRegistry;
+import com.linkedin.metadata.search.utils.ESUtils;
 import com.linkedin.r2.RemoteInvocationException;
 import com.linkedin.structured.StructuredProperties;
 import com.linkedin.structured.StructuredPropertyDefinition;
@@ -255,12 +256,8 @@ public void setSearchableValue(
       return;
     }
 
-    if (fieldSpec.getSearchableAnnotation().isIncludeSystemModifiedAt()) {
-      String modifiedAtFieldName =
-          fieldSpec
-              .getSearchableAnnotation()
-              .getSystemModifiedAtFieldName()
-              .orElse(String.format("%sSystemModifiedAt", fieldName));
+    if (ESUtils.getSystemModifiedAtFieldName(fieldSpec).isPresent()) {
+      String modifiedAtFieldName = ESUtils.getSystemModifiedAtFieldName(fieldSpec).get();
       searchDocument.set(
           modifiedAtFieldName,
           JsonNodeFactory.instance.numberNode((Long) System.currentTimeMillis()));

diff --git a/metadata-io/src/main/java/com/linkedin/metadata/search/utils/ESUtils.java b/metadata-io/src/main/java/com/linkedin/metadata/search/utils/ESUtils.java
@@ -907,4 +907,15 @@ public static BoolQueryBuilder buildFilterNonLatestEntities(
             queryFilterRewriteChain);
     return QueryBuilders.boolQuery().should(isLatest).should(isNotVersioned).minimumShouldMatch(1);
   }
+
+  public static Optional<String> getSystemModifiedAtFieldName(
+      @Nonnull SearchableFieldSpec searchableFieldSpec) {
+    final String fieldName = searchableFieldSpec.getSearchableAnnotation().getFieldName();
+    return searchableFieldSpec.getSearchableAnnotation().isIncludeSystemModifiedAt()
+        ? searchableFieldSpec
+            .getSearchableAnnotation()
+            .getSystemModifiedAtFieldName()
+            .or(() -> Optional.of(String.format("%sSystemModifiedAt", fieldName)))
+        : Optional.empty();
+  }
 }
diff --git a/...src/test/java/com/linkedin/metadata/search/query/request/AggregationQueryBuilderTest.java b/...src/test/java/com/linkedin/metadata/search/query/request/AggregationQueryBuilderTest.java
@@ -170,7 +170,9 @@ public void testGetDefaultAggregationsHasFields() {
             Optional.empty(),
             Collections.emptyMap(),
             Collections.emptyList(),
-            false);
+            false,
+            false,
+            Optional.empty());
 
     SearchConfiguration config = new SearchConfiguration();
     config.setMaxTermBucketSize(25);
@@ -203,7 +205,9 @@ public void testGetDefaultAggregationsFields() {
             Optional.empty(),
             Collections.emptyMap(),
             Collections.emptyList(),
-            false);
+            false,
+            false,
+            Optional.empty());
 
     SearchConfiguration config = new SearchConfiguration();
     config.setMaxTermBucketSize(25);
@@ -235,7 +239,9 @@ public void testGetSpecificAggregationsHasFields() {
             Optional.empty(),
             Collections.emptyMap(),
             Collections.emptyList(),
-            false);
+            false,
+            false,
+            Optional.empty());
 
     SearchableAnnotation annotation2 =
         new SearchableAnnotation(
@@ -252,7 +258,9 @@ public void testGetSpecificAggregationsHasFields() {
             Optional.empty(),
             Collections.emptyMap(),
             Collections.emptyList(),
-            false);
+            false,
+            false,
+            Optional.empty());
 
     SearchConfiguration config = new SearchConfiguration();
     config.setMaxTermBucketSize(25);
@@ -462,7 +470,9 @@ public void testAggregateOverFieldsAndStructProp() {
             Optional.empty(),
             Collections.emptyMap(),
             Collections.emptyList(),
-            false);
+            false,
+            false,
+            Optional.empty());
 
     SearchableAnnotation annotation2 =
         new SearchableAnnotation(
@@ -479,7 +489,9 @@ public void testAggregateOverFieldsAndStructProp() {
             Optional.empty(),
             Collections.emptyMap(),
             Collections.emptyList(),
-            false);
+            false,
+            false,
+            Optional.empty());
 
     SearchConfiguration config = new SearchConfiguration();
     config.setMaxTermBucketSize(25);
@@ -532,7 +544,9 @@ public void testAggregateOverFieldsAndStructPropV1() {
             Optional.empty(),
             Collections.emptyMap(),
             Collections.emptyList(),
-            false);
+            false,
+            false,
+            Optional.empty());
 
     SearchableAnnotation annotation2 =
         new SearchableAnnotation(
@@ -549,7 +563,9 @@ public void testAggregateOverFieldsAndStructPropV1() {
             Optional.empty(),
             Collections.emptyMap(),
             Collections.emptyList(),
-            false);
+            false,
+            false,
+            Optional.empty());
 
     SearchConfiguration config = new SearchConfiguration();
     config.setMaxTermBucketSize(25);
@@ -606,7 +622,9 @@ public void testMissingAggregation() {
             Optional.empty(),
             Collections.emptyMap(),
             Collections.emptyList(),
-            true);
+            true,
+            false,
+            Optional.empty());
 
     SearchConfiguration config = new SearchConfiguration();
     config.setMaxTermBucketSize(25);

diff --git a/...a-io/src/test/java/com/linkedin/metadata/search/query/request/SearchQueryBuilderTest.java b/...a-io/src/test/java/com/linkedin/metadata/search/query/request/SearchQueryBuilderTest.java
@@ -454,7 +454,9 @@ public void testGetStandardFields() {
                         Optional.empty(),
                         Map.of(),
                         List.of(),
-                        false),
+                        false,
+                        false,
+                        Optional.empty()),
                     mock(DataSchema.class)),
                 new SearchableFieldSpec(
                     mock(PathSpec.class),
@@ -472,7 +474,9 @@ public void testGetStandardFields() {
                         Optional.empty(),
                         Map.of(),
                         List.of(),
-                        false),
+                        false,
+                        false,
+                        Optional.empty()),
                     mock(DataSchema.class)),
                 new SearchableFieldSpec(
                     mock(PathSpec.class),
@@ -490,7 +494,9 @@ public void testGetStandardFields() {
                         Optional.empty(),
                         Map.of(),
                         List.of(),
-                        false),
+                        false,
+                        false,
+                        Optional.empty()),
                     mock(DataSchema.class))));
 
     fieldConfigs =

diff --git a/...a-models/src/main/pegasus/com/linkedin/businessattribute/BusinessAttributeAssociation.pdl b/...a-models/src/main/pegasus/com/linkedin/businessattribute/BusinessAttributeAssociation.pdl
@@ -7,6 +7,7 @@ record BusinessAttributeAssociation {
   */
   @Searchable = {
      "fieldName": "schemaFieldBusinessAttribute",
+     "queryByDefault": false,
      "includeSystemModifiedAt": true,
      "systemModifiedAtFieldName": "schemaFieldBusinessAttributeModifiedAt"
   }