yujunjun/datahub
2
0
Fork 0
mirror of https://github.com/datahub-project/datahub.git synced 2025-10-11 08:54:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(search): fix field name in api (#10170)

Browse Source
This commit is contained in:
RyanHolstien 2024-03-29 14:45:23 -05:00 committed by GitHub
parent c1eff5982e
commit a72e9a818f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
metadata-io/src/main/java/com/linkedin/metadata/graph/elastic/ESGraphQueryDAO.java
View File

@ -1,7 +1,7 @@
package com.linkedin.metadata.graph.elastic;
import static com.linkedin.metadata.graph.Edge.*;
import static com.linkedin.metadata.graph.elastic.ElasticSearchGraphService.*;
import static com.linkedin.metadata.graph.elastic.GraphRelationshipMappingsBuilder.*;
import com.codahale.metrics.Timer;
import com.datahub.util.exception.ESQueryException;

2
metadata-io/src/main/java/com/linkedin/metadata/graph/elastic/ElasticSearchGraphService.java
View File

@ -1,6 +1,6 @@
package com.linkedin.metadata.graph.elastic;
import static com.linkedin.metadata.graph.elastic.GraphRelationshipMappingsBuilder.*;
import static com.linkedin.metadata.graph.Edge.*;
import com.fasterxml.jackson.databind.node.JsonNodeFactory;
import com.fasterxml.jackson.databind.node.ObjectNode;

8
metadata-io/src/main/java/com/linkedin/metadata/graph/elastic/GraphRelationshipMappingsBuilder.java
View File

@ -1,5 +1,7 @@
package com.linkedin.metadata.graph.elastic;
import static com.linkedin.metadata.graph.Edge.*;
import com.google.common.collect.ImmutableMap;
import java.util.HashMap;
import java.util.Map;
@ -7,12 +9,6 @@ import lombok.extern.slf4j.Slf4j;
@Slf4j
public class GraphRelationshipMappingsBuilder {
public static final String EDGE_FIELD_SOURCE = "source";
public static final String EDGE_FIELD_DESTINATION = "destination";
public static final String EDGE_FIELD_RELNSHIP_TYPE = "relationshipType";
public static final String EDGE_FIELD_PROPERTIES = "properties";
public static final String EDGE_FIELD_VIA = "via";
public static final String EDGE_FIELD_LIFECYCLE_OWNER = "lifecycleOwner";
private GraphRelationshipMappingsBuilder() {}

20
metadata-service/services/src/main/java/com/linkedin/metadata/graph/Edge.java
View File

@ -81,17 +81,21 @@ public class Edge {
}
}
public static final String SOURCE_URN_FIELD = "source.urn";
public static final String DESTINATION_URN_FIELD = "destination.urn";
public static final String RELATIONSHIP_TYPE_FIELD = "relationshipType";
public static final String LIFE_CYCLE_OWNER_FIELD = "lifeCycleOwner";
public static final String EDGE_FIELD_SOURCE = "source";
public static final String EDGE_FIELD_DESTINATION = "destination";
public static final String EDGE_FIELD_RELNSHIP_TYPE = "relationshipType";
public static final String EDGE_FIELD_PROPERTIES = "properties";
public static final String EDGE_FIELD_VIA = "via";
public static final String EDGE_FIELD_LIFECYCLE_OWNER = "lifecycleOwner";
public static final String EDGE_SOURCE_URN_FIELD = "source.urn";
public static final String EDGE_DESTINATION_URN_FIELD = "destination.urn";
public static final List<Pair<String, SortOrder>> KEY_SORTS =
List.of(
new Pair<>(SOURCE_URN_FIELD, SortOrder.ASCENDING),
new Pair<>(DESTINATION_URN_FIELD, SortOrder.ASCENDING),
new Pair<>(RELATIONSHIP_TYPE_FIELD, SortOrder.ASCENDING),
new Pair<>(LIFE_CYCLE_OWNER_FIELD, SortOrder.ASCENDING));
new Pair<>(EDGE_SOURCE_URN_FIELD, SortOrder.ASCENDING),
new Pair<>(EDGE_DESTINATION_URN_FIELD, SortOrder.ASCENDING),
new Pair<>(EDGE_FIELD_RELNSHIP_TYPE, SortOrder.ASCENDING),
new Pair<>(EDGE_FIELD_LIFECYCLE_OWNER, SortOrder.ASCENDING));
public static List<SortCriterion> EDGE_SORT_CRITERION =
KEY_SORTS.stream()
.map(entry -> SearchUtil.sortBy(entry.getKey(), entry.getValue()))