Upgrade to TP M9-RC2

Added in memory graph test for TP suite for easy debugging.

pom.xml

@@ -59,7 +59,7 @@
     </scm>
     <properties>
         <titan.compatible.versions />
-        <tinkerpop.version>3.0.0.M9-incubating-rc1</tinkerpop.version>
+        <tinkerpop.version>3.0.0.M9-incubating-rc2</tinkerpop.version>
         <junit.version>4.11</junit.version>
         <mrunit.version>1.1.0</mrunit.version>
         <cassandra.version>2.0.8</cassandra.version>

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

@@ -21,7 +21,7 @@
 /**
  * @author Matthias Broecheler (me@matthiasb.com)
  */
-public class TitanGraphStepStrategy extends AbstractTraversalStrategy {
+public class TitanGraphStepStrategy extends AbstractTraversalStrategy<TraversalStrategy> {
 
     private static final TitanGraphStepStrategy INSTANCE = new TitanGraphStepStrategy();
 
@@ -30,6 +30,9 @@ private TitanGraphStepStrategy() {
 
     @Override
     public void apply(final Traversal.Admin<?, ?> traversal) {
+        if(!traversal.getGraph().isPresent())
+            return;
+
         if (traversal.getEngine().isComputer())
             return;
 

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

@@ -21,7 +21,7 @@
  * @author Marko A. Rodriguez (http://markorodriguez.com)
  * @author Matthias Broecheler (http://matthiasb.com)
  */
-public class TitanLocalQueryOptimizerStrategy extends AbstractTraversalStrategy {
+public class TitanLocalQueryOptimizerStrategy extends AbstractTraversalStrategy<TraversalStrategy> {
 
     private static final TitanLocalQueryOptimizerStrategy INSTANCE = new TitanLocalQueryOptimizerStrategy();
 
@@ -30,6 +30,9 @@ private TitanLocalQueryOptimizerStrategy() {
 
     @Override
     public void apply(final Traversal.Admin<?, ?> traversal) {
+        if(!traversal.getGraph().isPresent())
+            return;
+
         Graph graph = traversal.getGraph().get();
 
         //If this is a compute graph then we can't apply local traversal optimisation at this stage.

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

@@ -12,7 +12,7 @@
 import org.apache.tinkerpop.gremlin.process.traversal.Traverser;
 import org.apache.tinkerpop.gremlin.process.traversal.step.map.PropertiesStep;
 import org.apache.tinkerpop.gremlin.process.traversal.step.util.HasContainer;
-import org.apache.tinkerpop.gremlin.process.traversal.FastNoSuchElementException;
+import org.apache.tinkerpop.gremlin.process.traversal.util.FastNoSuchElementException;
 import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalHelper;
 import org.apache.tinkerpop.gremlin.structure.*;
 

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

@@ -15,7 +15,7 @@
 import org.apache.tinkerpop.gremlin.process.traversal.step.Profileable;
 import org.apache.tinkerpop.gremlin.process.traversal.step.map.VertexStep;
 import org.apache.tinkerpop.gremlin.process.traversal.step.util.HasContainer;
-import org.apache.tinkerpop.gremlin.process.traversal.FastNoSuchElementException;
+import org.apache.tinkerpop.gremlin.process.traversal.util.FastNoSuchElementException;
 import org.apache.tinkerpop.gremlin.process.traversal.util.MutableMetrics;
 import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalHelper;
 import org.apache.tinkerpop.gremlin.structure.*;

titan-test/src/main/java/com/thinkaurelius/titan/StorageSetup.java

@@ -54,8 +54,12 @@ public static final void deleteHomeDir(String subdir) {
         if (!success) throw new IllegalStateException("Could not remove " + homeDirFile);
     }
 
+    public static ModifiableConfiguration getInMemoryConfiguration() {
+        return buildGraphConfiguration().set(STORAGE_BACKEND, "inmemory");
+    }
+
     public static TitanGraph getInMemoryGraph() {
-        return TitanFactory.open(buildGraphConfiguration().set(STORAGE_BACKEND,"inmemory"));
+        return TitanFactory.open(getInMemoryConfiguration());
     }
 
     public static WriteConfiguration addPermanentCache(ModifiableConfiguration conf) {

titan-test/src/main/java/com/thinkaurelius/titan/blueprints/InMemoryGraphProvider.java

@@ -0,0 +1,15 @@
+package com.thinkaurelius.titan.blueprints;
+
+import com.thinkaurelius.titan.StorageSetup;
+import com.thinkaurelius.titan.diskstorage.configuration.ModifiableConfiguration;
+import org.apache.tinkerpop.gremlin.AbstractGremlinSuite;
+
+/**
+ * Created by bryn on 06/05/15.
+ */
+public class InMemoryGraphProvider extends AbstractTitanGraphProvider {
+    @Override
+    public ModifiableConfiguration getTitanConfiguration(String graphName, Class<?> test, String testMethodName) {
+        return StorageSetup.getInMemoryConfiguration();
+    }
+}

titan-test/src/main/java/com/thinkaurelius/titan/blueprints/InMemoryTitanProcessTest.java

@@ -0,0 +1,11 @@
+package com.thinkaurelius.titan.blueprints;
+
+import com.thinkaurelius.titan.core.TitanGraph;
+import org.apache.tinkerpop.gremlin.process.ProcessStandardSuite;
+import org.junit.runner.RunWith;
+
+
+@RunWith(ProcessStandardSuite.class)
+@ProcessStandardSuite.GraphProviderClass(provider = InMemoryGraphProvider.class, graph = TitanGraph.class)
+public class InMemoryTitanProcessTest {
+}