You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by fl...@apache.org on 2017/11/01 19:09:30 UTC
[7/9] tinkerpop git commit: Merge branch 'tp32'
Merge branch 'tp32'
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/8e224ef6
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/8e224ef6
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/8e224ef6
Branch: refs/heads/master
Commit: 8e224ef6cdf540332721dcc84541d8fef142fdee
Parents: f243669 65abea5
Author: florianhockmann <fh...@florian-hockmann.de>
Authored: Wed Nov 1 18:57:02 2017 +0100
Committer: florianhockmann <fh...@florian-hockmann.de>
Committed: Wed Nov 1 18:57:02 2017 +0100
----------------------------------------------------------------------
docs/src/reference/gremlin-variants.asciidoc | 2 +-
gremlin-dotnet/glv/AnonymousTraversal.template | 11 +-
gremlin-dotnet/glv/GraphTraversal.template | 12 +-
.../glv/GraphTraversalSource.template | 24 +-
gremlin-dotnet/glv/generate.groovy | 231 +++-
.../Gremlin.Net/Process/Traversal/Bindings.cs | 36 +-
.../Gremlin.Net/Process/Traversal/Bytecode.cs | 80 +-
.../Process/Traversal/GraphTraversal.cs | 1184 ++++++++++++++----
.../Process/Traversal/GraphTraversalSource.cs | 92 +-
.../Decoration/HaltedTraverserStrategy.cs | 4 +
.../Strategy/Decoration/PartitionStrategy.cs | 7 +
.../Strategy/Decoration/SubgraphStrategy.cs | 7 +
.../Decoration/VertexProgramStrategy.cs | 4 +
.../Finalization/MatchAlgorithmStrategy.cs | 4 +
.../src/Gremlin.Net/Process/Traversal/__.cs | 928 +++++++++++---
.../Structure/IO/GraphSON/ClassSerializer.cs | 37 +
.../Structure/IO/GraphSON/GraphSONWriter.cs | 1 +
.../BytecodeGenerationTests.cs | 14 +-
.../BytecodeGeneration/StrategiesTests.cs | 14 +-
.../GraphTraversalTests.cs | 2 +-
.../DriverRemoteConnection/StrategiesTests.cs | 14 +
.../Process/Traversal/BytecodeTests.cs | 142 ++-
.../Process/Traversal/Strategy/StrategyTests.cs | 31 +
.../IO/GraphSON/GraphSONWriterTests.cs | 13 +
24 files changed, 2397 insertions(+), 497 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/8e224ef6/docs/src/reference/gremlin-variants.asciidoc
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/8e224ef6/gremlin-dotnet/glv/generate.groovy
----------------------------------------------------------------------
diff --cc gremlin-dotnet/glv/generate.groovy
index 6504fcf,ad22116..4e5997f
--- a/gremlin-dotnet/glv/generate.groovy
+++ b/gremlin-dotnet/glv/generate.groovy
@@@ -27,15 -27,18 +27,21 @@@ import org.apache.tinkerpop.gremlin.str
import java.lang.reflect.Modifier
def toCSharpTypeMap = ["Long": "long",
+ "Double": "double",
"Integer": "int",
"String": "string",
+ "boolean": "bool",
"Object": "object",
+ "String[]": "string[]",
+ "Object[]": "object[]",
+ "Class": "Type",
+ "Class[]": "Type[]",
"java.util.Map<java.lang.String, E2>": "IDictionary<string, E2>",
"java.util.Map<java.lang.String, B>": "IDictionary<string, E2>",
+ "java.util.Map<java.lang.Object, E2>": "IDictionary<object, E2>",
+ "java.util.Map<java.lang.Object, B>": "IDictionary<object, E2>",
"java.util.List<E>": "IList<E>",
+ "java.util.List<A>": "IList<E2>",
"java.util.Map<K, V>": "IDictionary<K, V>",
"java.util.Collection<E2>": "ICollection<E2>",
"java.util.Collection<B>": "ICollection<E2>",
@@@ -48,13 -65,9 +68,10 @@@ def methodsWithSpecificTypes = ["consta
"mean": useE2,
"optional": useE2,
"range": useE2,
- "select": ["IDictionary<string, E2>", "E2"],
+ "skip": useE2,
"sum": useE2,
"tail": useE2,
- "tree": ["object"],
- "unfold": useE2,
- "unfold": useE2]
+ "valueMap": ["IDictionary<TKey, TValue>", "TKey, TValue"],]
def getCSharpGenericTypeParam = { typeName ->
def tParam = ""
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/8e224ef6/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/GraphTraversalSource.cs
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/8e224ef6/gremlin-dotnet/src/Gremlin.Net/Structure/IO/GraphSON/GraphSONWriter.cs
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/8e224ef6/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Process/Traversal/DriverRemoteConnection/GraphTraversalTests.cs
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/8e224ef6/gremlin-dotnet/test/Gremlin.Net.UnitTest/Structure/IO/GraphSON/GraphSONWriterTests.cs
----------------------------------------------------------------------