Updated to latest TP3 release.

thinkaurelius · Jan 19, 2015 · a43a3a7 · a43a3a7
1 parent 0ec8e8f
commit a43a3a7
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/pom.xml b/pom.xml
@@ -59,7 +59,7 @@
     </scm>
     <properties>
         <titan.compatible.versions />
-        <tinkerpop.version>3.0.0-SNAPSHOT</tinkerpop.version>
+        <tinkerpop.version>3.0.0.M7</tinkerpop.version>
         <junit.version>4.11</junit.version>
         <mrunit.version>1.1.0</mrunit.version>
         <cassandra.version>2.0.8</cassandra.version>

diff --git a/titan-core/src/main/java/com/thinkaurelius/titan/graphdb/olap/computer/FulgoraUtil.java b/titan-core/src/main/java/com/thinkaurelius/titan/graphdb/olap/computer/FulgoraUtil.java
@@ -55,7 +55,7 @@ public static Traversal<Vertex,Edge> getReverseElementTraversal(final MessageSco
                                                                        final Vertex start,
                                                                        final TitanTransaction graph) {
         Traversal<Vertex,Edge> incident = scope.getIncidentTraversal().get();
-        Step<Vertex,?> startStep = TraversalHelper.getStart(incident);
+        Step<Vertex,?> startStep = TraversalHelper.getStart(incident.asAdmin());
         assert startStep instanceof VertexStep;
         ((VertexStep) startStep).reverse();
 

diff --git a/...ore/src/main/java/com/thinkaurelius/titan/graphdb/olap/computer/VertexProgramScanJob.java b/...ore/src/main/java/com/thinkaurelius/titan/graphdb/olap/computer/VertexProgramScanJob.java
@@ -114,7 +114,7 @@ public void getQueries(QueryContainer queries) {
             } else {
                 assert scope instanceof MessageScope.Local;
                 Traversal<Vertex,Edge> incident = FulgoraUtil.getTraversal((MessageScope.Local) scope,queries.getTransaction());
-                TitanVertexStep<Vertex> startStep = (TitanVertexStep<Vertex>) TraversalHelper.getStart(incident);
+                TitanVertexStep<Vertex> startStep = (TitanVertexStep<Vertex>) TraversalHelper.getStart(incident.asAdmin());
                 startStep.reverse();
                 QueryContainer.QueryBuilder qb = queries.addQuery();
                 startStep.makeQuery(qb);

diff --git a/...-core/src/main/java/com/thinkaurelius/titan/graphdb/tinkerpop/optimize/HasStepFolder.java b/...-core/src/main/java/com/thinkaurelius/titan/graphdb/tinkerpop/optimize/HasStepFolder.java
@@ -87,7 +87,7 @@ public static void foldInHasContainer(final HasStepFolder titanStep, final Trave
         }
     }
 
-    public static void addLabeledStepAsIdentity(Step<?,?> currentStep, final Traversal<?, ?> traversal) {
+    public static void addLabeledStepAsIdentity(Step<?,?> currentStep, final Traversal.Admin<?, ?> traversal) {
         currentStep.getLabel().ifPresent(label -> {
             final IdentityStep identityStep = new IdentityStep<>(traversal);
             identityStep.setLabel(label);

diff --git a/.../main/java/com/thinkaurelius/titan/graphdb/tinkerpop/optimize/TitanGraphStepStrategy.java b/.../main/java/com/thinkaurelius/titan/graphdb/tinkerpop/optimize/TitanGraphStepStrategy.java
@@ -34,7 +34,7 @@ public void apply(final Traversal.Admin<?, ?> traversal, final TraversalEngine e
             final GraphStep<?> originalGraphStep = (GraphStep) startStep;
             if (originalGraphStep.getIds()==null || originalGraphStep.getIds().length==0) {
                 final TitanGraphStep<?> titanGraphStep = new TitanGraphStep<>(originalGraphStep);
-                TraversalHelper.replaceStep(startStep, titanGraphStep, traversal);
+                TraversalHelper.replaceStep(startStep, (Step)titanGraphStep, traversal);
 
                 HasStepFolder.foldInHasContainer(titanGraphStep,traversal);
                 HasStepFolder.foldInOrder(titanGraphStep,traversal,traversal,titanGraphStep.returnsVertices());

diff --git a/.../src/main/java/com/thinkaurelius/titan/graphdb/tinkerpop/optimize/TitanTraversalUtil.java b/.../src/main/java/com/thinkaurelius/titan/graphdb/tinkerpop/optimize/TitanTraversalUtil.java
@@ -66,7 +66,7 @@ public static TitanTransaction getTx(Traversal<?,?> traversal) {
         if (traversal instanceof FulgoraElementTraversal) {
             tx = ((FulgoraElementTraversal)traversal).getGraph();
         } else {
-            Step startStep = TraversalHelper.getStart(traversal);
+            Step startStep = TraversalHelper.getStart(traversal.asAdmin());
             if (startStep instanceof GraphStep) {
                 Graph graph = ((GraphStep)startStep).getGraph(Graph.class);
                 if (graph instanceof TitanTransaction) tx = (TitanTransaction)graph;