ATLAS-1119 Add retries for edge label creation (sumasai via shwethags)

release-log.txt

@@ -6,6 +6,7 @@ INCOMPATIBLE CHANGES:
 ATLAS-1060 Add composite indexes for exact match performance improvements for all attributes (sumasai via shwethags)
 
 ALL CHANGES:
+ATLAS-1119 Add retries for edge label creation (sumasai via shwethags)
 ATLAS-1111 Data loss is observed when atlas is restarted while hive_table metadata ingestion into kafka topic is in-progress(shwethags via sumasai)
 ATLAS-1115 Show Tag / Taxonomy Listing in sorted order (Kalyanikashikar via sumasai)
 ATLAS-1117 Atlas start fails on trunk (jnhagelb via dkantor)

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

@@ -85,7 +85,7 @@ public abstract class DeleteHandler {
             }
 
            // Get GUIDs and vertices for all deletion candidates.
-           Set<VertexInfo> compositeVertices = GraphHelper.getCompositeVertices(instanceVertex);
+           Set<VertexInfo> compositeVertices = graphHelper.getCompositeVertices(instanceVertex);
 
            // Record all deletion candidate GUIDs in RequestContext
            // and gather deletion candidate vertices.
@@ -158,7 +158,7 @@ public abstract class DeleteHandler {
                 DataTypes.TypeCategory elementTypeCategory = elementType.getTypeCategory();
                 if (elementTypeCategory == DataTypes.TypeCategory.STRUCT ||
                         elementTypeCategory == DataTypes.TypeCategory.CLASS) {
-                    Iterator<Edge> edges = GraphHelper.getOutGoingEdgesByLabel(instanceVertex, edgeLabel);
+                    Iterator<Edge> edges = graphHelper.getOutGoingEdgesByLabel(instanceVertex, edgeLabel);
                     if (edges != null) {
                         while (edges.hasNext()) {
                             Edge edge = edges.next();
@@ -228,7 +228,7 @@ public abstract class DeleteHandler {
 
     public void deleteEdgeReference(Vertex outVertex, String edgeLabel, DataTypes.TypeCategory typeCategory,
                                     boolean isComposite) throws AtlasException {
-        Edge edge = GraphHelper.getEdgeForLabel(outVertex, edgeLabel);
+        Edge edge = graphHelper.getEdgeForLabel(outVertex, edgeLabel);
         if (edge != null) {
             deleteEdgeReference(edge, typeCategory, isComposite, false);
         }
@@ -295,7 +295,7 @@ public abstract class DeleteHandler {
         case CLASS:
             //If its class attribute, its the only edge between two vertices
             if (attributeInfo.multiplicity.nullAllowed()) {
-                edge = GraphHelper.getEdgeForLabel(outVertex, edgeLabel);
+                edge = graphHelper.getEdgeForLabel(outVertex, edgeLabel);
                 if (shouldUpdateReverseAttribute) {
                     GraphHelper.setProperty(outVertex, propertyName, null);
                 }

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

@@ -267,7 +267,7 @@ public class GraphBackedMetadataRepository implements MetadataRepository {
         try {
             final String entityTypeName = GraphHelper.getTypeName(instanceVertex);
             String relationshipLabel = GraphHelper.getTraitLabel(entityTypeName, traitNameToBeDeleted);
-            Edge edge = GraphHelper.getEdgeForLabel(instanceVertex, relationshipLabel);
+            Edge edge = graphHelper.getEdgeForLabel(instanceVertex, relationshipLabel);
             if(edge != null) {
                 deleteHandler.deleteEdgeReference(edge, DataTypes.TypeCategory.TRAIT, false, true);
 

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

@@ -163,7 +163,7 @@ public final class GraphToTypedInstanceMapper {
 
         Edge edge;
         if (edgeId == null) {
-            edge = GraphHelper.getEdgeForLabel(instanceVertex, relationshipLabel);
+            edge = graphHelper.getEdgeForLabel(instanceVertex, relationshipLabel);
         } else {
             edge = graphHelper.getEdgeByEdgeId(instanceVertex, relationshipLabel, edgeId);
         }
@@ -269,7 +269,7 @@ public final class GraphToTypedInstanceMapper {
 
         Edge edge;
         if (edgeId == null) {
-            edge = GraphHelper.getEdgeForLabel(instanceVertex, relationshipLabel);
+            edge = graphHelper.getEdgeForLabel(instanceVertex, relationshipLabel);
         } else {
             edge = graphHelper.getEdgeByEdgeId(instanceVertex, relationshipLabel, edgeId);
         }
@@ -296,7 +296,7 @@ public final class GraphToTypedInstanceMapper {
         TraitType traitType, ITypedStruct traitInstance) throws AtlasException {
         String relationshipLabel = GraphHelper.getTraitLabel(typedInstanceTypeName, traitName);
         LOG.debug("Finding edge for {} -> label {} ", instanceVertex, relationshipLabel);
-        Iterator<Edge> edgeIterator = GraphHelper.getOutGoingEdgesByLabel(instanceVertex, relationshipLabel);
+        Iterator<Edge> edgeIterator = graphHelper.getOutGoingEdgesByLabel(instanceVertex, relationshipLabel);
         while (edgeIterator.hasNext()) {
             Edge edge = edgeIterator.next();
             final Vertex traitInstanceVertex = edge.getVertex(Direction.IN);

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

@@ -211,9 +211,9 @@ public final class TypedInstanceToGraphMapper {
 
             case STRUCT:
             case CLASS:
-                String edgeLabel = GraphHelper.getEdgeLabel(typedInstance, attributeInfo);
+                String edgeLabel = graphHelper.getEdgeLabel(typedInstance, attributeInfo);
 
-                Edge currentEdge = GraphHelper.getEdgeForLabel(instanceVertex, edgeLabel);
+                Edge currentEdge = graphHelper.getEdgeForLabel(instanceVertex, edgeLabel);
                 String newEdgeId = addOrUpdateReference(instanceVertex, attributeInfo, attributeInfo.dataType(),
                         attrValue, currentEdge, edgeLabel, operation);
 

repository/src/main/java/org/apache/atlas/repository/typestore/GraphBackedTypeStore.java

@@ -282,7 +282,7 @@ public class GraphBackedTypeStore implements ITypeStore {
 
     private ImmutableSet<String> getSuperTypes(Vertex vertex) {
         Set<String> superTypes = new HashSet<>();
-        Iterator<Edge> edges = GraphHelper.getOutGoingEdgesByLabel(vertex, SUPERTYPE_EDGE_LABEL);
+        Iterator<Edge> edges = graphHelper.getOutGoingEdgesByLabel(vertex, SUPERTYPE_EDGE_LABEL);
         while (edges.hasNext()) {
             Edge edge = edges.next();
             superTypes.add((String) edge.getVertex(Direction.IN).getProperty(Constants.TYPENAME_PROPERTY_KEY));

repository/src/test/java/org/apache/atlas/repository/graph/GraphHelperMockTest.java

+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.atlas.repository.graph;
+
+import com.thinkaurelius.titan.core.TitanGraph;
+import com.thinkaurelius.titan.core.TitanVertex;
+import com.tinkerpop.blueprints.Direction;
+import com.tinkerpop.blueprints.Edge;
+import org.apache.atlas.repository.RepositoryException;
+import org.mockito.MockitoAnnotations;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
+
+import java.util.Iterator;
+
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+import static org.testng.Assert.assertEquals;
+
+public class GraphHelperMockTest {
+
+    private GraphHelper graphHelperInstance;
+
+    private TitanGraph graph;
+
+    @BeforeClass
+    public void setup() {
+        MockitoAnnotations.initMocks(this);
+        graph = mock(TitanGraph.class);
+        graphHelperInstance = GraphHelper.getInstance(graph);
+    }
+
+    @Test(expectedExceptions = RepositoryException.class)
+    public void testGetOrCreateEdgeLabelWithMaxRetries() throws Exception {
+        final String edgeLabel = "testLabel";
+        TitanVertex v1 = mock(TitanVertex.class);
+        TitanVertex v2 = mock(TitanVertex.class);
+
+        Iterable noEdgesIterable = new Iterable<Edge>() {
+            @Override
+            public Iterator<Edge> iterator() {
+                return new Iterator<Edge>() {
+                    @Override
+                    public boolean hasNext() {
+                        return false;
+                    }
+
+                    @Override
+                    public Edge next() {
+                        return null;
+                    }
+
+                    @Override
+                    public void remove() {
+                    }
+                };
+            }
+        };
+        when(v2.getEdges(Direction.IN)).thenReturn(noEdgesIterable);
+        when(v1.getEdges(Direction.OUT)).thenReturn(noEdgesIterable);
+
+        when(v1.getId()).thenReturn(new String("1234"));
+        when(v2.getId()).thenReturn(new String("5678"));
+        when(graph.addEdge(null, v1, v2, edgeLabel)).thenThrow(new RuntimeException("Unique property constraint violated"));
+        graphHelperInstance.getOrCreateEdge(v1, v2, edgeLabel);
+    }
+
+    @Test
+    public void testGetOrCreateEdgeLabelWithRetries() throws Exception {
+        final String edgeLabel = "testLabel";
+        TitanVertex v1 = mock(TitanVertex.class);
+        TitanVertex v2 = mock(TitanVertex.class);
+        Edge edge = mock(Edge.class);
+
+        Iterable noEdgesIterable = new Iterable<Edge>() {
+            @Override
+            public Iterator<Edge> iterator() {
+                return new Iterator<Edge>() {
+                    @Override
+                    public boolean hasNext() {
+                        return false;
+                    }
+
+                    @Override
+                    public Edge next() {
+                        return null;
+                    }
+
+                    @Override
+                    public void remove() {
+                    }
+                };
+            }
+        };
+        when(v2.getEdges(Direction.IN)).thenReturn(noEdgesIterable);
+        when(v1.getEdges(Direction.OUT)).thenReturn(noEdgesIterable);
+
+        when(v1.getId()).thenReturn(new String("v1"));
+        when(v2.getId()).thenReturn(new String("v2"));
+        when(edge.getId()).thenReturn(new String("edge"));
+        when(graph.addEdge(null, v1, v2, edgeLabel))
+                .thenThrow(new RuntimeException("Unique property constraint violated")).thenReturn(edge);
+        Edge redge = graphHelperInstance.getOrCreateEdge(v1, v2, edgeLabel);
+        assertEquals(edge, redge);
+    }
+}

repository/src/test/java/org/apache/atlas/repository/graph/GraphHelperTest.java

@@ -117,7 +117,7 @@ public class GraphHelperTest {
             }
         }
         Vertex deptVertex = GraphHelper.getInstance().getVertexForGUID(deptGuid);
-        Set<VertexInfo> compositeVertices = GraphHelper.getCompositeVertices(deptVertex);
+        Set<VertexInfo> compositeVertices = GraphHelper.getInstance().getCompositeVertices(deptVertex);
         HashMap<String, VertexInfo> verticesByGuid = new HashMap<>();
         for (VertexInfo vertexInfo: compositeVertices) {
             verticesByGuid.put(vertexInfo.getGuid(), vertexInfo);
@@ -148,7 +148,7 @@ public class GraphHelperTest {
         v1.addEdge("l1", v2);
         v1.addEdge("l2", v2);
 
-        Iterator<Edge> iterator = GraphHelper.getOutGoingEdgesByLabel(v1, "l1");
+        Iterator<Edge> iterator = GraphHelper.getInstance().getOutGoingEdgesByLabel(v1, "l1");
         assertTrue(iterator.hasNext());
         assertTrue(iterator.hasNext());
         assertNotNull(iterator.next());

repository/src/test/java/org/apache/atlas/repository/typestore/GraphBackedTypeStoreTest.java

@@ -223,7 +223,7 @@ public class GraphBackedTypeStoreTest {
 
     private int countOutgoingEdges(Vertex typeVertex, String edgeLabel) {
 
-        Iterator<Edge> outGoingEdgesByLabel = GraphHelper.getOutGoingEdgesByLabel(typeVertex, edgeLabel);
+        Iterator<Edge> outGoingEdgesByLabel = GraphHelper.getInstance().getOutGoingEdgesByLabel(typeVertex, edgeLabel);
         int edgeCount = 0;
         for (Iterator<Edge> iterator = outGoingEdgesByLabel; iterator.hasNext();) {
             iterator.next();