You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by dk...@apache.org on 2016/11/30 16:53:15 UTC
[1/8] tinkerpop git commit: valueMap should always return string keys
Repository: tinkerpop
Updated Branches:
refs/heads/master 4c6e43d9a -> 686ce61e5
valueMap should always return string keys
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/02a179ca
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/02a179ca
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/02a179ca
Branch: refs/heads/master
Commit: 02a179ca3aba5089faca25f20647ff7dc1de1e6a
Parents: 4fc05e8
Author: jpmoresmau <jp...@moresmau.fr>
Authored: Fri Sep 30 16:49:49 2016 +0200
Committer: jpmoresmau <jp...@moresmau.fr>
Committed: Fri Sep 30 16:49:49 2016 +0200
----------------------------------------------------------------------
.../traversal/step/map/PropertyMapStep.java | 21 ++++++------
.../step/map/GroovyValueMapTest.groovy | 5 +++
.../process/computer/GraphComputerTest.java | 9 ++---
.../traversal/step/map/ValueMapTest.java | 36 ++++++++++++++++++++
4 files changed, 57 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/02a179ca/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/PropertyMapStep.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/PropertyMapStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/PropertyMapStep.java
index 5ab3a17..4cb195f 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/PropertyMapStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/PropertyMapStep.java
@@ -60,18 +60,18 @@ public class PropertyMapStep<E> extends MapStep<Element, Map<String, E>> impleme
@Override
protected Map<String, E> map(final Traverser.Admin<Element> traverser) {
- final Map<Object, Object> map = new HashMap<>();
+ final Map<String, Object> map = new HashMap<>();
final Element element = traverser.get();
final boolean isVertex = traverser.get() instanceof Vertex;
final Iterator<? extends Property> properties = null == this.propertyTraversal ?
- (Iterator) element.properties(this.propertyKeys) :
+ element.properties(this.propertyKeys) :
TraversalUtil.applyAll(traverser, this.propertyTraversal);
while (properties.hasNext()) {
- final Property property = properties.next();
+ final Property<?> property = properties.next();
if (isVertex) {
- List values = (List) map.get(property.key());
+ List<Object> values = (List<Object>) map.get(property.key());
if (null == values) {
- values = new ArrayList();
+ values = new ArrayList<>();
map.put(property.key(), values);
}
values.add(this.returnType == PropertyType.VALUE ? property.value() : property);
@@ -79,13 +79,14 @@ public class PropertyMapStep<E> extends MapStep<Element, Map<String, E>> impleme
map.put(property.key(), this.returnType == PropertyType.VALUE ? property.value() : property);
}
if (this.returnType == PropertyType.VALUE && this.includeTokens) {
+ // add tokens, as string keys
if (element instanceof VertexProperty) {
- map.put(T.id, element.id());
- map.put(T.key, ((VertexProperty) element).key());
- map.put(T.value, ((VertexProperty) element).value());
+ map.put(T.id.getAccessor(), element.id());
+ map.put(T.key.getAccessor(), ((VertexProperty<?>) element).key());
+ map.put(T.value.getAccessor(), ((VertexProperty<?>) element).value());
} else {
- map.put(T.id, element.id());
- map.put(T.label, element.label());
+ map.put(T.id.getAccessor(), element.id());
+ map.put(T.label.getAccessor(), element.label());
}
}
return (Map) map;
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/02a179ca/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyValueMapTest.groovy
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyValueMapTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyValueMapTest.groovy
index c3c20fa..71c57e6 100644
--- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyValueMapTest.groovy
+++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyValueMapTest.groovy
@@ -42,5 +42,10 @@ public abstract class GroovyValueMapTest {
public Traversal<Vertex, Map<String, List<String>>> get_g_VX1X_outXcreatedX_valueMap(final Object v1Id) {
new ScriptTraversal<>(g, "gremlin-groovy", "g.V(v1Id).out('created').valueMap", "v1Id", v1Id)
}
+
+ @Override
+ public Traversal<Vertex, Map<String, Object>> get_g_V_valueMapToken() {
+ new ScriptTraversal<>(g, "gremlin-groovy", "g.V().hasLabel('person').filter(__.outE('created')).valueMap(true)")
+ }
}
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/02a179ca/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/GraphComputerTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/GraphComputerTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/GraphComputerTest.java
index 108550a..2f63abb 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/GraphComputerTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/GraphComputerTest.java
@@ -2346,6 +2346,7 @@ public class GraphComputerTest extends AbstractGremlinProcessTest {
///////////////////////////////////
+
@Test
@LoadGraphWith(MODERN)
public void shouldSucceedWithProperTraverserRequirements() throws Exception {
@@ -2354,8 +2355,8 @@ public class GraphComputerTest extends AbstractGremlinProcessTest {
final Map<String, Object> idsByName = new HashMap<>();
final VertexProgramQ vp = VertexProgramQ.build().from("a").property("coworkers").create();
- g.V().hasLabel("person").filter(outE("created")).valueMap(true, "name").forEachRemaining((Map map) ->
- idsByName.put((String) ((List) map.get("name")).get(0), map.get(id)));
+ g.V().hasLabel("person").filter(outE("created")).valueMap(true, "name").forEachRemaining((Map<String,Object> map) ->
+ idsByName.put((String) ((List) map.get("name")).get(0), map.get(id.getAccessor())));
try {
g.V().as("a").out("created").in("created").program(vp).dedup()
@@ -2388,8 +2389,8 @@ public class GraphComputerTest extends AbstractGremlinProcessTest {
final VertexProgramQ vp = VertexProgramQ.build().from("a").property("coworkers").
useTraverserRequirements(false).create();
- g.V().hasLabel("person").filter(outE("created")).valueMap(true, "name").forEachRemaining((Map map) ->
- idsByName.put((String) ((List) map.get("name")).get(0), map.get(id)));
+ g.V().hasLabel("person").filter(outE("created")).valueMap(true, "name").forEachRemaining((Map<String,Object> map) ->
+ idsByName.put((String) ((List) map.get("name")).get(0), map.get(id.getAccessor())));
try {
g.V().as("a").out("created").in("created").program(vp).dedup()
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/02a179ca/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ValueMapTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ValueMapTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ValueMapTest.java
index 0935945..dfa9700 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ValueMapTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ValueMapTest.java
@@ -23,6 +23,8 @@ 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.process.traversal.dsl.graph.__;
+import org.apache.tinkerpop.gremlin.structure.T;
import org.apache.tinkerpop.gremlin.structure.Vertex;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -31,6 +33,8 @@ import java.util.List;
import java.util.Map;
import static org.apache.tinkerpop.gremlin.LoadGraphWith.GraphData.MODERN;
+import static org.apache.tinkerpop.gremlin.structure.T.id;
+import static org.apache.tinkerpop.gremlin.structure.T.label;
import static org.junit.Assert.*;
/**
@@ -44,6 +48,8 @@ public abstract class ValueMapTest extends AbstractGremlinProcessTest {
public abstract Traversal<Vertex, Map<String, List>> get_g_V_valueMapXname_ageX();
+ public abstract Traversal<Vertex, Map<String, Object>> get_g_V_valueMapToken();
+
public abstract Traversal<Vertex, Map<String, List<String>>> get_g_VX1X_outXcreatedX_valueMap(final Object v1Id);
@Test
@@ -125,6 +131,31 @@ public abstract class ValueMapTest extends AbstractGremlinProcessTest {
}
+ /**
+ * TINKERPOP-1483
+ *
+ */
+ @Test
+ @LoadGraphWith(MODERN)
+ public void valueMapHasStringKeys() {
+ Traversal<Vertex,Map<String,Object>> gt=get_g_V_valueMapToken();
+ int cnt=0;
+ while(gt.hasNext()){
+ Map<String,Object> m=gt.next();
+ assertTrue(m.size()>0);
+ for (Object o:m.keySet()){
+ assertTrue(o instanceof String);
+ assertNotNull(m.get(o));
+ }
+ assertTrue(m.containsKey(id.getAccessor()));
+ assertTrue(m.containsKey(label.getAccessor()));
+ assertEquals("person",m.get(label.getAccessor()));
+ cnt++;
+ }
+ // check we had results
+ assertTrue(cnt>0);
+ }
+
public static class Traversals extends ValueMapTest {
@Override
public Traversal<Vertex, Map<String, List>> get_g_V_valueMap() {
@@ -140,5 +171,10 @@ public abstract class ValueMapTest extends AbstractGremlinProcessTest {
public Traversal<Vertex, Map<String, List<String>>> get_g_VX1X_outXcreatedX_valueMap(final Object v1Id) {
return g.V(v1Id).out("created").valueMap();
}
+
+ @Override
+ public Traversal<Vertex, Map<String, Object>> get_g_V_valueMapToken() {
+ return g.V().hasLabel("person").filter(__.outE("created")).valueMap(true);
+ }
}
}
[5/8] tinkerpop git commit: fix typo
Posted by dk...@apache.org.
fix typo
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/879003c0
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/879003c0
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/879003c0
Branch: refs/heads/master
Commit: 879003c0fc6bd3ce3679047d177ddd6a0abe43b3
Parents: 4eba658
Author: jpmoresmau <jp...@moresmau.fr>
Authored: Mon Nov 28 20:26:58 2016 +0100
Committer: jpmoresmau <jp...@moresmau.fr>
Committed: Mon Nov 28 20:26:58 2016 +0100
----------------------------------------------------------------------
CHANGELOG.asciidoc | 2 +-
docs/src/upgrade/release-3.3.x.asciidoc | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/879003c0/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 475a10d..300d927 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -46,7 +46,7 @@ TinkerPop 3.3.0 (Release Date: NOT OFFICIALLY RELEASED YET)
* Removed `tryRandomCommit()` from `AbstractGremlinTest`.
* Changed `gremlin-benchmark` system property for the report location to `benchmarkReportDir` for consistency.
* Added SysV and systemd init scripts.
-* `valueMap` now returns a `Map<Object,E>` since keys could be `V.id` or `V.label`.
+* `valueMap` now returns a `Map<Object,E>` since keys could be `T.id` or `T.label`.
TinkerPop 3.2.0 (Nine Inch Gremlins)
------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/879003c0/docs/src/upgrade/release-3.3.x.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/upgrade/release-3.3.x.asciidoc b/docs/src/upgrade/release-3.3.x.asciidoc
index c7f84b7..40a3104 100644
--- a/docs/src/upgrade/release-3.3.x.asciidoc
+++ b/docs/src/upgrade/release-3.3.x.asciidoc
@@ -76,7 +76,7 @@ See: link:https://issues.apache.org/jira/browse/TINKERPOP-1283[TINKERPOP-1283]
ValueMap
^^^^^^^^
-`valueMap` now returns a `Map<Object,E>` to account for the presence of `V.id` or `V.label` if you pass `true` to it.
+`valueMap` now returns a `Map<Object,E>` to account for the presence of `T.id` or `T.label` if you pass `true` to it.
See: link:https://issues.apache.org/jira/browse/TINKERPOP-1283[TINKERPOP-1483]
[6/8] tinkerpop git commit: only when passing includeTokens are the
keys Object
Posted by dk...@apache.org.
only when passing includeTokens are the keys Object
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/8f038aa0
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/8f038aa0
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/8f038aa0
Branch: refs/heads/master
Commit: 8f038aa0888d544b8830521644de26bcf9701fdf
Parents: 879003c
Author: jpmoresmau <jp...@moresmau.fr>
Authored: Mon Nov 28 21:13:17 2016 +0100
Committer: jpmoresmau <jp...@moresmau.fr>
Committed: Mon Nov 28 21:13:17 2016 +0100
----------------------------------------------------------------------
CHANGELOG.asciidoc | 2 +-
docs/src/upgrade/release-3.3.x.asciidoc | 6 ++--
.../traversal/dsl/graph/GraphTraversal.java | 2 +-
.../gremlin/process/traversal/dsl/graph/__.java | 2 +-
.../step/map/GroovyPageRankTest.groovy | 8 ++---
.../step/map/GroovyPeerPressureTest.groovy | 2 +-
.../traversal/step/map/GroovyProgramTest.groovy | 2 +-
.../step/map/GroovyValueMapTest.groovy | 6 ++--
.../process/computer/GraphComputerTest.java | 4 +--
.../traversal/step/map/PageRankTest.java | 32 ++++++++++----------
.../traversal/step/map/PeerPressureTest.java | 8 ++---
.../process/traversal/step/map/ProgramTest.java | 8 ++---
.../traversal/step/map/ValueMapTest.java | 24 +++++++--------
13 files changed, 53 insertions(+), 53 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/8f038aa0/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 300d927..dc4e17d 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -46,7 +46,7 @@ TinkerPop 3.3.0 (Release Date: NOT OFFICIALLY RELEASED YET)
* Removed `tryRandomCommit()` from `AbstractGremlinTest`.
* Changed `gremlin-benchmark` system property for the report location to `benchmarkReportDir` for consistency.
* Added SysV and systemd init scripts.
-* `valueMap` now returns a `Map<Object,E>` since keys could be `T.id` or `T.label`.
+* `GraphTraversal.valueMap(includeTokens,propertyKeys...)` now returns a `Map<Object,E>` since keys could be `T.id` or `T.label`.
TinkerPop 3.2.0 (Nine Inch Gremlins)
------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/8f038aa0/docs/src/upgrade/release-3.3.x.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/upgrade/release-3.3.x.asciidoc b/docs/src/upgrade/release-3.3.x.asciidoc
index 40a3104..7d42e6c 100644
--- a/docs/src/upgrade/release-3.3.x.asciidoc
+++ b/docs/src/upgrade/release-3.3.x.asciidoc
@@ -73,10 +73,10 @@ bin/gremlin.sh -e gremlin.groovy
See: link:https://issues.apache.org/jira/browse/TINKERPOP-1283[TINKERPOP-1283]
-ValueMap
-^^^^^^^^
+GraphTraversal valueMap() Signature Updated
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-`valueMap` now returns a `Map<Object,E>` to account for the presence of `T.id` or `T.label` if you pass `true` to it.
+`GraphTraversal.valueMap(includeTokens,propertyKeys...)` now returns a `Map<Object,E>` to account for the presence of `T.id` or `T.label` if you pass `true` to it.
See: link:https://issues.apache.org/jira/browse/TINKERPOP-1283[TINKERPOP-1483]
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/8f038aa0/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java
index 9ab2e81..2ca0cb6 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java
@@ -483,7 +483,7 @@ public interface GraphTraversal<S, E> extends Traversal<S, E> {
* @param <E2> the value type of the returned properties
* @return the traversal with an appended {@link PropertyMapStep}.
*/
- public default <E2> GraphTraversal<S, Map<Object, E2>> valueMap(final String... propertyKeys) {
+ public default <E2> GraphTraversal<S, Map<String, E2>> valueMap(final String... propertyKeys) {
this.asAdmin().getBytecode().addStep(Symbols.valueMap, propertyKeys);
return this.asAdmin().addStep(new PropertyMapStep<>(this.asAdmin(), false, PropertyType.VALUE, propertyKeys));
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/8f038aa0/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/__.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/__.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/__.java
index 1dbf51c..2ec0d0a 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/__.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/__.java
@@ -255,7 +255,7 @@ public class __ {
/**
* @see GraphTraversal#valueMap(String...)
*/
- public static <A, B> GraphTraversal<A, Map<Object, B>> valueMap(final String... propertyKeys) {
+ public static <A, B> GraphTraversal<A, Map<String, B>> valueMap(final String... propertyKeys) {
return __.<A>start().valueMap(propertyKeys);
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/8f038aa0/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyPageRankTest.groovy
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyPageRankTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyPageRankTest.groovy
index 276445d..13787cc 100644
--- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyPageRankTest.groovy
+++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyPageRankTest.groovy
@@ -36,7 +36,7 @@ public abstract class GroovyPageRankTest {
}
@Override
- public Traversal<Vertex, Map<Object, List<Object>>> get_g_V_pageRank_byXoutEXknowsXX_byXfriendRankX_valueMapXname_friendRankX() {
+ public Traversal<Vertex, Map<String, List<Object>>> get_g_V_pageRank_byXoutEXknowsXX_byXfriendRankX_valueMapXname_friendRankX() {
new ScriptTraversal<>(g, "gremlin-groovy", "g.V.pageRank.by(outE('knows')).by('friendRank').valueMap('name','friendRank')")
}
@@ -51,7 +51,7 @@ public abstract class GroovyPageRankTest {
}
@Override
- public Traversal<Vertex, Map<Object, List<Object>>> get_g_V_hasLabelXpersonX_pageRank_byXpageRankX_order_byXpageRankX_valueMapXname_pageRankX() {
+ public Traversal<Vertex, Map<String, List<Object>>> get_g_V_hasLabelXpersonX_pageRank_byXpageRankX_order_byXpageRankX_valueMapXname_pageRankX() {
new ScriptTraversal<>(g, "gremlin-groovy", "g.V.hasLabel('person').pageRank.by('pageRank').order.by('pageRank').valueMap('name', 'pageRank')")
}
@@ -61,7 +61,7 @@ public abstract class GroovyPageRankTest {
}
@Override
- public Traversal<Vertex, Map<Object, List<Object>>> get_g_V_hasLabelXsoftwareX_hasXname_rippleX_pageRankX1X_byXinEXcreatedXX_timesX1X_byXpriorsX_inXcreatedX_unionXboth__identityX_valueMapXname_priorsX() {
+ public Traversal<Vertex, Map<String, List<Object>>> get_g_V_hasLabelXsoftwareX_hasXname_rippleX_pageRankX1X_byXinEXcreatedXX_timesX1X_byXpriorsX_inXcreatedX_unionXboth__identityX_valueMapXname_priorsX() {
new ScriptTraversal<>(g, "gremlin-groovy", "g.V().hasLabel('software').has('name', 'ripple').pageRank(1.0).by(inE('created')).times(1).by('priors').in('created').union(identity(),both()).valueMap('name', 'priors')")
}
@@ -71,7 +71,7 @@ public abstract class GroovyPageRankTest {
}
@Override
- public Traversal<Vertex, Map<Object, List<Object>>> get_g_V_outXcreatedX_pageRank_byXbothEX_byXprojectRankX_timesX0X_valueMapXname_projectRankX() {
+ public Traversal<Vertex, Map<String, List<Object>>> get_g_V_outXcreatedX_pageRank_byXbothEX_byXprojectRankX_timesX0X_valueMapXname_projectRankX() {
new ScriptTraversal<>(g, "gremlin-groovy", "g.V.out('created').pageRank().by(bothE()).by('projectRank').times(0).valueMap('name','projectRank')")
}
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/8f038aa0/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyPeerPressureTest.groovy
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyPeerPressureTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyPeerPressureTest.groovy
index f111077..6ec0750 100644
--- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyPeerPressureTest.groovy
+++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyPeerPressureTest.groovy
@@ -41,7 +41,7 @@ public abstract class GroovyPeerPressureTest {
}
@Override
- public Traversal<Vertex, Map<Object, List<Object>>> get_g_V_hasXname_rippleX_inXcreatedX_peerPressure_byXoutEX_byXclusterX_repeatXunionXidentity__bothX_timesX2X_dedup_valueMapXname_clusterX() {
+ public Traversal<Vertex, Map<String, List<Object>>> get_g_V_hasXname_rippleX_inXcreatedX_peerPressure_byXoutEX_byXclusterX_repeatXunionXidentity__bothX_timesX2X_dedup_valueMapXname_clusterX() {
new ScriptTraversal<>(g, "gremlin-groovy", "g.V.has('name', 'ripple').in('created').peerPressure.by(outE()).by('cluster').repeat(union(identity(), both())).times(2).dedup.valueMap('name', 'cluster')")
}
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/8f038aa0/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyProgramTest.groovy
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyProgramTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyProgramTest.groovy
index d7bfe1e..7abe113 100644
--- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyProgramTest.groovy
+++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyProgramTest.groovy
@@ -36,7 +36,7 @@ public abstract class GroovyProgramTest {
}
@Override
- public Traversal<Vertex, Map<Object, List<Object>>> get_g_V_hasLabelXpersonX_programXpageRank_rankX_order_byXrank_incrX_valueMapXname_rankX() {
+ public Traversal<Vertex, Map<String, List<Object>>> get_g_V_hasLabelXpersonX_programXpageRank_rankX_order_byXrank_incrX_valueMapXname_rankX() {
new ScriptTraversal<>(g, "gremlin-groovy", "g.V.hasLabel('person').program(PageRankVertexProgram.build().property('rank').create(graph)).order.by('rank',incr).valueMap('name','rank')");
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/8f038aa0/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyValueMapTest.groovy
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyValueMapTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyValueMapTest.groovy
index 61e19b4..bda27fd 100644
--- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyValueMapTest.groovy
+++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyValueMapTest.groovy
@@ -29,17 +29,17 @@ public abstract class GroovyValueMapTest {
public static class Traversals extends ValueMapTest {
@Override
- public Traversal<Vertex, Map<Object, List>> get_g_V_valueMap() {
+ public Traversal<Vertex, Map<String, List>> get_g_V_valueMap() {
new ScriptTraversal<>(g, "gremlin-groovy", "g.V.valueMap");
}
@Override
- public Traversal<Vertex, Map<Object, List>> get_g_V_valueMapXname_ageX() {
+ public Traversal<Vertex, Map<String, List>> get_g_V_valueMapXname_ageX() {
new ScriptTraversal<>(g, "gremlin-groovy", "g.V.valueMap('name', 'age')")
}
@Override
- public Traversal<Vertex, Map<Object, List<String>>> get_g_VX1X_outXcreatedX_valueMap(final Object v1Id) {
+ public Traversal<Vertex, Map<String, List<String>>> get_g_VX1X_outXcreatedX_valueMap(final Object v1Id) {
new ScriptTraversal<>(g, "gremlin-groovy", "g.V(v1Id).out('created').valueMap", "v1Id", v1Id)
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/8f038aa0/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/GraphComputerTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/GraphComputerTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/GraphComputerTest.java
index 8b8c720..58fbd9e 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/GraphComputerTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/GraphComputerTest.java
@@ -2360,7 +2360,7 @@ public class GraphComputerTest extends AbstractGremlinProcessTest {
try {
g.V().as("a").out("created").in("created").program(vp).dedup()
- .valueMap("name", "coworkers").forEachRemaining((Map<Object, Object> map) -> {
+ .valueMap("name", "coworkers").forEachRemaining((Map<String, Object> map) -> {
final String name = (String) ((List) map.get("name")).get(0);
final Map<Object, Long> coworkers = (Map<Object, Long>) ((List) map.get("coworkers")).get(0);
@@ -2394,7 +2394,7 @@ public class GraphComputerTest extends AbstractGremlinProcessTest {
try {
g.V().as("a").out("created").in("created").program(vp).dedup()
- .valueMap("name", "coworkers").forEachRemaining((Map<Object, Object> map) -> {
+ .valueMap("name", "coworkers").forEachRemaining((Map<String, Object> map) -> {
final String name = (String) ((List) map.get("name")).get(0);
final Map coworkers = (Map) ((List) map.get("coworkers")).get(0);
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/8f038aa0/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/PageRankTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/PageRankTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/PageRankTest.java
index bbd4329..57a3b3f 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/PageRankTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/PageRankTest.java
@@ -49,19 +49,19 @@ public abstract class PageRankTest extends AbstractGremlinProcessTest {
public abstract Traversal<Vertex, Vertex> get_g_V_pageRank();
- public abstract Traversal<Vertex, Map<Object, List<Object>>> get_g_V_outXcreatedX_pageRank_byXbothEX_byXprojectRankX_timesX0X_valueMapXname_projectRankX();
+ public abstract Traversal<Vertex, Map<String, List<Object>>> get_g_V_outXcreatedX_pageRank_byXbothEX_byXprojectRankX_timesX0X_valueMapXname_projectRankX();
public abstract Traversal<Vertex, String> get_g_V_pageRank_order_byXpageRank_decrX_name();
public abstract Traversal<Vertex, String> get_g_V_pageRank_order_byXpageRank_decrX_name_limitX2X();
- public abstract Traversal<Vertex, Map<Object, List<Object>>> get_g_V_pageRank_byXoutEXknowsXX_byXfriendRankX_valueMapXname_friendRankX();
+ public abstract Traversal<Vertex, Map<String, List<Object>>> get_g_V_pageRank_byXoutEXknowsXX_byXfriendRankX_valueMapXname_friendRankX();
- public abstract Traversal<Vertex, Map<Object, List<Object>>> get_g_V_hasLabelXpersonX_pageRank_byXpageRankX_order_byXpageRankX_valueMapXname_pageRankX();
+ public abstract Traversal<Vertex, Map<String, List<Object>>> get_g_V_hasLabelXpersonX_pageRank_byXpageRankX_order_byXpageRankX_valueMapXname_pageRankX();
public abstract Traversal<Vertex, Map<String, Object>> get_g_V_pageRank_byXpageRankX_asXaX_outXknowsX_pageRank_asXbX_selectXa_bX();
- public abstract Traversal<Vertex, Map<Object, List<Object>>> get_g_V_hasLabelXsoftwareX_hasXname_rippleX_pageRankX1X_byXinEXcreatedXX_timesX1X_byXpriorsX_inXcreatedX_unionXboth__identityX_valueMapXname_priorsX();
+ public abstract Traversal<Vertex, Map<String, List<Object>>> get_g_V_hasLabelXsoftwareX_hasXname_rippleX_pageRankX1X_byXinEXcreatedXX_timesX1X_byXpriorsX_inXcreatedX_unionXboth__identityX_valueMapXname_priorsX();
public abstract Traversal<Vertex, Map<Object, List<Vertex>>> get_g_V_outXcreatedX_groupXmX_byXlabelX_pageRankX1X_byXpageRankX_byXinEX_timesX1X_inXcreatedX_groupXmX_byXpageRankX_capXmX();
@@ -82,9 +82,9 @@ public abstract class PageRankTest extends AbstractGremlinProcessTest {
@Test
@LoadGraphWith(MODERN)
public void g_V_outXcreatedX_pageRank_byXbothEX_byXprojectRankX_valueMapXname_projectRankX() {
- final Traversal<Vertex, Map<Object, List<Object>>> traversal = get_g_V_outXcreatedX_pageRank_byXbothEX_byXprojectRankX_timesX0X_valueMapXname_projectRankX();
+ final Traversal<Vertex, Map<String, List<Object>>> traversal = get_g_V_outXcreatedX_pageRank_byXbothEX_byXprojectRankX_timesX0X_valueMapXname_projectRankX();
printTraversalForm(traversal);
- final List<Map<Object, List<Object>>> result = traversal.toList();
+ final List<Map<String, List<Object>>> result = traversal.toList();
assertEquals(4, result.size());
final Map<String, Double> map = new HashMap<>();
result.forEach(m -> map.put((String) m.get("name").get(0), (Double) m.get("projectRank").get(0)));
@@ -115,11 +115,11 @@ public abstract class PageRankTest extends AbstractGremlinProcessTest {
@Test
@LoadGraphWith(MODERN)
public void g_V_pageRank_byXoutEXknowsXX_byXfriendRankX_valueMapXname_friendRankX() {
- final Traversal<Vertex, Map<Object, List<Object>>> traversal = get_g_V_pageRank_byXoutEXknowsXX_byXfriendRankX_valueMapXname_friendRankX();
+ final Traversal<Vertex, Map<String, List<Object>>> traversal = get_g_V_pageRank_byXoutEXknowsXX_byXfriendRankX_valueMapXname_friendRankX();
printTraversalForm(traversal);
int counter = 0;
while (traversal.hasNext()) {
- final Map<Object, List<Object>> map = traversal.next();
+ final Map<String, List<Object>> map = traversal.next();
assertEquals(2, map.size());
assertEquals(1, map.get("name").size());
assertEquals(1, map.get("friendRank").size());
@@ -149,12 +149,12 @@ public abstract class PageRankTest extends AbstractGremlinProcessTest {
@Test
@LoadGraphWith(MODERN)
public void g_V_hasLabelXpersonX_pageRank_byXpageRankX_order_byXpageRankX_valueMapXname_pageRankX() {
- final Traversal<Vertex, Map<Object, List<Object>>> traversal = get_g_V_hasLabelXpersonX_pageRank_byXpageRankX_order_byXpageRankX_valueMapXname_pageRankX();
+ final Traversal<Vertex, Map<String, List<Object>>> traversal = get_g_V_hasLabelXpersonX_pageRank_byXpageRankX_order_byXpageRankX_valueMapXname_pageRankX();
printTraversalForm(traversal);
int counter = 0;
double lastPageRank = Double.MIN_VALUE;
while (traversal.hasNext()) {
- final Map<Object, List<Object>> map = traversal.next();
+ final Map<String, List<Object>> map = traversal.next();
assertEquals(2, map.size());
assertEquals(1, map.get("name").size());
assertEquals(1, map.get("pageRank").size());
@@ -189,11 +189,11 @@ public abstract class PageRankTest extends AbstractGremlinProcessTest {
@Test
@LoadGraphWith(MODERN)
public void g_V_hasLabelXsoftwareX_hasXname_rippleX_pageRankX1X_byXinEXcreatedXX_timesX1X_byXpriorsX_inXcreatedX_unionXboth__identityX_valueMapXname_priorsX() {
- final Traversal<Vertex, Map<Object, List<Object>>> traversal = get_g_V_hasLabelXsoftwareX_hasXname_rippleX_pageRankX1X_byXinEXcreatedXX_timesX1X_byXpriorsX_inXcreatedX_unionXboth__identityX_valueMapXname_priorsX();
+ final Traversal<Vertex, Map<String, List<Object>>> traversal = get_g_V_hasLabelXsoftwareX_hasXname_rippleX_pageRankX1X_byXinEXcreatedXX_timesX1X_byXpriorsX_inXcreatedX_unionXboth__identityX_valueMapXname_priorsX();
printTraversalForm(traversal);
int counter = 0;
while (traversal.hasNext()) {
- final Map<Object, List<Object>> map = traversal.next();
+ final Map<String, List<Object>> map = traversal.next();
assertEquals(2, map.size());
String name = (String) map.get("name").get(0);
double pageRank = (Double) map.get("priors").get(0);
@@ -246,12 +246,12 @@ public abstract class PageRankTest extends AbstractGremlinProcessTest {
}
@Override
- public Traversal<Vertex, Map<Object, List<Object>>> get_g_V_outXcreatedX_pageRank_byXbothEX_byXprojectRankX_timesX0X_valueMapXname_projectRankX() {
+ public Traversal<Vertex, Map<String, List<Object>>> get_g_V_outXcreatedX_pageRank_byXbothEX_byXprojectRankX_timesX0X_valueMapXname_projectRankX() {
return g.V().out("created").pageRank().by(__.bothE()).by("projectRank").times(0).valueMap("name", "projectRank");
}
@Override
- public Traversal<Vertex, Map<Object, List<Object>>> get_g_V_pageRank_byXoutEXknowsXX_byXfriendRankX_valueMapXname_friendRankX() {
+ public Traversal<Vertex, Map<String, List<Object>>> get_g_V_pageRank_byXoutEXknowsXX_byXfriendRankX_valueMapXname_friendRankX() {
return g.V().pageRank().by(__.outE("knows")).by("friendRank").valueMap("name", "friendRank");
}
@@ -266,7 +266,7 @@ public abstract class PageRankTest extends AbstractGremlinProcessTest {
}
@Override
- public Traversal<Vertex, Map<Object, List<Object>>> get_g_V_hasLabelXpersonX_pageRank_byXpageRankX_order_byXpageRankX_valueMapXname_pageRankX() {
+ public Traversal<Vertex, Map<String, List<Object>>> get_g_V_hasLabelXpersonX_pageRank_byXpageRankX_order_byXpageRankX_valueMapXname_pageRankX() {
return g.V().hasLabel("person").pageRank().by("pageRank").order().by("pageRank").valueMap("name", "pageRank");
}
@@ -276,7 +276,7 @@ public abstract class PageRankTest extends AbstractGremlinProcessTest {
}
@Override
- public Traversal<Vertex, Map<Object, List<Object>>> get_g_V_hasLabelXsoftwareX_hasXname_rippleX_pageRankX1X_byXinEXcreatedXX_timesX1X_byXpriorsX_inXcreatedX_unionXboth__identityX_valueMapXname_priorsX() {
+ public Traversal<Vertex, Map<String, List<Object>>> get_g_V_hasLabelXsoftwareX_hasXname_rippleX_pageRankX1X_byXinEXcreatedXX_timesX1X_byXpriorsX_inXcreatedX_unionXboth__identityX_valueMapXname_priorsX() {
return g.V().hasLabel("software").has("name", "ripple").pageRank(1.0).by(__.inE("created")).times(1).by("priors").in("created").union(__.both(), __.identity()).valueMap("name", "priors");
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/8f038aa0/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/PeerPressureTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/PeerPressureTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/PeerPressureTest.java
index bde8ab9..5a2477c 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/PeerPressureTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/PeerPressureTest.java
@@ -47,7 +47,7 @@ public abstract class PeerPressureTest extends AbstractGremlinProcessTest {
public abstract Traversal<Vertex, Map<Object, Number>> get_g_V_peerPressure_byXclusterX_byXoutEXknowsXX_pageRankX1X_byXrankX_byXoutEXknowsXX_timesX2X_group_byXclusterX_byXrank_sumX_limitX100X();
- public abstract Traversal<Vertex, Map<Object, List<Object>>> get_g_V_hasXname_rippleX_inXcreatedX_peerPressure_byXoutEX_byXclusterX_repeatXunionXidentity__bothX_timesX2X_dedup_valueMapXname_clusterX();
+ public abstract Traversal<Vertex, Map<String, List<Object>>> get_g_V_hasXname_rippleX_inXcreatedX_peerPressure_byXoutEX_byXclusterX_repeatXunionXidentity__bothX_timesX2X_dedup_valueMapXname_clusterX();
@Test
@LoadGraphWith(MODERN)
@@ -80,9 +80,9 @@ public abstract class PeerPressureTest extends AbstractGremlinProcessTest {
@Test
@LoadGraphWith(MODERN)
public void g_V_hasXname_rippleX_inXcreatedX_peerPressure_byXoutEX_byXclusterX_repeatXunionXidentity__bothX_timesX2X_dedup_valueMapXname_clusterX() {
- final Traversal<Vertex, Map<Object, List<Object>>> traversal = get_g_V_hasXname_rippleX_inXcreatedX_peerPressure_byXoutEX_byXclusterX_repeatXunionXidentity__bothX_timesX2X_dedup_valueMapXname_clusterX();
+ final Traversal<Vertex, Map<String, List<Object>>> traversal = get_g_V_hasXname_rippleX_inXcreatedX_peerPressure_byXoutEX_byXclusterX_repeatXunionXidentity__bothX_timesX2X_dedup_valueMapXname_clusterX();
printTraversalForm(traversal);
- final List<Map<Object, List<Object>>> results = traversal.toList();
+ final List<Map<String, List<Object>>> results = traversal.toList();
assertEquals(6, results.size());
final Map<String, Object> clusters = new HashMap<>();
results.forEach(m -> clusters.put((String) m.get("name").get(0), m.get("cluster").get(0)));
@@ -112,7 +112,7 @@ public abstract class PeerPressureTest extends AbstractGremlinProcessTest {
}
@Override
- public Traversal<Vertex, Map<Object, List<Object>>> get_g_V_hasXname_rippleX_inXcreatedX_peerPressure_byXoutEX_byXclusterX_repeatXunionXidentity__bothX_timesX2X_dedup_valueMapXname_clusterX() {
+ public Traversal<Vertex, Map<String, List<Object>>> get_g_V_hasXname_rippleX_inXcreatedX_peerPressure_byXoutEX_byXclusterX_repeatXunionXidentity__bothX_timesX2X_dedup_valueMapXname_clusterX() {
return g.V().has("name", "ripple").in("created").peerPressure().by(__.outE()).by("cluster").repeat(__.union(__.identity(), __.both())).times(2).dedup().valueMap("name", "cluster");
}
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/8f038aa0/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ProgramTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ProgramTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ProgramTest.java
index f86a6ef..5f548da 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ProgramTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ProgramTest.java
@@ -70,7 +70,7 @@ public abstract class ProgramTest extends AbstractGremlinProcessTest {
public abstract Traversal<Vertex, Vertex> get_g_V_programXpageRankX();
- public abstract Traversal<Vertex, Map<Object, List<Object>>> get_g_V_hasLabelXpersonX_programXpageRank_rankX_order_byXrank_incrX_valueMapXname_rankX();
+ public abstract Traversal<Vertex, Map<String, List<Object>>> get_g_V_hasLabelXpersonX_programXpageRank_rankX_order_byXrank_incrX_valueMapXname_rankX();
public abstract Traversal<Vertex, Map<String, Object>> get_g_V_outXcreatedX_aggregateXxX_byXlangX_groupCount_programXTestProgramX_asXaX_selectXa_xX();
@@ -91,12 +91,12 @@ public abstract class ProgramTest extends AbstractGremlinProcessTest {
@Test
@LoadGraphWith(MODERN)
public void g_V_hasLabelXpersonX_programXpageRank_rankX_order_byXrank_decrX_valueMapXname_rankX() {
- final Traversal<Vertex, Map<Object, List<Object>>> traversal = get_g_V_hasLabelXpersonX_programXpageRank_rankX_order_byXrank_incrX_valueMapXname_rankX();
+ final Traversal<Vertex, Map<String, List<Object>>> traversal = get_g_V_hasLabelXpersonX_programXpageRank_rankX_order_byXrank_incrX_valueMapXname_rankX();
printTraversalForm(traversal);
int counter = 0;
double lastRank = Double.MIN_VALUE;
while (traversal.hasNext()) {
- final Map<Object, List<Object>> map = traversal.next();
+ final Map<String, List<Object>> map = traversal.next();
assertEquals(2, map.size());
assertEquals(1, map.get("name").size());
assertEquals(1, map.get("rank").size());
@@ -147,7 +147,7 @@ public abstract class ProgramTest extends AbstractGremlinProcessTest {
}
@Override
- public Traversal<Vertex, Map<Object, List<Object>>> get_g_V_hasLabelXpersonX_programXpageRank_rankX_order_byXrank_incrX_valueMapXname_rankX() {
+ public Traversal<Vertex, Map<String, List<Object>>> get_g_V_hasLabelXpersonX_programXpageRank_rankX_order_byXrank_incrX_valueMapXname_rankX() {
return g.V().hasLabel("person").program(PageRankVertexProgram.build().property("rank").create(graph)).order().by("rank", Order.incr).valueMap("name", "rank");
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/8f038aa0/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ValueMapTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ValueMapTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ValueMapTest.java
index 14c7902..6ab0852 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ValueMapTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ValueMapTest.java
@@ -44,23 +44,23 @@ import static org.junit.Assert.*;
@RunWith(GremlinProcessRunner.class)
public abstract class ValueMapTest extends AbstractGremlinProcessTest {
- public abstract Traversal<Vertex, Map<Object, List>> get_g_V_valueMap();
+ public abstract Traversal<Vertex, Map<String, List>> get_g_V_valueMap();
- public abstract Traversal<Vertex, Map<Object, List>> get_g_V_valueMapXname_ageX();
+ public abstract Traversal<Vertex, Map<String, List>> get_g_V_valueMapXname_ageX();
public abstract Traversal<Vertex, Map<Object, Object>> get_g_V_valueMapToken();
- public abstract Traversal<Vertex, Map<Object, List<String>>> get_g_VX1X_outXcreatedX_valueMap(final Object v1Id);
+ public abstract Traversal<Vertex, Map<String, List<String>>> get_g_VX1X_outXcreatedX_valueMap(final Object v1Id);
@Test
@LoadGraphWith(MODERN)
public void g_V_valueMap() {
- final Traversal<Vertex, Map<Object, List>> traversal = get_g_V_valueMap();
+ final Traversal<Vertex, Map<String, List>> traversal = get_g_V_valueMap();
printTraversalForm(traversal);
int counter = 0;
while (traversal.hasNext()) {
counter++;
- final Map<Object, List> values = traversal.next();
+ final Map<String, List> values = traversal.next();
final String name = (String) values.get("name").get(0);
assertEquals(2, values.size());
if (name.equals("marko")) {
@@ -85,12 +85,12 @@ public abstract class ValueMapTest extends AbstractGremlinProcessTest {
@Test
@LoadGraphWith(MODERN)
public void g_V_valueMapXname_ageX() {
- final Traversal<Vertex, Map<Object, List>> traversal = get_g_V_valueMapXname_ageX();
+ final Traversal<Vertex, Map<String, List>> traversal = get_g_V_valueMapXname_ageX();
printTraversalForm(traversal);
int counter = 0;
while (traversal.hasNext()) {
counter++;
- final Map<Object, List> values = traversal.next();
+ final Map<String, List> values = traversal.next();
final String name = (String) values.get("name").get(0);
if (name.equals("marko")) {
assertEquals(29, values.get("age").get(0));
@@ -120,10 +120,10 @@ public abstract class ValueMapTest extends AbstractGremlinProcessTest {
@Test
@LoadGraphWith(MODERN)
public void g_VX1X_outXcreatedX_valueMap() {
- final Traversal<Vertex, Map<Object, List<String>>> traversal = get_g_VX1X_outXcreatedX_valueMap(convertToVertexId("marko"));
+ final Traversal<Vertex, Map<String, List<String>>> traversal = get_g_VX1X_outXcreatedX_valueMap(convertToVertexId("marko"));
printTraversalForm(traversal);
assertTrue(traversal.hasNext());
- final Map<Object, List<String>> values = traversal.next();
+ final Map<String, List<String>> values = traversal.next();
assertFalse(traversal.hasNext());
assertEquals("lop", values.get("name").get(0));
assertEquals("java", values.get("lang").get(0));
@@ -157,17 +157,17 @@ public abstract class ValueMapTest extends AbstractGremlinProcessTest {
public static class Traversals extends ValueMapTest {
@Override
- public Traversal<Vertex, Map<Object, List>> get_g_V_valueMap() {
+ public Traversal<Vertex, Map<String, List>> get_g_V_valueMap() {
return g.V().valueMap();
}
@Override
- public Traversal<Vertex, Map<Object, List>> get_g_V_valueMapXname_ageX() {
+ public Traversal<Vertex, Map<String, List>> get_g_V_valueMapXname_ageX() {
return g.V().valueMap("name", "age");
}
@Override
- public Traversal<Vertex, Map<Object, List<String>>> get_g_VX1X_outXcreatedX_valueMap(final Object v1Id) {
+ public Traversal<Vertex, Map<String, List<String>>> get_g_VX1X_outXcreatedX_valueMap(final Object v1Id) {
return g.V(v1Id).out("created").valueMap();
}
[2/8] tinkerpop git commit: signature change: valueMap returns Object
keys
Posted by dk...@apache.org.
signature change: valueMap returns Object keys
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/4af23871
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/4af23871
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/4af23871
Branch: refs/heads/master
Commit: 4af23871e38ee96c38e184edbd0f9ccc4c91267a
Parents: 02a179c
Author: jpmoresmau <jp...@moresmau.fr>
Authored: Wed Nov 23 21:54:12 2016 +0100
Committer: jpmoresmau <jp...@moresmau.fr>
Committed: Wed Nov 23 21:54:12 2016 +0100
----------------------------------------------------------------------
.../traversal/dsl/graph/GraphTraversal.java | 4 +-
.../gremlin/process/traversal/dsl/graph/__.java | 4 +-
.../traversal/step/map/PropertyMapStep.java | 20 +++++-----
.../process/computer/GraphComputerTest.java | 10 ++---
.../traversal/step/map/PageRankTest.java | 32 +++++++--------
.../traversal/step/map/PeerPressureTest.java | 8 ++--
.../process/traversal/step/map/ProgramTest.java | 8 ++--
.../process/traversal/step/map/SelectTest.java | 4 +-
.../traversal/step/map/ValueMapTest.java | 41 ++++++++++----------
9 files changed, 65 insertions(+), 66 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/4af23871/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java
index c8af8ca..9d1187f 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java
@@ -482,7 +482,7 @@ public interface GraphTraversal<S, E> extends Traversal<S, E> {
* @param <E2> the value type of the returned properties
* @return the traversal with an appended {@link PropertyMapStep}.
*/
- public default <E2> GraphTraversal<S, Map<String, E2>> valueMap(final String... propertyKeys) {
+ public default <E2> GraphTraversal<S, Map<Object, E2>> valueMap(final String... propertyKeys) {
this.asAdmin().getBytecode().addStep(Symbols.valueMap, propertyKeys);
return this.asAdmin().addStep(new PropertyMapStep<>(this.asAdmin(), false, PropertyType.VALUE, propertyKeys));
}
@@ -496,7 +496,7 @@ public interface GraphTraversal<S, E> extends Traversal<S, E> {
* @param <E2> the value type of the returned properties
* @return the traversal with an appended {@link PropertyMapStep}.
*/
- public default <E2> GraphTraversal<S, Map<String, E2>> valueMap(final boolean includeTokens, final String... propertyKeys) {
+ public default <E2> GraphTraversal<S, Map<Object, E2>> valueMap(final boolean includeTokens, final String... propertyKeys) {
this.asAdmin().getBytecode().addStep(Symbols.valueMap, includeTokens, propertyKeys);
return this.asAdmin().addStep(new PropertyMapStep<>(this.asAdmin(), includeTokens, PropertyType.VALUE, propertyKeys));
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/4af23871/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/__.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/__.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/__.java
index 1349633..30a4050 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/__.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/__.java
@@ -255,14 +255,14 @@ public class __ {
/**
* @see GraphTraversal#valueMap(String...)
*/
- public static <A, B> GraphTraversal<A, Map<String, B>> valueMap(final String... propertyKeys) {
+ public static <A, B> GraphTraversal<A, Map<Object, B>> valueMap(final String... propertyKeys) {
return __.<A>start().valueMap(propertyKeys);
}
/**
* @see GraphTraversal#valueMap(boolean, String...)
*/
- public static <A, B> GraphTraversal<A, Map<String, B>> valueMap(final boolean includeTokens, final String... propertyKeys) {
+ public static <A, B> GraphTraversal<A, Map<Object, B>> valueMap(final boolean includeTokens, final String... propertyKeys) {
return __.<A>start().valueMap(includeTokens, propertyKeys);
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/4af23871/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/PropertyMapStep.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/PropertyMapStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/PropertyMapStep.java
index 4cb195f..9ac7d3d 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/PropertyMapStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/PropertyMapStep.java
@@ -43,7 +43,7 @@ import java.util.Set;
/**
* @author Marko A. Rodriguez (http://markorodriguez.com)
*/
-public class PropertyMapStep<E> extends MapStep<Element, Map<String, E>> implements TraversalParent {
+public class PropertyMapStep<K,E> extends MapStep<Element, Map<K, E>> implements TraversalParent {
protected final String[] propertyKeys;
protected final PropertyType returnType;
@@ -59,8 +59,8 @@ public class PropertyMapStep<E> extends MapStep<Element, Map<String, E>> impleme
}
@Override
- protected Map<String, E> map(final Traverser.Admin<Element> traverser) {
- final Map<String, Object> map = new HashMap<>();
+ protected Map<K, E> map(final Traverser.Admin<Element> traverser) {
+ final Map<Object, Object> map = new HashMap<>();
final Element element = traverser.get();
final boolean isVertex = traverser.get() instanceof Vertex;
final Iterator<? extends Property> properties = null == this.propertyTraversal ?
@@ -81,12 +81,12 @@ public class PropertyMapStep<E> extends MapStep<Element, Map<String, E>> impleme
if (this.returnType == PropertyType.VALUE && this.includeTokens) {
// add tokens, as string keys
if (element instanceof VertexProperty) {
- map.put(T.id.getAccessor(), element.id());
- map.put(T.key.getAccessor(), ((VertexProperty<?>) element).key());
- map.put(T.value.getAccessor(), ((VertexProperty<?>) element).value());
+ map.put(T.id, element.id());
+ map.put(T.key, ((VertexProperty<?>) element).key());
+ map.put(T.value, ((VertexProperty<?>) element).value());
} else {
- map.put(T.id.getAccessor(), element.id());
- map.put(T.label.getAccessor(), element.label());
+ map.put(T.id, element.id());
+ map.put(T.label, element.label());
}
}
return (Map) map;
@@ -120,8 +120,8 @@ public class PropertyMapStep<E> extends MapStep<Element, Map<String, E>> impleme
}
@Override
- public PropertyMapStep<E> clone() {
- final PropertyMapStep<E> clone = (PropertyMapStep<E>) super.clone();
+ public PropertyMapStep<K,E> clone() {
+ final PropertyMapStep<K,E> clone = (PropertyMapStep<K,E>) super.clone();
if (null != this.propertyTraversal)
clone.propertyTraversal = this.propertyTraversal.clone();
return clone;
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/4af23871/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/GraphComputerTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/GraphComputerTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/GraphComputerTest.java
index 2f63abb..8b8c720 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/GraphComputerTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/GraphComputerTest.java
@@ -2355,12 +2355,12 @@ public class GraphComputerTest extends AbstractGremlinProcessTest {
final Map<String, Object> idsByName = new HashMap<>();
final VertexProgramQ vp = VertexProgramQ.build().from("a").property("coworkers").create();
- g.V().hasLabel("person").filter(outE("created")).valueMap(true, "name").forEachRemaining((Map<String,Object> map) ->
- idsByName.put((String) ((List) map.get("name")).get(0), map.get(id.getAccessor())));
+ g.V().hasLabel("person").filter(outE("created")).valueMap(true, "name").forEachRemaining((Map<Object,Object> map) ->
+ idsByName.put((String) ((List) map.get("name")).get(0), map.get(id)));
try {
g.V().as("a").out("created").in("created").program(vp).dedup()
- .valueMap("name", "coworkers").forEachRemaining((Map<String, Object> map) -> {
+ .valueMap("name", "coworkers").forEachRemaining((Map<Object, Object> map) -> {
final String name = (String) ((List) map.get("name")).get(0);
final Map<Object, Long> coworkers = (Map<Object, Long>) ((List) map.get("coworkers")).get(0);
@@ -2389,12 +2389,12 @@ public class GraphComputerTest extends AbstractGremlinProcessTest {
final VertexProgramQ vp = VertexProgramQ.build().from("a").property("coworkers").
useTraverserRequirements(false).create();
- g.V().hasLabel("person").filter(outE("created")).valueMap(true, "name").forEachRemaining((Map<String,Object> map) ->
+ g.V().hasLabel("person").filter(outE("created")).valueMap(true, "name").forEachRemaining((Map<Object,Object> map) ->
idsByName.put((String) ((List) map.get("name")).get(0), map.get(id.getAccessor())));
try {
g.V().as("a").out("created").in("created").program(vp).dedup()
- .valueMap("name", "coworkers").forEachRemaining((Map<String, Object> map) -> {
+ .valueMap("name", "coworkers").forEachRemaining((Map<Object, Object> map) -> {
final String name = (String) ((List) map.get("name")).get(0);
final Map coworkers = (Map) ((List) map.get("coworkers")).get(0);
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/4af23871/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/PageRankTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/PageRankTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/PageRankTest.java
index 57a3b3f..bbd4329 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/PageRankTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/PageRankTest.java
@@ -49,19 +49,19 @@ public abstract class PageRankTest extends AbstractGremlinProcessTest {
public abstract Traversal<Vertex, Vertex> get_g_V_pageRank();
- public abstract Traversal<Vertex, Map<String, List<Object>>> get_g_V_outXcreatedX_pageRank_byXbothEX_byXprojectRankX_timesX0X_valueMapXname_projectRankX();
+ public abstract Traversal<Vertex, Map<Object, List<Object>>> get_g_V_outXcreatedX_pageRank_byXbothEX_byXprojectRankX_timesX0X_valueMapXname_projectRankX();
public abstract Traversal<Vertex, String> get_g_V_pageRank_order_byXpageRank_decrX_name();
public abstract Traversal<Vertex, String> get_g_V_pageRank_order_byXpageRank_decrX_name_limitX2X();
- public abstract Traversal<Vertex, Map<String, List<Object>>> get_g_V_pageRank_byXoutEXknowsXX_byXfriendRankX_valueMapXname_friendRankX();
+ public abstract Traversal<Vertex, Map<Object, List<Object>>> get_g_V_pageRank_byXoutEXknowsXX_byXfriendRankX_valueMapXname_friendRankX();
- public abstract Traversal<Vertex, Map<String, List<Object>>> get_g_V_hasLabelXpersonX_pageRank_byXpageRankX_order_byXpageRankX_valueMapXname_pageRankX();
+ public abstract Traversal<Vertex, Map<Object, List<Object>>> get_g_V_hasLabelXpersonX_pageRank_byXpageRankX_order_byXpageRankX_valueMapXname_pageRankX();
public abstract Traversal<Vertex, Map<String, Object>> get_g_V_pageRank_byXpageRankX_asXaX_outXknowsX_pageRank_asXbX_selectXa_bX();
- public abstract Traversal<Vertex, Map<String, List<Object>>> get_g_V_hasLabelXsoftwareX_hasXname_rippleX_pageRankX1X_byXinEXcreatedXX_timesX1X_byXpriorsX_inXcreatedX_unionXboth__identityX_valueMapXname_priorsX();
+ public abstract Traversal<Vertex, Map<Object, List<Object>>> get_g_V_hasLabelXsoftwareX_hasXname_rippleX_pageRankX1X_byXinEXcreatedXX_timesX1X_byXpriorsX_inXcreatedX_unionXboth__identityX_valueMapXname_priorsX();
public abstract Traversal<Vertex, Map<Object, List<Vertex>>> get_g_V_outXcreatedX_groupXmX_byXlabelX_pageRankX1X_byXpageRankX_byXinEX_timesX1X_inXcreatedX_groupXmX_byXpageRankX_capXmX();
@@ -82,9 +82,9 @@ public abstract class PageRankTest extends AbstractGremlinProcessTest {
@Test
@LoadGraphWith(MODERN)
public void g_V_outXcreatedX_pageRank_byXbothEX_byXprojectRankX_valueMapXname_projectRankX() {
- final Traversal<Vertex, Map<String, List<Object>>> traversal = get_g_V_outXcreatedX_pageRank_byXbothEX_byXprojectRankX_timesX0X_valueMapXname_projectRankX();
+ final Traversal<Vertex, Map<Object, List<Object>>> traversal = get_g_V_outXcreatedX_pageRank_byXbothEX_byXprojectRankX_timesX0X_valueMapXname_projectRankX();
printTraversalForm(traversal);
- final List<Map<String, List<Object>>> result = traversal.toList();
+ final List<Map<Object, List<Object>>> result = traversal.toList();
assertEquals(4, result.size());
final Map<String, Double> map = new HashMap<>();
result.forEach(m -> map.put((String) m.get("name").get(0), (Double) m.get("projectRank").get(0)));
@@ -115,11 +115,11 @@ public abstract class PageRankTest extends AbstractGremlinProcessTest {
@Test
@LoadGraphWith(MODERN)
public void g_V_pageRank_byXoutEXknowsXX_byXfriendRankX_valueMapXname_friendRankX() {
- final Traversal<Vertex, Map<String, List<Object>>> traversal = get_g_V_pageRank_byXoutEXknowsXX_byXfriendRankX_valueMapXname_friendRankX();
+ final Traversal<Vertex, Map<Object, List<Object>>> traversal = get_g_V_pageRank_byXoutEXknowsXX_byXfriendRankX_valueMapXname_friendRankX();
printTraversalForm(traversal);
int counter = 0;
while (traversal.hasNext()) {
- final Map<String, List<Object>> map = traversal.next();
+ final Map<Object, List<Object>> map = traversal.next();
assertEquals(2, map.size());
assertEquals(1, map.get("name").size());
assertEquals(1, map.get("friendRank").size());
@@ -149,12 +149,12 @@ public abstract class PageRankTest extends AbstractGremlinProcessTest {
@Test
@LoadGraphWith(MODERN)
public void g_V_hasLabelXpersonX_pageRank_byXpageRankX_order_byXpageRankX_valueMapXname_pageRankX() {
- final Traversal<Vertex, Map<String, List<Object>>> traversal = get_g_V_hasLabelXpersonX_pageRank_byXpageRankX_order_byXpageRankX_valueMapXname_pageRankX();
+ final Traversal<Vertex, Map<Object, List<Object>>> traversal = get_g_V_hasLabelXpersonX_pageRank_byXpageRankX_order_byXpageRankX_valueMapXname_pageRankX();
printTraversalForm(traversal);
int counter = 0;
double lastPageRank = Double.MIN_VALUE;
while (traversal.hasNext()) {
- final Map<String, List<Object>> map = traversal.next();
+ final Map<Object, List<Object>> map = traversal.next();
assertEquals(2, map.size());
assertEquals(1, map.get("name").size());
assertEquals(1, map.get("pageRank").size());
@@ -189,11 +189,11 @@ public abstract class PageRankTest extends AbstractGremlinProcessTest {
@Test
@LoadGraphWith(MODERN)
public void g_V_hasLabelXsoftwareX_hasXname_rippleX_pageRankX1X_byXinEXcreatedXX_timesX1X_byXpriorsX_inXcreatedX_unionXboth__identityX_valueMapXname_priorsX() {
- final Traversal<Vertex, Map<String, List<Object>>> traversal = get_g_V_hasLabelXsoftwareX_hasXname_rippleX_pageRankX1X_byXinEXcreatedXX_timesX1X_byXpriorsX_inXcreatedX_unionXboth__identityX_valueMapXname_priorsX();
+ final Traversal<Vertex, Map<Object, List<Object>>> traversal = get_g_V_hasLabelXsoftwareX_hasXname_rippleX_pageRankX1X_byXinEXcreatedXX_timesX1X_byXpriorsX_inXcreatedX_unionXboth__identityX_valueMapXname_priorsX();
printTraversalForm(traversal);
int counter = 0;
while (traversal.hasNext()) {
- final Map<String, List<Object>> map = traversal.next();
+ final Map<Object, List<Object>> map = traversal.next();
assertEquals(2, map.size());
String name = (String) map.get("name").get(0);
double pageRank = (Double) map.get("priors").get(0);
@@ -246,12 +246,12 @@ public abstract class PageRankTest extends AbstractGremlinProcessTest {
}
@Override
- public Traversal<Vertex, Map<String, List<Object>>> get_g_V_outXcreatedX_pageRank_byXbothEX_byXprojectRankX_timesX0X_valueMapXname_projectRankX() {
+ public Traversal<Vertex, Map<Object, List<Object>>> get_g_V_outXcreatedX_pageRank_byXbothEX_byXprojectRankX_timesX0X_valueMapXname_projectRankX() {
return g.V().out("created").pageRank().by(__.bothE()).by("projectRank").times(0).valueMap("name", "projectRank");
}
@Override
- public Traversal<Vertex, Map<String, List<Object>>> get_g_V_pageRank_byXoutEXknowsXX_byXfriendRankX_valueMapXname_friendRankX() {
+ public Traversal<Vertex, Map<Object, List<Object>>> get_g_V_pageRank_byXoutEXknowsXX_byXfriendRankX_valueMapXname_friendRankX() {
return g.V().pageRank().by(__.outE("knows")).by("friendRank").valueMap("name", "friendRank");
}
@@ -266,7 +266,7 @@ public abstract class PageRankTest extends AbstractGremlinProcessTest {
}
@Override
- public Traversal<Vertex, Map<String, List<Object>>> get_g_V_hasLabelXpersonX_pageRank_byXpageRankX_order_byXpageRankX_valueMapXname_pageRankX() {
+ public Traversal<Vertex, Map<Object, List<Object>>> get_g_V_hasLabelXpersonX_pageRank_byXpageRankX_order_byXpageRankX_valueMapXname_pageRankX() {
return g.V().hasLabel("person").pageRank().by("pageRank").order().by("pageRank").valueMap("name", "pageRank");
}
@@ -276,7 +276,7 @@ public abstract class PageRankTest extends AbstractGremlinProcessTest {
}
@Override
- public Traversal<Vertex, Map<String, List<Object>>> get_g_V_hasLabelXsoftwareX_hasXname_rippleX_pageRankX1X_byXinEXcreatedXX_timesX1X_byXpriorsX_inXcreatedX_unionXboth__identityX_valueMapXname_priorsX() {
+ public Traversal<Vertex, Map<Object, List<Object>>> get_g_V_hasLabelXsoftwareX_hasXname_rippleX_pageRankX1X_byXinEXcreatedXX_timesX1X_byXpriorsX_inXcreatedX_unionXboth__identityX_valueMapXname_priorsX() {
return g.V().hasLabel("software").has("name", "ripple").pageRank(1.0).by(__.inE("created")).times(1).by("priors").in("created").union(__.both(), __.identity()).valueMap("name", "priors");
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/4af23871/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/PeerPressureTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/PeerPressureTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/PeerPressureTest.java
index 5a2477c..bde8ab9 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/PeerPressureTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/PeerPressureTest.java
@@ -47,7 +47,7 @@ public abstract class PeerPressureTest extends AbstractGremlinProcessTest {
public abstract Traversal<Vertex, Map<Object, Number>> get_g_V_peerPressure_byXclusterX_byXoutEXknowsXX_pageRankX1X_byXrankX_byXoutEXknowsXX_timesX2X_group_byXclusterX_byXrank_sumX_limitX100X();
- public abstract Traversal<Vertex, Map<String, List<Object>>> get_g_V_hasXname_rippleX_inXcreatedX_peerPressure_byXoutEX_byXclusterX_repeatXunionXidentity__bothX_timesX2X_dedup_valueMapXname_clusterX();
+ public abstract Traversal<Vertex, Map<Object, List<Object>>> get_g_V_hasXname_rippleX_inXcreatedX_peerPressure_byXoutEX_byXclusterX_repeatXunionXidentity__bothX_timesX2X_dedup_valueMapXname_clusterX();
@Test
@LoadGraphWith(MODERN)
@@ -80,9 +80,9 @@ public abstract class PeerPressureTest extends AbstractGremlinProcessTest {
@Test
@LoadGraphWith(MODERN)
public void g_V_hasXname_rippleX_inXcreatedX_peerPressure_byXoutEX_byXclusterX_repeatXunionXidentity__bothX_timesX2X_dedup_valueMapXname_clusterX() {
- final Traversal<Vertex, Map<String, List<Object>>> traversal = get_g_V_hasXname_rippleX_inXcreatedX_peerPressure_byXoutEX_byXclusterX_repeatXunionXidentity__bothX_timesX2X_dedup_valueMapXname_clusterX();
+ final Traversal<Vertex, Map<Object, List<Object>>> traversal = get_g_V_hasXname_rippleX_inXcreatedX_peerPressure_byXoutEX_byXclusterX_repeatXunionXidentity__bothX_timesX2X_dedup_valueMapXname_clusterX();
printTraversalForm(traversal);
- final List<Map<String, List<Object>>> results = traversal.toList();
+ final List<Map<Object, List<Object>>> results = traversal.toList();
assertEquals(6, results.size());
final Map<String, Object> clusters = new HashMap<>();
results.forEach(m -> clusters.put((String) m.get("name").get(0), m.get("cluster").get(0)));
@@ -112,7 +112,7 @@ public abstract class PeerPressureTest extends AbstractGremlinProcessTest {
}
@Override
- public Traversal<Vertex, Map<String, List<Object>>> get_g_V_hasXname_rippleX_inXcreatedX_peerPressure_byXoutEX_byXclusterX_repeatXunionXidentity__bothX_timesX2X_dedup_valueMapXname_clusterX() {
+ public Traversal<Vertex, Map<Object, List<Object>>> get_g_V_hasXname_rippleX_inXcreatedX_peerPressure_byXoutEX_byXclusterX_repeatXunionXidentity__bothX_timesX2X_dedup_valueMapXname_clusterX() {
return g.V().has("name", "ripple").in("created").peerPressure().by(__.outE()).by("cluster").repeat(__.union(__.identity(), __.both())).times(2).dedup().valueMap("name", "cluster");
}
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/4af23871/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ProgramTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ProgramTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ProgramTest.java
index 5f548da..f86a6ef 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ProgramTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ProgramTest.java
@@ -70,7 +70,7 @@ public abstract class ProgramTest extends AbstractGremlinProcessTest {
public abstract Traversal<Vertex, Vertex> get_g_V_programXpageRankX();
- public abstract Traversal<Vertex, Map<String, List<Object>>> get_g_V_hasLabelXpersonX_programXpageRank_rankX_order_byXrank_incrX_valueMapXname_rankX();
+ public abstract Traversal<Vertex, Map<Object, List<Object>>> get_g_V_hasLabelXpersonX_programXpageRank_rankX_order_byXrank_incrX_valueMapXname_rankX();
public abstract Traversal<Vertex, Map<String, Object>> get_g_V_outXcreatedX_aggregateXxX_byXlangX_groupCount_programXTestProgramX_asXaX_selectXa_xX();
@@ -91,12 +91,12 @@ public abstract class ProgramTest extends AbstractGremlinProcessTest {
@Test
@LoadGraphWith(MODERN)
public void g_V_hasLabelXpersonX_programXpageRank_rankX_order_byXrank_decrX_valueMapXname_rankX() {
- final Traversal<Vertex, Map<String, List<Object>>> traversal = get_g_V_hasLabelXpersonX_programXpageRank_rankX_order_byXrank_incrX_valueMapXname_rankX();
+ final Traversal<Vertex, Map<Object, List<Object>>> traversal = get_g_V_hasLabelXpersonX_programXpageRank_rankX_order_byXrank_incrX_valueMapXname_rankX();
printTraversalForm(traversal);
int counter = 0;
double lastRank = Double.MIN_VALUE;
while (traversal.hasNext()) {
- final Map<String, List<Object>> map = traversal.next();
+ final Map<Object, List<Object>> map = traversal.next();
assertEquals(2, map.size());
assertEquals(1, map.get("name").size());
assertEquals(1, map.get("rank").size());
@@ -147,7 +147,7 @@ public abstract class ProgramTest extends AbstractGremlinProcessTest {
}
@Override
- public Traversal<Vertex, Map<String, List<Object>>> get_g_V_hasLabelXpersonX_programXpageRank_rankX_order_byXrank_incrX_valueMapXname_rankX() {
+ public Traversal<Vertex, Map<Object, List<Object>>> get_g_V_hasLabelXpersonX_programXpageRank_rankX_order_byXrank_incrX_valueMapXname_rankX() {
return g.V().hasLabel("person").program(PageRankVertexProgram.build().property("rank").create(graph)).order().by("rank", Order.incr).valueMap("name", "rank");
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/4af23871/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SelectTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SelectTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SelectTest.java
index 6e418b2..302a1c9 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SelectTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SelectTest.java
@@ -783,13 +783,13 @@ public abstract class SelectTest extends AbstractGremlinProcessTest {
@Override
public Traversal<Vertex, Object> get_g_V_valueMap_selectXpop_aX(final Pop pop) {
- final GraphTraversal<Vertex, Map<String, Object>> root = g.V().valueMap();
+ final GraphTraversal<Vertex, Map<Object, Object>> root = g.V().valueMap();
return null == pop ? root.select("a") : root.select(pop, "a");
}
@Override
public Traversal<Vertex, Map<String, Object>> get_g_V_valueMap_selectXpop_a_bX(final Pop pop) {
- final GraphTraversal<Vertex, Map<String, Object>> root = g.V().valueMap();
+ final GraphTraversal<Vertex, Map<Object, Object>> root = g.V().valueMap();
return null == pop ? root.select("a", "b") : root.select(pop, "a", "b");
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/4af23871/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ValueMapTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ValueMapTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ValueMapTest.java
index dfa9700..14c7902 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ValueMapTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ValueMapTest.java
@@ -44,23 +44,23 @@ import static org.junit.Assert.*;
@RunWith(GremlinProcessRunner.class)
public abstract class ValueMapTest extends AbstractGremlinProcessTest {
- public abstract Traversal<Vertex, Map<String, List>> get_g_V_valueMap();
+ public abstract Traversal<Vertex, Map<Object, List>> get_g_V_valueMap();
- public abstract Traversal<Vertex, Map<String, List>> get_g_V_valueMapXname_ageX();
+ public abstract Traversal<Vertex, Map<Object, List>> get_g_V_valueMapXname_ageX();
- public abstract Traversal<Vertex, Map<String, Object>> get_g_V_valueMapToken();
+ public abstract Traversal<Vertex, Map<Object, Object>> get_g_V_valueMapToken();
- public abstract Traversal<Vertex, Map<String, List<String>>> get_g_VX1X_outXcreatedX_valueMap(final Object v1Id);
+ public abstract Traversal<Vertex, Map<Object, List<String>>> get_g_VX1X_outXcreatedX_valueMap(final Object v1Id);
@Test
@LoadGraphWith(MODERN)
public void g_V_valueMap() {
- final Traversal<Vertex, Map<String, List>> traversal = get_g_V_valueMap();
+ final Traversal<Vertex, Map<Object, List>> traversal = get_g_V_valueMap();
printTraversalForm(traversal);
int counter = 0;
while (traversal.hasNext()) {
counter++;
- final Map<String, List> values = traversal.next();
+ final Map<Object, List> values = traversal.next();
final String name = (String) values.get("name").get(0);
assertEquals(2, values.size());
if (name.equals("marko")) {
@@ -85,12 +85,12 @@ public abstract class ValueMapTest extends AbstractGremlinProcessTest {
@Test
@LoadGraphWith(MODERN)
public void g_V_valueMapXname_ageX() {
- final Traversal<Vertex, Map<String, List>> traversal = get_g_V_valueMapXname_ageX();
+ final Traversal<Vertex, Map<Object, List>> traversal = get_g_V_valueMapXname_ageX();
printTraversalForm(traversal);
int counter = 0;
while (traversal.hasNext()) {
counter++;
- final Map<String, List> values = traversal.next();
+ final Map<Object, List> values = traversal.next();
final String name = (String) values.get("name").get(0);
if (name.equals("marko")) {
assertEquals(29, values.get("age").get(0));
@@ -120,10 +120,10 @@ public abstract class ValueMapTest extends AbstractGremlinProcessTest {
@Test
@LoadGraphWith(MODERN)
public void g_VX1X_outXcreatedX_valueMap() {
- final Traversal<Vertex, Map<String, List<String>>> traversal = get_g_VX1X_outXcreatedX_valueMap(convertToVertexId("marko"));
+ final Traversal<Vertex, Map<Object, List<String>>> traversal = get_g_VX1X_outXcreatedX_valueMap(convertToVertexId("marko"));
printTraversalForm(traversal);
assertTrue(traversal.hasNext());
- final Map<String, List<String>> values = traversal.next();
+ final Map<Object, List<String>> values = traversal.next();
assertFalse(traversal.hasNext());
assertEquals("lop", values.get("name").get(0));
assertEquals("java", values.get("lang").get(0));
@@ -137,19 +137,18 @@ public abstract class ValueMapTest extends AbstractGremlinProcessTest {
*/
@Test
@LoadGraphWith(MODERN)
- public void valueMapHasStringKeys() {
- Traversal<Vertex,Map<String,Object>> gt=get_g_V_valueMapToken();
+ public void valueMapHasObjectKeys() {
+ Traversal<Vertex,Map<Object,Object>> gt=get_g_V_valueMapToken();
int cnt=0;
while(gt.hasNext()){
- Map<String,Object> m=gt.next();
+ Map<Object,Object> m=gt.next();
assertTrue(m.size()>0);
for (Object o:m.keySet()){
- assertTrue(o instanceof String);
assertNotNull(m.get(o));
}
- assertTrue(m.containsKey(id.getAccessor()));
- assertTrue(m.containsKey(label.getAccessor()));
- assertEquals("person",m.get(label.getAccessor()));
+ assertTrue(m.containsKey(id));
+ assertTrue(m.containsKey(label));
+ assertEquals("person",m.get(label));
cnt++;
}
// check we had results
@@ -158,22 +157,22 @@ public abstract class ValueMapTest extends AbstractGremlinProcessTest {
public static class Traversals extends ValueMapTest {
@Override
- public Traversal<Vertex, Map<String, List>> get_g_V_valueMap() {
+ public Traversal<Vertex, Map<Object, List>> get_g_V_valueMap() {
return g.V().valueMap();
}
@Override
- public Traversal<Vertex, Map<String, List>> get_g_V_valueMapXname_ageX() {
+ public Traversal<Vertex, Map<Object, List>> get_g_V_valueMapXname_ageX() {
return g.V().valueMap("name", "age");
}
@Override
- public Traversal<Vertex, Map<String, List<String>>> get_g_VX1X_outXcreatedX_valueMap(final Object v1Id) {
+ public Traversal<Vertex, Map<Object, List<String>>> get_g_VX1X_outXcreatedX_valueMap(final Object v1Id) {
return g.V(v1Id).out("created").valueMap();
}
@Override
- public Traversal<Vertex, Map<String, Object>> get_g_V_valueMapToken() {
+ public Traversal<Vertex, Map<Object, Object>> get_g_V_valueMapToken() {
return g.V().hasLabel("person").filter(__.outE("created")).valueMap(true);
}
}
[8/8] tinkerpop git commit: Merge branch 'TINKERPOP-1483'
Posted by dk...@apache.org.
Merge branch 'TINKERPOP-1483'
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/686ce61e
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/686ce61e
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/686ce61e
Branch: refs/heads/master
Commit: 686ce61e5a57d3865f5915c89fef68842830dfe7
Parents: 4c6e43d 02345aa
Author: Daniel Kuppitz <da...@hotmail.com>
Authored: Wed Nov 30 17:51:44 2016 +0100
Committer: Daniel Kuppitz <da...@hotmail.com>
Committed: Wed Nov 30 17:51:44 2016 +0100
----------------------------------------------------------------------
CHANGELOG.asciidoc | 1 +
docs/src/upgrade/release-3.3.x.asciidoc | 7 ++++
.../traversal/dsl/graph/GraphTraversal.java | 2 +-
.../gremlin/process/traversal/dsl/graph/__.java | 2 +-
.../traversal/step/map/PropertyMapStep.java | 21 ++++++------
.../step/map/GroovyValueMapTest.groovy | 5 +++
.../process/computer/GraphComputerTest.java | 7 ++--
.../traversal/step/map/ValueMapTest.java | 35 ++++++++++++++++++++
8 files changed, 65 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/686ce61e/CHANGELOG.asciidoc
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/686ce61e/docs/src/upgrade/release-3.3.x.asciidoc
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/686ce61e/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java
----------------------------------------------------------------------
[3/8] tinkerpop git commit: merge master
Posted by dk...@apache.org.
merge master
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/952c63e3
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/952c63e3
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/952c63e3
Branch: refs/heads/master
Commit: 952c63e353a256048981a4615519f5e9533760a0
Parents: 4af2387 e70e400
Author: jpmoresmau <jp...@moresmau.fr>
Authored: Wed Nov 23 22:35:39 2016 +0100
Committer: jpmoresmau <jp...@moresmau.fr>
Committed: Wed Nov 23 22:35:39 2016 +0100
----------------------------------------------------------------------
.gitignore | 1 -
CHANGELOG.asciidoc | 199 +-
LICENSE | 5 +-
bin/generate-home.sh | 43 +
bin/gremlin.sh | 23 +-
bin/publish-docs.sh | 16 +-
bin/publish-home.sh | 70 +
bin/validate-distribution.sh | 4 +-
docker/build.sh | 2 +-
docker/scripts/build.sh | 7 +
docs/preprocessor/awk/init-code-blocks.awk | 107 +-
docs/site/home/css/bootstrap-mods.css | 140 +
docs/site/home/css/carousel.css | 417 +
docs/site/home/css/prism.css | 145 +
docs/site/home/downloads.html | 307 +
docs/site/home/gremlin.html | 396 +
docs/site/home/images/apache-tinkerpop-logo.png | Bin 0 -> 118637 bytes
docs/site/home/images/blueprints-handdrawn.png | Bin 0 -> 39838 bytes
docs/site/home/images/cityscape-button.png | Bin 0 -> 54260 bytes
docs/site/home/images/egg-logo.png | Bin 0 -> 7241 bytes
docs/site/home/images/favicon.ico | Bin 0 -> 1406 bytes
docs/site/home/images/furnace-handdrawn.png | Bin 0 -> 27598 bytes
docs/site/home/images/goutte-blue.png | Bin 0 -> 13400 bytes
docs/site/home/images/graph-globe.png | Bin 0 -> 97146 bytes
docs/site/home/images/graph-vs-table.png | Bin 0 -> 35982 bytes
docs/site/home/images/gremlin-apache.png | Bin 0 -> 184276 bytes
docs/site/home/images/gremlin-download.png | Bin 0 -> 35666 bytes
docs/site/home/images/gremlin-github.png | Bin 0 -> 25806 bytes
docs/site/home/images/gremlin-gym-mini.png | Bin 0 -> 128185 bytes
docs/site/home/images/gremlin-handdrawn.png | Bin 0 -> 24985 bytes
docs/site/home/images/gremlin-head.png | Bin 0 -> 47157 bytes
.../home/images/gremlin-language-variants.png | Bin 0 -> 157258 bytes
docs/site/home/images/gremlin-quill.png | Bin 0 -> 200459 bytes
docs/site/home/images/homepage.graffle | 71498 +++++++++++++++++
docs/site/home/images/logos/blazegraph-logo.png | Bin 0 -> 58946 bytes
docs/site/home/images/logos/datastax-logo.png | Bin 0 -> 38630 bytes
docs/site/home/images/logos/grakn-logo.png | Bin 0 -> 141276 bytes
.../home/images/logos/gremlin-groovy-logo.png | Bin 0 -> 126622 bytes
.../home/images/logos/gremlin-java-logo.png | Bin 0 -> 106573 bytes
.../home/images/logos/gremlin-python-logo.png | Bin 0 -> 100190 bytes
.../home/images/logos/gremlin-scala-logo.png | Bin 0 -> 83255 bytes
docs/site/home/images/logos/ibmgraph-logo.png | Bin 0 -> 70338 bytes
docs/site/home/images/logos/keylines-logo.png | Bin 0 -> 38740 bytes
docs/site/home/images/logos/linkurious-logo.png | Bin 0 -> 58124 bytes
docs/site/home/images/logos/neo4j-logo.png | Bin 0 -> 48361 bytes
docs/site/home/images/logos/ogre-logo.png | Bin 0 -> 119692 bytes
docs/site/home/images/logos/orientdb-logo.png | Bin 0 -> 38721 bytes
.../home/images/logos/sparql-gremlin-logo.png | Bin 0 -> 102985 bytes
.../site/home/images/logos/sql-gremlin-logo.png | Bin 0 -> 94816 bytes
docs/site/home/images/logos/stardog-logo.png | Bin 0 -> 78711 bytes
docs/site/home/images/logos/titan-logo.png | Bin 0 -> 76305 bytes
docs/site/home/images/logos/tomsawyer-logo.png | Bin 0 -> 68634 bytes
docs/site/home/images/meeting-room-button.png | Bin 0 -> 46717 bytes
docs/site/home/images/oltp-and-olap.png | Bin 0 -> 400257 bytes
docs/site/home/images/peon-head.png | Bin 0 -> 11761 bytes
docs/site/home/images/policy/adjacency-list.png | Bin 0 -> 36192 bytes
.../home/images/policy/blueprints-character.png | Bin 0 -> 18474 bytes
.../home/images/policy/business-gremlin.png | Bin 0 -> 412520 bytes
.../site/home/images/policy/cyclicpath-step.png | Bin 0 -> 133628 bytes
.../site/home/images/policy/flat-map-lambda.png | Bin 0 -> 26423 bytes
.../home/images/policy/frames-character.png | Bin 0 -> 17482 bytes
.../home/images/policy/furnace-character.png | Bin 0 -> 14118 bytes
.../home/images/policy/gremlin-character.png | Bin 0 -> 16473 bytes
.../home/images/policy/gremlin-chickenwing.png | Bin 0 -> 34307 bytes
.../home/images/policy/gremlin-gremopoly.png | Bin 0 -> 28803 bytes
.../home/images/policy/gremlin-gremreaper.png | Bin 0 -> 33275 bytes
.../home/images/policy/gremlin-gremstefani.png | Bin 0 -> 32122 bytes
.../policy/gremlin-new-sheriff-in-town.png | Bin 0 -> 30381 bytes
.../policy/gremlin-no-more-mr-nice-guy.png | Bin 0 -> 27941 bytes
docs/site/home/images/policy/gremlintron.png | Bin 0 -> 219686 bytes
docs/site/home/images/policy/olap-traversal.png | Bin 0 -> 315037 bytes
.../site/home/images/policy/pipes-character.png | Bin 0 -> 19807 bytes
.../home/images/policy/rexster-character.png | Bin 0 -> 18100 bytes
.../home/images/policy/tinkerpop-reading.png | Bin 0 -> 195749 bytes
.../home/images/policy/tinkerpop3-splash.png | Bin 0 -> 643257 bytes
.../images/resources/arxiv-article-resource.png | Bin 0 -> 306821 bytes
.../benefits-gremlin-machine-resource.png | Bin 0 -> 159622 bytes
.../resources/graph-databases-101-resource.png | Bin 0 -> 139229 bytes
.../resources/on-graph-computing-resource.png | Bin 0 -> 159091 bytes
.../resources/property-graph-resource.png | Bin 0 -> 162245 bytes
.../images/resources/sql-2-gremlin-resource.png | Bin 0 -> 210892 bytes
.../resources/tables-and-graphs-resource.png | Bin 0 -> 344091 bytes
.../resources/why-graph-databases-resource.png | Bin 0 -> 243807 bytes
docs/site/home/images/rexster-handdrawn.png | Bin 0 -> 30247 bytes
docs/site/home/images/tinkerblocks.png | Bin 0 -> 802732 bytes
docs/site/home/images/tinkerpop-book.png | Bin 0 -> 195749 bytes
docs/site/home/images/tinkerpop-cityscape.png | Bin 0 -> 801856 bytes
docs/site/home/images/tinkerpop-conference.png | Bin 0 -> 719950 bytes
docs/site/home/images/tinkerpop-logo-small.png | Bin 0 -> 30662 bytes
.../site/home/images/tinkerpop-meeting-room.png | Bin 0 -> 703938 bytes
docs/site/home/images/tinkerpop-reading-2.png | Bin 0 -> 211187 bytes
docs/site/home/images/tinkerpop-reading.png | Bin 0 -> 195749 bytes
docs/site/home/images/tinkerpop-splash.png | Bin 0 -> 653463 bytes
docs/site/home/images/tinkerpop3-splash.png | Bin 0 -> 643257 bytes
docs/site/home/index.html | 319 +
docs/site/home/js/bootstrap-3.3.5.min.js | 7 +
docs/site/home/js/jquery-1.11.0.min.js | 4 +
docs/site/home/js/prism.js | 423 +
docs/site/home/policy.html | 72 +
docs/site/home/providers.html | 366 +
docs/site/home/template/header-footer.html | 148 +
.../developer/development-environment.asciidoc | 25 +-
docs/src/dev/developer/for-committers.asciidoc | 15 +
docs/src/dev/developer/release.asciidoc | 37 +-
docs/src/dev/io/graphml.asciidoc | 119 +
docs/src/dev/io/graphson.asciidoc | 4652 ++
docs/src/dev/io/gryo.asciidoc | 63 +
docs/src/dev/io/index.asciidoc | 37 +
docs/src/dev/provider/index.asciidoc | 48 +-
docs/src/index.asciidoc | 4 +
docs/src/recipes/between-vertices.asciidoc | 2 +-
docs/src/recipes/centrality.asciidoc | 24 +-
docs/src/recipes/cycle-detection.asciidoc | 30 +-
docs/src/recipes/index.asciidoc | 12 +-
docs/src/recipes/pagination.asciidoc | 79 +
docs/src/recipes/recommendation.asciidoc | 248 +
docs/src/recipes/shortest-path.asciidoc | 44 +-
docs/src/recipes/tree.asciidoc | 218 +
.../src/reference/gremlin-applications.asciidoc | 137 +-
docs/src/reference/gremlin-variants.asciidoc | 109 +-
.../reference/implementations-neo4j.asciidoc | 4 +-
docs/src/reference/the-graph.asciidoc | 6 +-
docs/src/reference/the-graphcomputer.asciidoc | 10 +-
docs/src/reference/the-traversal.asciidoc | 162 +-
.../tutorials/getting-started/index.asciidoc | 2 +-
.../gremlin-language-variants/index.asciidoc | 2 +-
docs/src/upgrade/index.asciidoc | 2 +
.../upgrade/release-3.1.x-incubating.asciidoc | 44 +-
.../upgrade/release-3.2.x-incubating.asciidoc | 239 +-
docs/src/upgrade/release-3.3.x.asciidoc | 130 +
docs/static/images/gremlin-groovy-drawing.png | Bin 0 -> 133892 bytes
docs/static/images/gremlin-index-time.png | Bin 0 -> 53361 bytes
docs/static/images/gremlin-io2.png | Bin 0 -> 185756 bytes
docs/static/images/gremlin-java-drawing.png | Bin 0 -> 131815 bytes
docs/static/images/gremlin-max-depth.png | Bin 0 -> 109506 bytes
docs/static/images/gremlin-mozart.png | Bin 0 -> 50928 bytes
docs/static/images/gremlin-paging.png | Bin 0 -> 248956 bytes
docs/static/images/gremlin-recommendation.png | Bin 0 -> 61024 bytes
docs/static/images/gremlin-tree.png | Bin 0 -> 229528 bytes
docs/static/images/recommendation-alice-1.png | Bin 0 -> 11028 bytes
docs/static/images/recommendation-alice-2.png | Bin 0 -> 28186 bytes
docs/static/images/recommendation-alice-3.png | Bin 0 -> 54869 bytes
docs/static/images/recommendation-alice-4.png | Bin 0 -> 46685 bytes
docs/static/images/step-types.png | Bin 129207 -> 63509 bytes
docs/static/images/tinkerpop3.graffle | 667 +-
docs/static/images/tree-lca.png | Bin 0 -> 27172 bytes
giraph-gremlin/pom.xml | 2 +-
.../src/test/resources/giraph-site.xml | 12 +
.../gremlin-archetype-server/pom.xml | 2 +-
.../archetype-resources/src/main/java/App.java | 2 +-
.../src/main/java/Service.java | 4 +-
.../src/test/java/ServiceTest.java | 4 +-
.../src/test/resources/gremlin-server.yaml | 2 +-
.../gremlin-archetype-tinkergraph/pom.xml | 2 +-
gremlin-archetype/pom.xml | 2 +-
gremlin-benchmark/pom.xml | 134 -
.../benchmark/util/AbstractBenchmarkBase.java | 117 -
.../benchmark/util/AbstractGraphBenchmark.java | 85 -
.../util/AbstractGraphMutateBenchmark.java | 48 -
.../gremlin/process/GraphMutateBenchmark.java | 92 -
.../process/GraphTraversalBenchmark.java | 101 -
gremlin-console/bin/gremlin.sh | 25 +-
gremlin-console/pom.xml | 2 +-
gremlin-console/src/main/bin/gremlin.sh | 28 +-
.../tinkerpop/gremlin/console/Console.groovy | 15 +-
.../plugin/gremlin-server-integration.yaml | 2 +-
.../gremlin/console/groovy/plugin/remote.yaml | 2 +-
gremlin-core/pom.xml | 2 +-
.../gremlin/jsr223/JavaTranslator.java | 72 +-
.../SingleGremlinScriptEngineManager.java | 7 +
.../gremlin/process/computer/Computer.java | 17 +
.../peerpressure/PeerPressureVertexProgram.java | 4 +-
.../computer/traversal/MasterExecutor.java | 4 +-
.../computer/traversal/WorkerExecutor.java | 4 +-
.../decoration/VertexProgramStrategy.java | 149 +-
.../computer/util/GraphComputerHelper.java | 1 +
.../traversal/AbstractRemoteTraversal.java | 17 +
.../AbstractRemoteTraversalSideEffects.java | 5 -
.../remote/traversal/RemoteTraversal.java | 18 +
.../traversal/RemoteTraversalSideEffects.java | 13 +
.../remote/traversal/step/map/RemoteStep.java | 5 -
.../gremlin/process/traversal/Bindings.java | 5 +
.../gremlin/process/traversal/Bytecode.java | 84 +-
.../gremlin/process/traversal/NumberHelper.java | 288 -
.../gremlin/process/traversal/Operator.java | 2 +
.../gremlin/process/traversal/Path.java | 23 +-
.../gremlin/process/traversal/Pop.java | 14 +-
.../process/traversal/SackFunctions.java | 6 +-
.../process/traversal/TraversalSideEffects.java | 9 +-
.../process/traversal/TraversalSource.java | 61 +-
.../process/traversal/TraversalStrategies.java | 17 +-
.../process/traversal/TraversalStrategy.java | 13 +
.../gremlin/process/traversal/Traverser.java | 16 +
.../traversal/dsl/graph/GraphTraversal.java | 183 +-
.../dsl/graph/GraphTraversalSource.java | 25 +-
.../gremlin/process/traversal/dsl/graph/__.java | 75 +-
.../process/traversal/step/GraphComputing.java | 29 +
.../traversal/step/HasContainerHolder.java | 4 +
.../gremlin/process/traversal/step/Scoping.java | 8 +-
.../traversal/step/branch/BranchStep.java | 11 +-
.../traversal/step/branch/OptionalStep.java | 92 +
.../traversal/step/branch/RepeatStep.java | 1 +
.../traversal/step/filter/DedupGlobalStep.java | 12 +-
.../process/traversal/step/filter/HasStep.java | 11 +-
.../process/traversal/step/filter/NotStep.java | 7 +
.../process/traversal/step/map/GroupStep.java | 34 +-
.../process/traversal/step/map/HasNextStep.java | 8 +-
.../process/traversal/step/map/MatchStep.java | 24 +-
.../traversal/step/map/MaxLocalStep.java | 2 +-
.../traversal/step/map/MeanGlobalStep.java | 6 +-
.../traversal/step/map/MeanLocalStep.java | 2 +-
.../traversal/step/map/MinLocalStep.java | 2 +-
.../process/traversal/step/map/ProjectStep.java | 4 +
.../traversal/step/map/SelectOneStep.java | 2 +-
.../traversal/step/map/SumGlobalStep.java | 2 +-
.../traversal/step/map/SumLocalStep.java | 2 +-
.../process/traversal/step/map/UnfoldStep.java | 16 +
.../step/sideEffect/GroupSideEffectStep.java | 18 +-
.../traversal/step/util/HasContainer.java | 26 +-
.../traversal/step/util/ImmutablePath.java | 328 +-
.../traversal/step/util/ImmutablePathImpl.java | 50 -
.../traversal/step/util/MutablePath.java | 21 +-
.../strategy/TraversalStrategyProxy.java | 51 +
.../strategy/decoration/ConnectiveStrategy.java | 5 +-
.../strategy/decoration/ElementIdStrategy.java | 27 +-
.../decoration/HaltedTraverserStrategy.java | 23 +
.../strategy/decoration/PartitionStrategy.java | 79 +-
.../strategy/decoration/SubgraphStrategy.java | 68 +-
.../finalization/LazyBarrierStrategy.java | 31 +-
.../finalization/MatchAlgorithmStrategy.java | 20 +
.../optimization/FilterRankingStrategy.java | 142 +-
.../optimization/IdentityRemovalStrategy.java | 14 +-
.../IncidentToAdjacentStrategy.java | 13 +-
.../optimization/InlineFilterStrategy.java | 281 +-
.../optimization/LazyBarrierStrategy.java | 111 +
.../optimization/MatchPredicateStrategy.java | 2 +-
.../optimization/PathProcessorStrategy.java | 77 +-
.../optimization/PathRetractionStrategy.java | 4 +-
.../optimization/RangeByIsCountStrategy.java | 116 +-
.../optimization/RepeatUnrollStrategy.java | 4 +-
.../StandardVerificationStrategy.java | 1 +
.../traverser/B_LP_O_P_S_SE_SL_Traverser.java | 3 +-
.../traverser/B_LP_O_S_SE_SL_Traverser.java | 14 +-
.../traverser/LP_O_OB_S_SE_SL_Traverser.java | 8 +-
.../traverser/util/AbstractTraverser.java | 2 +-
.../traversal/traverser/util/TraverserSet.java | 6 +-
.../gremlin/process/traversal/util/AndP.java | 8 +-
.../process/traversal/util/ConnectiveP.java | 3 +-
.../traversal/util/DefaultTraversal.java | 35 +-
.../traversal/util/DefaultTraversalMetrics.java | 76 +-
.../util/DefaultTraversalStrategies.java | 11 +-
.../gremlin/process/traversal/util/OrP.java | 9 +-
.../process/traversal/util/TraversalHelper.java | 163 +-
.../process/traversal/util/TraversalRing.java | 8 +-
.../tinkerpop/gremlin/structure/Graph.java | 15 +-
.../gremlin/structure/VertexProperty.java | 4 +
.../gremlin/structure/io/IoRegistry.java | 2 +-
.../structure/io/graphson/GraphSONModule.java | 90 +-
.../structure/io/graphson/GraphSONReader.java | 4 +
.../io/graphson/GraphSONSerializerProvider.java | 2 +-
.../GraphSONTraversalSerializersV2d0.java | 36 +
.../gremlin/structure/io/gryo/GryoMapper.java | 4 +-
.../gremlin/structure/io/gryo/GryoPool.java | 23 +-
.../gremlin/structure/io/gryo/GryoReader.java | 4 +
.../gremlin/structure/util/StringFactory.java | 19 +-
.../structure/util/detached/DetachedPath.java | 8 +-
.../tinkerpop/gremlin/util/CoreImports.java | 6 +-
.../tinkerpop/gremlin/util/NumberHelper.java | 280 +
.../process/TraversalStrategiesTest.java | 195 +-
.../gremlin/process/traversal/BytecodeTest.java | 22 +
.../gremlin/process/traversal/PTest.java | 245 +-
.../gremlin/process/traversal/PathTest.java | 18 +
.../dsl/graph/GraphTraversalSourceTest.java | 28 +
.../traversal/step/branch/ChooseStepTest.java | 11 +-
.../traversal/step/branch/OptionalStepTest.java | 49 +
.../traversal/step/filter/HasStepTest.java | 12 +-
.../traversal/step/map/SelectOneStepTest.java | 4 +-
.../traversal/step/map/SelectStepTest.java | 4 +-
.../traversal/step/map/UnfoldStepTest.java | 28 +
.../decoration/SubgraphStrategyTest.java | 28 +-
.../finalization/LazyBarrierStrategyTest.java | 74 -
.../optimization/FilterRankingStrategyTest.java | 36 +-
.../optimization/InlineFilterStrategyTest.java | 73 +-
.../optimization/LazyBarrierStrategyTest.java | 107 +
.../MatchPredicateStrategyTest.java | 4 +-
.../optimization/PathProcessorStrategyTest.java | 79 +-
.../PathRetractionStrategyTest.java | 16 +-
.../RangeByIsCountStrategyTest.java | 32 +-
.../optimization/RepeatUnrollStrategyTest.java | 2 +-
.../process/util/TraversalHelperTest.java | 87 +-
.../gremlin/structure/io/IoXIoRegistry.java | 2 +-
.../gremlin/structure/io/IoYIoRegistry.java | 2 +-
.../structure/io/gryo/GryoMapperTest.java | 12 +-
gremlin-driver/pom.xml | 22 +-
.../tinkerpop/gremlin/driver/Channelizer.java | 2 +-
.../apache/tinkerpop/gremlin/driver/Client.java | 66 +-
.../tinkerpop/gremlin/driver/Cluster.java | 79 +-
.../tinkerpop/gremlin/driver/Connection.java | 76 +-
.../gremlin/driver/ConnectionPool.java | 21 +-
.../tinkerpop/gremlin/driver/Handler.java | 26 +-
.../tinkerpop/gremlin/driver/ResultQueue.java | 8 +-
.../tinkerpop/gremlin/driver/ResultSet.java | 13 +
.../apache/tinkerpop/gremlin/driver/Tokens.java | 1 +
.../driver/handler/WebSocketClientHandler.java | 4 +-
.../driver/remote/DriverRemoteConnection.java | 6 +-
.../driver/remote/DriverRemoteTraversal.java | 27 +-
.../DriverRemoteTraversalSideEffects.java | 68 +-
.../ser/AbstractGryoMessageSerializerV1d0.java | 4 +-
.../driver/ser/AbstractMessageSerializer.java | 26 +-
.../driver/util/ProfilingApplication.java | 58 +-
.../gremlin/driver/ClusterBuilderTest.java | 88 +
.../tinkerpop/gremlin/driver/ResultSetTest.java | 26 +-
.../DriverRemoteTraversalSideEffectsTest.java | 134 +
...raphSONMessageSerializerGremlinV2d0Test.java | 1 +
.../ser/GryoBaseMessageSerializerV1d0Test.java | 93 +
gremlin-groovy-test/pom.xml | 2 +-
.../jsr223/AllowColorSandboxExtension.groovy | 36 -
.../BlockSomeVariablesSandboxExtension.groovy | 42 -
...ebindAllVariableTypesSandboxExtension.groovy | 31 -
.../loaders/SugarLoaderPerformanceTest.groovy | 138 -
.../step/branch/GroovyBranchTest.groovy | 13 +-
.../step/branch/GroovyChooseTest.groovy | 20 +
.../step/branch/GroovyOptionalTest.groovy | 4 +
.../step/filter/GroovyDedupTest.groovy | 11 +-
.../step/filter/GroovyRangeTest.groovy | 20 +-
.../traversal/step/filter/GroovyTailTest.groovy | 16 +-
.../step/filter/GroovyWhereTest.groovy | 10 +
.../traversal/step/map/GroovyMatchTest.groovy | 23 +-
.../step/map/GroovyPageRankTest.groovy | 8 +-
.../traversal/step/map/GroovyPathTest.groovy | 5 +
.../step/map/GroovyPeerPressureTest.groovy | 2 +-
.../traversal/step/map/GroovyProfileTest.groovy | 5 +
.../traversal/step/map/GroovyProgramTest.groovy | 2 +-
.../step/map/GroovyValueMapTest.groovy | 8 +-
.../traversal/step/map/GroovyVertexTest.groovy | 5 +
.../step/sideEffect/GroovyGroupTest.groovy | 5 +
.../GroovyEnvironmentPerformanceSuite.java | 88 -
.../gremlin/groovy/GroovyEnvironmentSuite.java | 2 -
.../engine/GremlinExecutorPerformanceTest.java | 189 -
...mlinGroovyScriptEngineSandboxCustomTest.java | 127 -
...GroovyScriptEngineSandboxedStandardTest.java | 6 +-
...nGroovyScriptEngineTinkerPopSandboxTest.java | 34 -
.../groovy/jsr223/GroovyTranslatorTest.java | 35 +-
gremlin-groovy/pom.xml | 2 +-
.../jsr223/customizer/SandboxExtension.groovy | 180 -
.../customizer/SimpleSandboxExtension.groovy | 1 -
.../groovy/engine/ConcurrentBindings.java | 44 -
.../jsr223/GremlinGroovyScriptEngine.java | 18 -
.../gremlin/groovy/jsr223/GroovyTranslator.java | 64 +-
.../gremlin/groovy/jsr223/ScriptExecutor.java | 60 -
.../plugin/dsl/credential/CredentialGraph.java | 3 +-
gremlin-python/pom.xml | 25 +-
.../python/GraphTraversalSourceGenerator.groovy | 6 +-
.../python/TraversalSourceGenerator.groovy | 42 +-
.../jsr223/GremlinJythonScriptEngine.java | 4 +-
.../gremlin/python/jsr223/PythonTranslator.java | 51 +-
.../driver/driver_remote_connection.py | 38 +-
.../gremlin_python/driver/remote_connection.py | 28 +-
.../gremlin_python/process/graph_traversal.py | 18 +-
.../jython/gremlin_python/process/strategies.py | 183 +
.../jython/gremlin_python/process/traversal.py | 49 +-
.../src/main/jython/gremlin_python/statics.py | 3 +-
.../gremlin_python/structure/io/graphson.py | 508 +-
gremlin-python/src/main/jython/setup.py | 7 +-
.../driver/test_driver_remote_connection.py | 83 +-
.../jython/tests/process/test_strategies.py | 106 +
.../jython/tests/structure/io/test_graphson.py | 111 +-
.../driver/DriverRemoteConnectionTest.java | 153 -
.../python/jsr223/JythonScriptEngineSetup.java | 5 +-
.../python/jsr223/JythonTranslatorTest.java | 34 +
.../jsr223/PythonGraphSONJavaTranslator.java | 2 +-
.../gremlin/python/jsr223/PythonProvider.java | 3 -
.../io/graphson/GraphSONReaderTest.java | 68 +-
.../io/graphson/GraphSONWriterTest.java | 57 +-
.../driver/gremlin-server-modern-secure-py.yaml | 4 +-
gremlin-server/conf/gremlin-server-classic.yaml | 4 +-
.../conf/gremlin-server-modern-py.yaml | 2 +-
.../conf/gremlin-server-modern-readonly.yaml | 2 +-
gremlin-server/conf/gremlin-server-modern.yaml | 2 +-
gremlin-server/conf/gremlin-server-neo4j.yaml | 2 +-
.../conf/gremlin-server-rest-modern.yaml | 2 +-
.../conf/gremlin-server-rest-secure.yaml | 2 +-
gremlin-server/conf/gremlin-server-secure.yaml | 2 +-
gremlin-server/conf/gremlin-server-spark.yaml | 2 +-
gremlin-server/conf/gremlin-server.yaml | 2 +-
gremlin-server/pom.xml | 2 +-
gremlin-server/src/main/bin/gremlin-server.bat | 10 +-
gremlin-server/src/main/bin/gremlin-server.conf | 42 +
gremlin-server/src/main/bin/gremlin-server.sh | 276 +-
.../tinkerpop/gremlin/server/GremlinServer.java | 10 +
.../tinkerpop/gremlin/server/Settings.java | 1 -
.../gremlin/server/channel/HttpChannelizer.java | 2 +-
.../handler/HttpBasicAuthenticationHandler.java | 2 +-
.../handler/HttpGremlinEndpointHandler.java | 15 +-
.../handler/SaslAuthenticationHandler.java | 2 +-
.../gremlin/server/op/AbstractOpProcessor.java | 2 +-
.../gremlin/server/op/session/Session.java | 83 +-
.../server/op/session/SessionOpProcessor.java | 26 +-
.../op/traversal/TraversalOpProcessor.java | 151 +-
.../driver/remote/RemoteGraphProvider.java | 25 +-
.../AbstractGremlinServerPerformanceTest.java | 100 -
.../server/GremlinAdditionPerformanceTest.java | 108 -
.../server/GremlinDriverIntegrateTest.java | 175 +-
.../server/GremlinResultSetIntegrateTest.java | 16 +-
.../server/GremlinServerAuthIntegrateTest.java | 29 +-
.../GremlinServerAuthOldIntegrateTest.java | 29 +-
.../server/GremlinServerHttpIntegrateTest.java | 94 +-
.../server/GremlinServerIntegrateTest.java | 278 +-
.../GremlinServerSessionIntegrateTest.java | 82 +-
.../server/GremlinTraversalPerformanceTest.java | 108 -
.../gremlin/server/TestClientFactory.java | 60 +
.../remote/gremlin-server-integration.yaml | 4 +-
.../server/gremlin-server-integration.yaml | 4 +-
.../server/gremlin-server-performance.yaml | 2 +-
gremlin-shaded/pom.xml | 2 +-
gremlin-test/pom.xml | 40 +-
.../tinkerpop/gremlin/AbstractGremlinSuite.java | 18 +
.../tinkerpop/gremlin/AbstractGremlinTest.java | 11 -
.../gremlin/FeatureRequirementSet.java | 2 +-
.../apache/tinkerpop/gremlin/GraphManager.java | 8 +-
.../generator/CommunityGeneratorTest.java | 4 +
.../generator/DistributionGeneratorTest.java | 4 +
.../process/ProcessPerformanceSuite.java | 57 -
.../process/TraversalPerformanceTest.java | 133 -
.../BulkDumperVertexProgramTest.java | 6 -
.../process/traversal/CoreTraversalTest.java | 35 +
.../TraversalInterruptionComputerTest.java | 15 +-
.../traversal/TraversalInterruptionTest.java | 6 +-
.../traversal/step/branch/BranchTest.java | 29 +-
.../traversal/step/branch/ChooseTest.java | 57 +-
.../traversal/step/branch/OptionalTest.java | 30 +-
.../traversal/step/filter/DedupTest.java | 48 +-
.../traversal/step/filter/RangeTest.java | 129 +-
.../process/traversal/step/filter/TailTest.java | 125 +-
.../traversal/step/filter/WhereTest.java | 31 +
.../process/traversal/step/map/MatchTest.java | 59 +-
.../process/traversal/step/map/PathTest.java | 35 +-
.../process/traversal/step/map/ProfileTest.java | 17 +
.../process/traversal/step/map/SelectTest.java | 25 +-
.../process/traversal/step/map/VertexTest.java | 21 +-
.../traversal/step/sideEffect/GroupTest.java | 23 +
.../PartitionStrategyProcessTest.java | 121 +-
.../decoration/SubgraphStrategyProcessTest.java | 47 +-
.../decoration/TranslationStrategy.java | 4 +-
.../tinkerpop/gremlin/structure/EdgeTest.java | 13 +-
.../gremlin/structure/FeatureSupportTest.java | 27 +-
.../structure/GraphReadPerformanceTest.java | 120 -
.../structure/GraphWritePerformanceTest.java | 128 -
.../structure/StructurePerformanceSuite.java | 54 -
.../gremlin/structure/TransactionTest.java | 2 +-
.../gremlin/structure/VertexPropertyTest.java | 26 +-
.../tinkerpop/gremlin/structure/io/IoTest.java | 4 +-
gremlin-tools/gremlin-benchmark/pom.xml | 134 +
.../benchmark/util/AbstractBenchmarkBase.java | 117 +
.../benchmark/util/AbstractGraphBenchmark.java | 85 +
.../util/AbstractGraphMutateBenchmark.java | 48 +
.../gremlin/process/GraphMutateBenchmark.java | 92 +
.../process/GraphTraversalBenchmark.java | 101 +
gremlin-tools/gremlin-coverage/pom.xml | 118 +
gremlin-tools/pom.xml | 31 +
hadoop-gremlin/pom.xml | 2 +-
.../gremlin/hadoop/structure/HadoopGraph.java | 20 +
licenses/bootstrap | 22 +
licenses/jquery | 21 +
licenses/prism | 21 +
neo4j-gremlin/pom.xml | 2 +-
.../step/sideEffect/Neo4jGraphStep.java | 11 +-
.../optimization/Neo4jGraphStepStrategy.java | 25 +-
.../gremlin/neo4j/structure/Neo4jGraph.java | 4 -
.../neo4j/process/NativeNeo4jCypherCheck.java | 16 +-
.../traversal/strategy/Neo4jStrategySuite.java | 44 -
.../traversal/strategy/Neo4jStrategyTest.java | 32 -
.../Neo4jGraphStepStrategyTest.java | 147 +-
pom.xml | 221 +-
spark-gremlin/pom.xml | 2 +-
.../spark/process/computer/SparkExecutor.java | 6 +
.../SparkStarBarrierInterceptor.java | 2 +-
.../structure/io/gryo/GryoRegistrator.java | 5 -
.../SparkGraphComputerProcessIntegrateTest.java | 32 +
.../computer/SparkGraphComputerProcessTest.java | 32 -
...GraphComputerGroovyProcessIntegrateTest.java | 33 +
.../SparkGraphComputerGroovyProcessTest.java | 33 -
.../PersistedInputOutputRDDIntegrateTest.java | 358 +
.../io/PersistedInputOutputRDDTest.java | 358 -
tinkergraph-gremlin/pom.xml | 2 +-
.../step/map/TinkerCountGlobalStep.java | 75 +
.../step/sideEffect/TinkerGraphStep.java | 9 +-
.../optimization/TinkerGraphCountStrategy.java | 95 +
.../optimization/TinkerGraphStepStrategy.java | 16 +-
.../tinkergraph/structure/TinkerGraph.java | 19 +-
.../tinkergraph/structure/TinkerHelper.java | 8 +
.../tinkergraph/structure/TinkerIoRegistry.java | 8 +
.../structure/TinkerIoRegistryV2d0.java | 10 +-
.../process/TinkerGraphComputerProvider.java | 12 +-
.../TinkerGraphProcessPerformanceTest.java | 37 -
.../TinkerGraphGroovyTranslatorProvider.java | 4 +
.../TinkerGraphJavaTranslatorProvider.java | 3 +
.../decoration/HaltedTraverserStrategyTest.java | 11 +-
.../TinkerGraphCountStrategyTest.java | 97 +
.../TinkerGraphStepStrategyTest.java | 35 +-
.../TinkerGraphGraphSONSerializerV2d0Test.java | 4 +-
.../TinkerGraphStructurePerformanceTest.java | 37 -
.../tinkergraph/structure/TinkerGraphTest.java | 2 +-
...erGraphGroovyEnvironmentPerformanceTest.java | 39 -
.../io/graphson/GraphSONTranslator.java | 3 +-
.../TinkerGraphGraphSONTranslatorProvider.java | 3 -
.../structure/io/gryo/GryoTranslator.java | 72 +
...nkerGraphGryoTranslatorComputerProvider.java | 38 +
...rGraphGryoTranslatorProcessComputerTest.java | 33 +
...rGraphGryoTranslatorProcessStandardTest.java | 33 +
.../gryo/TinkerGraphGryoTranslatorProvider.java | 72 +
511 files changed, 90933 insertions(+), 6507 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/952c63e3/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/952c63e3/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/__.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/952c63e3/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyPageRankTest.groovy
----------------------------------------------------------------------
diff --cc gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyPageRankTest.groovy
index 13787cc,13787cc..276445d
--- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyPageRankTest.groovy
+++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyPageRankTest.groovy
@@@ -36,7 -36,7 +36,7 @@@ public abstract class GroovyPageRankTes
}
@Override
-- public Traversal<Vertex, Map<String, List<Object>>> get_g_V_pageRank_byXoutEXknowsXX_byXfriendRankX_valueMapXname_friendRankX() {
++ public Traversal<Vertex, Map<Object, List<Object>>> get_g_V_pageRank_byXoutEXknowsXX_byXfriendRankX_valueMapXname_friendRankX() {
new ScriptTraversal<>(g, "gremlin-groovy", "g.V.pageRank.by(outE('knows')).by('friendRank').valueMap('name','friendRank')")
}
@@@ -51,7 -51,7 +51,7 @@@
}
@Override
-- public Traversal<Vertex, Map<String, List<Object>>> get_g_V_hasLabelXpersonX_pageRank_byXpageRankX_order_byXpageRankX_valueMapXname_pageRankX() {
++ public Traversal<Vertex, Map<Object, List<Object>>> get_g_V_hasLabelXpersonX_pageRank_byXpageRankX_order_byXpageRankX_valueMapXname_pageRankX() {
new ScriptTraversal<>(g, "gremlin-groovy", "g.V.hasLabel('person').pageRank.by('pageRank').order.by('pageRank').valueMap('name', 'pageRank')")
}
@@@ -61,7 -61,7 +61,7 @@@
}
@Override
-- public Traversal<Vertex, Map<String, List<Object>>> get_g_V_hasLabelXsoftwareX_hasXname_rippleX_pageRankX1X_byXinEXcreatedXX_timesX1X_byXpriorsX_inXcreatedX_unionXboth__identityX_valueMapXname_priorsX() {
++ public Traversal<Vertex, Map<Object, List<Object>>> get_g_V_hasLabelXsoftwareX_hasXname_rippleX_pageRankX1X_byXinEXcreatedXX_timesX1X_byXpriorsX_inXcreatedX_unionXboth__identityX_valueMapXname_priorsX() {
new ScriptTraversal<>(g, "gremlin-groovy", "g.V().hasLabel('software').has('name', 'ripple').pageRank(1.0).by(inE('created')).times(1).by('priors').in('created').union(identity(),both()).valueMap('name', 'priors')")
}
@@@ -71,7 -71,7 +71,7 @@@
}
@Override
-- public Traversal<Vertex, Map<String, List<Object>>> get_g_V_outXcreatedX_pageRank_byXbothEX_byXprojectRankX_timesX0X_valueMapXname_projectRankX() {
++ public Traversal<Vertex, Map<Object, List<Object>>> get_g_V_outXcreatedX_pageRank_byXbothEX_byXprojectRankX_timesX0X_valueMapXname_projectRankX() {
new ScriptTraversal<>(g, "gremlin-groovy", "g.V.out('created').pageRank().by(bothE()).by('projectRank').times(0).valueMap('name','projectRank')")
}
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/952c63e3/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyPeerPressureTest.groovy
----------------------------------------------------------------------
diff --cc gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyPeerPressureTest.groovy
index 6ec0750,6ec0750..f111077
--- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyPeerPressureTest.groovy
+++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyPeerPressureTest.groovy
@@@ -41,7 -41,7 +41,7 @@@ public abstract class GroovyPeerPressur
}
@Override
-- public Traversal<Vertex, Map<String, List<Object>>> get_g_V_hasXname_rippleX_inXcreatedX_peerPressure_byXoutEX_byXclusterX_repeatXunionXidentity__bothX_timesX2X_dedup_valueMapXname_clusterX() {
++ public Traversal<Vertex, Map<Object, List<Object>>> get_g_V_hasXname_rippleX_inXcreatedX_peerPressure_byXoutEX_byXclusterX_repeatXunionXidentity__bothX_timesX2X_dedup_valueMapXname_clusterX() {
new ScriptTraversal<>(g, "gremlin-groovy", "g.V.has('name', 'ripple').in('created').peerPressure.by(outE()).by('cluster').repeat(union(identity(), both())).times(2).dedup.valueMap('name', 'cluster')")
}
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/952c63e3/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyProgramTest.groovy
----------------------------------------------------------------------
diff --cc gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyProgramTest.groovy
index 7abe113,7abe113..d7bfe1e
--- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyProgramTest.groovy
+++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyProgramTest.groovy
@@@ -36,7 -36,7 +36,7 @@@ public abstract class GroovyProgramTes
}
@Override
-- public Traversal<Vertex, Map<String, List<Object>>> get_g_V_hasLabelXpersonX_programXpageRank_rankX_order_byXrank_incrX_valueMapXname_rankX() {
++ public Traversal<Vertex, Map<Object, List<Object>>> get_g_V_hasLabelXpersonX_programXpageRank_rankX_order_byXrank_incrX_valueMapXname_rankX() {
new ScriptTraversal<>(g, "gremlin-groovy", "g.V.hasLabel('person').program(PageRankVertexProgram.build().property('rank').create(graph)).order.by('rank',incr).valueMap('name','rank')");
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/952c63e3/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyValueMapTest.groovy
----------------------------------------------------------------------
diff --cc gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyValueMapTest.groovy
index 71c57e6,c3c20fa..61e19b4
--- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyValueMapTest.groovy
+++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyValueMapTest.groovy
@@@ -29,23 -29,18 +29,23 @@@ public abstract class GroovyValueMapTes
public static class Traversals extends ValueMapTest {
@Override
-- public Traversal<Vertex, Map<String, List>> get_g_V_valueMap() {
++ public Traversal<Vertex, Map<Object, List>> get_g_V_valueMap() {
new ScriptTraversal<>(g, "gremlin-groovy", "g.V.valueMap");
}
@Override
-- public Traversal<Vertex, Map<String, List>> get_g_V_valueMapXname_ageX() {
++ public Traversal<Vertex, Map<Object, List>> get_g_V_valueMapXname_ageX() {
new ScriptTraversal<>(g, "gremlin-groovy", "g.V.valueMap('name', 'age')")
}
@Override
-- public Traversal<Vertex, Map<String, List<String>>> get_g_VX1X_outXcreatedX_valueMap(final Object v1Id) {
++ public Traversal<Vertex, Map<Object, List<String>>> get_g_VX1X_outXcreatedX_valueMap(final Object v1Id) {
new ScriptTraversal<>(g, "gremlin-groovy", "g.V(v1Id).out('created').valueMap", "v1Id", v1Id)
}
+
+ @Override
- public Traversal<Vertex, Map<String, Object>> get_g_V_valueMapToken() {
++ public Traversal<Vertex, Map<Object, Object>> get_g_V_valueMapToken() {
+ new ScriptTraversal<>(g, "gremlin-groovy", "g.V().hasLabel('person').filter(__.outE('created')).valueMap(true)")
+ }
}
}
[4/8] tinkerpop git commit: change and upgrade docs
Posted by dk...@apache.org.
change and upgrade docs
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/4eba658b
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/4eba658b
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/4eba658b
Branch: refs/heads/master
Commit: 4eba658bcb347679eda964c27595e5d3969a199a
Parents: 952c63e
Author: jpmoresmau <jp...@moresmau.fr>
Authored: Mon Nov 28 20:14:58 2016 +0100
Committer: jpmoresmau <jp...@moresmau.fr>
Committed: Mon Nov 28 20:14:58 2016 +0100
----------------------------------------------------------------------
CHANGELOG.asciidoc | 1 +
docs/src/upgrade/release-3.3.x.asciidoc | 7 +++++++
2 files changed, 8 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/4eba658b/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 822efde..475a10d 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -46,6 +46,7 @@ TinkerPop 3.3.0 (Release Date: NOT OFFICIALLY RELEASED YET)
* Removed `tryRandomCommit()` from `AbstractGremlinTest`.
* Changed `gremlin-benchmark` system property for the report location to `benchmarkReportDir` for consistency.
* Added SysV and systemd init scripts.
+* `valueMap` now returns a `Map<Object,E>` since keys could be `V.id` or `V.label`.
TinkerPop 3.2.0 (Nine Inch Gremlins)
------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/4eba658b/docs/src/upgrade/release-3.3.x.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/upgrade/release-3.3.x.asciidoc b/docs/src/upgrade/release-3.3.x.asciidoc
index c0213d8..c7f84b7 100644
--- a/docs/src/upgrade/release-3.3.x.asciidoc
+++ b/docs/src/upgrade/release-3.3.x.asciidoc
@@ -73,6 +73,13 @@ bin/gremlin.sh -e gremlin.groovy
See: link:https://issues.apache.org/jira/browse/TINKERPOP-1283[TINKERPOP-1283]
+ValueMap
+^^^^^^^^
+
+`valueMap` now returns a `Map<Object,E>` to account for the presence of `V.id` or `V.label` if you pass `true` to it.
+
+See: link:https://issues.apache.org/jira/browse/TINKERPOP-1283[TINKERPOP-1483]
+
Deprecation Removal
^^^^^^^^^^^^^^^^^^^
[7/8] tinkerpop git commit: rename test method
Posted by dk...@apache.org.
rename test method
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/02345aa2
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/02345aa2
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/02345aa2
Branch: refs/heads/master
Commit: 02345aa2b0800b9dc657aa851f41a654c0283d00
Parents: 8f038aa
Author: jpmoresmau <jp...@moresmau.fr>
Authored: Tue Nov 29 18:35:43 2016 +0100
Committer: jpmoresmau <jp...@moresmau.fr>
Committed: Tue Nov 29 18:35:43 2016 +0100
----------------------------------------------------------------------
.../process/traversal/step/map/GroovyValueMapTest.groovy | 2 +-
.../gremlin/process/traversal/step/map/ValueMapTest.java | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/02345aa2/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyValueMapTest.groovy
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyValueMapTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyValueMapTest.groovy
index bda27fd..6e339f9 100644
--- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyValueMapTest.groovy
+++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyValueMapTest.groovy
@@ -44,7 +44,7 @@ public abstract class GroovyValueMapTest {
}
@Override
- public Traversal<Vertex, Map<Object, Object>> get_g_V_valueMapToken() {
+ public Traversal<Vertex, Map<Object, Object>> get_g_V_hasLabelXpersonX_filterXoutEXcreatedXX_valueMapXtrueX() {
new ScriptTraversal<>(g, "gremlin-groovy", "g.V().hasLabel('person').filter(__.outE('created')).valueMap(true)")
}
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/02345aa2/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ValueMapTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ValueMapTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ValueMapTest.java
index 6ab0852..f128689 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ValueMapTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ValueMapTest.java
@@ -48,7 +48,7 @@ public abstract class ValueMapTest extends AbstractGremlinProcessTest {
public abstract Traversal<Vertex, Map<String, List>> get_g_V_valueMapXname_ageX();
- public abstract Traversal<Vertex, Map<Object, Object>> get_g_V_valueMapToken();
+ public abstract Traversal<Vertex, Map<Object, Object>> get_g_V_hasLabelXpersonX_filterXoutEXcreatedXX_valueMapXtrueX();
public abstract Traversal<Vertex, Map<String, List<String>>> get_g_VX1X_outXcreatedX_valueMap(final Object v1Id);
@@ -137,8 +137,8 @@ public abstract class ValueMapTest extends AbstractGremlinProcessTest {
*/
@Test
@LoadGraphWith(MODERN)
- public void valueMapHasObjectKeys() {
- Traversal<Vertex,Map<Object,Object>> gt=get_g_V_valueMapToken();
+ public void g_V_hasLabelXpersonX_filterXoutEXcreatedXX_valueMapXtrueX() {
+ Traversal<Vertex,Map<Object,Object>> gt=get_g_V_hasLabelXpersonX_filterXoutEXcreatedXX_valueMapXtrueX();
int cnt=0;
while(gt.hasNext()){
Map<Object,Object> m=gt.next();
@@ -172,7 +172,7 @@ public abstract class ValueMapTest extends AbstractGremlinProcessTest {
}
@Override
- public Traversal<Vertex, Map<Object, Object>> get_g_V_valueMapToken() {
+ public Traversal<Vertex, Map<Object, Object>> get_g_V_hasLabelXpersonX_filterXoutEXcreatedXX_valueMapXtrueX() {
return g.V().hasLabel("person").filter(__.outE("created")).valueMap(true);
}
}