If vertex existence verification isn't needed, getVertices() should r…

…un a query.
thinkaurelius · Jan 15, 2015 · 1856ae7 · 1856ae7
1 parent 22539c6
commit 1856ae7
Showing 1 changed file with 18 additions and 8 deletions.
diff --git a/titan-core/src/main/java/com/thinkaurelius/titan/graphdb/transaction/StandardTitanTx.java b/titan-core/src/main/java/com/thinkaurelius/titan/graphdb/transaction/StandardTitanTx.java
@@ -159,9 +159,9 @@ public class StandardTitanTx extends TitanBlueprintsTransaction implements TypeI
      */
     private boolean isOpen;
 
-    private final Retriever<Long, InternalVertex> existingVertexRetriever;
+    private final VertexConstructor existingVertexRetriever;
-    private final Retriever<Long, InternalVertex> externalVertexRetriever;
+    private final VertexConstructor externalVertexRetriever;
-    private final Retriever<Long, InternalVertex> internalVertexRetriever;
+    private final VertexConstructor internalVertexRetriever;
 
     public StandardTitanTx(StandardTitanGraph graph, TransactionConfiguration config) {
         Preconditions.checkNotNull(graph);
@@ -381,11 +381,17 @@ public Iterable<TitanVertex> getVertices(long... ids) {
             }
         }
         if (!vids.isEmpty()) {
-            List<EntryList> existence = graph.edgeMultiQuery(vids,graph.vertexExistenceQuery,txHandle);
+            if (externalVertexRetriever.hasVerifyExistence()) {
-            for (int i = 0; i < vids.size(); i++) {
+                List<EntryList> existence = graph.edgeMultiQuery(vids,graph.vertexExistenceQuery,txHandle);
-                if (!existence.get(i).isEmpty()) {
+                for (int i = 0; i < vids.size(); i++) {
-                    long id = vids.get(i);
+                    if (!existence.get(i).isEmpty()) {
-                    result.add(vertexCache.get(id, existingVertexRetriever));
+                        long id = vids.get(i);
+                        result.add(vertexCache.get(id, existingVertexRetriever));
+                    }
+                }
+            } else {
+                for (int i = 0; i < vids.size(); i++) {
+                    result.add(vertexCache.get(vids.get(i),externalVertexRetriever));
                 }
             }
         }
@@ -416,6 +422,10 @@ private VertexConstructor(boolean verifyExistence, boolean createStubVertex) {
             this.createStubVertex = createStubVertex;
         }
 
+        public boolean hasVerifyExistence() {
+            return verifyExistence;
+        }
+
         @Override
         public InternalVertex get(Long vertexid) {
             Preconditions.checkArgument(vertexid!=null && vertexid > 0, "Invalid vertex id: %s",vertexid);