[18/20] tinkerpop git commit: Merge branch 'tp33'
Merge branch 'tp33' Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/734b01f3 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/734b01f3 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/734b01f3 Branch: refs/heads/TINKERPOP-1987 Commit: 734b01f358c59c9e16b2479c5bcdfb95a7e75e78 Parents: ec7e27e 65ba04f Author: Stephen Mallette Authored: Fri Jun 29 15:21:49 2018 -0400 Committer: Stephen Mallette Committed: Fri Jun 29 15:21:49 2018 -0400 -- gremlin-dotnet/glv/generate.groovy | 28 ++-- 1 file changed, 14 insertions(+), 14 deletions(-) --
[19/20] tinkerpop git commit: The GraphTraversal in .NET got out of sync somehow. CTR
The GraphTraversal in .NET got out of sync somehow. CTR
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/1f240fe2
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/1f240fe2
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/1f240fe2
Branch: refs/heads/TINKERPOP-1987
Commit: 1f240fe2593524211553c222deadc4f95628f33a
Parents: 734b01f
Author: Stephen Mallette
Authored: Fri Jun 29 16:04:26 2018 -0400
Committer: Stephen Mallette
Committed: Fri Jun 29 16:04:26 2018 -0400
--
.../src/Gremlin.Net/Process/Traversal/GraphTraversal.cs | 9 +
1 file changed, 9 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/1f240fe2/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 9952455..537cdbe 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/GraphTraversal.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/GraphTraversal.cs
@@ -1676,5 +1676,14 @@ namespace Gremlin.Net.Process.Traversal
return Wrap(this);
}
+///
+/// Adds the with step to this .
+///
+public GraphTraversal With (string key, object value)
+{
+Bytecode.AddStep("with", key, value);
+return Wrap(this);
+}
+
}
}
\ No newline at end of file
[15/20] tinkerpop git commit: Merge branch 'tp33'
Merge branch 'tp33' Conflicts: docs/src/reference/the-graphcomputer.asciidoc Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/ec7e27ea Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/ec7e27ea Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/ec7e27ea Branch: refs/heads/TINKERPOP-1987 Commit: ec7e27ea02d588076c681782ac4e7a57c1824d8e Parents: 935ef5c ef888a1 Author: Stephen Mallette Authored: Thu Jun 28 10:10:09 2018 -0400 Committer: Stephen Mallette Committed: Thu Jun 28 10:10:09 2018 -0400 -- CHANGELOG.asciidoc | 2 + docs/src/dev/provider/index.asciidoc| 13 +++ .../reference/implementations-spark.asciidoc| 64 ++--- docs/src/reference/the-graphcomputer.asciidoc | 85 - .../upgrade/release-3.2.x-incubating.asciidoc | 27 ++ .../tinkerpop/gremlin/jsr223/CoreImports.java | 2 + .../bulkdumping/BulkDumperVertexProgram.java| 3 + .../computer/bulkloading/BulkLoader.java| 2 + .../bulkloading/BulkLoaderVertexProgram.java| 2 + .../bulkloading/IncrementalBulkLoader.java | 2 + .../computer/bulkloading/OneTimeBulkLoader.java | 2 + .../computer/clone/CloneVertexProgram.java | 98 .../gremlin/process/remote/RemoteGraph.java | 4 + .../gremlin/process/ProcessComputerSuite.java | 2 + .../computer/clone/CloneVertexProgramTest.java | 98 15 files changed, 283 insertions(+), 123 deletions(-) -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ec7e27ea/CHANGELOG.asciidoc -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ec7e27ea/docs/src/dev/provider/index.asciidoc -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ec7e27ea/docs/src/reference/the-graphcomputer.asciidoc -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ec7e27ea/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/CoreImports.java -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ec7e27ea/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/bulkloading/BulkLoaderVertexProgram.java --
[17/20] tinkerpop git commit: Merge branch 'tp32' into tp33
Merge branch 'tp32' into tp33 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/65ba04f1 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/65ba04f1 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/65ba04f1 Branch: refs/heads/TINKERPOP-1987 Commit: 65ba04f19dd218f10dbf45ee169db7f688357721 Parents: ef888a1 34a648b Author: Stephen Mallette Authored: Fri Jun 29 15:21:42 2018 -0400 Committer: Stephen Mallette Committed: Fri Jun 29 15:21:42 2018 -0400 -- gremlin-dotnet/glv/generate.groovy | 28 ++-- 1 file changed, 14 insertions(+), 14 deletions(-) -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/65ba04f1/gremlin-dotnet/glv/generate.groovy --
[16/20] tinkerpop git commit: Removed some unneeded semi-colons from groovy script CTR
Removed some unneeded semi-colons from groovy script CTR
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/34a648b1
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/34a648b1
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/34a648b1
Branch: refs/heads/TINKERPOP-1987
Commit: 34a648b1bb36475beddbad4d673f5bed9c77ed4a
Parents: 4160b04
Author: Stephen Mallette
Authored: Fri Jun 29 15:21:21 2018 -0400
Committer: Stephen Mallette
Committed: Fri Jun 29 15:21:21 2018 -0400
--
gremlin-dotnet/glv/generate.groovy | 28 ++--
1 file changed, 14 insertions(+), 14 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/34a648b1/gremlin-dotnet/glv/generate.groovy
--
diff --git a/gremlin-dotnet/glv/generate.groovy
b/gremlin-dotnet/glv/generate.groovy
index 8f5fa44..29f9ec7 100644
--- a/gremlin-dotnet/glv/generate.groovy
+++ b/gremlin-dotnet/glv/generate.groovy
@@ -61,7 +61,7 @@ def toCSharpTypeMap = ["Long": "long",
"Comparator": "IComparator",
"VertexProgram": "object"]
-def useE2 = ["E2", "E2"];
+def useE2 = ["E2", "E2"]
def methodsWithSpecificTypes = ["constant": useE2,
"limit": useE2,
"mean": useE2,
@@ -92,17 +92,17 @@ def getCSharpGenericTypeParam = { typeName ->
}
def toCSharpType = { name ->
-String typeName = toCSharpTypeMap.getOrDefault(name, name);
+String typeName = toCSharpTypeMap.getOrDefault(name, name)
if (typeName.equals(name) && (typeName.contains("? extends") ||
typeName.equals("Tree"))) {
typeName = "E2"
}
-return typeName;
+return typeName
}
def toCSharpMethodName = { symbol -> (String)
Character.toUpperCase(symbol.charAt(0)) + symbol.substring(1) }
def getJavaGenericTypeParameterTypeNames = { method ->
-def typeArguments = method.genericReturnType.actualTypeArguments;
+def typeArguments = method.genericReturnType.actualTypeArguments
return typeArguments.
collect { (it instanceof Class) ? ((Class)it).simpleName :
it.typeName }.
collect { name ->
@@ -110,7 +110,7 @@ def getJavaGenericTypeParameterTypeNames = { method ->
name = "object"
}
else if (name.equals("B")) {
-name = "E2";
+name = "E2"
}
name
}
@@ -124,18 +124,18 @@ def getJavaParameterTypeNames = { method ->
}
def toCSharpParamString = { param, genTypeName ->
-String csharpParamTypeName = genTypeName;
+String csharpParamTypeName = genTypeName
if (csharpParamTypeName == null){
csharpParamTypeName = toCSharpType(param.type.simpleName)
}
else if (csharpParamTypeName == "M") {
-csharpParamTypeName = "object";
+csharpParamTypeName = "object"
}
else if (csharpParamTypeName == "A[]") {
-csharpParamTypeName = "object[]";
+csharpParamTypeName = "object[]"
}
else if (csharpParamTypeName == "A" || csharpParamTypeName == "B") {
-csharpParamTypeName = "E2";
+csharpParamTypeName = "E2"
}
"${csharpParamTypeName} ${param.name}"
}
@@ -152,11 +152,11 @@ def getCSharpParamTypeString = { method ->
}
def getCSharpParamString = { method, useGenericParams ->
-def parameters = method.parameters;
+def parameters = method.parameters
if (parameters.length == 0)
return ""
-def genericTypes = method.getGenericParameterTypes();
+def genericTypes = method.getGenericParameterTypes()
def csharpParameters = parameters.
toList().indexed().
collect { index, param ->
@@ -174,11 +174,11 @@ def getCSharpParamString = { method, useGenericParams ->
}
toCSharpParamString(param, genTypeName)
}.
-toArray();
+toArray()
if (method.isVarArgs()) {
-def lastIndex = csharpParameters.length-1;
-csharpParameters[lastIndex] = "params " + csharpParameters[lastIndex];
+def lastIndex = csharpParameters.length-1
+csharpParameters[lastIndex] = "params " + csharpParameters[lastIndex]
}
csharpParameters.join(", ")
[05/20] tinkerpop git commit: Merge branch 'tp32' into tp33
Merge branch 'tp32' into tp33 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/b87a555f Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/b87a555f Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/b87a555f Branch: refs/heads/TINKERPOP-1987 Commit: b87a555f10b016136f45335091d72323a3a5d0af Parents: 4973070 007c4aa Author: Robert Dale Authored: Mon Jun 25 09:28:04 2018 -0400 Committer: Robert Dale Committed: Mon Jun 25 09:28:04 2018 -0400 -- docs/src/reference/implementations-neo4j.asciidoc | 4 ++-- gremlin-server/conf/gremlin-server-neo4j.yaml | 2 +- gremlin-server/conf/neo4j-empty.properties | 2 +- gremlin-server/src/test/scripts/neo4j-empty.properties | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b87a555f/docs/src/reference/implementations-neo4j.asciidoc -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b87a555f/gremlin-server/conf/gremlin-server-neo4j.yaml -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b87a555f/gremlin-server/conf/neo4j-empty.properties --
[11/20] tinkerpop git commit: Merge branch 'tp32' into tp33
Merge branch 'tp32' into tp33 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/4f462c53 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/4f462c53 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/4f462c53 Branch: refs/heads/TINKERPOP-1987 Commit: 4f462c5327e04c475db6c9b6af38e36587610480 Parents: 84c3ff4 c02b993 Author: Florian Hockmann Authored: Wed Jun 27 19:20:37 2018 +0200 Committer: Florian Hockmann Committed: Wed Jun 27 19:20:37 2018 +0200 -- .../src/Gremlin.Net/Driver/ConnectionPool.cs| 26 +--- 1 file changed, 17 insertions(+), 9 deletions(-) --
[13/20] tinkerpop git commit: Merge branch 'TINKERPOP-1985' into tp32
Merge branch 'TINKERPOP-1985' into tp32 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/4160b046 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/4160b046 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/4160b046 Branch: refs/heads/TINKERPOP-1987 Commit: 4160b046aab6cfdfecd6eaaab294f545f42601ee Parents: c02b993 fe25083 Author: Stephen Mallette Authored: Thu Jun 28 09:49:09 2018 -0400 Committer: Stephen Mallette Committed: Thu Jun 28 09:49:09 2018 -0400 -- CHANGELOG.asciidoc | 2 + docs/src/dev/provider/index.asciidoc| 13 +++ .../reference/implementations-spark.asciidoc| 64 ++--- docs/src/reference/the-graphcomputer.asciidoc | 85 - .../upgrade/release-3.2.x-incubating.asciidoc | 27 ++ .../tinkerpop/gremlin/jsr223/CoreImports.java | 2 + .../bulkdumping/BulkDumperVertexProgram.java| 3 + .../computer/bulkloading/BulkLoader.java| 2 + .../bulkloading/BulkLoaderVertexProgram.java| 2 + .../bulkloading/IncrementalBulkLoader.java | 2 + .../computer/bulkloading/OneTimeBulkLoader.java | 2 + .../computer/clone/CloneVertexProgram.java | 98 .../gremlin/process/remote/RemoteGraph.java | 4 + .../tinkerpop/gremlin/util/CoreImports.java | 2 + .../AbstractImportCustomizerProvider.java | 2 + .../gremlin/process/ProcessComputerSuite.java | 2 + .../computer/clone/CloneVertexProgramTest.java | 98 17 files changed, 287 insertions(+), 123 deletions(-) -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/4160b046/CHANGELOG.asciidoc -- diff --cc CHANGELOG.asciidoc index 33fe5c4,fb01fac..1d05615 --- a/CHANGELOG.asciidoc +++ b/CHANGELOG.asciidoc @@@ -29,9 -29,10 +29,11 @@@ image::https://raw.githubusercontent.co * Fixed bug in `branch()` where reducing steps as options would produce incorrect results. * Removed recursive handling of streaming results from Gremlin-Python driver to avoid max recursion depth errors. * Improved performance of `TraversalVertexProgram` and related infrastructure. + * Deprecated `BulkLoaderVertexProgram` and related infrastructure. + * Deprecated `BulkDumperVertexProgram` with the more aptly named `CloneVertexProgram`. * Added `createGratefulDead()`to `TinkerFactory` to help make it easier to try to instantiate that toy graph. * Added identifiers to edges in the Kitchen Sink toy graph. +* Ordered the loading of plugins in the Gremlin Console by their position in the configuration file. * Refactored the Gremlin Server integration testing framework and streamlined that infrastructure. * Fixed bug in `GroovyTranslator` that didn't properly handle empty `Map` objects. * Added concrete configuration methods to `SparkGraphComputer` to make a more clear API for configuring it.
[08/20] tinkerpop git commit: Merge branch 'tp32' into tp33
Merge branch 'tp32' into tp33
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/84c3ff40
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/84c3ff40
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/84c3ff40
Branch: refs/heads/TINKERPOP-1987
Commit: 84c3ff40e19b748886eabbb4f12c74f932d1383d
Parents: b87a555 160c1de
Author: Stephen Mallette
Authored: Wed Jun 27 12:30:13 2018 -0400
Committer: Stephen Mallette
Committed: Wed Jun 27 12:30:13 2018 -0400
--
CHANGELOG.asciidoc | 1 +
.../apache/tinkerpop/gremlin/console/Console.groovy | 16 +---
2 files changed, 10 insertions(+), 7 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/84c3ff40/CHANGELOG.asciidoc
--
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/84c3ff40/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/Console.groovy
--
diff --cc
gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/Console.groovy
index 096d329,ad41d6c..d45b49a
---
a/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/Console.groovy
+++
b/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/Console.groovy
@@@ -111,21 -127,30 +111,23 @@@ class Console
GremlinLoader.load()
- // check for available plugins. if they are in the "active" plugins
strategies then "activate" them
+ // check for available plugins on the path and track them by plugin
class name
def activePlugins = Mediator.readPluginState()
-def pluginClass = mediator.useV3d3 ?
org.apache.tinkerpop.gremlin.jsr223.GremlinPlugin : GremlinPlugin
-ServiceLoader.load(pluginClass,
groovy.getInterp().getClassLoader()).each { plugin ->
+ServiceLoader.load(GremlinPlugin,
groovy.getInterp().getClassLoader()).each { plugin ->
if (!mediator.availablePlugins.containsKey(plugin.class.name)) {
-def pluggedIn
-
-if (Mediator.useV3d3) {
-pluggedIn = new PluggedIn(new
PluggedIn.GremlinPluginAdapter((org.apache.tinkerpop.gremlin.jsr223.GremlinPlugin)
plugin, groovy, io), groovy, io, false)
-} else {
-pluggedIn = new PluggedIn((GremlinPlugin) plugin, groovy,
io, false)
-}
+def pluggedIn = new PluggedIn((GremlinPlugin) plugin, groovy,
io, false)
mediator.availablePlugins.put(plugin.class.name, pluggedIn)
+ }
+ }
- if (activePlugins.contains(plugin.class.name)) {
- pluggedIn.activate()
+ // if there are active plugins then initialize them in the order that
they are listed
+ activePlugins.each { pluginName ->
+ def pluggedIn = mediator.availablePlugins[pluginName]
+ pluggedIn.activate()
- if (!io.quiet)
-
io.out.println(Colorizer.render(Preferences.infoColor, "plugin activated: " +
plugin.getName()))
- }
- }
+ if (!io.quiet)
+ io.out.println(Colorizer.render(Preferences.infoColor,
"plugin activated: " + pluggedIn.getPlugin().getName()))
}
// remove any "uninstalled" plugins from plugin state as it means
they were installed, activated, but not
[10/20] tinkerpop git commit: Merge branch 'TINKERPOP-1978' into tp32
Merge branch 'TINKERPOP-1978' into tp32 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/c02b9934 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/c02b9934 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/c02b9934 Branch: refs/heads/TINKERPOP-1987 Commit: c02b9934c73d7b915333cb873e97de7789f35a80 Parents: 160c1de c4a2547 Author: Florian Hockmann Authored: Wed Jun 27 19:19:12 2018 +0200 Committer: Florian Hockmann Committed: Wed Jun 27 19:19:12 2018 +0200 -- .../src/Gremlin.Net/Driver/ConnectionPool.cs| 26 +--- 1 file changed, 17 insertions(+), 9 deletions(-) --
[03/20] tinkerpop git commit: Add check for connection state before returning it TINKERPOP-1978
Add check for connection state before returning it TINKERPOP-1978
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/c4a25472
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/c4a25472
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/c4a25472
Branch: refs/heads/TINKERPOP-1987
Commit: c4a254726167d798617331ff3dd00ece97377b2d
Parents: 32aebb8
Author: Florian Hockmann
Authored: Sat Jun 23 12:24:15 2018 +0200
Committer: Florian Hockmann
Committed: Sat Jun 23 12:24:15 2018 +0200
--
.../src/Gremlin.Net/Driver/ConnectionPool.cs| 26 +---
1 file changed, 17 insertions(+), 9 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/c4a25472/gremlin-dotnet/src/Gremlin.Net/Driver/ConnectionPool.cs
--
diff --git a/gremlin-dotnet/src/Gremlin.Net/Driver/ConnectionPool.cs
b/gremlin-dotnet/src/Gremlin.Net/Driver/ConnectionPool.cs
index 9501686..d9e53f4 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Driver/ConnectionPool.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Driver/ConnectionPool.cs
@@ -23,7 +23,6 @@
using System;
using System.Collections.Concurrent;
-using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using Gremlin.Net.Process;
@@ -45,19 +44,28 @@ namespace Gremlin.Net.Driver
public async Task GetAvailableConnectionAsync()
{
-Connection connection = null;
-lock (_connectionsLock)
-{
-if (!_connections.IsEmpty)
-_connections.TryTake(out connection);
-}
-
-if (connection == null)
+if (!TryGetConnectionFromPool(out var connection))
connection = await
CreateNewConnectionAsync().ConfigureAwait(false);
return new ProxyConnection(connection, AddConnectionIfOpen);
}
+private bool TryGetConnectionFromPool(out Connection connection)
+{
+while (true)
+{
+connection = null;
+lock (_connectionsLock)
+{
+if (_connections.IsEmpty) return false;
+_connections.TryTake(out connection);
+}
+
+if (connection.IsOpen) return true;
+connection.Dispose();
+}
+}
+
private async Task CreateNewConnectionAsync()
{
NrConnections++;
[09/20] tinkerpop git commit: Merge branch 'tp33'
Merge branch 'tp33' Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/cff4c161 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/cff4c161 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/cff4c161 Branch: refs/heads/TINKERPOP-1987 Commit: cff4c161615f2b50bda27b6ba523c7f52b833532 Parents: 3bbb957 84c3ff4 Author: Stephen Mallette Authored: Wed Jun 27 12:30:25 2018 -0400 Committer: Stephen Mallette Committed: Wed Jun 27 12:30:25 2018 -0400 -- CHANGELOG.asciidoc | 1 + .../apache/tinkerpop/gremlin/console/Console.groovy | 16 +--- 2 files changed, 10 insertions(+), 7 deletions(-) -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/cff4c161/CHANGELOG.asciidoc --
[04/20] tinkerpop git commit: Neo Technology changed name to Neo4j, Inc. on 7/27/2017 - CTR
Neo Technology changed name to Neo4j, Inc. on 7/27/2017 - CTR Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/007c4aa6 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/007c4aa6 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/007c4aa6 Branch: refs/heads/TINKERPOP-1987 Commit: 007c4aa647a897794d0ec67fb8681eaa11251f1d Parents: 32aebb8 Author: Robert Dale Authored: Mon Jun 25 09:27:39 2018 -0400 Committer: Robert Dale Committed: Mon Jun 25 09:27:39 2018 -0400 -- docs/src/reference/implementations-neo4j.asciidoc | 4 ++-- gremlin-server/conf/gremlin-server-neo4j.yaml | 2 +- gremlin-server/conf/neo4j-empty.properties | 2 +- gremlin-server/src/test/scripts/neo4j-empty.properties | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/007c4aa6/docs/src/reference/implementations-neo4j.asciidoc -- diff --git a/docs/src/reference/implementations-neo4j.asciidoc b/docs/src/reference/implementations-neo4j.asciidoc index 1f4cc6b..a556675 100644 --- a/docs/src/reference/implementations-neo4j.asciidoc +++ b/docs/src/reference/implementations-neo4j.asciidoc @@ -32,9 +32,9 @@ limitations under the License. -link:http://neo4j.com[Neo Technology] are the developers of the OLTP-based link:http://neo4j.com[Neo4j graph database]. +link:http://neo4j.com[Neo4j, Inc.] are the developers of the OLTP-based link:http://neo4j.com[Neo4j graph database]. -WARNING: Unless under a commercial agreement with Neo Technology, Neo4j is licensed +WARNING: Unless under a commercial agreement with Neo4j, Inc., Neo4j is licensed link:http://en.wikipedia.org/wiki/Affero_General_Public_License[AGPL]. The `neo4j-gremlin` module is licensed Apache2 because it only references the Apache2-licensed Neo4j API (not its implementation). Note that neither the <> nor <> distribute with the Neo4j implementation http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/007c4aa6/gremlin-server/conf/gremlin-server-neo4j.yaml -- diff --git a/gremlin-server/conf/gremlin-server-neo4j.yaml b/gremlin-server/conf/gremlin-server-neo4j.yaml index f88001c..09729fb 100644 --- a/gremlin-server/conf/gremlin-server-neo4j.yaml +++ b/gremlin-server/conf/gremlin-server-neo4j.yaml @@ -22,7 +22,7 @@ # # bin/gremlin-server.sh -i org.apache.tinkerpop neo4j-gremlin x.y.z # -# Note that unless under a commercial agreement with Neo Technology, +# Note that unless under a commercial agreement with Neo4j, Inc., # Neo4j is licensed AGPL. host: localhost http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/007c4aa6/gremlin-server/conf/neo4j-empty.properties -- diff --git a/gremlin-server/conf/neo4j-empty.properties b/gremlin-server/conf/neo4j-empty.properties index 0ea551b..7f3ffaa 100644 --- a/gremlin-server/conf/neo4j-empty.properties +++ b/gremlin-server/conf/neo4j-empty.properties @@ -23,7 +23,7 @@ # # gremlin-server.sh -i org.apache.tinkerpop neo4j-gremlin 3.y.z # -# Note that unless under a commercial agreement with Neo Technology, +# Note that unless under a commercial agreement with Neo4j, Inc., # Neo4j is licensed AGPL. http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/007c4aa6/gremlin-server/src/test/scripts/neo4j-empty.properties -- diff --git a/gremlin-server/src/test/scripts/neo4j-empty.properties b/gremlin-server/src/test/scripts/neo4j-empty.properties index 0ea551b..7f3ffaa 100644 --- a/gremlin-server/src/test/scripts/neo4j-empty.properties +++ b/gremlin-server/src/test/scripts/neo4j-empty.properties @@ -23,7 +23,7 @@ # # gremlin-server.sh -i org.apache.tinkerpop neo4j-gremlin 3.y.z # -# Note that unless under a commercial agreement with Neo Technology, +# Note that unless under a commercial agreement with Neo4j, Inc., # Neo4j is licensed AGPL.
[07/20] tinkerpop git commit: Merge branch 'TINKERPOP-1989' into tp32
Merge branch 'TINKERPOP-1989' into tp32 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/160c1def Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/160c1def Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/160c1def Branch: refs/heads/TINKERPOP-1987 Commit: 160c1def3068964224959fd8261ce900deb6 Parents: 007c4aa 6c75ceb Author: Stephen Mallette Authored: Wed Jun 27 12:29:51 2018 -0400 Committer: Stephen Mallette Committed: Wed Jun 27 12:29:51 2018 -0400 -- CHANGELOG.asciidoc | 1 + .../apache/tinkerpop/gremlin/console/Console.groovy | 16 +--- 2 files changed, 10 insertions(+), 7 deletions(-) --
[06/20] tinkerpop git commit: Merge branch 'tp33'
Merge branch 'tp33' Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/3bbb957f Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/3bbb957f Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/3bbb957f Branch: refs/heads/TINKERPOP-1987 Commit: 3bbb957f3521b71298e1afc08c7eadb92d8d277b Parents: 9b3ffe9 b87a555 Author: Robert Dale Authored: Mon Jun 25 09:28:22 2018 -0400 Committer: Robert Dale Committed: Mon Jun 25 09:28:22 2018 -0400 -- docs/src/reference/implementations-neo4j.asciidoc | 4 ++-- gremlin-server/conf/gremlin-server-neo4j.yaml | 2 +- gremlin-server/conf/neo4j-empty.properties | 2 +- gremlin-server/src/test/scripts/neo4j-empty.properties | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/3bbb957f/docs/src/reference/implementations-neo4j.asciidoc --
[14/20] tinkerpop git commit: Merge branch 'tp32' into tp33
Merge branch 'tp32' into tp33 Conflicts: gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/util/CoreImports.java gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/AbstractImportCustomizerProvider.java Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/ef888a1b Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/ef888a1b Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/ef888a1b Branch: refs/heads/TINKERPOP-1987 Commit: ef888a1b5380f563d688bd04fae0ea052e11d041 Parents: 4f462c5 4160b04 Author: Stephen Mallette Authored: Thu Jun 28 10:08:51 2018 -0400 Committer: Stephen Mallette Committed: Thu Jun 28 10:08:51 2018 -0400 -- CHANGELOG.asciidoc | 2 + docs/src/dev/provider/index.asciidoc| 13 +++ .../reference/implementations-spark.asciidoc| 64 ++--- docs/src/reference/the-graphcomputer.asciidoc | 85 - .../upgrade/release-3.2.x-incubating.asciidoc | 27 ++ .../tinkerpop/gremlin/jsr223/CoreImports.java | 2 + .../bulkdumping/BulkDumperVertexProgram.java| 3 + .../computer/bulkloading/BulkLoader.java| 2 + .../bulkloading/BulkLoaderVertexProgram.java| 2 + .../bulkloading/IncrementalBulkLoader.java | 2 + .../computer/bulkloading/OneTimeBulkLoader.java | 2 + .../computer/clone/CloneVertexProgram.java | 98 .../gremlin/process/remote/RemoteGraph.java | 4 + .../gremlin/process/ProcessComputerSuite.java | 2 + .../computer/clone/CloneVertexProgramTest.java | 98 15 files changed, 283 insertions(+), 123 deletions(-) -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ef888a1b/CHANGELOG.asciidoc -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ef888a1b/docs/src/dev/provider/index.asciidoc -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ef888a1b/docs/src/reference/the-graphcomputer.asciidoc -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ef888a1b/docs/src/upgrade/release-3.2.x-incubating.asciidoc -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ef888a1b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/CoreImports.java -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ef888a1b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/remote/RemoteGraph.java -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ef888a1b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/ProcessComputerSuite.java --
[02/20] tinkerpop git commit: TINKERPOP-1985 Changing position on bulk import/export
TINKERPOP-1985 Changing position on bulk import/export Deprecated BulkLoaderVertexProgram and BulkDumperVertexProgram. BLVP is not replaced, but BDVP has been renamed to CloneVertexProgram which is more aptly named for what it does. Modified docs to discuss all these changes. Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/fe250834 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/fe250834 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/fe250834 Branch: refs/heads/TINKERPOP-1987 Commit: fe250834684202c0fbd947da816d172b07d5c9d4 Parents: 7c7dddb Author: Stephen Mallette Authored: Thu Jun 21 15:11:36 2018 -0400 Committer: Stephen Mallette Committed: Thu Jun 21 15:11:36 2018 -0400 -- CHANGELOG.asciidoc | 2 + docs/src/dev/provider/index.asciidoc| 13 +++ .../reference/implementations-spark.asciidoc| 64 ++--- docs/src/reference/the-graphcomputer.asciidoc | 85 - .../upgrade/release-3.2.x-incubating.asciidoc | 27 ++ .../tinkerpop/gremlin/jsr223/CoreImports.java | 2 + .../bulkdumping/BulkDumperVertexProgram.java| 3 + .../computer/bulkloading/BulkLoader.java| 2 + .../bulkloading/BulkLoaderVertexProgram.java| 2 + .../bulkloading/IncrementalBulkLoader.java | 2 + .../computer/bulkloading/OneTimeBulkLoader.java | 2 + .../computer/clone/CloneVertexProgram.java | 98 .../gremlin/process/remote/RemoteGraph.java | 4 + .../tinkerpop/gremlin/util/CoreImports.java | 2 + .../AbstractImportCustomizerProvider.java | 2 + .../gremlin/process/ProcessComputerSuite.java | 2 + .../computer/clone/CloneVertexProgramTest.java | 98 17 files changed, 287 insertions(+), 123 deletions(-) -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fe250834/CHANGELOG.asciidoc -- diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc index 05b74da..fb01fac 100644 --- a/CHANGELOG.asciidoc +++ b/CHANGELOG.asciidoc @@ -29,6 +29,8 @@ image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima * Fixed bug in `branch()` where reducing steps as options would produce incorrect results. * Removed recursive handling of streaming results from Gremlin-Python driver to avoid max recursion depth errors. * Improved performance of `TraversalVertexProgram` and related infrastructure. +* Deprecated `BulkLoaderVertexProgram` and related infrastructure. +* Deprecated `BulkDumperVertexProgram` with the more aptly named `CloneVertexProgram`. * Added `createGratefulDead()`to `TinkerFactory` to help make it easier to try to instantiate that toy graph. * Added identifiers to edges in the Kitchen Sink toy graph. * Refactored the Gremlin Server integration testing framework and streamlined that infrastructure. http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fe250834/docs/src/dev/provider/index.asciidoc -- diff --git a/docs/src/dev/provider/index.asciidoc b/docs/src/dev/provider/index.asciidoc index dddcb18..6cb1b22 100644 --- a/docs/src/dev/provider/index.asciidoc +++ b/docs/src/dev/provider/index.asciidoc @@ -620,6 +620,19 @@ something required if there is a need to exploit `withRemote()` in some way. If similar to Gremlin Server that can accept a serialized `Traversal` instance, then that would be one example of a reason to implement this interface. +[bulk-import-export]] + Bulk Import Export + +When it comes to doing "bulk" operations, the diverse nature of the available graph databases and their specific +capabilities, prevents TinkerPop from doing a good job of generalizing that capability well. TinkerPop refers users to +the bulk import/export facilities of specific graph providers as they tend to be more efficient and easier to use than +the options TinkerPop has tried to generalize in the past. + +That said, for graph providers that don't have a special bulk loading feature, they can get a basic bulk loader from +TinkerPop using the link:http://tinkerpop.apache.org/docs/x.y.z/reference/#clonevertexprogram[CloneVertexProgram]. +Simply provide a `InputFormat` and `OutputFormat` that can be referenced by a `HadoopGraph` instance as discussed +in the link:http://tinkerpop.apache.org/docs/x.y.z/reference/#clonevertexprogram[Reference Documentation]. + [[validating-with-gremlin-test]] === Validating with Gremlin-Test http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fe250834/docs/src/reference/implementations-spark.asciidoc -- diff --git
[20/20] tinkerpop git commit: Bump to Spark 2.3.1 and Netty 4.1.25.Final
Bump to Spark 2.3.1 and Netty 4.1.25.Final
These really needed to be bumped together because going to netty 4.1.x doesn't
work nicely with Spark 2.2.x - Spark only upgraded on 2.3.x.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/07ca64e9
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/07ca64e9
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/07ca64e9
Branch: refs/heads/TINKERPOP-1987
Commit: 07ca64e9d462a0ea496d3924953532f8b794346f
Parents: 1f240fe
Author: Stephen Mallette
Authored: Wed Jun 27 08:23:58 2018 -0400
Committer: Stephen Mallette
Committed: Fri Jun 29 16:05:23 2018 -0400
--
CHANGELOG.asciidoc | 2 ++
gremlin-console/src/main/static/NOTICE | 2 +-
.../src/Gremlin.Net/Process/Traversal/GraphTraversal.cs | 9 +
gremlin-server/src/main/static/NOTICE | 2 +-
pom.xml | 4 ++--
spark-gremlin/pom.xml | 4 ++--
.../gremlin/spark/process/computer/LocalPropertyTest.java | 7 ++-
7 files changed, 23 insertions(+), 7 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/07ca64e9/CHANGELOG.asciidoc
--
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index d4f0c2e..f37c574 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -25,6 +25,8 @@
image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
This release also includes changes from <>.
+* Bumped to Netty 4.1.25.
+* Bumped to Spark 2.3.1.
* Moved `Parameterizing` interface to the
`org.apache.tinkerpop.gremlin.process.traversal.step` package with other marker
interfaces of its type.
* Replaced `Parameterizing.addPropertyMutations()` with
`Configuring.configure()`.
* Changed interface hierarchy for `Parameterizing` and `Mutating` interfaces
as they are tightly related.
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/07ca64e9/gremlin-console/src/main/static/NOTICE
--
diff --git a/gremlin-console/src/main/static/NOTICE
b/gremlin-console/src/main/static/NOTICE
index 2bcdb41..593d16b 100644
--- a/gremlin-console/src/main/static/NOTICE
+++ b/gremlin-console/src/main/static/NOTICE
@@ -48,7 +48,7 @@ JavaTuples 1.2
Copyright (c) 2010, The JAVATUPLES team (http://www.javatuples.org)
-Netty 4.0.56
+Netty 4.1.25
Copyright 2014 The Netty Project
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/07ca64e9/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 537cdbe..4e8ad22 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/GraphTraversal.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/GraphTraversal.cs
@@ -1685,5 +1685,14 @@ namespace Gremlin.Net.Process.Traversal
return Wrap(this);
}
+///
+/// Adds the with step to this .
+///
+public GraphTraversal With (string key, object value)
+{
+Bytecode.AddStep("with", key, value);
+return Wrap(this);
+}
+
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/07ca64e9/gremlin-server/src/main/static/NOTICE
--
diff --git a/gremlin-server/src/main/static/NOTICE
b/gremlin-server/src/main/static/NOTICE
index c166ba7..68e628c 100644
--- a/gremlin-server/src/main/static/NOTICE
+++ b/gremlin-server/src/main/static/NOTICE
@@ -55,6 +55,6 @@ LongAdder), which was released with the following comments:
http://creativecommons.org/publicdomain/zero/1.0/
-Netty 4.0.56
+Netty 4.1.25
Copyright 2014 The Netty Project
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/07ca64e9/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 13dd988..c279851 100644
--- a/pom.xml
+++ b/pom.xml
@@ -146,10 +146,10 @@ limitations under the License.
1.1
1.2.17
3.0.2
-4.0.56.Final
+4.1.25.Final
1.7.21
1.15
-2.2.0
+
[12/20] tinkerpop git commit: Merge branch 'tp33'
Merge branch 'tp33' Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/935ef5c9 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/935ef5c9 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/935ef5c9 Branch: refs/heads/TINKERPOP-1987 Commit: 935ef5c9db8209db30986b8de57d012cdf656e9e Parents: cff4c16 4f462c5 Author: Florian Hockmann Authored: Wed Jun 27 19:21:19 2018 +0200 Committer: Florian Hockmann Committed: Wed Jun 27 19:21:19 2018 +0200 -- .../src/Gremlin.Net/Driver/ConnectionPool.cs| 26 +--- 1 file changed, 17 insertions(+), 9 deletions(-) --
[01/20] tinkerpop git commit: TINKERPOP-1989 Enforce order of plugin load in Gremlin Console [Forced Update!]
Repository: tinkerpop
Updated Branches:
refs/heads/TINKERPOP-1987 d38e3da3f -> 07ca64e9d (forced update)
TINKERPOP-1989 Enforce order of plugin load in Gremlin Console
Use the order presented in the configuration file to enforce the load order.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/6c75ceb2
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/6c75ceb2
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/6c75ceb2
Branch: refs/heads/TINKERPOP-1987
Commit: 6c75ceb25d6a828489f29b883be99ae7739e09e0
Parents: 7c7dddb
Author: Stephen Mallette
Authored: Wed Jun 20 11:24:34 2018 -0400
Committer: Stephen Mallette
Committed: Wed Jun 20 11:24:34 2018 -0400
--
CHANGELOG.asciidoc | 1 +
.../apache/tinkerpop/gremlin/console/Console.groovy | 16 +---
2 files changed, 10 insertions(+), 7 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6c75ceb2/CHANGELOG.asciidoc
--
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 05b74da..33fe5c4 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -31,6 +31,7 @@
image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
* Improved performance of `TraversalVertexProgram` and related infrastructure.
* Added `createGratefulDead()`to `TinkerFactory` to help make it easier to try
to instantiate that toy graph.
* Added identifiers to edges in the Kitchen Sink toy graph.
+* Ordered the loading of plugins in the Gremlin Console by their position in
the configuration file.
* Refactored the Gremlin Server integration testing framework and streamlined
that infrastructure.
* Fixed bug in `GroovyTranslator` that didn't properly handle empty `Map`
objects.
* Added concrete configuration methods to `SparkGraphComputer` to make a more
clear API for configuring it.
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6c75ceb2/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/Console.groovy
--
diff --git
a/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/Console.groovy
b/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/Console.groovy
index 4e54a42..ad41d6c 100644
---
a/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/Console.groovy
+++
b/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/Console.groovy
@@ -127,7 +127,7 @@ class Console {
GremlinLoader.load()
-// check for available plugins. if they are in the "active" plugins
strategies then "activate" them
+// check for available plugins on the path and track them by plugin
class name
def activePlugins = Mediator.readPluginState()
def pluginClass = mediator.useV3d3 ?
org.apache.tinkerpop.gremlin.jsr223.GremlinPlugin : GremlinPlugin
ServiceLoader.load(pluginClass,
groovy.getInterp().getClassLoader()).each { plugin ->
@@ -141,14 +141,16 @@ class Console {
}
mediator.availablePlugins.put(plugin.class.name, pluggedIn)
+}
+}
-if (activePlugins.contains(plugin.class.name)) {
-pluggedIn.activate()
+// if there are active plugins then initialize them in the order that
they are listed
+activePlugins.each { pluginName ->
+def pluggedIn = mediator.availablePlugins[pluginName]
+pluggedIn.activate()
-if (!io.quiet)
-io.out.println(Colorizer.render(Preferences.infoColor,
"plugin activated: " + plugin.getName()))
-}
-}
+if (!io.quiet)
+io.out.println(Colorizer.render(Preferences.infoColor, "plugin
activated: " + pluggedIn.getPlugin().getName()))
}
// remove any "uninstalled" plugins from plugin state as it means they
were installed, activated, but not
tinkerpop git commit: The GraphTraversal in .NET got out of sync somehow. CTR
Repository: tinkerpop
Updated Branches:
refs/heads/master 734b01f35 -> 1f240fe25
The GraphTraversal in .NET got out of sync somehow. CTR
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/1f240fe2
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/1f240fe2
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/1f240fe2
Branch: refs/heads/master
Commit: 1f240fe2593524211553c222deadc4f95628f33a
Parents: 734b01f
Author: Stephen Mallette
Authored: Fri Jun 29 16:04:26 2018 -0400
Committer: Stephen Mallette
Committed: Fri Jun 29 16:04:26 2018 -0400
--
.../src/Gremlin.Net/Process/Traversal/GraphTraversal.cs | 9 +
1 file changed, 9 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/1f240fe2/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 9952455..537cdbe 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/GraphTraversal.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/GraphTraversal.cs
@@ -1676,5 +1676,14 @@ namespace Gremlin.Net.Process.Traversal
return Wrap(this);
}
+///
+/// Adds the with step to this .
+///
+public GraphTraversal With (string key, object value)
+{
+Bytecode.AddStep("with", key, value);
+return Wrap(this);
+}
+
}
}
\ No newline at end of file
tinkerpop git commit: Removed some unneeded semi-colons from groovy script CTR
Repository: tinkerpop
Updated Branches:
refs/heads/tp32 4160b046a -> 34a648b1b
Removed some unneeded semi-colons from groovy script CTR
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/34a648b1
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/34a648b1
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/34a648b1
Branch: refs/heads/tp32
Commit: 34a648b1bb36475beddbad4d673f5bed9c77ed4a
Parents: 4160b04
Author: Stephen Mallette
Authored: Fri Jun 29 15:21:21 2018 -0400
Committer: Stephen Mallette
Committed: Fri Jun 29 15:21:21 2018 -0400
--
gremlin-dotnet/glv/generate.groovy | 28 ++--
1 file changed, 14 insertions(+), 14 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/34a648b1/gremlin-dotnet/glv/generate.groovy
--
diff --git a/gremlin-dotnet/glv/generate.groovy
b/gremlin-dotnet/glv/generate.groovy
index 8f5fa44..29f9ec7 100644
--- a/gremlin-dotnet/glv/generate.groovy
+++ b/gremlin-dotnet/glv/generate.groovy
@@ -61,7 +61,7 @@ def toCSharpTypeMap = ["Long": "long",
"Comparator": "IComparator",
"VertexProgram": "object"]
-def useE2 = ["E2", "E2"];
+def useE2 = ["E2", "E2"]
def methodsWithSpecificTypes = ["constant": useE2,
"limit": useE2,
"mean": useE2,
@@ -92,17 +92,17 @@ def getCSharpGenericTypeParam = { typeName ->
}
def toCSharpType = { name ->
-String typeName = toCSharpTypeMap.getOrDefault(name, name);
+String typeName = toCSharpTypeMap.getOrDefault(name, name)
if (typeName.equals(name) && (typeName.contains("? extends") ||
typeName.equals("Tree"))) {
typeName = "E2"
}
-return typeName;
+return typeName
}
def toCSharpMethodName = { symbol -> (String)
Character.toUpperCase(symbol.charAt(0)) + symbol.substring(1) }
def getJavaGenericTypeParameterTypeNames = { method ->
-def typeArguments = method.genericReturnType.actualTypeArguments;
+def typeArguments = method.genericReturnType.actualTypeArguments
return typeArguments.
collect { (it instanceof Class) ? ((Class)it).simpleName :
it.typeName }.
collect { name ->
@@ -110,7 +110,7 @@ def getJavaGenericTypeParameterTypeNames = { method ->
name = "object"
}
else if (name.equals("B")) {
-name = "E2";
+name = "E2"
}
name
}
@@ -124,18 +124,18 @@ def getJavaParameterTypeNames = { method ->
}
def toCSharpParamString = { param, genTypeName ->
-String csharpParamTypeName = genTypeName;
+String csharpParamTypeName = genTypeName
if (csharpParamTypeName == null){
csharpParamTypeName = toCSharpType(param.type.simpleName)
}
else if (csharpParamTypeName == "M") {
-csharpParamTypeName = "object";
+csharpParamTypeName = "object"
}
else if (csharpParamTypeName == "A[]") {
-csharpParamTypeName = "object[]";
+csharpParamTypeName = "object[]"
}
else if (csharpParamTypeName == "A" || csharpParamTypeName == "B") {
-csharpParamTypeName = "E2";
+csharpParamTypeName = "E2"
}
"${csharpParamTypeName} ${param.name}"
}
@@ -152,11 +152,11 @@ def getCSharpParamTypeString = { method ->
}
def getCSharpParamString = { method, useGenericParams ->
-def parameters = method.parameters;
+def parameters = method.parameters
if (parameters.length == 0)
return ""
-def genericTypes = method.getGenericParameterTypes();
+def genericTypes = method.getGenericParameterTypes()
def csharpParameters = parameters.
toList().indexed().
collect { index, param ->
@@ -174,11 +174,11 @@ def getCSharpParamString = { method, useGenericParams ->
}
toCSharpParamString(param, genTypeName)
}.
-toArray();
+toArray()
if (method.isVarArgs()) {
-def lastIndex = csharpParameters.length-1;
-csharpParameters[lastIndex] = "params " + csharpParameters[lastIndex];
+def lastIndex = csharpParameters.length-1
+csharpParameters[lastIndex] = "params " + csharpParameters[lastIndex]
}
csharpParameters.join(", ")
[2/2] tinkerpop git commit: Merge branch 'tp32' into tp33
Merge branch 'tp32' into tp33 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/65ba04f1 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/65ba04f1 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/65ba04f1 Branch: refs/heads/tp33 Commit: 65ba04f19dd218f10dbf45ee169db7f688357721 Parents: ef888a1 34a648b Author: Stephen Mallette Authored: Fri Jun 29 15:21:42 2018 -0400 Committer: Stephen Mallette Committed: Fri Jun 29 15:21:42 2018 -0400 -- gremlin-dotnet/glv/generate.groovy | 28 ++-- 1 file changed, 14 insertions(+), 14 deletions(-) -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/65ba04f1/gremlin-dotnet/glv/generate.groovy --
[1/2] tinkerpop git commit: Removed some unneeded semi-colons from groovy script CTR
Repository: tinkerpop
Updated Branches:
refs/heads/tp33 ef888a1b5 -> 65ba04f19
Removed some unneeded semi-colons from groovy script CTR
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/34a648b1
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/34a648b1
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/34a648b1
Branch: refs/heads/tp33
Commit: 34a648b1bb36475beddbad4d673f5bed9c77ed4a
Parents: 4160b04
Author: Stephen Mallette
Authored: Fri Jun 29 15:21:21 2018 -0400
Committer: Stephen Mallette
Committed: Fri Jun 29 15:21:21 2018 -0400
--
gremlin-dotnet/glv/generate.groovy | 28 ++--
1 file changed, 14 insertions(+), 14 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/34a648b1/gremlin-dotnet/glv/generate.groovy
--
diff --git a/gremlin-dotnet/glv/generate.groovy
b/gremlin-dotnet/glv/generate.groovy
index 8f5fa44..29f9ec7 100644
--- a/gremlin-dotnet/glv/generate.groovy
+++ b/gremlin-dotnet/glv/generate.groovy
@@ -61,7 +61,7 @@ def toCSharpTypeMap = ["Long": "long",
"Comparator": "IComparator",
"VertexProgram": "object"]
-def useE2 = ["E2", "E2"];
+def useE2 = ["E2", "E2"]
def methodsWithSpecificTypes = ["constant": useE2,
"limit": useE2,
"mean": useE2,
@@ -92,17 +92,17 @@ def getCSharpGenericTypeParam = { typeName ->
}
def toCSharpType = { name ->
-String typeName = toCSharpTypeMap.getOrDefault(name, name);
+String typeName = toCSharpTypeMap.getOrDefault(name, name)
if (typeName.equals(name) && (typeName.contains("? extends") ||
typeName.equals("Tree"))) {
typeName = "E2"
}
-return typeName;
+return typeName
}
def toCSharpMethodName = { symbol -> (String)
Character.toUpperCase(symbol.charAt(0)) + symbol.substring(1) }
def getJavaGenericTypeParameterTypeNames = { method ->
-def typeArguments = method.genericReturnType.actualTypeArguments;
+def typeArguments = method.genericReturnType.actualTypeArguments
return typeArguments.
collect { (it instanceof Class) ? ((Class)it).simpleName :
it.typeName }.
collect { name ->
@@ -110,7 +110,7 @@ def getJavaGenericTypeParameterTypeNames = { method ->
name = "object"
}
else if (name.equals("B")) {
-name = "E2";
+name = "E2"
}
name
}
@@ -124,18 +124,18 @@ def getJavaParameterTypeNames = { method ->
}
def toCSharpParamString = { param, genTypeName ->
-String csharpParamTypeName = genTypeName;
+String csharpParamTypeName = genTypeName
if (csharpParamTypeName == null){
csharpParamTypeName = toCSharpType(param.type.simpleName)
}
else if (csharpParamTypeName == "M") {
-csharpParamTypeName = "object";
+csharpParamTypeName = "object"
}
else if (csharpParamTypeName == "A[]") {
-csharpParamTypeName = "object[]";
+csharpParamTypeName = "object[]"
}
else if (csharpParamTypeName == "A" || csharpParamTypeName == "B") {
-csharpParamTypeName = "E2";
+csharpParamTypeName = "E2"
}
"${csharpParamTypeName} ${param.name}"
}
@@ -152,11 +152,11 @@ def getCSharpParamTypeString = { method ->
}
def getCSharpParamString = { method, useGenericParams ->
-def parameters = method.parameters;
+def parameters = method.parameters
if (parameters.length == 0)
return ""
-def genericTypes = method.getGenericParameterTypes();
+def genericTypes = method.getGenericParameterTypes()
def csharpParameters = parameters.
toList().indexed().
collect { index, param ->
@@ -174,11 +174,11 @@ def getCSharpParamString = { method, useGenericParams ->
}
toCSharpParamString(param, genTypeName)
}.
-toArray();
+toArray()
if (method.isVarArgs()) {
-def lastIndex = csharpParameters.length-1;
-csharpParameters[lastIndex] = "params " + csharpParameters[lastIndex];
+def lastIndex = csharpParameters.length-1
+csharpParameters[lastIndex] = "params " + csharpParameters[lastIndex]
}
csharpParameters.join(", ")
[1/3] tinkerpop git commit: Removed some unneeded semi-colons from groovy script CTR
Repository: tinkerpop
Updated Branches:
refs/heads/master ec7e27ea0 -> 734b01f35
Removed some unneeded semi-colons from groovy script CTR
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/34a648b1
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/34a648b1
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/34a648b1
Branch: refs/heads/master
Commit: 34a648b1bb36475beddbad4d673f5bed9c77ed4a
Parents: 4160b04
Author: Stephen Mallette
Authored: Fri Jun 29 15:21:21 2018 -0400
Committer: Stephen Mallette
Committed: Fri Jun 29 15:21:21 2018 -0400
--
gremlin-dotnet/glv/generate.groovy | 28 ++--
1 file changed, 14 insertions(+), 14 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/34a648b1/gremlin-dotnet/glv/generate.groovy
--
diff --git a/gremlin-dotnet/glv/generate.groovy
b/gremlin-dotnet/glv/generate.groovy
index 8f5fa44..29f9ec7 100644
--- a/gremlin-dotnet/glv/generate.groovy
+++ b/gremlin-dotnet/glv/generate.groovy
@@ -61,7 +61,7 @@ def toCSharpTypeMap = ["Long": "long",
"Comparator": "IComparator",
"VertexProgram": "object"]
-def useE2 = ["E2", "E2"];
+def useE2 = ["E2", "E2"]
def methodsWithSpecificTypes = ["constant": useE2,
"limit": useE2,
"mean": useE2,
@@ -92,17 +92,17 @@ def getCSharpGenericTypeParam = { typeName ->
}
def toCSharpType = { name ->
-String typeName = toCSharpTypeMap.getOrDefault(name, name);
+String typeName = toCSharpTypeMap.getOrDefault(name, name)
if (typeName.equals(name) && (typeName.contains("? extends") ||
typeName.equals("Tree"))) {
typeName = "E2"
}
-return typeName;
+return typeName
}
def toCSharpMethodName = { symbol -> (String)
Character.toUpperCase(symbol.charAt(0)) + symbol.substring(1) }
def getJavaGenericTypeParameterTypeNames = { method ->
-def typeArguments = method.genericReturnType.actualTypeArguments;
+def typeArguments = method.genericReturnType.actualTypeArguments
return typeArguments.
collect { (it instanceof Class) ? ((Class)it).simpleName :
it.typeName }.
collect { name ->
@@ -110,7 +110,7 @@ def getJavaGenericTypeParameterTypeNames = { method ->
name = "object"
}
else if (name.equals("B")) {
-name = "E2";
+name = "E2"
}
name
}
@@ -124,18 +124,18 @@ def getJavaParameterTypeNames = { method ->
}
def toCSharpParamString = { param, genTypeName ->
-String csharpParamTypeName = genTypeName;
+String csharpParamTypeName = genTypeName
if (csharpParamTypeName == null){
csharpParamTypeName = toCSharpType(param.type.simpleName)
}
else if (csharpParamTypeName == "M") {
-csharpParamTypeName = "object";
+csharpParamTypeName = "object"
}
else if (csharpParamTypeName == "A[]") {
-csharpParamTypeName = "object[]";
+csharpParamTypeName = "object[]"
}
else if (csharpParamTypeName == "A" || csharpParamTypeName == "B") {
-csharpParamTypeName = "E2";
+csharpParamTypeName = "E2"
}
"${csharpParamTypeName} ${param.name}"
}
@@ -152,11 +152,11 @@ def getCSharpParamTypeString = { method ->
}
def getCSharpParamString = { method, useGenericParams ->
-def parameters = method.parameters;
+def parameters = method.parameters
if (parameters.length == 0)
return ""
-def genericTypes = method.getGenericParameterTypes();
+def genericTypes = method.getGenericParameterTypes()
def csharpParameters = parameters.
toList().indexed().
collect { index, param ->
@@ -174,11 +174,11 @@ def getCSharpParamString = { method, useGenericParams ->
}
toCSharpParamString(param, genTypeName)
}.
-toArray();
+toArray()
if (method.isVarArgs()) {
-def lastIndex = csharpParameters.length-1;
-csharpParameters[lastIndex] = "params " + csharpParameters[lastIndex];
+def lastIndex = csharpParameters.length-1
+csharpParameters[lastIndex] = "params " + csharpParameters[lastIndex]
}
csharpParameters.join(", ")
[3/3] tinkerpop git commit: Merge branch 'tp33'
Merge branch 'tp33' Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/734b01f3 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/734b01f3 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/734b01f3 Branch: refs/heads/master Commit: 734b01f358c59c9e16b2479c5bcdfb95a7e75e78 Parents: ec7e27e 65ba04f Author: Stephen Mallette Authored: Fri Jun 29 15:21:49 2018 -0400 Committer: Stephen Mallette Committed: Fri Jun 29 15:21:49 2018 -0400 -- gremlin-dotnet/glv/generate.groovy | 28 ++-- 1 file changed, 14 insertions(+), 14 deletions(-) --
[2/3] tinkerpop git commit: Merge branch 'tp32' into tp33
Merge branch 'tp32' into tp33 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/65ba04f1 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/65ba04f1 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/65ba04f1 Branch: refs/heads/master Commit: 65ba04f19dd218f10dbf45ee169db7f688357721 Parents: ef888a1 34a648b Author: Stephen Mallette Authored: Fri Jun 29 15:21:42 2018 -0400 Committer: Stephen Mallette Committed: Fri Jun 29 15:21:42 2018 -0400 -- gremlin-dotnet/glv/generate.groovy | 28 ++-- 1 file changed, 14 insertions(+), 14 deletions(-) -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/65ba04f1/gremlin-dotnet/glv/generate.groovy --
[tinkerpop] Git Push Summary
Repository: tinkerpop Updated Tags: refs/tags/3.4.0-rc1 [created] 69f3df8e3
