atlas-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mad...@apache.org
Subject [1/2] incubator-atlas git commit: ATLAS-1686: fixed import to use the given guid, instead of looking into store with unique attribute
Date Tue, 28 Mar 2017 06:26:09 GMT
Repository: incubator-atlas
Updated Branches:
  refs/heads/0.8-incubating fc9a8a4d6 -> 191a805a8


ATLAS-1686: fixed import to use the given guid, instead of looking into store with unique
attribute

Signed-off-by: Madhan Neethiraj <madhan@apache.org>
(cherry picked from commit a9f3da62d4c131c837a908c27555fb66bcdcdd05)


Project: http://git-wip-us.apache.org/repos/asf/incubator-atlas/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-atlas/commit/31a69c1b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-atlas/tree/31a69c1b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-atlas/diff/31a69c1b

Branch: refs/heads/0.8-incubating
Commit: 31a69c1b4908a06d8eba085029669ad1b6ce27ba
Parents: fc9a8a4
Author: ashutoshm <amestry@hortonworks.com>
Authored: Mon Mar 27 15:33:14 2017 -0700
Committer: Madhan Neethiraj <madhan@apache.org>
Committed: Mon Mar 27 23:25:41 2017 -0700

----------------------------------------------------------------------
 .../atlas/repository/store/graph/v1/IDBasedEntityResolver.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/31a69c1b/repository/src/main/java/org/apache/atlas/repository/store/graph/v1/IDBasedEntityResolver.java
----------------------------------------------------------------------
diff --git a/repository/src/main/java/org/apache/atlas/repository/store/graph/v1/IDBasedEntityResolver.java
b/repository/src/main/java/org/apache/atlas/repository/store/graph/v1/IDBasedEntityResolver.java
index f53efe6..8b7ac8b 100644
--- a/repository/src/main/java/org/apache/atlas/repository/store/graph/v1/IDBasedEntityResolver.java
+++ b/repository/src/main/java/org/apache/atlas/repository/store/graph/v1/IDBasedEntityResolver.java
@@ -51,7 +51,7 @@ public class IDBasedEntityResolver implements EntityResolver {
             boolean isAssignedGuid = AtlasTypeUtil.isAssignedGuid(guid);
             AtlasVertex vertex = isAssignedGuid ? AtlasGraphUtilsV1.findByGuid(guid) : null;
 
-            if (vertex == null) { // if not found in the store, look if the entity is present
in the stream
+            if (vertex == null && !(entityStream instanceof EntityImportStream))
{ // if not found in the store, look if the entity is present in the stream
                 AtlasEntity entity = entityStream.getByGuid(guid);
 
                 if (entity != null) { // look for the entity in the store using unique-attributes


Mime
View raw message