Updated to latest TP3 changes. Added clone method to set initializati…

…on to false.

titan-core/src/main/java/com/thinkaurelius/titan/graphdb/tinkerpop/optimize/HasStepFolder.java

@@ -65,7 +65,7 @@ public static boolean validTitanOrder(OrderStep ostep, Traversal rootTraversal,
     public static void foldInHasContainer(final HasStepFolder titanStep, final Traversal.Admin<?, ?> traversal) {
         Step currentStep = titanStep.getNextStep();
         while (true) {
-            if (TraversalHelper.isLabeled(currentStep)) break;
+            if (currentStep.getLabel().isPresent()) break;
 
             if (currentStep instanceof HasContainerHolder) {
                 Iterable<HasContainer> containers = ((HasContainerHolder) currentStep).getHasContainers();
@@ -87,12 +87,12 @@ public static void foldInHasContainer(final HasStepFolder titanStep, final Trave
         }
     }
 
-    public static void addLabeledStepAsIdentity(Step currentStep, final Traversal<?, ?> traversal) {
-        if (TraversalHelper.isLabeled(currentStep)) {
+    public static void addLabeledStepAsIdentity(Step<?,?> currentStep, final Traversal<?, ?> traversal) {
+        currentStep.getLabel().ifPresent(label -> {
             final IdentityStep identityStep = new IdentityStep<>(traversal);
-            identityStep.setLabel(currentStep.getLabel());
+            identityStep.setLabel(label);
             TraversalHelper.insertAfterStep(identityStep, currentStep, traversal);
-        }
+        });
     }
 
     public static void foldInOrder(final HasStepFolder titanStep, final Traversal.Admin<?, ?> traversal,

titan-core/src/main/java/com/thinkaurelius/titan/graphdb/tinkerpop/optimize/TitanElementStepStrategy.java

@@ -43,14 +43,13 @@ public void apply(final Traversal.Admin<?, ?> traversal, final TraversalEngine e
         final StartStep<Element> startStep = (StartStep) TraversalHelper.getStart(traversal);
         if (startStep.startAssignableTo(Vertex.class, Edge.class)) {
             final Element element = ((StartStep<?>) startStep).getStart();
-            final String label = startStep.getLabel();
             traversal.removeStep(startStep);
-            if (TraversalHelper.isLabeled(label)) {
+            startStep.getLabel().ifPresent(label -> {
                 final Step identityStep = new IdentityStep(traversal);
                 identityStep.setLabel(label);
-                traversal.addStep(0,identityStep);
-            }
-            traversal.addStep(0,new GraphStep<>(traversal, EmptyGraph.instance(), element.getClass(), element.id()));
+                traversal.addStep(0, identityStep);
+            });
+            traversal.addStep(0, new GraphStep<>(traversal, EmptyGraph.instance(), element.getClass(), element.id()));
         }
     }
 

titan-core/src/main/java/com/thinkaurelius/titan/graphdb/tinkerpop/optimize/TitanGraphStep.java

@@ -26,10 +26,10 @@ public class TitanGraphStep<E extends Element> extends GraphStep<E> implements H
     private int limit = BaseQuery.NO_LIMIT;
     private List<OrderEntry> orders = new ArrayList<>();
 
-    public TitanGraphStep(final GraphStep<E> originalGraphStep) {
-        super(originalGraphStep.getTraversal(), originalGraphStep.getGraph(TitanGraph.class), originalGraphStep.getReturnClass(), originalGraphStep.getIds());
-        if (TraversalHelper.isLabeled(originalGraphStep))
-            this.setLabel(originalGraphStep.getLabel());
+    public TitanGraphStep(final GraphStep<E> originalStep) {
+        super(originalStep.getTraversal(), originalStep.getGraph(TitanGraph.class), originalStep.getReturnClass(), originalStep.getIds());
+        if (originalStep.getLabel().isPresent())
+            this.setLabel(originalStep.getLabel().get());
         this.setIteratorSupplier(() -> {
             TitanTransaction tx = TitanTraversalUtil.getTx(traversal);
             TitanGraphQuery query = tx.query();

titan-core/src/main/java/com/thinkaurelius/titan/graphdb/tinkerpop/optimize/TitanPropertiesStep.java

@@ -29,8 +29,8 @@ public class TitanPropertiesStep<E> extends PropertiesStep<E> implements HasStep
 
     public TitanPropertiesStep(PropertiesStep<E> originalStep) {
         super(originalStep.getTraversal(), originalStep.getReturnType(), originalStep.getPropertyKeys());
-        if (TraversalHelper.isLabeled(originalStep))
-            this.setLabel(originalStep.getLabel());
+        if (originalStep.getLabel().isPresent())
+            this.setLabel(originalStep.getLabel().get());
         this.hasContainers = new ArrayList<>();
         this.limit = Query.NO_LIMIT;
     }
@@ -112,6 +112,13 @@ public void reset() {
         this.initialized = false;
     }
 
+    @Override
+    public TitanPropertiesStep<E> clone() throws CloneNotSupportedException {
+        final TitanPropertiesStep<E> clone = (TitanPropertiesStep<E>) super.clone();
+        clone.initialized=false;
+        return clone;
+    }
+
     /*
     ===== HOLDER =====
      */

titan-core/src/main/java/com/thinkaurelius/titan/graphdb/tinkerpop/optimize/TitanTraversalUtil.java

@@ -16,6 +16,7 @@
 import com.tinkerpop.gremlin.process.graph.step.sideEffect.IdentityStep;
 import com.tinkerpop.gremlin.process.graph.step.sideEffect.StartStep;
 import com.tinkerpop.gremlin.process.graph.strategy.IdentityRemovalStrategy;
+import com.tinkerpop.gremlin.process.util.EmptyStep;
 import com.tinkerpop.gremlin.process.util.TraversalHelper;
 import com.tinkerpop.gremlin.structure.Edge;
 import com.tinkerpop.gremlin.structure.Element;
@@ -58,8 +59,9 @@ public static Step getNextNonIdentityStep(final Step start) {
         return currentStep;
     }
 
-    public static TitanTransaction getTx(Traversal traversal) {
+    public static TitanTransaction getTx(Traversal<?,?> traversal) {
         TitanTransaction tx=null;
+        traversal = getRootTraversal(traversal);
 
         if (traversal instanceof FulgoraElementTraversal) {
             tx = ((FulgoraElementTraversal)traversal).getGraph();
@@ -80,4 +82,11 @@ public static TitanTransaction getTx(Traversal traversal) {
         else return ((StandardTitanTx)tx).getNextTx();
     }
 
+    public static Traversal<?,?> getRootTraversal(Traversal<?,?> traversal) {
+        while (!((traversal.asAdmin().getTraversalHolder()) instanceof EmptyStep)) {
+            traversal = traversal.asAdmin().getTraversalHolder().asStep().getTraversal();
+        }
+        return traversal;
+    }
+
 }

titan-core/src/main/java/com/thinkaurelius/titan/graphdb/tinkerpop/optimize/TitanVertexStep.java

@@ -23,8 +23,8 @@ public class TitanVertexStep<E extends Element> extends VertexStep<E> implements
 
     public TitanVertexStep(VertexStep<E> originalStep) {
         super(originalStep.getTraversal(), originalStep.getReturnClass(), originalStep.getDirection(), originalStep.getEdgeLabels());
-        if (TraversalHelper.isLabeled(originalStep))
-            this.setLabel(originalStep.getLabel());
+        if (originalStep.getLabel().isPresent())
+            this.setLabel(originalStep.getLabel().get());
         this.hasContainers = new ArrayList<>();
         this.limit = Query.NO_LIMIT;
     }
@@ -87,6 +87,13 @@ public void reset() {
         this.initialized = false;
     }
 
+    @Override
+    public TitanVertexStep<E> clone() throws CloneNotSupportedException {
+        final TitanVertexStep<E> clone = (TitanVertexStep<E>) super.clone();
+        clone.initialized=false;
+        return clone;
+    }
+
     /*
     ===== HOLDER =====
      */