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

fix(lineage): Move lineage registry to entity-registry module (#4412)

Browse Source 
* Move lineage registry

* Fix test
This commit is contained in:
Dexter Lee 2022-03-15 11:59:59 -07:00 committed by GitHub
parent 540d1b3be5
commit ab0b5162af
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
14 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
entity-registry/build.gradle
View File

@ -15,6 +15,8 @@ dependencies {
compile externalDependency.mavenArtifact compile externalDependency.mavenArtifact
testCompile externalDependency.testng testCompile externalDependency.testng
testCompile externalDependency.mockito
testCompile externalDependency.mockitoInline
testCompile project(':test-models') testCompile project(':test-models')
} }

6
metadata-io/src/main/java/com/linkedin/metadata/graph/LineageRegistry.java → entity-registry/src/main/java/com/linkedin/metadata/models/registry/LineageRegistry.java
View File

@ -1,7 +1,7 @@
package com.linkedin.metadata.graph; package com.linkedin.metadata.models.registry;
import com.linkedin.metadata.graph.LineageDirection;
import com.linkedin.metadata.models.annotation.RelationshipAnnotation; import com.linkedin.metadata.models.annotation.RelationshipAnnotation;
import com.linkedin.metadata.models.registry.EntityRegistry;
import com.linkedin.metadata.query.filter.RelationshipDirection; import com.linkedin.metadata.query.filter.RelationshipDirection;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
@ -91,7 +91,7 @@ public class LineageRegistry {
if (spec == null) { if (spec == null) {
return Collections.emptyList(); return Collections.emptyList();
} }
if (direction == LineageDirection.UPSTREAM) { if (direction == LineageDirection.UPSTREAM) {
return spec.getUpstreamEdges(); return spec.getUpstreamEdges();
} }

3
metadata-io/src/test/java/com/linkedin/metadata/graph/LineageRegistryTest.java → entity-registry/src/test/java/com/linkedin/metadata/models/registry/LineageRegistryTest.java
View File

@ -1,10 +1,9 @@
package com.linkedin.metadata.graph; package com.linkedin.metadata.models.registry;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import com.linkedin.metadata.models.EntitySpec; import com.linkedin.metadata.models.EntitySpec;
import com.linkedin.metadata.models.RelationshipFieldSpec; import com.linkedin.metadata.models.RelationshipFieldSpec;
import com.linkedin.metadata.models.annotation.RelationshipAnnotation; import com.linkedin.metadata.models.annotation.RelationshipAnnotation;
import com.linkedin.metadata.models.registry.EntityRegistry;
import com.linkedin.metadata.query.filter.RelationshipDirection; import com.linkedin.metadata.query.filter.RelationshipDirection;
import java.util.Collections; import java.util.Collections;
import java.util.HashMap; import java.util.HashMap;

1
metadata-io/src/main/java/com/linkedin/metadata/graph/GraphService.java
View File

@ -1,6 +1,7 @@
package com.linkedin.metadata.graph; package com.linkedin.metadata.graph;
import com.linkedin.common.urn.Urn; import com.linkedin.common.urn.Urn;
import com.linkedin.metadata.models.registry.LineageRegistry;
import com.linkedin.metadata.query.filter.Filter; import com.linkedin.metadata.query.filter.Filter;
import com.linkedin.metadata.query.filter.RelationshipDirection; import com.linkedin.metadata.query.filter.RelationshipDirection;
import com.linkedin.metadata.query.filter.RelationshipFilter; import com.linkedin.metadata.query.filter.RelationshipFilter;

2
metadata-io/src/main/java/com/linkedin/metadata/graph/dgraph/DgraphGraphService.java
View File

@ -6,7 +6,7 @@ import com.google.protobuf.ByteString;
import com.linkedin.common.urn.Urn; import com.linkedin.common.urn.Urn;
import com.linkedin.metadata.graph.Edge; import com.linkedin.metadata.graph.Edge;
import com.linkedin.metadata.graph.GraphService; import com.linkedin.metadata.graph.GraphService;
import com.linkedin.metadata.graph.LineageRegistry; import com.linkedin.metadata.models.registry.LineageRegistry;
import com.linkedin.metadata.graph.RelatedEntitiesResult; import com.linkedin.metadata.graph.RelatedEntitiesResult;
import com.linkedin.metadata.graph.RelatedEntity; import com.linkedin.metadata.graph.RelatedEntity;
import com.linkedin.metadata.query.filter.Criterion; import com.linkedin.metadata.query.filter.Criterion;

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

@ -7,8 +7,8 @@ import com.google.common.collect.Lists;
import com.linkedin.common.urn.Urn; import com.linkedin.common.urn.Urn;
import com.linkedin.common.urn.UrnUtils; import com.linkedin.common.urn.UrnUtils;
import com.linkedin.metadata.graph.LineageDirection; import com.linkedin.metadata.graph.LineageDirection;
import com.linkedin.metadata.graph.LineageRegistry; import com.linkedin.metadata.models.registry.LineageRegistry;
import com.linkedin.metadata.graph.LineageRegistry.EdgeInfo; import com.linkedin.metadata.models.registry.LineageRegistry.EdgeInfo;
import com.linkedin.metadata.graph.LineageRelationship; import com.linkedin.metadata.graph.LineageRelationship;
import com.linkedin.metadata.query.filter.Condition; import com.linkedin.metadata.query.filter.Condition;
import com.linkedin.metadata.query.filter.ConjunctiveCriterion; import com.linkedin.metadata.query.filter.ConjunctiveCriterion;

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

@ -8,7 +8,7 @@ import com.linkedin.metadata.graph.Edge;
import com.linkedin.metadata.graph.EntityLineageResult; import com.linkedin.metadata.graph.EntityLineageResult;
import com.linkedin.metadata.graph.GraphService; import com.linkedin.metadata.graph.GraphService;
import com.linkedin.metadata.graph.LineageDirection; import com.linkedin.metadata.graph.LineageDirection;
import com.linkedin.metadata.graph.LineageRegistry; import com.linkedin.metadata.models.registry.LineageRegistry;
import com.linkedin.metadata.graph.LineageRelationshipArray; import com.linkedin.metadata.graph.LineageRelationshipArray;
import com.linkedin.metadata.graph.RelatedEntitiesResult; import com.linkedin.metadata.graph.RelatedEntitiesResult;
import com.linkedin.metadata.graph.RelatedEntity; import com.linkedin.metadata.graph.RelatedEntity;

2
metadata-io/src/main/java/com/linkedin/metadata/graph/neo4j/Neo4jGraphService.java
View File

@ -7,7 +7,7 @@ import com.google.common.collect.ImmutableMap;
import com.linkedin.common.urn.Urn; import com.linkedin.common.urn.Urn;
import com.linkedin.metadata.graph.Edge; import com.linkedin.metadata.graph.Edge;
import com.linkedin.metadata.graph.GraphService; import com.linkedin.metadata.graph.GraphService;
import com.linkedin.metadata.graph.LineageRegistry; import com.linkedin.metadata.models.registry.LineageRegistry;
import com.linkedin.metadata.graph.RelatedEntitiesResult; import com.linkedin.metadata.graph.RelatedEntitiesResult;
import com.linkedin.metadata.graph.RelatedEntity; import com.linkedin.metadata.graph.RelatedEntity;
import com.linkedin.metadata.query.filter.Condition; import com.linkedin.metadata.query.filter.Condition;

2
metadata-io/src/test/java/com/linkedin/metadata/graph/dgraph/DgraphGraphServiceTest.java
View File

@ -2,7 +2,7 @@ package com.linkedin.metadata.graph.dgraph;
import com.linkedin.metadata.graph.GraphService; import com.linkedin.metadata.graph.GraphService;
import com.linkedin.metadata.graph.GraphServiceTestBase; import com.linkedin.metadata.graph.GraphServiceTestBase;
import com.linkedin.metadata.graph.LineageRegistry; import com.linkedin.metadata.models.registry.LineageRegistry;
import com.linkedin.metadata.graph.RelatedEntity; import com.linkedin.metadata.graph.RelatedEntity;
import com.linkedin.metadata.models.registry.SnapshotEntityRegistry; import com.linkedin.metadata.models.registry.SnapshotEntityRegistry;
import com.linkedin.metadata.query.filter.RelationshipDirection; import com.linkedin.metadata.query.filter.RelationshipDirection;

2
metadata-io/src/test/java/com/linkedin/metadata/graph/elastic/ElasticSearchGraphServiceTest.java
View File

@ -7,7 +7,7 @@ import com.linkedin.metadata.graph.EntityLineageResult;
import com.linkedin.metadata.graph.GraphService; import com.linkedin.metadata.graph.GraphService;
import com.linkedin.metadata.graph.GraphServiceTestBase; import com.linkedin.metadata.graph.GraphServiceTestBase;
import com.linkedin.metadata.graph.LineageDirection; import com.linkedin.metadata.graph.LineageDirection;
import com.linkedin.metadata.graph.LineageRegistry; import com.linkedin.metadata.models.registry.LineageRegistry;
import com.linkedin.metadata.graph.LineageRelationship; import com.linkedin.metadata.graph.LineageRelationship;
import com.linkedin.metadata.graph.RelatedEntitiesResult; import com.linkedin.metadata.graph.RelatedEntitiesResult;
import com.linkedin.metadata.graph.RelatedEntity; import com.linkedin.metadata.graph.RelatedEntity;

2
metadata-io/src/test/java/com/linkedin/metadata/graph/neo4j/Neo4jGraphServiceTest.java
View File

@ -2,7 +2,7 @@ package com.linkedin.metadata.graph.neo4j;
import com.linkedin.metadata.graph.GraphService; import com.linkedin.metadata.graph.GraphService;
import com.linkedin.metadata.graph.GraphServiceTestBase; import com.linkedin.metadata.graph.GraphServiceTestBase;
import com.linkedin.metadata.graph.LineageRegistry; import com.linkedin.metadata.models.registry.LineageRegistry;
import com.linkedin.metadata.graph.RelatedEntitiesResult; import com.linkedin.metadata.graph.RelatedEntitiesResult;
import com.linkedin.metadata.graph.RelatedEntity; import com.linkedin.metadata.graph.RelatedEntity;
import com.linkedin.metadata.models.registry.SnapshotEntityRegistry; import com.linkedin.metadata.models.registry.SnapshotEntityRegistry;

2
metadata-service/factories/src/main/java/com/linkedin/gms/factory/common/ElasticSearchGraphServiceFactory.java
View File

@ -3,7 +3,7 @@ package com.linkedin.gms.factory.common;
import com.linkedin.gms.factory.entityregistry.EntityRegistryFactory; import com.linkedin.gms.factory.entityregistry.EntityRegistryFactory;
import com.linkedin.gms.factory.search.BaseElasticSearchComponentsFactory; import com.linkedin.gms.factory.search.BaseElasticSearchComponentsFactory;
import com.linkedin.gms.factory.spring.YamlPropertySourceFactory; import com.linkedin.gms.factory.spring.YamlPropertySourceFactory;
import com.linkedin.metadata.graph.LineageRegistry; import com.linkedin.metadata.models.registry.LineageRegistry;
import com.linkedin.metadata.graph.elastic.ESGraphQueryDAO; import com.linkedin.metadata.graph.elastic.ESGraphQueryDAO;
import com.linkedin.metadata.graph.elastic.ESGraphWriteDAO; import com.linkedin.metadata.graph.elastic.ESGraphWriteDAO;
import com.linkedin.metadata.graph.elastic.ElasticSearchGraphService; import com.linkedin.metadata.graph.elastic.ElasticSearchGraphService;

2
metadata-service/factories/src/main/java/com/linkedin/gms/factory/common/Neo4jGraphServiceFactory.java
View File

@ -1,7 +1,7 @@
package com.linkedin.gms.factory.common; package com.linkedin.gms.factory.common;
import com.linkedin.gms.factory.entityregistry.EntityRegistryFactory; import com.linkedin.gms.factory.entityregistry.EntityRegistryFactory;
import com.linkedin.metadata.graph.LineageRegistry; import com.linkedin.metadata.models.registry.LineageRegistry;
import com.linkedin.metadata.graph.neo4j.Neo4jGraphService; import com.linkedin.metadata.graph.neo4j.Neo4jGraphService;
import com.linkedin.metadata.models.registry.EntityRegistry; import com.linkedin.metadata.models.registry.EntityRegistry;
import javax.annotation.Nonnull; import javax.annotation.Nonnull;

1
metadata-service/restli-servlet-impl/build.gradle
View File

@ -46,7 +46,6 @@ dependencies {
annotationProcessor externalDependency.lombok annotationProcessor externalDependency.lombok
testCompile project(':test-models') testCompile project(':test-models')
testCompile externalDependency.parseqTest
testCompile externalDependency.mockito testCompile externalDependency.mockito
testCompile externalDependency.testng testCompile externalDependency.testng