ATLAS-1471: avoid unnecessary overhead in debug log calls

repository/src/main/java/org/apache/atlas/repository/graph/DeleteHandler.java

@@ -79,7 +79,10 @@ public abstract class DeleteHandler {
             String guid = GraphHelper.getGuid(instanceVertex);
             Id.EntityState state = GraphHelper.getState(instanceVertex);
             if (requestContext.getDeletedEntityIds().contains(guid) || state == Id.EntityState.DELETED) {
+                if (LOG.isDebugEnabled()) {
                     LOG.debug("Skipping deletion of {} as it is already deleted", guid);
+                }
+
                 continue;
             }
 
@@ -131,13 +134,19 @@ public abstract class DeleteHandler {
      * @throws AtlasException
      */
     protected void deleteTypeVertex(AtlasVertex instanceVertex, boolean force) throws AtlasException {
+        if (LOG.isDebugEnabled()) {
             LOG.debug("Deleting {}", string(instanceVertex));
+        }
+
         String typeName = GraphHelper.getTypeName(instanceVertex);
         IDataType type = typeSystem.getDataType(IDataType.class, typeName);
         FieldMapping fieldMapping = getFieldMapping(type);
 
         for (AttributeInfo attributeInfo : fieldMapping.fields.values()) {
+            if (LOG.isDebugEnabled()) {
                 LOG.debug("Deleting attribute {} for {}", attributeInfo.name, string(instanceVertex));
+            }
+
             String edgeLabel = GraphHelper.getEdgeLabel(type, attributeInfo);
 
             switch (attributeInfo.dataType().getTypeCategory()) {
@@ -200,7 +209,10 @@ public abstract class DeleteHandler {
      */
     public boolean deleteEdgeReference(AtlasEdge edge, DataTypes.TypeCategory typeCategory, boolean isComposite,
                                     boolean forceDeleteStructTrait) throws AtlasException {
+        if (LOG.isDebugEnabled()) {
             LOG.debug("Deleting {}", string(edge));
+        }
+
         boolean forceDelete =
                 (typeCategory == DataTypes.TypeCategory.STRUCT || typeCategory == DataTypes.TypeCategory.TRAIT) && forceDeleteStructTrait;
         if (typeCategory == DataTypes.TypeCategory.STRUCT || typeCategory == DataTypes.TypeCategory.TRAIT
@@ -247,7 +259,9 @@ public abstract class DeleteHandler {
 
     protected void deleteVertex(AtlasVertex instanceVertex, boolean force) throws AtlasException {
         //Update external references(incoming edges) to this vertex
+        if (LOG.isDebugEnabled()) {
             LOG.debug("Setting the external references to {} to null(removing edges)", string(instanceVertex));
+        }
 
         for (AtlasEdge edge : (Iterable<AtlasEdge>) instanceVertex.getEdges(AtlasEdgeDirection.IN)) {
             Id.EntityState edgeState = GraphHelper.getState(edge);
@@ -271,8 +285,11 @@ public abstract class DeleteHandler {
      * @throws AtlasException
      */
     protected void deleteEdgeBetweenVertices(AtlasVertex outVertex, AtlasVertex inVertex, String attributeName) throws AtlasException {
+        if (LOG.isDebugEnabled()) {
             LOG.debug("Removing edge from {} to {} with attribute name {}", string(outVertex), string(inVertex),
                     attributeName);
+        }
+
         String typeName = GraphHelper.getTypeName(outVertex);
         String outId = GraphHelper.getGuid(outVertex);
         Id.EntityState state = GraphHelper.getState(outVertex);
@@ -331,8 +348,11 @@ public abstract class DeleteHandler {
                             //if composite attribute, remove the reference as well. else, just remove the edge
                             //for example, when table is deleted, process still references the table
                             //but when column is deleted, table will not reference the deleted column
+                            if (LOG.isDebugEnabled()) {
                                 LOG.debug("Removing edge {} from the array attribute {}", string(elementEdge),
                                         attributeName);
+                            }
+
                             elements.remove(elementEdge.getId().toString());
                             GraphHelper.setProperty(outVertex, propertyName, elements);
                             break;
@@ -367,8 +387,11 @@ public abstract class DeleteHandler {
 
                             if (shouldUpdateReverseAttribute) {
                                 //remove this key
+                                if (LOG.isDebugEnabled()) {
                                     LOG.debug("Removing edge {}, key {} from the map attribute {}", string(mapEdge), key,
                                             attributeName);
+                                }
+
                                 keys.remove(key);
                                 GraphHelper.setProperty(outVertex, propertyName, keys);
                                 GraphHelper.setProperty(outVertex, keyPropertyName, null);
@@ -426,7 +449,11 @@ public abstract class DeleteHandler {
      */
     private void deleteAllTraits(AtlasVertex instanceVertex) throws AtlasException {
         List<String> traitNames = GraphHelper.getTraitNames(instanceVertex);
+
+        if (LOG.isDebugEnabled()) {
             LOG.debug("Deleting traits {} for {}", traitNames, string(instanceVertex));
+        }
+
         String typeName = GraphHelper.getTypeName(instanceVertex);
 
         for (String traitNameToBeDeleted : traitNames) {

repository/src/main/java/org/apache/atlas/repository/graph/FullTextMapper.java

@@ -56,13 +56,19 @@ public class FullTextMapper {
         ITypedReferenceableInstance typedReference;
         if (instanceCache.containsKey(guid)) {
             typedReference = instanceCache.get(guid);
+
+            if (LOG.isDebugEnabled()) {
                 LOG.debug("Cache hit: guid = {}, entityId = {}", guid, typedReference.getId()._getId());
+            }
         } else {
             typedReference =
                     graphToTypedInstanceMapper.mapGraphToTypedInstance(guid, instanceVertex);
             instanceCache.put(guid, typedReference);
+
+            if (LOG.isDebugEnabled()) {
                 LOG.debug("Cache miss: guid = {}, entityId = {}", guid, typedReference.getId().getId());
             }
+        }
         String fullText = forInstance(typedReference, followReferences);
         StringBuilder fullTextBuilder =
             new StringBuilder(typedReference.getTypeName()).append(FULL_TEXT_DELIMITER).append(fullText);

repository/src/main/java/org/apache/atlas/repository/graph/GraphBackedMetadataRepository.java

@@ -136,7 +136,10 @@ public class GraphBackedMetadataRepository implements MetadataRepository {
     @GraphTransaction
     public List<String> createEntities(ITypedReferenceableInstance... entities) throws RepositoryException,
         EntityExistsException {
+        if (LOG.isDebugEnabled()) {
             LOG.debug("adding entities={}", entities);
+        }
+
         try {
             TypedInstanceToGraphMapper instanceToGraphMapper = new TypedInstanceToGraphMapper(graphToInstanceMapper, deleteHandler);
             instanceToGraphMapper.mapTypedInstanceToGraph(TypedInstanceToGraphMapper.Operation.CREATE, entities);
@@ -151,7 +154,9 @@ public class GraphBackedMetadataRepository implements MetadataRepository {
     @Override
     @GraphTransaction
     public ITypedReferenceableInstance getEntityDefinition(String guid) throws RepositoryException, EntityNotFoundException {
+        if (LOG.isDebugEnabled()) {
             LOG.debug("Retrieving entity with guid={}", guid);
+        }
 
         AtlasVertex instanceVertex = graphHelper.getVertexForGUID(guid);
 
@@ -166,7 +171,10 @@ public class GraphBackedMetadataRepository implements MetadataRepository {
     @GraphTransaction
     public ITypedReferenceableInstance getEntityDefinition(String entityType, String attribute, Object value)
             throws AtlasException {
+        if (LOG.isDebugEnabled()) {
             LOG.debug("Retrieving entity with type={} and {}={}", entityType, attribute, value);
+        }
+
         IDataType type = typeSystem.getDataType(IDataType.class, entityType);
         String propertyKey = getFieldNameInVertex(type, attribute);
         AtlasVertex instanceVertex = graphHelper.findVertex(propertyKey, value,
@@ -180,7 +188,10 @@ public class GraphBackedMetadataRepository implements MetadataRepository {
     @Override
     @GraphTransaction
     public List<String> getEntityList(String entityType) throws RepositoryException {
+        if (LOG.isDebugEnabled()) {
             LOG.debug("Retrieving entity list for type={}", entityType);
+        }
+
         AtlasGraphQuery query = graph.query().has(Constants.ENTITY_TYPE_PROPERTY_KEY, entityType);
         Iterator<AtlasVertex> results = query.vertices().iterator();
         if (!results.hasNext()) {
@@ -206,7 +217,10 @@ public class GraphBackedMetadataRepository implements MetadataRepository {
     @Override
     @GraphTransaction
     public List<String> getTraitNames(String guid) throws AtlasException {
+        if (LOG.isDebugEnabled()) {
             LOG.debug("Retrieving trait names for entity={}", guid);
+        }
+
         AtlasVertex instanceVertex = graphHelper.getVertexForGUID(guid);
         return GraphHelper.getTraitNames(instanceVertex);
     }
@@ -224,7 +238,10 @@ public class GraphBackedMetadataRepository implements MetadataRepository {
     public void addTrait(String guid, ITypedStruct traitInstance) throws RepositoryException {
         Preconditions.checkNotNull(traitInstance, "Trait instance cannot be null");
         final String traitName = traitInstance.getTypeName();
+
+        if (LOG.isDebugEnabled()) {
             LOG.debug("Adding a new trait={} for entity={}", traitName, guid);
+        }
 
         try {
             AtlasVertex instanceVertex = graphHelper.getVertexForGUID(guid);
@@ -260,7 +277,9 @@ public class GraphBackedMetadataRepository implements MetadataRepository {
     @Override
     @GraphTransaction
     public void deleteTrait(String guid, String traitNameToBeDeleted) throws TraitNotFoundException, EntityNotFoundException, RepositoryException {
+        if (LOG.isDebugEnabled()) {
             LOG.debug("Deleting trait={} from entity={}", traitNameToBeDeleted, guid);
+        }
         
         AtlasVertex instanceVertex = graphHelper.getVertexForGUID(guid);
 
@@ -303,7 +322,10 @@ public class GraphBackedMetadataRepository implements MetadataRepository {
     @Override
     @GraphTransaction
     public AtlasClient.EntityResult updateEntities(ITypedReferenceableInstance... entitiesUpdated) throws RepositoryException {
+        if (LOG.isDebugEnabled()) {
             LOG.debug("updating entity {}", entitiesUpdated);
+        }
+
         try {
             TypedInstanceToGraphMapper instanceToGraphMapper = new TypedInstanceToGraphMapper(graphToInstanceMapper, deleteHandler);
             instanceToGraphMapper.mapTypedInstanceToGraph(TypedInstanceToGraphMapper.Operation.UPDATE_FULL,
@@ -319,7 +341,10 @@ public class GraphBackedMetadataRepository implements MetadataRepository {
     @Override
     @GraphTransaction
     public AtlasClient.EntityResult updatePartial(ITypedReferenceableInstance entity) throws RepositoryException {
+        if (LOG.isDebugEnabled()) {
             LOG.debug("updating entity {}", entity);
+        }
+
         try {
             TypedInstanceToGraphMapper instanceToGraphMapper = new TypedInstanceToGraphMapper(graphToInstanceMapper, deleteHandler);
             instanceToGraphMapper.mapTypedInstanceToGraph(TypedInstanceToGraphMapper.Operation.UPDATE_PARTIAL, entity);

repository/src/main/java/org/apache/atlas/repository/graph/GraphBackedSearchIndexer.java

@@ -233,7 +233,10 @@ public class    GraphBackedSearchIndexer implements SearchIndexer, ActiveStateCh
         AtlasGraphManagement management = provider.get().getManagementSystem();
                
         for (IDataType dataType : dataTypes) {
+            if (LOG.isDebugEnabled()) {
                 LOG.debug("Creating indexes for type name={}, definition={}", dataType.getName(), dataType.getClass());
+            }
+
             try {
                 addIndexForType(management, dataType);
                 LOG.info("Index creation for type {} complete", dataType.getName());
@@ -506,17 +509,17 @@ public class    GraphBackedSearchIndexer implements SearchIndexer, ActiveStateCh
             AtlasPropertyKey propertyKey, boolean enforceUniqueness) {
         
         String propertyName = propertyKey.getName();
-        LOG.debug("Creating composite index for property {} of type {} ", propertyName, propertyClass.getName());
+
+        if (LOG.isDebugEnabled()) {
+            LOG.debug("Creating composite index for property {} of type {}; isUnique={} ", propertyName, propertyClass.getName(), enforceUniqueness);
+        }
 
         AtlasGraphIndex existingIndex = management.getGraphIndex(propertyName);
         if (existingIndex == null) {
-            if (enforceUniqueness) {
-                LOG.debug("Enabling unique index for property {} of type {} ", propertyName, propertyClass.getName());
-            }
             management.createExactMatchIndex(propertyName, enforceUniqueness, Collections.singletonList(propertyKey));
-
         }
-        LOG.info("Created composite index for property {} of type {} ", propertyName, propertyClass.getName());
+
+        LOG.info("Created composite index for property {} of type {}; isUnique={} ", propertyName, propertyClass.getName(), enforceUniqueness);
     }
     
 
@@ -536,8 +539,10 @@ public class    GraphBackedSearchIndexer implements SearchIndexer, ActiveStateCh
             Class propertyClass, AtlasPropertyKey propertyKey, final String systemPropertyKey,
             AtlasCardinality cardinality) {
 
+        if (LOG.isDebugEnabled()) {
             LOG.debug("Creating composite index for property {} of type {} and {}", propertyKey.getName(), propertyClass.getName(),
                     systemPropertyKey);
+        }
 
         AtlasPropertyKey typePropertyKey = management.getPropertyKey(systemPropertyKey);
         if (typePropertyKey == null) {
@@ -562,9 +567,12 @@ public class    GraphBackedSearchIndexer implements SearchIndexer, ActiveStateCh
     private void updateVertexIndex(AtlasGraphManagement management, String propertyName, Class propertyClass,
             AtlasCardinality cardinality, AtlasPropertyKey propertyKey) {
         if (checkIfVertexIndexApplicable(propertyClass, cardinality)) {
+            if (LOG.isDebugEnabled()) {
+                LOG.debug("Creating backing index for property {} of type {} ", propertyName, propertyClass.getName());
+            }
+
             // Use backing index
             management.addVertexIndexKey(Constants.VERTEX_INDEX, propertyKey);
-            LOG.debug("Creating backing index for property {} of type {} ", propertyName, propertyClass.getName());
 
             LOG.info("Created backing index for property {} of type {} ", propertyName, propertyClass.getName());
         }

repository/src/main/java/org/apache/atlas/repository/graph/GraphToTypedInstanceMapper.java

@@ -70,7 +70,10 @@ public final class GraphToTypedInstanceMapper {
     public ITypedReferenceableInstance mapGraphToTypedInstance(String guid, AtlasVertex instanceVertex)
         throws AtlasException {
 
+        if (LOG.isDebugEnabled()) {
             LOG.debug("Mapping graph root vertex {} to typed instance for guid {}", instanceVertex, guid);
+        }
+
         String typeName = GraphHelper.getSingleValuedProperty(instanceVertex, Constants.ENTITY_TYPE_PROPERTY_KEY, String.class);
         List<String> traits = GraphHelper.getTraitNames(instanceVertex);
         String state = GraphHelper.getStateAsString(instanceVertex);
@@ -80,11 +83,16 @@ public final class GraphToTypedInstanceMapper {
         Date modifiedTime = new Date(GraphHelper.getModifiedTime(instanceVertex));
         AtlasSystemAttributes systemAttributes = new AtlasSystemAttributes(createdBy, modifiedBy, createdTime, modifiedTime);
 
+        if (LOG.isDebugEnabled()) {
             LOG.debug("Found createdBy : {} modifiedBy : {} createdTime: {} modifedTime: {}", createdBy, modifiedBy, createdTime, modifiedTime);
+        }
 
         Id id = new Id(guid, Integer.parseInt(String.valueOf(GraphHelper.getProperty(instanceVertex, Constants.VERSION_PROPERTY_KEY))),
                 typeName, state);
+
+        if (LOG.isDebugEnabled()) {
             LOG.debug("Created id {} for instance type {}", id, typeName);
+        }
 
         ClassType classType = typeSystem.getDataType(ClassType.class, typeName);
         ITypedReferenceableInstance typedInstance =
@@ -100,7 +108,10 @@ public final class GraphToTypedInstanceMapper {
     private void mapVertexToInstanceTraits(AtlasVertex instanceVertex, ITypedReferenceableInstance typedInstance,
         List<String> traits) throws AtlasException {
         for (String traitName : traits) {
+            if (LOG.isDebugEnabled()) {
                 LOG.debug("mapping trait {} to instance", traitName);
+            }
+
             TraitType traitType = typeSystem.getDataType(TraitType.class, traitName);
             mapVertexToTraitInstance(instanceVertex, typedInstance, traitName, traitType);
         }
@@ -110,8 +121,11 @@ public final class GraphToTypedInstanceMapper {
     public void mapVertexToInstance(AtlasVertex instanceVertex, ITypedInstance typedInstance,
         Map<String, AttributeInfo> fields) throws AtlasException {
 
+        if (LOG.isDebugEnabled()) {
             LOG.debug("Mapping vertex {} to instance {} for fields", instanceVertex, typedInstance.getTypeName(),
                     fields);
+        }
+
         for (AttributeInfo attributeInfo : fields.values()) {
             mapVertexToAttribute(instanceVertex, typedInstance, attributeInfo);
         }
@@ -119,7 +133,11 @@ public final class GraphToTypedInstanceMapper {
 
     private void mapVertexToAttribute(AtlasVertex instanceVertex, ITypedInstance typedInstance,
         AttributeInfo attributeInfo) throws AtlasException {
+
+        if (LOG.isDebugEnabled()) {
             LOG.debug("Mapping attributeInfo {}", attributeInfo.name);
+        }
+
         final IDataType dataType = attributeInfo.dataType();
         final String vertexPropertyName = GraphHelper.getQualifiedFieldName(typedInstance, attributeInfo);
         String relationshipLabel = GraphHelper.getEdgeLabel(typedInstance, attributeInfo);
@@ -172,7 +190,9 @@ public final class GraphToTypedInstanceMapper {
 
     private Object mapVertexToClassReference(AtlasVertex instanceVertex, AttributeInfo attributeInfo,
             String relationshipLabel, IDataType dataType, AtlasEdge optionalEdge) throws AtlasException {
+        if (LOG.isDebugEnabled()) {
             LOG.debug("Finding edge for {} -> label {} ", instanceVertex, relationshipLabel);
+        }
 
         AtlasEdge edge = null;
         if (optionalEdge == null) {
@@ -184,7 +204,11 @@ public final class GraphToTypedInstanceMapper {
         if (GraphHelper.elementExists(edge)) {
             final AtlasVertex referenceVertex = edge.getInVertex();
             final String guid = GraphHelper.getSingleValuedProperty(referenceVertex, Constants.GUID_PROPERTY_KEY, String.class);
+
+            if (LOG.isDebugEnabled()) {
                 LOG.debug("Found vertex {} for label {} with guid {}", referenceVertex, relationshipLabel, guid);
+            }
+
             if (attributeInfo.isComposite) {
                 //Also, when you retrieve a type's instance, you get the complete object graph of the composites
                 LOG.debug("Found composite, mapping vertex to instance");
@@ -194,7 +218,11 @@ public final class GraphToTypedInstanceMapper {
                 Id referenceId =
                         new Id(guid, GraphHelper.getSingleValuedProperty(referenceVertex, Constants.VERSION_PROPERTY_KEY, Integer.class),
                                 dataType.getName(), state);
+
+                if (LOG.isDebugEnabled()) {
                     LOG.debug("Found non-composite, adding id {} ", referenceId);
+                }
+
                 return referenceId;
             }
         }
@@ -205,7 +233,9 @@ public final class GraphToTypedInstanceMapper {
     @SuppressWarnings("unchecked")
     private void mapVertexToArrayInstance(AtlasVertex<?,?> instanceVertex, ITypedInstance typedInstance,
             AttributeInfo attributeInfo, String propertyName) throws AtlasException {
+        if (LOG.isDebugEnabled()) {
             LOG.debug("mapping vertex {} to array {}", instanceVertex, attributeInfo.name);
+        }
 
         final DataTypes.ArrayType arrayType = (DataTypes.ArrayType) attributeInfo.dataType();
         final IDataType elementType = arrayType.getElemType();
@@ -257,7 +287,10 @@ public final class GraphToTypedInstanceMapper {
     @SuppressWarnings("unchecked")
     private void mapVertexToMapInstance(AtlasVertex<?,?> instanceVertex, ITypedInstance typedInstance,
             AttributeInfo attributeInfo, final String propertyName) throws AtlasException {
+        if (LOG.isDebugEnabled()) {
             LOG.debug("mapping vertex {} to array {}", instanceVertex, attributeInfo.name);
+        }
+
         List<String> keys = GraphHelper.getListProperty(instanceVertex, propertyName);
         if (keys == null || keys.size() == 0) {
             return;
@@ -283,7 +316,10 @@ public final class GraphToTypedInstanceMapper {
 
     private  ITypedStruct mapVertexToStructInstance(AtlasVertex instanceVertex, StructType structType,
             String relationshipLabel, AtlasEdge optionalEdge) throws AtlasException {
+        if (LOG.isDebugEnabled()) {
             LOG.debug("mapping {} to struct {}", string(instanceVertex), relationshipLabel);
+        }
+
         ITypedStruct structInstance = null;
 
         AtlasEdge edge;
@@ -296,10 +332,12 @@ public final class GraphToTypedInstanceMapper {
         if (GraphHelper.elementExists(edge)) {
             structInstance = structType.createInstance();
             AtlasVertex structInstanceVertex = edge.getInVertex();
+            if (LOG.isDebugEnabled()) {
                 LOG.debug("Found struct instance {}, mapping to instance {} ", string(structInstanceVertex),
                         structInstance.getTypeName());
-            mapVertexToInstance(structInstanceVertex, structInstance, structType.fieldMapping().fields);
+            }
 
+            mapVertexToInstance(structInstanceVertex, structInstance, structType.fieldMapping().fields);
         }
         return structInstance;
     }
@@ -314,12 +352,19 @@ public final class GraphToTypedInstanceMapper {
     private void mapVertexToTraitInstance(AtlasVertex<?,?> instanceVertex, String typedInstanceTypeName, String traitName,
             TraitType traitType, ITypedStruct traitInstance) throws AtlasException {
         String relationshipLabel = GraphHelper.getTraitLabel(typedInstanceTypeName, traitName);
+
+        if (LOG.isDebugEnabled()) {
             LOG.debug("Finding edge for {} -> label {} ", instanceVertex, relationshipLabel);
+        }
+
         for (AtlasEdge<?,?> edge : instanceVertex.getEdges(AtlasEdgeDirection.OUT, relationshipLabel)) {
             final AtlasVertex<?,?> traitInstanceVertex = edge.getInVertex();
             if (traitInstanceVertex != null) {
+                if (LOG.isDebugEnabled()) {
                     LOG.debug("Found trait instance vertex {}, mapping to instance {} ", traitInstanceVertex,
                             traitInstance.getTypeName());
+                }
+
                 mapVertexToInstance(traitInstanceVertex, traitInstance, traitType.fieldMapping().fields);
                 break;
             }
@@ -328,7 +373,10 @@ public final class GraphToTypedInstanceMapper {
 
     private void mapVertexToPrimitive(AtlasVertex<?,?> instanceVertex, ITypedInstance typedInstance,
             AttributeInfo attributeInfo) throws AtlasException {
+        if (LOG.isDebugEnabled()) {
             LOG.debug("Adding primitive {} from vertex {}", attributeInfo, instanceVertex);
+        }
+
         final String vertexPropertyName = GraphHelper.getQualifiedFieldName(typedInstance, attributeInfo);
         if (GraphHelper.getSingleValuedProperty(instanceVertex, vertexPropertyName, Object.class) == null) {
             return;
@@ -369,8 +417,11 @@ public final class GraphToTypedInstanceMapper {
             if (referredVertex != null) {
                 switch (referredType.getTypeCategory()) {
                 case STRUCT:
+                    if (LOG.isDebugEnabled()) {
                         LOG.debug("Found struct instance vertex {}, mapping to instance {} ", referredVertex,
                                 referredType.getName());
+                    }
+
                     StructType structType = (StructType) referredType;
                     ITypedStruct instance = structType.createInstance();
                     Map<String, AttributeInfo> fields = structType.fieldMapping().fields;