You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by sp...@apache.org on 2017/07/12 13:48:24 UTC
[1/5] tinkerpop git commit: Merge branch 'TINKERPOP-1552' into tp32
Repository: tinkerpop
Updated Branches:
refs/heads/TINKERPOP-1552-master [created] b3c916325
Merge branch 'TINKERPOP-1552' into tp32
Conflicts:
CHANGELOG.asciidoc
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/694b16ed
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/694b16ed
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/694b16ed
Branch: refs/heads/TINKERPOP-1552-master
Commit: 694b16ed5e5ce3328d9a74ceed2d4d0dea5f8cf0
Parents: bd4b989 426d141
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Wed Jul 12 07:49:49 2017 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Wed Jul 12 07:49:49 2017 -0400
----------------------------------------------------------------------
.gitignore | 11 +
.travis.yml | 5 +
CHANGELOG.asciidoc | 1 +
docker/Dockerfile | 6 +-
.../developer/development-environment.asciidoc | 35 +
docs/src/dev/developer/release.asciidoc | 18 +-
docs/src/reference/gremlin-variants.asciidoc | 190 ++++
gremlin-dotnet/Gremlin.Net.sln | 45 +
gremlin-dotnet/glv/AnonymousTraversal.template | 52 +
gremlin-dotnet/glv/Enum.template | 35 +
gremlin-dotnet/glv/GraphTraversal.template | 75 ++
.../glv/GraphTraversalSource.template | 132 +++
gremlin-dotnet/glv/Gremlin.Net.csproj.template | 64 ++
gremlin-dotnet/glv/NamingConversions.template | 50 +
gremlin-dotnet/glv/P.template | 45 +
gremlin-dotnet/pom.xml | 296 ++++++
.../src/Gremlin.Net/Driver/Connection.cs | 162 ++++
.../src/Gremlin.Net/Driver/ConnectionFactory.cs | 48 +
.../src/Gremlin.Net/Driver/ConnectionPool.cs | 114 +++
.../Driver/Exceptions/ResponseException.cs | 37 +
.../src/Gremlin.Net/Driver/GremlinClient.cs | 95 ++
.../Driver/GremlinClientExtensions.cs | 140 +++
.../src/Gremlin.Net/Driver/GremlinServer.cs | 70 ++
.../src/Gremlin.Net/Driver/IConnection.cs | 35 +
.../src/Gremlin.Net/Driver/IGremlinClient.cs | 48 +
.../Gremlin.Net/Driver/JsonMessageSerializer.cs | 49 +
.../Driver/Messages/RequestMessage.cs | 143 +++
.../Driver/Messages/ResponseMessage.cs | 40 +
.../Driver/Messages/ResponseResult.cs | 37 +
.../Driver/Messages/ResponseStatus.cs | 50 +
.../Driver/Messages/ResponseStatusCode.cs | 67 ++
.../src/Gremlin.Net/Driver/ProxyConnection.cs | 52 +
.../Driver/Remote/DriverRemoteConnection.cs | 80 ++
.../Driver/Remote/DriverRemoteTraversal.cs | 39 +
.../Remote/DriverRemoteTraversalSideEffects.cs | 126 +++
.../ResultsAggregation/AggregatorFactory.cs | 44 +
.../ResultsAggregation/DefaultAggregator.cs | 42 +
.../ResultsAggregation/DictionaryAggregator.cs | 44 +
.../Driver/ResultsAggregation/IAggregator.cs | 31 +
.../ResultsAggregation/TraverserAggregator.cs | 44 +
gremlin-dotnet/src/Gremlin.Net/Driver/Tokens.cs | 125 +++
.../Gremlin.Net/Driver/WebSocketConnection.cs | 96 ++
.../src/Gremlin.Net/Gremlin.Net.csproj | 64 ++
.../Process/Remote/IRemoteConnection.cs | 42 +
.../Process/Remote/RemoteStrategy.cs | 61 ++
.../Gremlin.Net/Process/Traversal/Barrier.cs | 35 +
.../Gremlin.Net/Process/Traversal/Binding.cs | 80 ++
.../Gremlin.Net/Process/Traversal/Bindings.cs | 42 +
.../Gremlin.Net/Process/Traversal/Bytecode.cs | 85 ++
.../Process/Traversal/Cardinality.cs | 37 +
.../src/Gremlin.Net/Process/Traversal/Column.cs | 36 +
.../Process/Traversal/DefaultTraversal.cs | 198 ++++
.../Gremlin.Net/Process/Traversal/Direction.cs | 37 +
.../Process/Traversal/GraphSONVersion.cs | 36 +
.../Process/Traversal/GraphTraversal.cs | 948 +++++++++++++++++++
.../Process/Traversal/GraphTraversalSource.cs | 194 ++++
.../Process/Traversal/GryoVersion.cs | 35 +
.../Gremlin.Net/Process/Traversal/ITraversal.cs | 102 ++
.../Process/Traversal/ITraversalSideEffects.cs | 52 +
.../Process/Traversal/ITraversalStrategy.cs | 46 +
.../Process/Traversal/Instruction.cs | 52 +
.../Process/Traversal/NamingConversions.cs | 91 ++
.../Gremlin.Net/Process/Traversal/Operator.cs | 45 +
.../src/Gremlin.Net/Process/Traversal/Order.cs | 41 +
.../src/Gremlin.Net/Process/Traversal/P.cs | 117 +++
.../src/Gremlin.Net/Process/Traversal/Pick.cs | 36 +
.../src/Gremlin.Net/Process/Traversal/Pop.cs | 37 +
.../src/Gremlin.Net/Process/Traversal/Scope.cs | 36 +
.../Strategy/AbstractTraversalStrategy.cs | 86 ++
.../Strategy/Decoration/ConnectiveStrategy.cs | 33 +
.../Strategy/Decoration/ElementIdStrategy.cs | 32 +
.../Decoration/HaltedTraverserStrategy.cs | 36 +
.../Strategy/Decoration/PartitionStrategy.cs | 56 ++
.../Strategy/Decoration/SubgraphStrategy.cs | 48 +
.../Decoration/VertexProgramStrategy.cs | 52 +
.../Finalization/MatchAlgorithmStrategy.cs | 36 +
.../Optimization/AdjacentToIncidentStrategy.cs | 32 +
.../Optimization/FilterRankingStrategy.cs | 32 +
.../Optimization/GraphFilterStrategy.cs | 31 +
.../Optimization/IdentityRemovalStrategy.cs | 32 +
.../Optimization/IncidentToAdjacentStrategy.cs | 33 +
.../Optimization/InlineFilterStrategy.cs | 32 +
.../Optimization/LazyBarrierStrategy.cs | 33 +
.../Optimization/MatchPredicateStrategy.cs | 32 +
.../Strategy/Optimization/OrderLimitStrategy.cs | 31 +
.../Optimization/PathProcessorStrategy.cs | 32 +
.../Optimization/PathRetractionStrategy.cs | 31 +
.../Optimization/RangeByIsCountStrategy.cs | 32 +
.../Optimization/RepeatUnrollStrategy.cs | 31 +
.../Verification/LambdaRestrictionStrategy.cs | 32 +
.../Strategy/Verification/ReadOnlyStrategy.cs | 32 +
.../src/Gremlin.Net/Process/Traversal/T.cs | 38 +
.../Process/Traversal/TraversalPredicate.cs | 85 ++
.../Gremlin.Net/Process/Traversal/Traverser.cs | 75 ++
.../src/Gremlin.Net/Process/Traversal/__.cs | 772 +++++++++++++++
.../src/Gremlin.Net/Structure/Edge.cs | 61 ++
.../src/Gremlin.Net/Structure/Element.cs | 77 ++
.../src/Gremlin.Net/Structure/Graph.cs | 43 +
.../Structure/IO/GraphSON/BindingSerializer.cs | 42 +
.../Structure/IO/GraphSON/BytecodeSerializer.cs | 58 ++
.../Structure/IO/GraphSON/DateDeserializer.cs | 43 +
.../Structure/IO/GraphSON/DateSerializer.cs | 43 +
.../Structure/IO/GraphSON/DoubleConverter.cs | 33 +
.../Structure/IO/GraphSON/EdgeDeserializer.cs | 43 +
.../Structure/IO/GraphSON/EdgeSerializer.cs | 45 +
.../Structure/IO/GraphSON/EnumSerializer.cs | 38 +
.../Structure/IO/GraphSON/FloatConverter.cs | 33 +
.../Structure/IO/GraphSON/GraphSONReader.cs | 123 +++
.../Structure/IO/GraphSON/GraphSONTokens.cs | 32 +
.../Structure/IO/GraphSON/GraphSONUtil.cs | 62 ++
.../Structure/IO/GraphSON/GraphSONWriter.cs | 146 +++
.../IO/GraphSON/IGraphSONDeserializer.cs | 41 +
.../IO/GraphSON/IGraphSONSerializer.cs | 41 +
.../Structure/IO/GraphSON/Int32Converter.cs | 33 +
.../Structure/IO/GraphSON/Int64Converter.cs | 33 +
.../Structure/IO/GraphSON/NumberConverter.cs | 45 +
.../Structure/IO/GraphSON/PathDeserializer.cs | 41 +
.../IO/GraphSON/PropertyDeserializer.cs | 38 +
.../Structure/IO/GraphSON/PropertySerializer.cs | 64 ++
.../IO/GraphSON/RequestMessageSerializer.cs | 43 +
.../IO/GraphSON/TraversalPredicateSerializer.cs | 45 +
.../IO/GraphSON/TraversalSerializer.cs | 38 +
.../IO/GraphSON/TraversalStrategySerializer.cs | 37 +
.../Structure/IO/GraphSON/TraverserReader.cs | 38 +
.../Structure/IO/GraphSON/UuidDeserializer.cs | 36 +
.../Structure/IO/GraphSON/UuidSerializer.cs | 37 +
.../Structure/IO/GraphSON/VertexDeserializer.cs | 37 +
.../IO/GraphSON/VertexPropertyDeserializer.cs | 41 +
.../IO/GraphSON/VertexPropertySerializer.cs | 43 +
.../Structure/IO/GraphSON/VertexSerializer.cs | 41 +
.../src/Gremlin.Net/Structure/Path.cs | 193 ++++
.../src/Gremlin.Net/Structure/Property.cs | 96 ++
.../src/Gremlin.Net/Structure/Vertex.cs | 52 +
.../src/Gremlin.Net/Structure/VertexProperty.cs | 66 ++
gremlin-dotnet/src/pom.xml | 219 +++++
.../ConfigProvider.cs | 47 +
.../Driver/ConnectionPoolTests.cs | 90 ++
.../Driver/GremlinClientAuthenticationTests.cs | 86 ++
.../Driver/GremlinClientTests.cs | 212 +++++
.../Driver/MessagesTests.cs | 147 +++
.../Gremlin.Net.IntegrationTest.csproj | 36 +
.../Process/Remote/RemoteStrategyTests.cs | 85 ++
.../BytecodeGenerationTests.cs | 76 ++
.../BytecodeGeneration/StrategiesTests.cs | 170 ++++
.../DriverRemoteConnection/EnumTests.cs | 59 ++
.../GraphTraversalSourceTests.cs | 55 ++
.../GraphTraversalTests.cs | 169 ++++
.../DriverRemoteConnection/PredicateTests.cs | 58 ++
.../RemoteConnectionFactory.cs | 41 +
.../DriverRemoteConnection/SideEffectTests.cs | 221 +++++
.../DriverRemoteConnection/StrategiesTests.cs | 193 ++++
.../Process/Traversal/GraphSONWriterTests.cs | 50 +
.../Util/RequestMessageProvider.cs | 54 ++
.../appsettings.json | 5 +
.../Driver/DriverRemoteConnectionTests.cs | 51 +
.../Driver/GremlinServerTests.cs | 66 ++
.../Driver/RequestMessageBuilderTests.cs | 41 +
.../Gremlin.Net.UnitTest.csproj | 28 +
.../Process/Traversal/BytecodeTests.cs | 44 +
.../Traversal/GraphTraversalSourceTests.cs | 68 ++
.../Process/Traversal/PredicateTests.cs | 50 +
.../Process/Traversal/Strategy/StrategyTests.cs | 109 +++
.../Process/Traversal/TestTraversal.cs | 51 +
.../Process/Traversal/TestTraversalStrategy.cs | 50 +
.../Process/Traversal/TraversalTests.cs | 177 ++++
.../Process/Traversal/TraverserTests.cs | 75 ++
.../Gremlin.Net.UnitTest/Structure/EdgeTests.cs | 57 ++
.../GraphSON/BytecodeGraphSONSerializerTests.cs | 153 +++
.../IO/GraphSON/GraphSONReaderTests.cs | 308 ++++++
.../IO/GraphSON/GraphSONWriterTests.cs | 324 +++++++
.../IO/GraphSON/StrategyWriterTests.cs | 66 ++
.../Structure/IO/GraphSON/TestClass.cs | 30 +
.../Structure/IO/GraphSON/TestUtils.cs | 36 +
.../Gremlin.Net.UnitTest/Structure/PathTests.cs | 416 ++++++++
.../Structure/PropertyTests.cs | 165 ++++
.../Structure/VertexPropertyTests.cs | 69 ++
.../Structure/VertexTests.cs | 80 ++
gremlin-dotnet/test/pom.xml | 205 ++++
pom.xml | 9 +
179 files changed, 14228 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/694b16ed/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --cc CHANGELOG.asciidoc
index 96e79ab,1c14ca6..5bf722d
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@@ -28,11 -28,9 +28,12 @@@ TinkerPop 3.2.6 (Release Date: NOT OFFI
This release also includes changes from <<release-3-1-8, 3.1.8>>.
-* Added Gremlin.Net.
++* Added Gremlin.Net for early release.
+* `ReferenceFactory` and `DetachedFactory` now detach elements in collections accordingly.
* Deprecated the `useMapperFromGraph` configuration option for Gremlin Server serializers.
+* `JavaTranslator` is now smart about handling `BulkSet` and `Tree`.
* Added annotations to the traversal metrics pretty print.
+* `EdgeOtherVertexStep` is no longer final and can be extended by providers.
* `EdgeVertexStep` is no longer final and can be extended by providers.
* Deprecated `Transaction.submit(Function)`.
* Fixed `HADOOP_GREMLIN_LIBS` parsing for Windows.
[3/5] tinkerpop git commit: TINKERPOP-1552 Bump gremlin-dotnet to
3.3.0-SNAPSHOT
Posted by sp...@apache.org.
TINKERPOP-1552 Bump gremlin-dotnet to 3.3.0-SNAPSHOT
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/f11b8c30
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/f11b8c30
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/f11b8c30
Branch: refs/heads/TINKERPOP-1552-master
Commit: f11b8c30bab1ee8f803025fba838117ded62d279
Parents: facd592
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Wed Jul 12 08:35:19 2017 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Wed Jul 12 09:47:40 2017 -0400
----------------------------------------------------------------------
gremlin-dotnet/pom.xml | 2 +-
.../src/Gremlin.Net/Gremlin.Net.csproj | 2 +-
.../Process/Traversal/GraphSONVersion.cs | 3 ++-
.../Process/Traversal/GraphTraversal.cs | 22 ++++++++++++++++++--
.../Process/Traversal/GryoVersion.cs | 3 ++-
.../Process/Traversal/NamingConversions.cs | 3 +++
.../src/Gremlin.Net/Process/Traversal/Pop.cs | 3 ++-
.../src/Gremlin.Net/Process/Traversal/__.cs | 20 ++++++++++++++++--
gremlin-dotnet/src/pom.xml | 2 +-
gremlin-dotnet/test/pom.xml | 2 +-
10 files changed, 51 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f11b8c30/gremlin-dotnet/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-dotnet/pom.xml b/gremlin-dotnet/pom.xml
index aba4315..206f454 100644
--- a/gremlin-dotnet/pom.xml
+++ b/gremlin-dotnet/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
<parent>
<groupId>org.apache.tinkerpop</groupId>
<artifactId>tinkerpop</artifactId>
- <version>3.2.6-SNAPSHOT</version>
+ <version>3.3.0-SNAPSHOT</version>
</parent>
<artifactId>gremlin-dotnet</artifactId>
<name>Apache TinkerPop :: Gremlin.Net</name>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f11b8c30/gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj
----------------------------------------------------------------------
diff --git a/gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj b/gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj
index 30e15a7..1cd286c 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj
+++ b/gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj
@@ -25,7 +25,7 @@ limitations under the License.
</PropertyGroup>
<PropertyGroup Label="Package">
- <Version>3.2.6-SNAPSHOT</Version>
+ <Version>3.3.0-SNAPSHOT</Version>
<Title>Gremlin.Net</Title>
<Authors>Apache TinkerPop</Authors>
<Description>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f11b8c30/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/GraphSONVersion.cs
----------------------------------------------------------------------
diff --git a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/GraphSONVersion.cs b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/GraphSONVersion.cs
index e978bc6..31187ac 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/GraphSONVersion.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/GraphSONVersion.cs
@@ -29,7 +29,8 @@ namespace Gremlin.Net.Process.Traversal
public enum GraphSONVersion
{
V1_0,
- V2_0
+ V2_0,
+ V3_0
}
#pragma warning restore 1591
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f11b8c30/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/GraphTraversal.cs
----------------------------------------------------------------------
diff --git a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/GraphTraversal.cs b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/GraphTraversal.cs
index 2493864..07173e8 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/GraphTraversal.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/GraphTraversal.cs
@@ -774,6 +774,15 @@ namespace Gremlin.Net.Process.Traversal
}
/// <summary>
+ /// Adds the selectV3d2 step to this <see cref="GraphTraversal{SType, EType}" />.
+ /// </summary>
+ public GraphTraversal< S , IDictionary<string, E2> > SelectV3d2<E2> (params object[] args)
+ {
+ Bytecode.AddStep("selectV3d2", args);
+ return Wrap< S , IDictionary<string, E2> >(this);
+ }
+
+ /// <summary>
/// Adds the sideEffect step to this <see cref="GraphTraversal{SType, EType}" />.
/// </summary>
public GraphTraversal< S , E > SideEffect (params object[] args)
@@ -792,6 +801,15 @@ namespace Gremlin.Net.Process.Traversal
}
/// <summary>
+ /// Adds the skip step to this <see cref="GraphTraversal{SType, EType}" />.
+ /// </summary>
+ public GraphTraversal< S , E2 > Skip<E2> (params object[] args)
+ {
+ Bytecode.AddStep("skip", args);
+ return Wrap< S , E2 >(this);
+ }
+
+ /// <summary>
/// Adds the store step to this <see cref="GraphTraversal{SType, EType}" />.
/// </summary>
public GraphTraversal< S , E > Store (params object[] args)
@@ -920,10 +938,10 @@ namespace Gremlin.Net.Process.Traversal
/// <summary>
/// Adds the valueMap step to this <see cref="GraphTraversal{SType, EType}" />.
/// </summary>
- public GraphTraversal< S , IDictionary<string, E2> > ValueMap<E2> (params object[] args)
+ public GraphTraversal< S , java.util.Map<java.lang.Object, E2> > ValueMap<E2> (params object[] args)
{
Bytecode.AddStep("valueMap", args);
- return Wrap< S , IDictionary<string, E2> >(this);
+ return Wrap< S , java.util.Map<java.lang.Object, E2> >(this);
}
/// <summary>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f11b8c30/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/GryoVersion.cs
----------------------------------------------------------------------
diff --git a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/GryoVersion.cs b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/GryoVersion.cs
index 5ee7358..f2b025a 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/GryoVersion.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/GryoVersion.cs
@@ -28,7 +28,8 @@ namespace Gremlin.Net.Process.Traversal
public enum GryoVersion
{
- V1_0
+ V1_0,
+ V3_0
}
#pragma warning restore 1591
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f11b8c30/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/NamingConversions.cs
----------------------------------------------------------------------
diff --git a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/NamingConversions.cs b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/NamingConversions.cs
index aecdc57..b9bc2ae 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/NamingConversions.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/NamingConversions.cs
@@ -55,7 +55,9 @@ namespace Gremlin.Net.Process.Traversal
{"Direction.Out", "OUT"},
{"GraphSONVersion.V1_0", "V1_0"},
{"GraphSONVersion.V2_0", "V2_0"},
+ {"GraphSONVersion.V3_0", "V3_0"},
{"GryoVersion.V1_0", "V1_0"},
+ {"GryoVersion.V3_0", "V3_0"},
{"Operator.AddAll", "addAll"},
{"Operator.And", "and"},
{"Operator.Assign", "assign"},
@@ -79,6 +81,7 @@ namespace Gremlin.Net.Process.Traversal
{"Pop.All", "all"},
{"Pop.First", "first"},
{"Pop.Last", "last"},
+ {"Pop.Mixed", "mixed"},
{"Scope.Global", "global"},
{"Scope.Local", "local"},
{"T.Id", "id"},
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f11b8c30/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Pop.cs
----------------------------------------------------------------------
diff --git a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Pop.cs b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Pop.cs
index a7a8403..5f3881d 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Pop.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Pop.cs
@@ -30,7 +30,8 @@ namespace Gremlin.Net.Process.Traversal
{
All,
First,
- Last
+ Last,
+ Mixed
}
#pragma warning restore 1591
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f11b8c30/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/__.cs
----------------------------------------------------------------------
diff --git a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/__.cs b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/__.cs
index fd7a901..2080bed 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/__.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/__.cs
@@ -617,6 +617,14 @@ namespace Gremlin.Net.Process.Traversal
}
/// <summary>
+ /// Spawns a <see cref="GraphTraversal{SType, EType}" /> and adds the selectV3d2 step to that traversal.
+ /// </summary>
+ public static GraphTraversal<object, IDictionary<string, E2>> SelectV3d2<E2>(params object[] args)
+ {
+ return new GraphTraversal<object, object>().SelectV3d2<E2>(args);
+ }
+
+ /// <summary>
/// Spawns a <see cref="GraphTraversal{SType, EType}" /> and adds the sideEffect step to that traversal.
/// </summary>
public static GraphTraversal<object, object> SideEffect(params object[] args)
@@ -633,6 +641,14 @@ namespace Gremlin.Net.Process.Traversal
}
/// <summary>
+ /// Spawns a <see cref="GraphTraversal{SType, EType}" /> and adds the skip step to that traversal.
+ /// </summary>
+ public static GraphTraversal<object, object> Skip(params object[] args)
+ {
+ return new GraphTraversal<object, object>().Skip(args);
+ }
+
+ /// <summary>
/// Spawns a <see cref="GraphTraversal{SType, EType}" /> and adds the store step to that traversal.
/// </summary>
public static GraphTraversal<object, object> Store(params object[] args)
@@ -747,9 +763,9 @@ namespace Gremlin.Net.Process.Traversal
/// <summary>
/// Spawns a <see cref="GraphTraversal{SType, EType}" /> and adds the valueMap step to that traversal.
/// </summary>
- public static GraphTraversal<object, IDictionary<string, E2>> ValueMap<E2>(params object[] args)
+ public static GraphTraversal<object, java.util.Map<java.lang.Object, B>> ValueMap(params object[] args)
{
- return new GraphTraversal<object, object>().ValueMap<E2>(args);
+ return new GraphTraversal<object, object>().ValueMap(args);
}
/// <summary>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f11b8c30/gremlin-dotnet/src/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-dotnet/src/pom.xml b/gremlin-dotnet/src/pom.xml
index d19170d..5068a62 100644
--- a/gremlin-dotnet/src/pom.xml
+++ b/gremlin-dotnet/src/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
<parent>
<groupId>org.apache.tinkerpop</groupId>
<artifactId>gremlin-dotnet</artifactId>
- <version>3.2.6-SNAPSHOT</version>
+ <version>3.3.0-SNAPSHOT</version>
</parent>
<artifactId>gremlin-dotnet-source</artifactId>
<name>Apache TinkerPop :: Gremlin.Net - Source</name>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f11b8c30/gremlin-dotnet/test/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-dotnet/test/pom.xml b/gremlin-dotnet/test/pom.xml
index ab2a607..34f4cda 100644
--- a/gremlin-dotnet/test/pom.xml
+++ b/gremlin-dotnet/test/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
<parent>
<groupId>org.apache.tinkerpop</groupId>
<artifactId>gremlin-dotnet</artifactId>
- <version>3.2.6-SNAPSHOT</version>
+ <version>3.3.0-SNAPSHOT</version>
</parent>
<artifactId>gremlin-dotnet-tests</artifactId>
<name>Apache TinkerPop :: Gremlin.Net - Tests</name>
[2/5] tinkerpop git commit: Merge branch 'tp32'
Posted by sp...@apache.org.
Merge branch 'tp32'
Conflicts:
docker/Dockerfile
pom.xml
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/facd592f
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/facd592f
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/facd592f
Branch: refs/heads/TINKERPOP-1552-master
Commit: facd592f2e1269543ce3df9e81a7e16cec15ccdc
Parents: 144441a 694b16e
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Wed Jul 12 07:53:04 2017 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Wed Jul 12 07:53:04 2017 -0400
----------------------------------------------------------------------
.gitignore | 11 +
.travis.yml | 5 +
CHANGELOG.asciidoc | 1 +
docker/Dockerfile | 6 +-
.../developer/development-environment.asciidoc | 35 +
docs/src/dev/developer/release.asciidoc | 18 +-
docs/src/reference/gremlin-variants.asciidoc | 190 ++++
gremlin-dotnet/Gremlin.Net.sln | 45 +
gremlin-dotnet/glv/AnonymousTraversal.template | 52 +
gremlin-dotnet/glv/Enum.template | 35 +
gremlin-dotnet/glv/GraphTraversal.template | 75 ++
.../glv/GraphTraversalSource.template | 132 +++
gremlin-dotnet/glv/Gremlin.Net.csproj.template | 64 ++
gremlin-dotnet/glv/NamingConversions.template | 50 +
gremlin-dotnet/glv/P.template | 45 +
gremlin-dotnet/pom.xml | 296 ++++++
.../src/Gremlin.Net/Driver/Connection.cs | 162 ++++
.../src/Gremlin.Net/Driver/ConnectionFactory.cs | 48 +
.../src/Gremlin.Net/Driver/ConnectionPool.cs | 114 +++
.../Driver/Exceptions/ResponseException.cs | 37 +
.../src/Gremlin.Net/Driver/GremlinClient.cs | 95 ++
.../Driver/GremlinClientExtensions.cs | 140 +++
.../src/Gremlin.Net/Driver/GremlinServer.cs | 70 ++
.../src/Gremlin.Net/Driver/IConnection.cs | 35 +
.../src/Gremlin.Net/Driver/IGremlinClient.cs | 48 +
.../Gremlin.Net/Driver/JsonMessageSerializer.cs | 49 +
.../Driver/Messages/RequestMessage.cs | 143 +++
.../Driver/Messages/ResponseMessage.cs | 40 +
.../Driver/Messages/ResponseResult.cs | 37 +
.../Driver/Messages/ResponseStatus.cs | 50 +
.../Driver/Messages/ResponseStatusCode.cs | 67 ++
.../src/Gremlin.Net/Driver/ProxyConnection.cs | 52 +
.../Driver/Remote/DriverRemoteConnection.cs | 80 ++
.../Driver/Remote/DriverRemoteTraversal.cs | 39 +
.../Remote/DriverRemoteTraversalSideEffects.cs | 126 +++
.../ResultsAggregation/AggregatorFactory.cs | 44 +
.../ResultsAggregation/DefaultAggregator.cs | 42 +
.../ResultsAggregation/DictionaryAggregator.cs | 44 +
.../Driver/ResultsAggregation/IAggregator.cs | 31 +
.../ResultsAggregation/TraverserAggregator.cs | 44 +
gremlin-dotnet/src/Gremlin.Net/Driver/Tokens.cs | 125 +++
.../Gremlin.Net/Driver/WebSocketConnection.cs | 96 ++
.../src/Gremlin.Net/Gremlin.Net.csproj | 64 ++
.../Process/Remote/IRemoteConnection.cs | 42 +
.../Process/Remote/RemoteStrategy.cs | 61 ++
.../Gremlin.Net/Process/Traversal/Barrier.cs | 35 +
.../Gremlin.Net/Process/Traversal/Binding.cs | 80 ++
.../Gremlin.Net/Process/Traversal/Bindings.cs | 42 +
.../Gremlin.Net/Process/Traversal/Bytecode.cs | 85 ++
.../Process/Traversal/Cardinality.cs | 37 +
.../src/Gremlin.Net/Process/Traversal/Column.cs | 36 +
.../Process/Traversal/DefaultTraversal.cs | 198 ++++
.../Gremlin.Net/Process/Traversal/Direction.cs | 37 +
.../Process/Traversal/GraphSONVersion.cs | 36 +
.../Process/Traversal/GraphTraversal.cs | 948 +++++++++++++++++++
.../Process/Traversal/GraphTraversalSource.cs | 194 ++++
.../Process/Traversal/GryoVersion.cs | 35 +
.../Gremlin.Net/Process/Traversal/ITraversal.cs | 102 ++
.../Process/Traversal/ITraversalSideEffects.cs | 52 +
.../Process/Traversal/ITraversalStrategy.cs | 46 +
.../Process/Traversal/Instruction.cs | 52 +
.../Process/Traversal/NamingConversions.cs | 91 ++
.../Gremlin.Net/Process/Traversal/Operator.cs | 45 +
.../src/Gremlin.Net/Process/Traversal/Order.cs | 41 +
.../src/Gremlin.Net/Process/Traversal/P.cs | 117 +++
.../src/Gremlin.Net/Process/Traversal/Pick.cs | 36 +
.../src/Gremlin.Net/Process/Traversal/Pop.cs | 37 +
.../src/Gremlin.Net/Process/Traversal/Scope.cs | 36 +
.../Strategy/AbstractTraversalStrategy.cs | 86 ++
.../Strategy/Decoration/ConnectiveStrategy.cs | 33 +
.../Strategy/Decoration/ElementIdStrategy.cs | 32 +
.../Decoration/HaltedTraverserStrategy.cs | 36 +
.../Strategy/Decoration/PartitionStrategy.cs | 56 ++
.../Strategy/Decoration/SubgraphStrategy.cs | 48 +
.../Decoration/VertexProgramStrategy.cs | 52 +
.../Finalization/MatchAlgorithmStrategy.cs | 36 +
.../Optimization/AdjacentToIncidentStrategy.cs | 32 +
.../Optimization/FilterRankingStrategy.cs | 32 +
.../Optimization/GraphFilterStrategy.cs | 31 +
.../Optimization/IdentityRemovalStrategy.cs | 32 +
.../Optimization/IncidentToAdjacentStrategy.cs | 33 +
.../Optimization/InlineFilterStrategy.cs | 32 +
.../Optimization/LazyBarrierStrategy.cs | 33 +
.../Optimization/MatchPredicateStrategy.cs | 32 +
.../Strategy/Optimization/OrderLimitStrategy.cs | 31 +
.../Optimization/PathProcessorStrategy.cs | 32 +
.../Optimization/PathRetractionStrategy.cs | 31 +
.../Optimization/RangeByIsCountStrategy.cs | 32 +
.../Optimization/RepeatUnrollStrategy.cs | 31 +
.../Verification/LambdaRestrictionStrategy.cs | 32 +
.../Strategy/Verification/ReadOnlyStrategy.cs | 32 +
.../src/Gremlin.Net/Process/Traversal/T.cs | 38 +
.../Process/Traversal/TraversalPredicate.cs | 85 ++
.../Gremlin.Net/Process/Traversal/Traverser.cs | 75 ++
.../src/Gremlin.Net/Process/Traversal/__.cs | 772 +++++++++++++++
.../src/Gremlin.Net/Structure/Edge.cs | 61 ++
.../src/Gremlin.Net/Structure/Element.cs | 77 ++
.../src/Gremlin.Net/Structure/Graph.cs | 43 +
.../Structure/IO/GraphSON/BindingSerializer.cs | 42 +
.../Structure/IO/GraphSON/BytecodeSerializer.cs | 58 ++
.../Structure/IO/GraphSON/DateDeserializer.cs | 43 +
.../Structure/IO/GraphSON/DateSerializer.cs | 43 +
.../Structure/IO/GraphSON/DoubleConverter.cs | 33 +
.../Structure/IO/GraphSON/EdgeDeserializer.cs | 43 +
.../Structure/IO/GraphSON/EdgeSerializer.cs | 45 +
.../Structure/IO/GraphSON/EnumSerializer.cs | 38 +
.../Structure/IO/GraphSON/FloatConverter.cs | 33 +
.../Structure/IO/GraphSON/GraphSONReader.cs | 123 +++
.../Structure/IO/GraphSON/GraphSONTokens.cs | 32 +
.../Structure/IO/GraphSON/GraphSONUtil.cs | 62 ++
.../Structure/IO/GraphSON/GraphSONWriter.cs | 146 +++
.../IO/GraphSON/IGraphSONDeserializer.cs | 41 +
.../IO/GraphSON/IGraphSONSerializer.cs | 41 +
.../Structure/IO/GraphSON/Int32Converter.cs | 33 +
.../Structure/IO/GraphSON/Int64Converter.cs | 33 +
.../Structure/IO/GraphSON/NumberConverter.cs | 45 +
.../Structure/IO/GraphSON/PathDeserializer.cs | 41 +
.../IO/GraphSON/PropertyDeserializer.cs | 38 +
.../Structure/IO/GraphSON/PropertySerializer.cs | 64 ++
.../IO/GraphSON/RequestMessageSerializer.cs | 43 +
.../IO/GraphSON/TraversalPredicateSerializer.cs | 45 +
.../IO/GraphSON/TraversalSerializer.cs | 38 +
.../IO/GraphSON/TraversalStrategySerializer.cs | 37 +
.../Structure/IO/GraphSON/TraverserReader.cs | 38 +
.../Structure/IO/GraphSON/UuidDeserializer.cs | 36 +
.../Structure/IO/GraphSON/UuidSerializer.cs | 37 +
.../Structure/IO/GraphSON/VertexDeserializer.cs | 37 +
.../IO/GraphSON/VertexPropertyDeserializer.cs | 41 +
.../IO/GraphSON/VertexPropertySerializer.cs | 43 +
.../Structure/IO/GraphSON/VertexSerializer.cs | 41 +
.../src/Gremlin.Net/Structure/Path.cs | 193 ++++
.../src/Gremlin.Net/Structure/Property.cs | 96 ++
.../src/Gremlin.Net/Structure/Vertex.cs | 52 +
.../src/Gremlin.Net/Structure/VertexProperty.cs | 66 ++
gremlin-dotnet/src/pom.xml | 219 +++++
.../ConfigProvider.cs | 47 +
.../Driver/ConnectionPoolTests.cs | 90 ++
.../Driver/GremlinClientAuthenticationTests.cs | 86 ++
.../Driver/GremlinClientTests.cs | 212 +++++
.../Driver/MessagesTests.cs | 147 +++
.../Gremlin.Net.IntegrationTest.csproj | 36 +
.../Process/Remote/RemoteStrategyTests.cs | 85 ++
.../BytecodeGenerationTests.cs | 76 ++
.../BytecodeGeneration/StrategiesTests.cs | 170 ++++
.../DriverRemoteConnection/EnumTests.cs | 59 ++
.../GraphTraversalSourceTests.cs | 55 ++
.../GraphTraversalTests.cs | 169 ++++
.../DriverRemoteConnection/PredicateTests.cs | 58 ++
.../RemoteConnectionFactory.cs | 41 +
.../DriverRemoteConnection/SideEffectTests.cs | 221 +++++
.../DriverRemoteConnection/StrategiesTests.cs | 193 ++++
.../Process/Traversal/GraphSONWriterTests.cs | 50 +
.../Util/RequestMessageProvider.cs | 54 ++
.../appsettings.json | 5 +
.../Driver/DriverRemoteConnectionTests.cs | 51 +
.../Driver/GremlinServerTests.cs | 66 ++
.../Driver/RequestMessageBuilderTests.cs | 41 +
.../Gremlin.Net.UnitTest.csproj | 28 +
.../Process/Traversal/BytecodeTests.cs | 44 +
.../Traversal/GraphTraversalSourceTests.cs | 68 ++
.../Process/Traversal/PredicateTests.cs | 50 +
.../Process/Traversal/Strategy/StrategyTests.cs | 109 +++
.../Process/Traversal/TestTraversal.cs | 51 +
.../Process/Traversal/TestTraversalStrategy.cs | 50 +
.../Process/Traversal/TraversalTests.cs | 177 ++++
.../Process/Traversal/TraverserTests.cs | 75 ++
.../Gremlin.Net.UnitTest/Structure/EdgeTests.cs | 57 ++
.../GraphSON/BytecodeGraphSONSerializerTests.cs | 153 +++
.../IO/GraphSON/GraphSONReaderTests.cs | 308 ++++++
.../IO/GraphSON/GraphSONWriterTests.cs | 324 +++++++
.../IO/GraphSON/StrategyWriterTests.cs | 66 ++
.../Structure/IO/GraphSON/TestClass.cs | 30 +
.../Structure/IO/GraphSON/TestUtils.cs | 36 +
.../Gremlin.Net.UnitTest/Structure/PathTests.cs | 416 ++++++++
.../Structure/PropertyTests.cs | 165 ++++
.../Structure/VertexPropertyTests.cs | 69 ++
.../Structure/VertexTests.cs | 80 ++
gremlin-dotnet/test/pom.xml | 205 ++++
pom.xml | 9 +
179 files changed, 14228 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/facd592f/.gitignore
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/facd592f/.travis.yml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/facd592f/CHANGELOG.asciidoc
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/facd592f/docker/Dockerfile
----------------------------------------------------------------------
diff --cc docker/Dockerfile
index ce3e62e,3e7ca42..35dd35e
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@@ -20,14 -20,13 +20,16 @@@ FROM ubuntu:trust
MAINTAINER Daniel Kuppitz <me...@gremlin.guru>
RUN apt-get update \
- && apt-get -y install software-properties-common python-software-properties \
+ && apt-get -y install software-properties-common python-software-properties apt-transport-https \
&& echo oracle-java8-installer shared/accepted-oracle-license-v1-1 select true | debconf-set-selections \
&& add-apt-repository -y ppa:webupd8team/java \
+ && sh -c 'echo "deb [arch=amd64] https://apt-mo.trafficmanager.net/repos/dotnet-release/ trusty main" > /etc/apt/sources.list.d/dotnetdev.list' \
+ && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 417A0893 \
&& apt-get update \
- && apt-get install -y oracle-java8-installer curl gawk git maven openssh-server subversion \
- && apt-get install -y oracle-java8-installer curl gawk git maven openssh-server dotnet-dev-1.0.4 \
++ && apt-get install -y oracle-java8-installer curl gawk git maven openssh-server dotnet-dev-1.0.4 subversion \
+ && apt-get install -y python python-dev python-pip build-essential \
+ && pip install virtualenv virtualenvwrapper \
+ && pip install --upgrade pip \
&& rm -rf /var/lib/apt/lists/* /var/cache/oracle-jdk8-installer
RUN sed -i 's@PermitRootLogin without-password@PermitRootLogin yes@' /etc/ssh/sshd_config
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/facd592f/docs/src/dev/developer/development-environment.asciidoc
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/facd592f/docs/src/dev/developer/release.asciidoc
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/facd592f/docs/src/reference/gremlin-variants.asciidoc
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/facd592f/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index c60254a,327a0db..9631f6a
--- a/pom.xml
+++ b/pom.xml
@@@ -116,9 -116,12 +116,10 @@@ limitations under the License
<module>gremlin-shaded</module>
<module>gremlin-core</module>
<module>gremlin-test</module>
- <module>gremlin-benchmark</module>
<module>gremlin-groovy</module>
- <module>gremlin-groovy-test</module>
<module>tinkergraph-gremlin</module>
<module>gremlin-python</module>
+ <module>gremlin-dotnet</module>
<module>hadoop-gremlin</module>
<module>spark-gremlin</module>
<module>giraph-gremlin</module>
@@@ -318,8 -312,14 +319,16 @@@
<exclude>**/.glv</exclude>
<exclude>bin/gremlin.sh</exclude>
<exclude>gremlin-console/bin/gremlin.sh</exclude>
+ <exclude>docs/site/home/css/**</exclude>
+ <exclude>docs/site/home/js/**</exclude>
+ <exclude>**/Debug/**</exclude>
+ <exclude>**/Release/**</exclude>
+ <exclude>**/obj/**</exclude>
+ <exclude>**/*.sln</exclude>
+ <exclude>**/*.user</exclude>
+ <exclude>**/*.csproj</exclude>
+ <exclude>**/.vs/**</exclude>
+ <exclude>**/NuGet.Config</exclude>
</excludes>
<licenses>
<license implementation="org.apache.rat.analysis.license.ApacheSoftwareLicense20"/>
[5/5] tinkerpop git commit: TINKERPOP-1552 Fixed templates for 3.3.0
and got tests running
Posted by sp...@apache.org.
TINKERPOP-1552 Fixed templates for 3.3.0 and got tests running
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/b3c91632
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/b3c91632
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/b3c91632
Branch: refs/heads/TINKERPOP-1552-master
Commit: b3c9163255c6c5463560f46ef5cf2c543335d480
Parents: ce4a4d9
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Wed Jul 12 09:46:20 2017 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Wed Jul 12 09:47:47 2017 -0400
----------------------------------------------------------------------
gremlin-dotnet/pom.xml | 3 +++
.../src/Gremlin.Net/Process/Traversal/GraphTraversal.cs | 4 ++--
gremlin-dotnet/src/Gremlin.Net/Process/Traversal/__.cs | 8 ++++----
.../Traversal/DriverRemoteConnection/GraphTraversalTests.cs | 4 ++--
gremlin-dotnet/test/pom.xml | 4 ++--
gremlin-python/pom.xml | 2 --
6 files changed, 13 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b3c91632/gremlin-dotnet/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-dotnet/pom.xml b/gremlin-dotnet/pom.xml
index 206f454..2ba30ec 100644
--- a/gremlin-dotnet/pom.xml
+++ b/gremlin-dotnet/pom.xml
@@ -88,6 +88,8 @@ def toCSharpTypeMap = ["Long": "long",
"Object": "object",
"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.Map<K, V>": "IDictionary<K, V>",
"java.util.Collection<E2>": "ICollection<E2>",
@@ -102,6 +104,7 @@ def methodsWithSpecificTypes = ["constant": useE2,
"optional": useE2,
"range": useE2,
"select": ["IDictionary<string, E2>", "E2"],
+ "skip": useE2,
"sum": useE2,
"tail": useE2,
"tree": ["object"],
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b3c91632/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/GraphTraversal.cs
----------------------------------------------------------------------
diff --git a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/GraphTraversal.cs b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/GraphTraversal.cs
index 07173e8..8f5b48c 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/GraphTraversal.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/GraphTraversal.cs
@@ -938,10 +938,10 @@ namespace Gremlin.Net.Process.Traversal
/// <summary>
/// Adds the valueMap step to this <see cref="GraphTraversal{SType, EType}" />.
/// </summary>
- public GraphTraversal< S , java.util.Map<java.lang.Object, E2> > ValueMap<E2> (params object[] args)
+ public GraphTraversal< S , IDictionary<object, E2> > ValueMap<E2> (params object[] args)
{
Bytecode.AddStep("valueMap", args);
- return Wrap< S , java.util.Map<java.lang.Object, E2> >(this);
+ return Wrap< S , IDictionary<object, E2> >(this);
}
/// <summary>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b3c91632/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/__.cs
----------------------------------------------------------------------
diff --git a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/__.cs b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/__.cs
index 2080bed..e0e6e42 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/__.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/__.cs
@@ -643,9 +643,9 @@ namespace Gremlin.Net.Process.Traversal
/// <summary>
/// Spawns a <see cref="GraphTraversal{SType, EType}" /> and adds the skip step to that traversal.
/// </summary>
- public static GraphTraversal<object, object> Skip(params object[] args)
+ public static GraphTraversal<object, E2> Skip<E2>(params object[] args)
{
- return new GraphTraversal<object, object>().Skip(args);
+ return new GraphTraversal<object, object>().Skip<E2>(args);
}
/// <summary>
@@ -763,9 +763,9 @@ namespace Gremlin.Net.Process.Traversal
/// <summary>
/// Spawns a <see cref="GraphTraversal{SType, EType}" /> and adds the valueMap step to that traversal.
/// </summary>
- public static GraphTraversal<object, java.util.Map<java.lang.Object, B>> ValueMap(params object[] args)
+ public static GraphTraversal<object, IDictionary<object, E2>> ValueMap<E2>(params object[] args)
{
- return new GraphTraversal<object, object>().ValueMap(args);
+ return new GraphTraversal<object, object>().ValueMap<E2>(args);
}
/// <summary>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b3c91632/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Process/Traversal/DriverRemoteConnection/GraphTraversalTests.cs
----------------------------------------------------------------------
diff --git a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Process/Traversal/DriverRemoteConnection/GraphTraversalTests.cs b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Process/Traversal/DriverRemoteConnection/GraphTraversalTests.cs
index 2156ff3..24c75b0 100644
--- a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Process/Traversal/DriverRemoteConnection/GraphTraversalTests.cs
+++ b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Process/Traversal/DriverRemoteConnection/GraphTraversalTests.cs
@@ -104,7 +104,7 @@ namespace Gremlin.Net.IntegrationTest.Process.Traversal.DriverRemoteConnection
var receivedValueMap = g.V().Has("name", "marko").ValueMap<object>().Next();
- var expectedValueMap = new Dictionary<string, object>
+ var expectedValueMap = new Dictionary<object, object>
{
{"age", new List<object> {29}},
{"name", new List<object> {"marko"}}
@@ -166,4 +166,4 @@ namespace Gremlin.Net.IntegrationTest.Process.Traversal.DriverRemoteConnection
Assert.Equal(6, count);
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b3c91632/gremlin-dotnet/test/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-dotnet/test/pom.xml b/gremlin-dotnet/test/pom.xml
index 34f4cda..2b09d26 100644
--- a/gremlin-dotnet/test/pom.xml
+++ b/gremlin-dotnet/test/pom.xml
@@ -140,7 +140,7 @@ if (${skipTests}) return
log.info("Starting Gremlin Server instances for native testing of gremlin-dotnet")
def settings = Settings.read("${gremlin.server.dir}/conf/gremlin-server-modern.yaml")
settings.graphs.graph = "${gremlin.server.dir}/conf/tinkergraph-empty.properties"
-settings.scriptEngines["gremlin-groovy"].scripts = ["${gremlin.server.dir}/scripts/generate-modern.groovy"]
+settings.scriptEngines["gremlin-groovy"].plugins["org.apache.tinkerpop.gremlin.jsr223.ScriptFileGremlinPlugin"].files = ["${gremlin.server.dir}/scripts/generate-modern.groovy"]
settings.port = 45950
def server = new GremlinServer(settings)
@@ -151,7 +151,7 @@ log.info("Gremlin Server with no authentication started on port 45950")
def settingsSecure = Settings.read("${gremlin.server.dir}/conf/gremlin-server-modern.yaml")
settingsSecure.graphs.graph = "${gremlin.server.dir}/conf/tinkergraph-empty.properties"
-settingsSecure.scriptEngines["gremlin-groovy"].scripts = ["${gremlin.server.dir}/scripts/generate-modern.groovy"]
+settingsSecure.scriptEngines["gremlin-groovy"].plugins["org.apache.tinkerpop.gremlin.jsr223.ScriptFileGremlinPlugin"].files = ["${gremlin.server.dir}/scripts/generate-modern.groovy"]
settingsSecure.port = 45951
settingsSecure.authentication.className = "org.apache.tinkerpop.gremlin.server.auth.SimpleAuthenticator"
settingsSecure.authentication.config = [credentialsDb: "${gremlin.server.dir}/conf/tinkergraph-credentials.properties", credentialsDbLocation: "${gremlin.server.dir}/data/credentials.kryo"]
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b3c91632/gremlin-python/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-python/pom.xml b/gremlin-python/pom.xml
index 7c1db0f..b53e60c 100644
--- a/gremlin-python/pom.xml
+++ b/gremlin-python/pom.xml
@@ -588,8 +588,6 @@ settings.graphs.graph = "${gremlin.server.dir}/conf/tinkergraph-empty.properties
settings.scriptEngines["gremlin-groovy"].plugins["org.apache.tinkerpop.gremlin.jsr223.ScriptFileGremlinPlugin"].files = ["${gremlin.server.dir}/scripts/generate-modern.groovy"]
settings.port = 45940
-println settings.scriptEngines["gremlin-groovy"].plugins["org.apache.tinkerpop.gremlin.jsr223.ScriptFileGremlinPlugin"].files
-
def server = new GremlinServer(settings)
server.start().join()
[4/5] tinkerpop git commit: TINKERPOP-1552 Add .glv file to
gremlin-dotnet so docker will build it
Posted by sp...@apache.org.
TINKERPOP-1552 Add .glv file to gremlin-dotnet so docker will build it
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/ce4a4d98
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/ce4a4d98
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/ce4a4d98
Branch: refs/heads/TINKERPOP-1552-master
Commit: ce4a4d98bf6588897c108d3c8394a3fe27331f33
Parents: f11b8c3
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Wed Jul 12 08:47:23 2017 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Wed Jul 12 09:47:47 2017 -0400
----------------------------------------------------------------------
docker/scripts/build.sh | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ce4a4d98/docker/scripts/build.sh
----------------------------------------------------------------------
diff --git a/docker/scripts/build.sh b/docker/scripts/build.sh
index ea3bd19..30544ac 100755
--- a/docker/scripts/build.sh
+++ b/docker/scripts/build.sh
@@ -68,6 +68,8 @@ if [ -d "${TINKERMEM_PATH}" ]; then
fi
touch gremlin-python/.glv
+touch gremlin-dotnet/src/.glv
+touch gremlin-dotnet/test/.glv
# use a custom maven settings.xml
if [ -r "settings.xml" ]; then