atlas-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mad...@apache.org
Subject incubator-atlas git commit: ATLAS-1573: Full text mapping for Entity store V2
Date Thu, 23 Feb 2017 00:07:19 GMT
Repository: incubator-atlas
Updated Branches:
  refs/heads/master 17a9aad06 -> 4ed4ba15a


ATLAS-1573: Full text mapping for Entity store V2

Signed-off-by: Madhan Neethiraj <madhan@apache.org>


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

Branch: refs/heads/master
Commit: 4ed4ba15ad230bdb0134bcc37eaa6a199d81f26b
Parents: 17a9aad
Author: apoorvnaik <anaik@hortonworks.com>
Authored: Tue Feb 21 23:40:37 2017 -0800
Committer: Madhan Neethiraj <madhan@apache.org>
Committed: Wed Feb 22 14:49:05 2017 -0800

----------------------------------------------------------------------
 .../atlas/repository/graph/FullTextMapper.java  | 10 ++---
 .../graph/v1/AtlasEntityChangeNotifier.java     | 43 ++++++++++++++++++++
 2 files changed, 48 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/4ed4ba15/repository/src/main/java/org/apache/atlas/repository/graph/FullTextMapper.java
----------------------------------------------------------------------
diff --git a/repository/src/main/java/org/apache/atlas/repository/graph/FullTextMapper.java
b/repository/src/main/java/org/apache/atlas/repository/graph/FullTextMapper.java
index b988b42..89f48ed 100644
--- a/repository/src/main/java/org/apache/atlas/repository/graph/FullTextMapper.java
+++ b/repository/src/main/java/org/apache/atlas/repository/graph/FullTextMapper.java
@@ -17,9 +17,6 @@
  */
 package org.apache.atlas.repository.graph;
 
-import java.util.List;
-import java.util.Map;
-
 import org.apache.atlas.AtlasException;
 import org.apache.atlas.RequestContext;
 import org.apache.atlas.repository.graphdb.AtlasVertex;
@@ -34,6 +31,9 @@ import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.List;
+import java.util.Map;
+
 public class FullTextMapper {
 
     private static final Logger LOG = LoggerFactory.getLogger(FullTextMapper.class);
@@ -45,8 +45,8 @@ public class FullTextMapper {
 
     private static final String FULL_TEXT_DELIMITER = " ";
 
-    FullTextMapper(TypedInstanceToGraphMapper typedInstanceToGraphMapper,
-            GraphToTypedInstanceMapper graphToTypedInstanceMapper) {
+    public FullTextMapper(TypedInstanceToGraphMapper typedInstanceToGraphMapper,
+                          GraphToTypedInstanceMapper graphToTypedInstanceMapper) {
         this.graphToTypedInstanceMapper = graphToTypedInstanceMapper;
         this.typedInstanceToGraphMapper = typedInstanceToGraphMapper;
     }

http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/4ed4ba15/repository/src/main/java/org/apache/atlas/repository/store/graph/v1/AtlasEntityChangeNotifier.java
----------------------------------------------------------------------
diff --git a/repository/src/main/java/org/apache/atlas/repository/store/graph/v1/AtlasEntityChangeNotifier.java
b/repository/src/main/java/org/apache/atlas/repository/store/graph/v1/AtlasEntityChangeNotifier.java
index a532f31..feada34 100644
--- a/repository/src/main/java/org/apache/atlas/repository/store/graph/v1/AtlasEntityChangeNotifier.java
+++ b/repository/src/main/java/org/apache/atlas/repository/store/graph/v1/AtlasEntityChangeNotifier.java
@@ -27,8 +27,17 @@ import org.apache.atlas.model.instance.AtlasEntityHeader;
 import org.apache.atlas.model.instance.EntityMutationResponse;
 import org.apache.atlas.model.instance.EntityMutations.EntityOperation;
 import org.apache.atlas.listener.EntityChangeListener;
+import org.apache.atlas.repository.Constants;
 import org.apache.atlas.repository.converters.AtlasInstanceConverter;
+import org.apache.atlas.repository.graph.AtlasGraphProvider;
+import org.apache.atlas.repository.graph.DeleteHandler;
+import org.apache.atlas.repository.graph.FullTextMapper;
+import org.apache.atlas.repository.graph.GraphHelper;
+import org.apache.atlas.repository.graph.GraphToTypedInstanceMapper;
+import org.apache.atlas.repository.graph.TypedInstanceToGraphMapper;
+import org.apache.atlas.repository.graphdb.AtlasVertex;
 import org.apache.atlas.typesystem.ITypedReferenceableInstance;
+import org.apache.atlas.util.AtlasRepositoryConfiguration;
 import org.apache.commons.collections.CollectionUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -49,12 +58,23 @@ public class AtlasEntityChangeNotifier {
 
     private final Set<EntityChangeListener> entityChangeListeners;
     private final AtlasInstanceConverter    instanceConverter;
+    private final FullTextMapper fullTextMapper;
+
+    @Inject
+    private DeleteHandler deleteHandler;
 
     @Inject
     public AtlasEntityChangeNotifier(Set<EntityChangeListener> entityChangeListeners,
                                      AtlasInstanceConverter    instanceConverter) {
         this.entityChangeListeners = entityChangeListeners;
         this.instanceConverter     = instanceConverter;
+
+        // This is only needed for the Legacy FullTextMapper, once the V2 changes are in
place this can be replaced/removed
+        AtlasGraphProvider graphProvider = new AtlasGraphProvider();
+        GraphToTypedInstanceMapper graphToTypedInstanceMapper = new GraphToTypedInstanceMapper(graphProvider);
+        TypedInstanceToGraphMapper typedInstanceToGraphMapper = new TypedInstanceToGraphMapper(graphToTypedInstanceMapper,
deleteHandler);
+
+        this.fullTextMapper        = new FullTextMapper(typedInstanceToGraphMapper, graphToTypedInstanceMapper);
     }
 
     public void onEntitiesMutated(EntityMutationResponse entityMutationResponse) throws AtlasBaseException
{
@@ -70,18 +90,21 @@ public class AtlasEntityChangeNotifier {
         if (CollectionUtils.isNotEmpty(createdEntities)) {
             List<ITypedReferenceableInstance> typedRefInst = toITypedReferenceable(createdEntities);
 
+            doFullTextMapping(createdEntities);
             notifyListeners(typedRefInst, EntityOperation.CREATE);
         }
 
         if (CollectionUtils.isNotEmpty(updatedEntities)) {
             List<ITypedReferenceableInstance> typedRefInst = toITypedReferenceable(updatedEntities);
 
+            doFullTextMapping(updatedEntities);
             notifyListeners(typedRefInst, EntityOperation.UPDATE);
         }
 
         if (CollectionUtils.isNotEmpty(partiallyUpdatedEntities)) {
             List<ITypedReferenceableInstance> typedRefInst = toITypedReferenceable(partiallyUpdatedEntities);
 
+            doFullTextMapping(partiallyUpdatedEntities);
             notifyListeners(typedRefInst, EntityOperation.PARTIAL_UPDATE);
         }
 
@@ -122,4 +145,24 @@ public class AtlasEntityChangeNotifier {
 
         return ret;
     }
+
+    private void doFullTextMapping(List<AtlasEntityHeader> atlasEntityHeaders) {
+        try {
+            if(!AtlasRepositoryConfiguration.isFullTextSearchEnabled()) {
+                return;
+            }
+        } catch (AtlasException e) {
+            LOG.warn("Unable to determine if FullText is disabled. Proceeding with FullText
mapping");
+        }
+
+        for (AtlasEntityHeader atlasEntityHeader : atlasEntityHeaders) {
+            AtlasVertex atlasVertex = AtlasGraphUtilsV1.findByGuid(atlasEntityHeader.getGuid());
+            try {
+                String fullText = fullTextMapper.mapRecursive(atlasVertex, true);
+                GraphHelper.setProperty(atlasVertex, Constants.ENTITY_TEXT_PROPERTY_KEY,
fullText);
+            } catch (AtlasException e) {
+                LOG.error("FullText mapping failed for Vertex[ guid = {} ]", atlasEntityHeader.getGuid());
+            }
+        }
+    }
 }
\ No newline at end of file


Mime
View raw message