Repository: atlas Updated Branches: refs/heads/branch-1.0 4ff2eb32a -> dd33acef4
ATLAS-2815 #2: Missing txn annotation and relationship attribute mapping Change-Id: If22ef9eda4576b52661501245f862eacc607a3ed Signed-off-by: apoorvnaik <[email protected]> (cherry picked from commit 42d801f) Project: http://git-wip-us.apache.org/repos/asf/atlas/repo Commit: http://git-wip-us.apache.org/repos/asf/atlas/commit/dd33acef Tree: http://git-wip-us.apache.org/repos/asf/atlas/tree/dd33acef Diff: http://git-wip-us.apache.org/repos/asf/atlas/diff/dd33acef Branch: refs/heads/branch-1.0 Commit: dd33acef4e3240ddef5c656df88abe9ef460b5d8 Parents: 4ff2eb3 Author: apoorvnaik <[email protected]> Authored: Tue Jul 31 07:06:17 2018 -0700 Committer: apoorvnaik <[email protected]> Committed: Wed Aug 8 16:45:00 2018 -0700 ---------------------------------------------------------------------- .../atlas/repository/store/graph/v2/AtlasEntityStoreV2.java | 4 ++++ .../atlas/repository/store/graph/v2/EntityGraphRetriever.java | 2 ++ 2 files changed, 6 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/atlas/blob/dd33acef/repository/src/main/java/org/apache/atlas/repository/store/graph/v2/AtlasEntityStoreV2.java ---------------------------------------------------------------------- diff --git a/repository/src/main/java/org/apache/atlas/repository/store/graph/v2/AtlasEntityStoreV2.java b/repository/src/main/java/org/apache/atlas/repository/store/graph/v2/AtlasEntityStoreV2.java index c533e32..6cb3c0d 100644 --- a/repository/src/main/java/org/apache/atlas/repository/store/graph/v2/AtlasEntityStoreV2.java +++ b/repository/src/main/java/org/apache/atlas/repository/store/graph/v2/AtlasEntityStoreV2.java @@ -105,6 +105,7 @@ public class AtlasEntityStoreV2 implements AtlasEntityStore { } @Override + @GraphTransaction public AtlasEntityWithExtInfo getById(final String guid, final boolean isMinExtInfo) throws AtlasBaseException { if (LOG.isDebugEnabled()) { LOG.debug("==> getById({}, {})", guid, isMinExtInfo); @@ -126,6 +127,7 @@ public class AtlasEntityStoreV2 implements AtlasEntityStore { } @Override + @GraphTransaction public AtlasEntityHeader getHeaderById(final String guid) throws AtlasBaseException { if (LOG.isDebugEnabled()) { LOG.debug("==> getHeaderById({})", guid); @@ -147,6 +149,7 @@ public class AtlasEntityStoreV2 implements AtlasEntityStore { } @Override + @GraphTransaction public AtlasEntitiesWithExtInfo getByIds(List<String> guids) throws AtlasBaseException { return getByIds(guids, false); } @@ -170,6 +173,7 @@ public class AtlasEntityStoreV2 implements AtlasEntityStore { } @Override + @GraphTransaction public AtlasEntityWithExtInfo getByUniqueAttributes(AtlasEntityType entityType, Map<String, Object> uniqAttributes) throws AtlasBaseException { return getByUniqueAttributes(entityType, uniqAttributes, false); http://git-wip-us.apache.org/repos/asf/atlas/blob/dd33acef/repository/src/main/java/org/apache/atlas/repository/store/graph/v2/EntityGraphRetriever.java ---------------------------------------------------------------------- diff --git a/repository/src/main/java/org/apache/atlas/repository/store/graph/v2/EntityGraphRetriever.java b/repository/src/main/java/org/apache/atlas/repository/store/graph/v2/EntityGraphRetriever.java index c227848..7b8e0ef 100644 --- a/repository/src/main/java/org/apache/atlas/repository/store/graph/v2/EntityGraphRetriever.java +++ b/repository/src/main/java/org/apache/atlas/repository/store/graph/v2/EntityGraphRetriever.java @@ -381,6 +381,8 @@ public final class EntityGraphRetriever { mapAttributes(entityVertex, entity, entityExtInfo, isMinExtInfo); + mapRelationshipAttributes(entityVertex, entity); + mapClassifications(entityVertex, entity); }
