You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by sp...@apache.org on 2015/08/25 15:06:01 UTC
[04/17] incubator-tinkerpop git commit: Revert "Merge remote-tracking
branch 'origin' into tp30"
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/6902e68a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/branch/RepeatTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/branch/RepeatTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/branch/RepeatTest.java
index e4ba1bb..550c7d2 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/branch/RepeatTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/branch/RepeatTest.java
@@ -22,9 +22,10 @@ import org.apache.tinkerpop.gremlin.LoadGraphWith;
import org.apache.tinkerpop.gremlin.process.AbstractGremlinProcessTest;
import org.apache.tinkerpop.gremlin.process.GremlinProcessRunner;
import org.apache.tinkerpop.gremlin.process.traversal.Path;
+import org.apache.tinkerpop.gremlin.structure.T;
import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
+import org.apache.tinkerpop.gremlin.process.traversal.TraversalEngine;
import org.apache.tinkerpop.gremlin.process.traversal.step.util.MapHelper;
-import org.apache.tinkerpop.gremlin.structure.T;
import org.apache.tinkerpop.gremlin.structure.Vertex;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -69,10 +70,6 @@ public abstract class RepeatTest extends AbstractGremlinProcessTest {
public abstract Traversal<Vertex, Map<String, Long>> get_g_V_repeatXgroupCountXmX_byXnameX_outX_timesX2X_capXmX();
- //
-
- public abstract Traversal<Vertex, Map<String, Vertex>> get_g_V_repeatXbothX_timesX10X_asXaX_out_asXbX_selectXa_bX();
-
@Test
@LoadGraphWith(MODERN)
public void g_V_repeatXoutX_timesX2X_emit_path() {
@@ -215,22 +212,6 @@ public abstract class RepeatTest extends AbstractGremlinProcessTest {
});
}
- @Test
- @LoadGraphWith(MODERN)
- public void g_V_repeatXbothX_timesX10X_asXaX_out_asXbX_selectXa_bX() {
- final Traversal<Vertex, Map<String, Vertex>> traversal = get_g_V_repeatXbothX_timesX10X_asXaX_out_asXbX_selectXa_bX();
- printTraversalForm(traversal);
- int counter = 0;
- while (traversal.hasNext()) {
- final Map<String, Vertex> map = traversal.next();
- assertEquals(2, map.size());
- assertTrue(map.get("a") instanceof Vertex);
- assertTrue(map.get("b") instanceof Vertex);
- counter++;
- }
- assertTrue(counter > 0);
- }
-
public static class Traversals extends RepeatTest {
@Override
@@ -277,10 +258,5 @@ public abstract class RepeatTest extends AbstractGremlinProcessTest {
public Traversal<Vertex, Map<String, Long>> get_g_V_repeatXgroupCountXmX_byXnameX_outX_timesX2X_capXmX() {
return g.V().repeat(groupCount("m").by("name").out()).times(2).cap("m");
}
-
- @Override
- public Traversal<Vertex, Map<String, Vertex>> get_g_V_repeatXbothX_timesX10X_asXaX_out_asXbX_selectXa_bX() {
- return g.V().repeat(both()).times(10).as("a").out().as("b").select("a", "b");
- }
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/6902e68a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/CountTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/CountTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/CountTest.java
index 320847c..3e3424a 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/CountTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/CountTest.java
@@ -21,7 +21,6 @@ package org.apache.tinkerpop.gremlin.process.traversal.step.map;
import org.apache.tinkerpop.gremlin.LoadGraphWith;
import org.apache.tinkerpop.gremlin.process.AbstractGremlinProcessTest;
import org.apache.tinkerpop.gremlin.process.GremlinProcessRunner;
-import org.apache.tinkerpop.gremlin.process.IgnoreEngine;
import org.apache.tinkerpop.gremlin.process.traversal.Scope;
import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
import org.apache.tinkerpop.gremlin.process.traversal.TraversalEngine;
@@ -51,8 +50,6 @@ public abstract class CountTest extends AbstractGremlinProcessTest {
public abstract Traversal<Vertex, Long> get_g_V_repeatXoutX_timesX8X_count();
- public abstract Traversal<Vertex, Long> get_g_V_repeatXoutX_timesX5X_asXaX_outXwrittenByX_asXbX_selectXa_bX_count();
-
public abstract Traversal<Vertex, Long> get_g_V_hasXnoX_count();
public abstract Traversal<Vertex, Long> get_g_V_fold_countXlocalX();
@@ -103,15 +100,6 @@ public abstract class CountTest extends AbstractGremlinProcessTest {
}
@Test
- @LoadGraphWith(GRATEFUL)
- public void g_V_repeatXoutX_timesX5X_asXaX_outXwrittenByX_asXbX_selectXa_bX_count() {
- final Traversal<Vertex, Long> traversal = get_g_V_repeatXoutX_timesX5X_asXaX_outXwrittenByX_asXbX_selectXa_bX_count();
- printTraversalForm(traversal);
- assertEquals(new Long(24309134024L), traversal.next());
- assertFalse(traversal.hasNext());
- }
-
- @Test
@LoadGraphWith(MODERN)
public void g_V_hasXnoX_count() {
final Traversal<Vertex, Long> traversal = get_g_V_hasXnoX_count();
@@ -166,11 +154,6 @@ public abstract class CountTest extends AbstractGremlinProcessTest {
}
@Override
- public Traversal<Vertex, Long> get_g_V_repeatXoutX_timesX5X_asXaX_outXwrittenByX_asXbX_selectXa_bX_count() {
- return g.V().repeat(out()).times(5).as("a").out("writtenBy").as("b").select("a", "b").count();
- }
-
- @Override
public Traversal<Vertex, Long> get_g_V_hasXnoX_count() {
return g.V().has("no").count();
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/6902e68a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/LoopsTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/LoopsTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/LoopsTest.java
deleted file mode 100644
index 298260d..0000000
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/LoopsTest.java
+++ /dev/null
@@ -1,152 +0,0 @@
-/*
- * 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.tinkerpop.gremlin.process.traversal.step.map;
-
-import org.apache.tinkerpop.gremlin.LoadGraphWith;
-import org.apache.tinkerpop.gremlin.process.AbstractGremlinProcessTest;
-import org.apache.tinkerpop.gremlin.process.GremlinProcessRunner;
-import org.apache.tinkerpop.gremlin.process.traversal.Path;
-import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
-import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__;
-import org.apache.tinkerpop.gremlin.structure.Vertex;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import java.util.Arrays;
-
-import static org.apache.tinkerpop.gremlin.LoadGraphWith.GraphData.MODERN;
-import static org.junit.Assert.*;
-
-/**
- * @author Daniel Kuppitz (http://gremlin.guru)
- */
-@RunWith(GremlinProcessRunner.class)
-public abstract class LoopsTest extends AbstractGremlinProcessTest {
-
- /*
- g.V(1).repeat(both().simplePath()).until(has('name', 'peter').or().loops().is(3)).has('name', 'peter').path().by('name').
- forEachRemaining(System.out::println);
- System.out.println('--');
- g.V(v1Id).repeat(both().simplePath()).until(has('name', 'peter').or().loops().is(2)).has('name', 'peter').path().by('name').
- forEachRemaining(System.out::println);
- System.out.println('--');
- g.V(v1Id).repeat(both().simplePath()).until(has('name', 'peter').and().loops().is(3)).has('name', 'peter').path().by('name').
- forEachRemaining(System.out::println);
- System.out.println('--');
- g.V().emit(has('name', 'marko').or().loops().is(2)).repeat(out()).values('name').
- forEachRemaining(System.out::println);
- */
- public abstract Traversal<Vertex, Path> get_g_VX1X_repeatXboth_simplePathX_untilXhasXname_peterX_or_loops_isX3XX_hasXname_peterX_path_byXnameX(final Object v1Id);
-
- public abstract Traversal<Vertex, Path> get_g_VX1X_repeatXboth_simplePathX_untilXhasXname_peterX_or_loops_isX2XX_hasXname_peterX_path_byXnameX(final Object v1Id);
-
- public abstract Traversal<Vertex, Path> get_g_VX1X_repeatXboth_simplePathX_untilXhasXname_peterX_and_loops_isX3XX_hasXname_peterX_path_byXnameX(final Object v1Id);
-
- public abstract Traversal<Vertex, String> get_g_V_emitXhasXname_markoX_or_loops_isX2XX_repeatXoutX_valuesXnameX();
-
- @Test
- @LoadGraphWith(MODERN)
- public void g_VX1X_repeatXboth_simplePathX_untilXhasXname_peterX_or_loops_isX3XX_hasXname_peterX_path_byXnameX() {
- final Traversal<Vertex, Path> traversal = get_g_VX1X_repeatXboth_simplePathX_untilXhasXname_peterX_or_loops_isX3XX_hasXname_peterX_path_byXnameX(convertToVertexId("marko"));
- printTraversalForm(traversal);
- int paths = 0;
- boolean has3 = false, has4 = false;
- while (traversal.hasNext()) {
- final Path path = traversal.next();
- switch (path.size()) {
- case 3:
- assertEquals("marko", path.get(0));
- assertEquals("lop", path.get(1));
- assertEquals("peter", path.get(2));
- has3 = true;
- break;
- case 4:
- assertEquals("marko", path.get(0));
- assertEquals("josh", path.get(1));
- assertEquals("lop", path.get(2));
- assertEquals("peter", path.get(3));
- has4 = true;
- break;
- }
- paths++;
- }
- assertTrue(has3 && has4);
- assertEquals(2, paths);
- }
-
- @Test
- @LoadGraphWith(MODERN)
- public void g_VX1X_repeatXboth_simplePathX_untilXhasXname_peterX_or_loops_isX2XX_hasXname_peterX_path_byXnameX() {
- final Traversal<Vertex, Path> traversal = get_g_VX1X_repeatXboth_simplePathX_untilXhasXname_peterX_or_loops_isX2XX_hasXname_peterX_path_byXnameX(convertToVertexId("marko"));
- printTraversalForm(traversal);
- assertTrue(traversal.hasNext());
- final Path path = traversal.next();
- assertEquals(3, path.size());
- assertEquals("marko", path.get(0));
- assertEquals("lop", path.get(1));
- assertEquals("peter", path.get(2));
- assertFalse(traversal.hasNext());
- }
-
- @Test
- @LoadGraphWith(MODERN)
- public void g_VX1X_repeatXboth_simplePathX_untilXhasXname_peterX_and_loops_isX3XX_hasXname_peterX_path_byXnameX() {
- final Traversal<Vertex, Path> traversal = get_g_VX1X_repeatXboth_simplePathX_untilXhasXname_peterX_and_loops_isX3XX_hasXname_peterX_path_byXnameX(convertToVertexId("marko"));
- printTraversalForm(traversal);
- assertTrue(traversal.hasNext());
- final Path path = traversal.next();
- assertEquals(4, path.size());
- assertEquals("marko", path.get(0));
- assertEquals("josh", path.get(1));
- assertEquals("lop", path.get(2));
- assertEquals("peter", path.get(3));
- assertFalse(traversal.hasNext());
- }
-
- @Test
- @LoadGraphWith(MODERN)
- public void g_V_emitXhasXname_markoX_or_loops_isX2XX_repeatXoutX_valuesXnameX() {
- final Traversal<Vertex, String> traversal = get_g_V_emitXhasXname_markoX_or_loops_isX2XX_repeatXoutX_valuesXnameX();
- printTraversalForm(traversal);
- checkResults(Arrays.asList("marko", "ripple", "lop"), traversal);
- }
-
- public static class Traversals extends LoopsTest {
-
- @Override
- public Traversal<Vertex, Path> get_g_VX1X_repeatXboth_simplePathX_untilXhasXname_peterX_or_loops_isX3XX_hasXname_peterX_path_byXnameX(final Object v1Id) {
- return g.V(v1Id).repeat(__.both().simplePath()).until(__.has("name", "peter").or().loops().is(3)).has("name", "peter").path().by("name");
- }
-
- @Override
- public Traversal<Vertex, Path> get_g_VX1X_repeatXboth_simplePathX_untilXhasXname_peterX_or_loops_isX2XX_hasXname_peterX_path_byXnameX(final Object v1Id) {
- return g.V(v1Id).repeat(__.both().simplePath()).until(__.has("name", "peter").or().loops().is(2)).has("name", "peter").path().by("name");
- }
-
- @Override
- public Traversal<Vertex, Path> get_g_VX1X_repeatXboth_simplePathX_untilXhasXname_peterX_and_loops_isX3XX_hasXname_peterX_path_byXnameX(final Object v1Id) {
- return g.V(v1Id).repeat(__.both().simplePath()).until(__.has("name", "peter").and().loops().is(3)).has("name", "peter").path().by("name");
- }
-
- @Override
- public Traversal<Vertex, String> get_g_V_emitXhasXname_markoX_or_loops_isX2XX_repeatXoutX_valuesXnameX() {
- return g.V().emit(__.has("name", "marko").or().loops().is(2)).repeat(__.out()).values("name");
- }
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/6902e68a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MapKeysTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MapKeysTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MapKeysTest.java
index 4578e0f..8db172f 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MapKeysTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MapKeysTest.java
@@ -27,7 +27,6 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import java.util.Arrays;
-import java.util.List;
import static org.apache.tinkerpop.gremlin.LoadGraphWith.GraphData.MODERN;
@@ -39,18 +38,12 @@ public abstract class MapKeysTest extends AbstractGremlinProcessTest {
public abstract Traversal<Vertex, Double> get_g_V_outE_valuesXweightX_groupCount_mapKeys();
- public abstract Traversal<Vertex, Double> get_g_V_outE_valuesXweightX_groupCount_unfold_mapKeys();
-
@Test
@LoadGraphWith(MODERN)
public void g_V_outE_valuesXweightX_groupCount_mapKeys() {
- final List<Traversal<Vertex, Double>> traversals = Arrays.asList(
- get_g_V_outE_valuesXweightX_groupCount_mapKeys(),
- get_g_V_outE_valuesXweightX_groupCount_unfold_mapKeys());
- for (final Traversal<Vertex, Double> traversal : traversals) {
- printTraversalForm(traversal);
- checkResults(Arrays.asList(0.2, 0.4, 0.5, 1.0), traversal);
- }
+ final Traversal<Vertex, Double> traversal = get_g_V_outE_valuesXweightX_groupCount_mapKeys();
+ printTraversalForm(traversal);
+ checkResults(Arrays.asList(0.2, 0.4, 0.5, 1.0), traversal);
}
public static class Traversals extends MapKeysTest {
@@ -59,10 +52,5 @@ public abstract class MapKeysTest extends AbstractGremlinProcessTest {
public Traversal<Vertex, Double> get_g_V_outE_valuesXweightX_groupCount_mapKeys() {
return g.V().outE().values("weight").groupCount().mapKeys();
}
-
- @Override
- public Traversal<Vertex, Double> get_g_V_outE_valuesXweightX_groupCount_unfold_mapKeys() {
- return g.V().outE().values("weight").groupCount().unfold().mapKeys();
- }
}
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/6902e68a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MapValuesTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MapValuesTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MapValuesTest.java
index 45edab1..4e454ba 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MapValuesTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MapValuesTest.java
@@ -27,7 +27,6 @@ import org.junit.Test;
import org.junit.runner.RunWith;
import java.util.Arrays;
-import java.util.List;
import static org.apache.tinkerpop.gremlin.LoadGraphWith.GraphData.MODERN;
@@ -39,20 +38,14 @@ public abstract class MapValuesTest extends AbstractGremlinProcessTest {
public abstract Traversal<Vertex, Long> get_g_V_outE_valuesXweightX_groupCount_mapValues();
- public abstract Traversal<Vertex, Long> get_g_V_outE_valuesXweightX_groupCount_unfold_mapValues();
-
public abstract Traversal<Vertex, Long> get_g_V_outE_valuesXweightX_groupCount_mapValues_groupCount_mapValues();
@Test
@LoadGraphWith(MODERN)
public void g_V_outE_valuesXweightX_groupCount_mapValues() {
- final List<Traversal<Vertex, Long>> traversals = Arrays.asList(
- get_g_V_outE_valuesXweightX_groupCount_mapValues(),
- get_g_V_outE_valuesXweightX_groupCount_unfold_mapValues());
- for (final Traversal<Vertex, Long> traversal : traversals) {
- printTraversalForm(traversal);
- checkResults(Arrays.asList(1l, 1l, 2l, 2l), traversal);
- }
+ final Traversal<Vertex, Long> traversal = get_g_V_outE_valuesXweightX_groupCount_mapValues();
+ printTraversalForm(traversal);
+ checkResults(Arrays.asList(1l, 1l, 2l, 2l), traversal);
}
@Test
@@ -71,11 +64,6 @@ public abstract class MapValuesTest extends AbstractGremlinProcessTest {
}
@Override
- public Traversal<Vertex, Long> get_g_V_outE_valuesXweightX_groupCount_unfold_mapValues() {
- return g.V().outE().values("weight").groupCount().unfold().mapValues();
- }
-
- @Override
public Traversal<Vertex, Long> get_g_V_outE_valuesXweightX_groupCount_mapValues_groupCount_mapValues() {
return g.V().outE().values("weight").groupCount().mapValues().groupCount().mapValues();
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/6902e68a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MatchTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MatchTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MatchTest.java
index ff657ef..4f8d582 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MatchTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MatchTest.java
@@ -53,8 +53,6 @@ import static org.junit.Assert.*;
@RunWith(GremlinProcessRunner.class)
public abstract class MatchTest extends AbstractGremlinProcessTest {
- public abstract Traversal<Vertex, Map<String, Object>> get_g_V_valueMap_matchXa_selectXnameX_bX();
-
// very basic query
public abstract Traversal<Vertex, Map<String, Vertex>> get_g_V_matchXa_out_bX();
@@ -136,22 +134,6 @@ public abstract class MatchTest extends AbstractGremlinProcessTest {
@Test
@LoadGraphWith(MODERN)
- public void g_V_valueMap_matchXa_selectXnameX_bX() {
- final Traversal<Vertex, Map<String, Object>> traversal = get_g_V_valueMap_matchXa_selectXnameX_bX();
- printTraversalForm(traversal);
- int counter = 0;
- while (traversal.hasNext()) {
- counter++;
- final Map<String, Object> map = traversal.next();
- assertTrue(Map.class.isAssignableFrom(map.get("a").getClass()));
- final String name = ((Map<String,List<String>>) map.get("a")).get("name").get(0);
- assertEquals(name, ((List<String>) map.get("b")).get(0));
- }
- assertEquals(6, counter);
- }
-
- @Test
- @LoadGraphWith(MODERN)
public void g_V_matchXa_out_bX() throws Exception {
final Traversal<Vertex, Map<String, Vertex>> traversal = get_g_V_matchXa_out_bX();
printTraversalForm(traversal);
@@ -487,11 +469,6 @@ public abstract class MatchTest extends AbstractGremlinProcessTest {
public abstract static class Traversals extends MatchTest {
@Override
- public Traversal<Vertex, Map<String, Object>> get_g_V_valueMap_matchXa_selectXnameX_bX() {
- return g.V().valueMap().match(as("a").select("name").as("b"));
- }
-
- @Override
public Traversal<Vertex, Map<String, Vertex>> get_g_V_matchXa_out_bX() {
return g.V().match(as("a").out().as("b"));
}
@@ -544,7 +521,7 @@ public abstract class MatchTest extends AbstractGremlinProcessTest {
return g.V().match(
as("a").out("created").has("name", "lop").as("b"),
as("b").in("created").has("age", 29).as("c"))
- .where(__.<Vertex>as("c").repeat(out()).times(2)).select("a", "b", "c");
+ .where(__.<Vertex>as("c").repeat(out()).times(2)).select("a","b","c");
}
@Override
@@ -574,7 +551,7 @@ public abstract class MatchTest extends AbstractGremlinProcessTest {
as("b").out("created").has("name", "lop"),
as("b").match(
as("b").out("created").as("d"),
- as("d").in("created").as("c")).select("c").as("c")).<Vertex>select("a", "b", "c");
+ as("d").in("created").as("c")).select("c").as("c")).<Vertex>select("a","b","c");
}
@Override
@@ -629,7 +606,7 @@ public abstract class MatchTest extends AbstractGremlinProcessTest {
public Traversal<Vertex, Map<String, String>> get_g_V_matchXa_created_b__c_created_bX_selectXa_b_cX_byXnameX() {
return g.V().match(
as("a").out("created").as("b"),
- as("c").out("created").as("b")).<String>select("a", "b", "c").by("name");
+ as("c").out("created").as("b")).<String>select("a","b","c").by("name");
}
@Override
@@ -650,7 +627,7 @@ public abstract class MatchTest extends AbstractGremlinProcessTest {
),
as("b").in("created").as("c"),
as("b").in("created").count().is(P.gt(1)))
- .select("a", "b", "c").by(T.id);
+ .select("a","b","c").by(T.id);
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/6902e68a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/UnfoldTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/UnfoldTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/UnfoldTest.java
index 88eda53..537b27d 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/UnfoldTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/UnfoldTest.java
@@ -22,15 +22,19 @@ import org.apache.tinkerpop.gremlin.LoadGraphWith;
import org.apache.tinkerpop.gremlin.process.AbstractGremlinProcessTest;
import org.apache.tinkerpop.gremlin.process.GremlinProcessRunner;
import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
+import org.apache.tinkerpop.gremlin.process.traversal.TraversalEngine;
import org.apache.tinkerpop.gremlin.structure.Edge;
import org.apache.tinkerpop.gremlin.structure.Vertex;
import org.junit.Test;
import org.junit.runner.RunWith;
-import java.util.*;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
import static org.apache.tinkerpop.gremlin.LoadGraphWith.GraphData.MODERN;
-import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.*;
+import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.outE;
import static org.junit.Assert.*;
/**
@@ -43,8 +47,6 @@ public abstract class UnfoldTest extends AbstractGremlinProcessTest {
public abstract Traversal<Vertex, String> get_g_V_valueMap_unfold_mapXkeyX();
- public abstract Traversal<Vertex, String> get_g_VX1X_repeatXboth_simplePathX_untilXhasIdX6XX_path_byXnameX_unfold(final Object v1Id, final Object v6Id);
-
@Test
@LoadGraphWith(MODERN)
public void g_V_localXoutE_foldX_unfold() {
@@ -90,15 +92,6 @@ public abstract class UnfoldTest extends AbstractGremlinProcessTest {
assertFalse(traversal.hasNext());
}
- @Test
- @LoadGraphWith(MODERN)
- public void g_VX1X_repeatXboth_simplePathX_untilXhasIdX6XX_path_byXnameX_unfold() {
- final Traversal<Vertex, String> traversal = get_g_VX1X_repeatXboth_simplePathX_untilXhasIdX6XX_path_byXnameX_unfold(
- convertToVertexId("marko"), convertToVertexId("peter"));
- printTraversalForm(traversal);
- checkResults(Arrays.asList("marko", "lop", "peter", "marko", "josh", "lop", "peter"), traversal);
- }
-
public static class Traversals extends UnfoldTest {
@Override
@@ -110,10 +103,5 @@ public abstract class UnfoldTest extends AbstractGremlinProcessTest {
public Traversal<Vertex, String> get_g_V_valueMap_unfold_mapXkeyX() {
return g.V().valueMap().<Map.Entry<String, List>>unfold().map(m -> m.get().getKey());
}
-
- @Override
- public Traversal<Vertex, String> get_g_VX1X_repeatXboth_simplePathX_untilXhasIdX6XX_path_byXnameX_unfold(Object v1Id, Object v6Id) {
- return g.V(v1Id).repeat(both().simplePath()).until(hasId(v6Id)).path().by("name").unfold();
- }
}
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/6902e68a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/VertexTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/VertexTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/VertexTest.java
index 73bb8b8..f23c2c7 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/VertexTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/VertexTest.java
@@ -21,15 +21,14 @@ package org.apache.tinkerpop.gremlin.process.traversal.step.map;
import org.apache.tinkerpop.gremlin.LoadGraphWith;
import org.apache.tinkerpop.gremlin.process.AbstractGremlinProcessTest;
import org.apache.tinkerpop.gremlin.process.GremlinProcessRunner;
-import org.apache.tinkerpop.gremlin.process.traversal.P;
import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
import org.apache.tinkerpop.gremlin.structure.Direction;
import org.apache.tinkerpop.gremlin.structure.Edge;
+import org.apache.tinkerpop.gremlin.process.traversal.P;
import org.apache.tinkerpop.gremlin.structure.Vertex;
import org.junit.Test;
import org.junit.runner.RunWith;
-import java.util.Arrays;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
@@ -47,10 +46,6 @@ import static org.junit.Assert.*;
@RunWith(GremlinProcessRunner.class)
public abstract class VertexTest extends AbstractGremlinProcessTest {
- public abstract Traversal<Vertex, String> get_g_VXlistXv1_v2_v3XX_name();
-
- public abstract Traversal<Vertex, String> get_g_VXlistX1_2_3XX_name();
-
public abstract Traversal<Vertex, Vertex> get_g_V();
public abstract Traversal<Vertex, Vertex> get_g_VX1X_out(final Object v1Id);
@@ -103,17 +98,6 @@ public abstract class VertexTest extends AbstractGremlinProcessTest {
public abstract Traversal<Vertex, Vertex> get_g_VX1X_to_XOUT_knowsX(final Object v1Id);
- // GRAPH VERTEX/EDGE
-
- @Test
- @LoadGraphWith(MODERN)
- public void g_VXlistX1_2_3XX_name() {
- Arrays.asList(get_g_VXlistX1_2_3XX_name(), get_g_VXlistXv1_v2_v3XX_name()).forEach(traversal -> {
- printTraversalForm(traversal);
- checkResults(Arrays.asList("marko", "vadas", "lop"), traversal);
- });
- }
-
// VERTEX ADJACENCY
@Test
@@ -533,17 +517,6 @@ public abstract class VertexTest extends AbstractGremlinProcessTest {
}
public static class Traversals extends VertexTest {
-
- @Override
- public Traversal<Vertex, String> get_g_VXlistXv1_v2_v3XX_name() {
- return g.V(Arrays.asList(convertToVertex(graph, "marko"), convertToVertex(graph, "vadas"), convertToVertex(graph, "lop"))).values("name");
- }
-
- @Override
- public Traversal<Vertex, String> get_g_VXlistX1_2_3XX_name() {
- return g.V(Arrays.asList(convertToVertexId(graph, "marko"), convertToVertexId(graph, "vadas"), convertToVertexId(graph, "lop"))).values("name");
- }
-
@Override
public Traversal<Vertex, Vertex> get_g_V() {
return g.V();
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/6902e68a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/ProfileTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/ProfileTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/ProfileTest.java
index 390678e..0a76d4e 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/ProfileTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/ProfileTest.java
@@ -57,7 +57,7 @@ import static org.junit.Assert.*;
public abstract class ProfileTest extends AbstractGremlinProcessTest {
public abstract Traversal<Vertex, Vertex> get_g_V_out_out_profile();
- public abstract Traversal<Vertex, Vertex> get_g_V_repeatXbothX_timesX3X_profile();
+ public abstract Traversal<Vertex, Vertex> get_g_V_repeat_both_profile();
public abstract Traversal<Vertex, Vertex> get_g_V_sideEffectXThread_sleepX10XX_sideEffectXThread_sleepX5XX_profile();
@@ -189,7 +189,7 @@ public abstract class ProfileTest extends AbstractGremlinProcessTest {
@LoadGraphWith(MODERN)
@IgnoreEngine(TraversalEngine.Type.COMPUTER)
public void g_V_repeat_both_modern_profile() {
- final Traversal<Vertex, Vertex> traversal = get_g_V_repeatXbothX_timesX3X_profile();
+ final Traversal<Vertex, Vertex> traversal = get_g_V_repeat_both_profile();
printTraversalForm(traversal);
traversal.iterate();
@@ -319,7 +319,7 @@ public abstract class ProfileTest extends AbstractGremlinProcessTest {
}
@Override
- public Traversal<Vertex, Vertex> get_g_V_repeatXbothX_timesX3X_profile() {
+ public Traversal<Vertex, Vertex> get_g_V_repeat_both_profile() {
return g.V().repeat(both()).times(3).profile();
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/6902e68a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/TransactionTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/TransactionTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/TransactionTest.java
index 2395d9a..5736be8 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/TransactionTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/TransactionTest.java
@@ -357,11 +357,10 @@ public class TransactionTest extends AbstractGremlinTest {
@FeatureRequirementSet(FeatureRequirementSet.Package.VERTICES_ONLY)
@FeatureRequirement(featureClass = Graph.Features.GraphFeatures.class, feature = Graph.Features.GraphFeatures.FEATURE_TRANSACTIONS)
@FeatureRequirement(featureClass = Graph.Features.GraphFeatures.class, feature = Graph.Features.GraphFeatures.FEATURE_PERSISTENCE)
- public void shouldCommitOnCloseWhenConfigured() throws Exception {
+ public void shouldCommitOnCloseByDefault() throws Exception {
final AtomicReference<Object> oid = new AtomicReference<>();
final Thread t = new Thread(() -> {
final Vertex v1 = graph.addVertex("name", "marko");
- g.tx().onClose(Transaction.CLOSE_BEHAVIOR.COMMIT);
oid.set(v1.id());
graph.tx().close();
});
@@ -376,17 +375,17 @@ public class TransactionTest extends AbstractGremlinTest {
@FeatureRequirementSet(FeatureRequirementSet.Package.VERTICES_ONLY)
@FeatureRequirement(featureClass = Graph.Features.GraphFeatures.class, feature = Graph.Features.GraphFeatures.FEATURE_TRANSACTIONS)
@FeatureRequirement(featureClass = Graph.Features.GraphFeatures.class, feature = Graph.Features.GraphFeatures.FEATURE_PERSISTENCE)
- public void shouldRollbackOnCloseByDefault() throws Exception {
+ public void shouldRollbackOnCloseWhenConfigured() throws Exception {
final AtomicReference<Object> oid = new AtomicReference<>();
final AtomicReference<Vertex> vid = new AtomicReference<>();
final Thread t = new Thread(() -> {
vid.set(graph.addVertex("name", "stephen"));
graph.tx().commit();
- try (Transaction ignored = graph.tx()) {
- final Vertex v1 = graph.addVertex("name", "marko");
- oid.set(v1.id());
- }
+ final Vertex v1 = graph.addVertex("name", "marko");
+ oid.set(v1.id());
+ g.tx().onClose(Transaction.CLOSE_BEHAVIOR.ROLLBACK);
+ graph.tx().close();
});
t.start();
t.join();
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/6902e68a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/IoTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/IoTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/IoTest.java
index cdef5b8..ec27504 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/IoTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/IoTest.java
@@ -79,7 +79,6 @@ import static org.apache.tinkerpop.gremlin.structure.Graph.Features.VertexFeatur
import static org.apache.tinkerpop.gremlin.structure.Graph.Features.VertexPropertyFeatures.*;
import static org.apache.tinkerpop.gremlin.structure.io.IoCore.graphson;
import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
@@ -124,7 +123,7 @@ public class IoTest {
@FeatureRequirement(featureClass = VertexPropertyFeatures.class, feature = FEATURE_LONG_VALUES)
@FeatureRequirement(featureClass = VertexPropertyFeatures.class, feature = FEATURE_DOUBLE_VALUES)
@FeatureRequirement(featureClass = EdgePropertyFeatures.class, feature = EdgePropertyFeatures.FEATURE_FLOAT_VALUES)
- public void shouldReadGraphMLWithAllSupportedDataTypes() throws IOException {
+ public void shouldReadGraphMLAnAllSupportedDataTypes() throws IOException {
final GraphReader reader = GraphMLReader.build().create();
try (final InputStream stream = IoTest.class.getResourceAsStream(TestHelper.convertPackageToResourcePath(GraphMLResourceAccess.class) + "graph-types.xml")) {
reader.readGraph(stream, graph);
@@ -140,49 +139,6 @@ public class IoTest {
assertEquals("junk", v.<String>value("n"));
}
- @Test
- @FeatureRequirement(featureClass = Graph.Features.EdgeFeatures.class, feature = Graph.Features.EdgeFeatures.FEATURE_ADD_EDGES)
- @FeatureRequirement(featureClass = Graph.Features.VertexFeatures.class, feature = Graph.Features.VertexFeatures.FEATURE_ADD_VERTICES)
- @FeatureRequirement(featureClass = VertexPropertyFeatures.class, feature = FEATURE_STRING_VALUES)
- @FeatureRequirement(featureClass = VertexPropertyFeatures.class, feature = FEATURE_INTEGER_VALUES)
- @FeatureRequirement(featureClass = VertexPropertyFeatures.class, feature = FEATURE_FLOAT_VALUES)
- @FeatureRequirement(featureClass = VertexPropertyFeatures.class, feature = FEATURE_BOOLEAN_VALUES)
- @FeatureRequirement(featureClass = VertexPropertyFeatures.class, feature = FEATURE_LONG_VALUES)
- @FeatureRequirement(featureClass = VertexPropertyFeatures.class, feature = FEATURE_DOUBLE_VALUES)
- @FeatureRequirement(featureClass = EdgePropertyFeatures.class, feature = EdgePropertyFeatures.FEATURE_FLOAT_VALUES)
- public void shouldReadGraphMLWithoutStrictOption() throws IOException {
- final GraphReader reader = GraphMLReader.build().strict(false).create();
- try (final InputStream stream = IoTest.class.getResourceAsStream(TestHelper.convertPackageToResourcePath(GraphMLResourceAccess.class) + "graph-types-bad.xml")) {
- reader.readGraph(stream, graph);
- }
-
- final Vertex v = graph.vertices().next();
- assertFalse(v.values("d").hasNext());
- assertEquals("some-string", v.<String>value("s"));
- assertFalse(v.values("i").hasNext());
- assertEquals(false, v.<Boolean>value("b"));
- assertFalse(v.values("f").hasNext());
- assertFalse(v.values("l").hasNext());
- assertEquals("junk", v.<String>value("n"));
- }
-
- @Test(expected = NumberFormatException.class)
- @FeatureRequirement(featureClass = Graph.Features.EdgeFeatures.class, feature = Graph.Features.EdgeFeatures.FEATURE_ADD_EDGES)
- @FeatureRequirement(featureClass = Graph.Features.VertexFeatures.class, feature = Graph.Features.VertexFeatures.FEATURE_ADD_VERTICES)
- @FeatureRequirement(featureClass = VertexPropertyFeatures.class, feature = FEATURE_STRING_VALUES)
- @FeatureRequirement(featureClass = VertexPropertyFeatures.class, feature = FEATURE_INTEGER_VALUES)
- @FeatureRequirement(featureClass = VertexPropertyFeatures.class, feature = FEATURE_FLOAT_VALUES)
- @FeatureRequirement(featureClass = VertexPropertyFeatures.class, feature = FEATURE_BOOLEAN_VALUES)
- @FeatureRequirement(featureClass = VertexPropertyFeatures.class, feature = FEATURE_LONG_VALUES)
- @FeatureRequirement(featureClass = VertexPropertyFeatures.class, feature = FEATURE_DOUBLE_VALUES)
- @FeatureRequirement(featureClass = EdgePropertyFeatures.class, feature = EdgePropertyFeatures.FEATURE_FLOAT_VALUES)
- public void shouldReadGraphMLWithStrictOption() throws IOException {
- final GraphReader reader = GraphMLReader.build().strict(true).create();
- try (final InputStream stream = IoTest.class.getResourceAsStream(TestHelper.convertPackageToResourcePath(GraphMLResourceAccess.class) + "graph-types-bad.xml")) {
- reader.readGraph(stream, graph);
- }
- }
-
/**
* Only need to execute this test with TinkerGraph or other graphs that support user supplied identifiers.
*/
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/6902e68a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphml/graph-types-bad.xml
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphml/graph-types-bad.xml b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphml/graph-types-bad.xml
deleted file mode 100644
index ee4700b..0000000
--- a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphml/graph-types-bad.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<!--
-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.
--->
-<graphml xmlns="http://graphml.graphdrawing.org/xmlns"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://graphml.graphdrawing.org/xmlns
- http://graphml.graphdrawing.org/xmlns/1.0/graphml.xsd">
- <key id="id-d" for="node" attr.name="d" attr.type="double"/>
- <key id="id-s" for="node" attr.name="s" attr.type="string"/>
- <key id="id-i" for="node" attr.name="i" attr.type="int"/>
- <key id="id-b" for="node" attr.name="b" attr.type="boolean"/>
- <key id="id-l" for="node" attr.name="l" attr.type="long"/>
- <key id="id-f" for="node" attr.name="f" attr.type="float"/>
- <key id="id-n" for="node" attr.name="n" attr.type="nothing-supported-and-goes-to-string"/>
- <key id="labelV" for="node" attr.name="labelV" attr.type="string"/>
- <key id="labelE" for="edge" attr.name="labelE" attr.type="string"/>
- <graph id="G" edgedefault="directed">
- <node id="1">
- <data key="id-d"></data>
- <data key="id-s">some-string</data>
- <data key="id-i">not-parseable</data>
- <data key="id-b">blah</data>
- <data key="id-l"></data>
- <data key="id-f"></data>
- <data key="id-n">junk</data>
- <data key="label">default</data>
- </node>
- </graph>
-</graphml>
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/6902e68a/hadoop-gremlin/pom.xml
----------------------------------------------------------------------
diff --git a/hadoop-gremlin/pom.xml b/hadoop-gremlin/pom.xml
index df55f99..ff094c4 100644
--- a/hadoop-gremlin/pom.xml
+++ b/hadoop-gremlin/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
<parent>
<groupId>org.apache.tinkerpop</groupId>
<artifactId>tinkerpop</artifactId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.0.1-SNAPSHOT</version>
</parent>
<artifactId>hadoop-gremlin</artifactId>
<name>Apache TinkerPop :: Hadoop Gremlin</name>
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/6902e68a/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/HadoopGraph.java
----------------------------------------------------------------------
diff --git a/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/HadoopGraph.java b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/HadoopGraph.java
index 18d515e..ee258d0 100644
--- a/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/HadoopGraph.java
+++ b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/HadoopGraph.java
@@ -119,10 +119,6 @@ import java.util.stream.Stream;
method = "g_V_repeatXoutX_timesX8X_count",
reason = "Hadoop-Gremlin is OLAP-oriented and for OLTP operations, linear-scan joins are required. This particular tests takes many minutes to execute.")
@Graph.OptOut(
- test = "org.apache.tinkerpop.gremlin.process.traversal.step.map.CountTest$Traversals",
- method = "g_V_repeatXoutX_timesX5X_asXaX_outXwrittenByX_asXbX_selectXa_bX_count",
- reason = "Hadoop-Gremlin is OLAP-oriented and for OLTP operations, linear-scan joins are required. This particular tests takes many minutes to execute.")
-@Graph.OptOut(
test = "org.apache.tinkerpop.gremlin.process.traversal.step.map.GroovyCountTest$Traversals",
method = "g_V_both_both_count",
reason = "Hadoop-Gremlin is OLAP-oriented and for OLTP operations, linear-scan joins are required. This particular tests takes many minutes to execute.")
@@ -135,10 +131,6 @@ import java.util.stream.Stream;
method = "g_V_repeatXoutX_timesX8X_count",
reason = "Hadoop-Gremlin is OLAP-oriented and for OLTP operations, linear-scan joins are required. This particular tests takes many minutes to execute.")
@Graph.OptOut(
- test = "org.apache.tinkerpop.gremlin.process.traversal.step.map.GroovyCountTest$Traversals",
- method = "g_V_repeatXoutX_timesX5X_asXaX_outXwrittenByX_asXbX_selectXa_bX_count",
- reason = "Hadoop-Gremlin is OLAP-oriented and for OLTP operations, linear-scan joins are required. This particular tests takes many minutes to execute.")
-@Graph.OptOut(
test = "org.apache.tinkerpop.gremlin.process.computer.GraphComputerTest",
method = "shouldNotAllowNullMemoryKeys",
reason = "Giraph does a hard kill on failure and stops threads which stops test cases. Exception handling semantics are correct though.",
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/6902e68a/neo4j-gremlin/pom.xml
----------------------------------------------------------------------
diff --git a/neo4j-gremlin/pom.xml b/neo4j-gremlin/pom.xml
index 8661064..c6349b4 100644
--- a/neo4j-gremlin/pom.xml
+++ b/neo4j-gremlin/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
<parent>
<groupId>org.apache.tinkerpop</groupId>
<artifactId>tinkerpop</artifactId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.0.1-SNAPSHOT</version>
</parent>
<artifactId>neo4j-gremlin</artifactId>
<name>Apache TinkerPop :: Neo4j Gremlin</name>
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/6902e68a/neo4j-gremlin/src/main/java/org/apache/tinkerpop/gremlin/neo4j/process/traversal/step/sideEffect/Neo4jGraphStep.java
----------------------------------------------------------------------
diff --git a/neo4j-gremlin/src/main/java/org/apache/tinkerpop/gremlin/neo4j/process/traversal/step/sideEffect/Neo4jGraphStep.java b/neo4j-gremlin/src/main/java/org/apache/tinkerpop/gremlin/neo4j/process/traversal/step/sideEffect/Neo4jGraphStep.java
index 8b613e4..b2bfbb6 100644
--- a/neo4j-gremlin/src/main/java/org/apache/tinkerpop/gremlin/neo4j/process/traversal/step/sideEffect/Neo4jGraphStep.java
+++ b/neo4j-gremlin/src/main/java/org/apache/tinkerpop/gremlin/neo4j/process/traversal/step/sideEffect/Neo4jGraphStep.java
@@ -47,7 +47,7 @@ public final class Neo4jGraphStep<S extends Element> extends GraphStep<S> implem
super(originalGraphStep.getTraversal(), originalGraphStep.getReturnClass(), originalGraphStep.getIds());
originalGraphStep.getLabels().forEach(this::addLabel);
//No need to do anything if the first element is an Element, all elements are guaranteed to be an element and will be return as is
- if (this.ids.length == 0 || !(this.ids[0] instanceof Element))
+ if ((this.ids.length == 0 || !(this.ids[0] instanceof Element)))
this.setIteratorSupplier(() -> (Iterator<S>) (Vertex.class.isAssignableFrom(this.returnClass) ? this.vertices() : this.edges()));
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/6902e68a/neo4j-gremlin/src/main/java/org/apache/tinkerpop/gremlin/neo4j/structure/Neo4jGraph.java
----------------------------------------------------------------------
diff --git a/neo4j-gremlin/src/main/java/org/apache/tinkerpop/gremlin/neo4j/structure/Neo4jGraph.java b/neo4j-gremlin/src/main/java/org/apache/tinkerpop/gremlin/neo4j/structure/Neo4jGraph.java
index 2ea254c..17b9976 100644
--- a/neo4j-gremlin/src/main/java/org/apache/tinkerpop/gremlin/neo4j/structure/Neo4jGraph.java
+++ b/neo4j-gremlin/src/main/java/org/apache/tinkerpop/gremlin/neo4j/structure/Neo4jGraph.java
@@ -36,7 +36,7 @@ import org.apache.tinkerpop.gremlin.structure.Graph;
import org.apache.tinkerpop.gremlin.structure.Transaction;
import org.apache.tinkerpop.gremlin.structure.Vertex;
import org.apache.tinkerpop.gremlin.structure.VertexProperty;
-import org.apache.tinkerpop.gremlin.structure.util.AbstractThreadLocalTransaction;
+import org.apache.tinkerpop.gremlin.structure.util.AbstractTransaction;
import org.apache.tinkerpop.gremlin.structure.util.ElementHelper;
import org.apache.tinkerpop.gremlin.structure.util.StringFactory;
import org.apache.tinkerpop.gremlin.structure.util.wrapped.WrappedGraph;
@@ -316,7 +316,7 @@ public final class Neo4jGraph implements Graph, WrappedGraph<Neo4jGraphAPI> {
return traversal;
}
- class Neo4jTransaction extends AbstractThreadLocalTransaction {
+ class Neo4jTransaction extends AbstractTransaction {
protected final ThreadLocal<Neo4jTx> threadLocalTx = ThreadLocal.withInitial(() -> null);
@@ -344,6 +344,10 @@ public final class Neo4jGraph implements Graph, WrappedGraph<Neo4jGraphAPI> {
@Override
public void doRollback() throws TransactionException {
try {
+// javax.transaction.Transaction t = transactionManager.getTransaction();
+// if (null == t || t.getStatus() == javax.transaction.Status.STATUS_ROLLEDBACK)
+// return;
+
threadLocalTx.get().failure();
} catch (Exception e) {
throw new TransactionException(e);
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/6902e68a/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 769f84f..a9b34e5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@ limitations under the License.
</parent>
<groupId>org.apache.tinkerpop</groupId>
<artifactId>tinkerpop</artifactId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.0.1-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Apache TinkerPop</name>
<description>A Graph Computing Framework</description>
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/6902e68a/tinkergraph-gremlin/pom.xml
----------------------------------------------------------------------
diff --git a/tinkergraph-gremlin/pom.xml b/tinkergraph-gremlin/pom.xml
index 8676a9d..4f271bc 100644
--- a/tinkergraph-gremlin/pom.xml
+++ b/tinkergraph-gremlin/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
<parent>
<groupId>org.apache.tinkerpop</groupId>
<artifactId>tinkerpop</artifactId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.0.1-SNAPSHOT</version>
</parent>
<artifactId>tinkergraph-gremlin</artifactId>
<name>Apache TinkerPop :: TinkerGraph Gremlin</name>
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/6902e68a/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/process/traversal/step/sideEffect/TinkerGraphStep.java
----------------------------------------------------------------------
diff --git a/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/process/traversal/step/sideEffect/TinkerGraphStep.java b/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/process/traversal/step/sideEffect/TinkerGraphStep.java
index 5e154ab..56bac20 100644
--- a/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/process/traversal/step/sideEffect/TinkerGraphStep.java
+++ b/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/process/traversal/step/sideEffect/TinkerGraphStep.java
@@ -49,7 +49,7 @@ public final class TinkerGraphStep<S extends Element> extends GraphStep<S> imple
super(originalGraphStep.getTraversal(), originalGraphStep.getReturnClass(), originalGraphStep.getIds());
originalGraphStep.getLabels().forEach(this::addLabel);
//No need to do anything if the first element is an Element, all elements are guaranteed to be an element and will be return as is
- if (this.ids.length == 0 || !(this.ids[0] instanceof Element))
+ if ((this.ids.length == 0 || !(this.ids[0] instanceof Element)))
this.setIteratorSupplier(() -> (Iterator<S>) (Vertex.class.isAssignableFrom(this.returnClass) ? this.vertices() : this.edges()));
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/6902e68a/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraph.java
----------------------------------------------------------------------
diff --git a/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraph.java b/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraph.java
index 9e0c8ab..37bafb5 100644
--- a/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraph.java
+++ b/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraph.java
@@ -28,7 +28,6 @@ import org.apache.tinkerpop.gremlin.structure.Graph;
import org.apache.tinkerpop.gremlin.structure.Transaction;
import org.apache.tinkerpop.gremlin.structure.Vertex;
import org.apache.tinkerpop.gremlin.structure.VertexProperty;
-import org.apache.tinkerpop.gremlin.structure.io.Io;
import org.apache.tinkerpop.gremlin.structure.util.ElementHelper;
import org.apache.tinkerpop.gremlin.structure.util.GraphFactory;
import org.apache.tinkerpop.gremlin.structure.util.StringFactory;
@@ -180,11 +179,6 @@ public final class TinkerGraph implements Graph {
}
@Override
- public <I extends Io> I io(final Io.Builder<I> builder) {
- return (I) builder.graph(this).registry(TinkerIoRegistry.getInstance()).create();
- }
-
- @Override
public String toString() {
return StringFactory.graphString(this, "vertices:" + this.vertices.size() + " edges:" + this.edges.size());
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/6902e68a/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerIoRegistry.java
----------------------------------------------------------------------
diff --git a/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerIoRegistry.java b/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerIoRegistry.java
deleted file mode 100644
index f38564d..0000000
--- a/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerIoRegistry.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * 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.tinkerpop.gremlin.tinkergraph.structure;
-
-import org.apache.tinkerpop.gremlin.structure.io.AbstractIoRegistry;
-import org.apache.tinkerpop.gremlin.structure.io.IoCore;
-import org.apache.tinkerpop.gremlin.structure.io.IoRegistry;
-import org.apache.tinkerpop.gremlin.structure.io.gryo.GryoIo;
-import org.apache.tinkerpop.shaded.kryo.Kryo;
-import org.apache.tinkerpop.shaded.kryo.Serializer;
-import org.apache.tinkerpop.shaded.kryo.io.Input;
-import org.apache.tinkerpop.shaded.kryo.io.Output;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-
-/**
- * An implementation of the {@link IoRegistry} interface that provides serializers with custom configurations for
- * implementation specific classes that might need to be serialized. This registry allows a {@link TinkerGraph} to
- * be serialized directly which is useful for moving small graphs around on the network.
- * <p/>
- * Most vendors need not implement this kind of custom serializer as they will deal with much larger graphs that
- * wouldn't be practical to serialize in this fashion. This is a bit of a special case for TinkerGraph given its
- * in-memory status. Typical implementations would create serializers for a complex vertex identifier or a
- * custom data class like a "geographic point".
- *
- * @author Stephen Mallette (http://stephen.genoprime.com)
- */
-public final class TinkerIoRegistry extends AbstractIoRegistry {
-
- private static final TinkerIoRegistry INSTANCE = new TinkerIoRegistry();
-
- private TinkerIoRegistry() {
- register(GryoIo.class, TinkerGraph.class, new TinkerGraphSerializer());
- }
-
- public static TinkerIoRegistry getInstance() {
- return INSTANCE;
- }
-
- /**
- * Provides a method to serialize an entire {@link TinkerGraph} into itself. This is useful when shipping small
- * graphs around through Gremlin Server.
- */
- final static class TinkerGraphSerializer extends Serializer<TinkerGraph> {
- @Override
- public void write(final Kryo kryo, final Output output, final TinkerGraph graph) {
- try (final ByteArrayOutputStream stream = new ByteArrayOutputStream()) {
- graph.io(IoCore.gryo()).writer().create().writeGraph(stream, graph);
- final byte[] bytes = stream.toByteArray();
- output.writeInt(bytes.length);
- output.write(bytes);
- } catch (Exception io) {
- throw new RuntimeException(io);
- }
- }
-
- @Override
- public TinkerGraph read(final Kryo kryo, final Input input, final Class<TinkerGraph> tinkerGraphClass) {
- final TinkerGraph graph = TinkerGraph.open();
- final int len = input.readInt();
- final byte[] bytes = input.readBytes(len);
- try (final ByteArrayInputStream stream = new ByteArrayInputStream(bytes)) {
- graph.io(IoCore.gryo()).reader().create().readGraph(stream, graph);
- } catch (Exception io) {
- throw new RuntimeException(io);
- }
-
- return graph;
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/6902e68a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphTest.java
----------------------------------------------------------------------
diff --git a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphTest.java b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphTest.java
index 0b33280..6b23710 100644
--- a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphTest.java
+++ b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphTest.java
@@ -30,15 +30,11 @@ import org.apache.tinkerpop.gremlin.structure.Edge;
import org.apache.tinkerpop.gremlin.structure.Graph;
import org.apache.tinkerpop.gremlin.structure.T;
import org.apache.tinkerpop.gremlin.structure.Vertex;
-import org.apache.tinkerpop.gremlin.structure.io.IoCore;
-import org.apache.tinkerpop.gremlin.structure.io.IoTest;
import org.apache.tinkerpop.gremlin.structure.io.graphml.GraphMLIo;
import org.apache.tinkerpop.gremlin.util.TimeUtil;
import org.junit.Ignore;
import org.junit.Test;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
@@ -156,10 +152,18 @@ public class TinkerGraphTest {
public void testPlayDK() throws Exception {
final Graph graph = TinkerFactory.createModern();
final GraphTraversalSource g = graph.traversal();
- Traversal traversal = g.V().dedup().filter(__.out()).has("age", P.gt(0));
+ Traversal traversal = g.V().where(out().and().in()).profile().cap(TraversalMetrics.METRICS_KEY);
+ //traversal.forEachRemaining(System.out::println);
System.out.println(traversal.toString());
- //traversal.asAdmin().applyStrategies();
- System.out.println(traversal.iterate().toString());
+ traversal.asAdmin().applyStrategies();
+ System.out.println(traversal.toString());
+ traversal.forEachRemaining(System.out::println);
+ traversal = g.V().where(and(out(), in())).profile().cap(TraversalMetrics.METRICS_KEY);
+ //traversal.forEachRemaining(System.out::println);
+ System.out.println(traversal.toString());
+ traversal.asAdmin().applyStrategies();
+ System.out.println(traversal.toString());
+ //System.out.println(traversal.toString());
}
@Test
@@ -187,17 +191,25 @@ public class TinkerGraphTest {
@Test
@Ignore
public void testPlay5() throws Exception {
+
TinkerGraph graph = TinkerGraph.open();
graph.createIndex("name",Vertex.class);
graph.io(GraphMLIo.build()).readGraph("/Users/marko/software/tinkerpop/tinkerpop3/data/grateful-dead.xml");
- GraphTraversalSource g = graph.traversal(GraphTraversalSource.computer());
+ GraphTraversalSource g = graph.traversal(GraphTraversalSource.standard());
final Supplier<Traversal<?,?>> traversal = () ->
- g.V().repeat(out()).times(5).as("a").out("writtenBy").as("b").select("a","b").count();
+ g.V().match(
+ as("a").has("name", "Garcia"),
+ as("a").in("writtenBy").as("b"),
+ as("b").out("followedBy").as("c"),
+ as("c").out("writtenBy").as("d"),
+ as("d").where(P.neq("a"))).select("a","b","c","d").by("name");
+
System.out.println(traversal.get());
System.out.println(traversal.get().iterate());
- System.out.println(TimeUtil.clockWithResult(1, () -> traversal.get().next()));
+ traversal.get().forEachRemaining(System.out::println);
+
}
@Test
@@ -447,15 +459,5 @@ public class TinkerGraphTest {
}, 0.5)).has("oid", "1").count().next());
}
- @Test
- public void shouldSerializeTinkerGraphToGryo() throws Exception {
- final TinkerGraph graph = TinkerFactory.createModern();
- try (final ByteArrayOutputStream out = new ByteArrayOutputStream()) {
- graph.io(IoCore.gryo()).writer().create().writeObject(out, graph);
- try (final ByteArrayInputStream inputStream = new ByteArrayInputStream(out.toByteArray())) {
- final TinkerGraph target = graph.io(IoCore.gryo()).reader().create().readObject(inputStream, TinkerGraph.class);
- IoTest.assertModernGraph(target, true, false);
- }
- }
- }
+
}