[15/50] tinkerpop git commit: Remove note about Gremlin.Net's history CTR
Remove note about Gremlin.Net's history CTR The note explained that Gremlin.Net was a personal project before it became part of TinkerPop. Considering that the first official release of Gremlin.Net as part of TinkerPop was over 6 months ago, it doesn't seem necessary anymore. Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/fc36be1b Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/fc36be1b Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/fc36be1b Branch: refs/heads/TINKERPOP-1913 Commit: fc36be1b9b269f281fea1ab308c064fb49330854 Parents: a7aed51 Author: Florian Hockmann Authored: Sun Jul 22 15:53:52 2018 +0200 Committer: Florian Hockmann Committed: Sun Jul 22 15:53:52 2018 +0200 -- gremlin-dotnet/glv/Gremlin.Net.csproj.template| 4 +--- gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fc36be1b/gremlin-dotnet/glv/Gremlin.Net.csproj.template -- diff --git a/gremlin-dotnet/glv/Gremlin.Net.csproj.template b/gremlin-dotnet/glv/Gremlin.Net.csproj.template index b95bae6..5357e14 100644 --- a/gremlin-dotnet/glv/Gremlin.Net.csproj.template +++ b/gremlin-dotnet/glv/Gremlin.Net.csproj.template @@ -36,9 +36,7 @@ Apache TinkerPop⢠is a graph computing framework for both graph databases (OLT Gremlin.Net implements Gremlin within .NET. C# syntax has the same constructs as Java including "dot notation" for function chaining (a.b.c), round bracket function arguments (a(b,c)), and support for global namespaces (a(b()) vs a(__.b())). As such, anyone familiar with Gremlin-Java will immediately be able to work with Gremlin.Net. Moreover, there are a few added constructs to Gremlin.Net that make traversals a bit more succinct. -Please see the reference documentation at Apache TinkerPop for more information on usage. - -NOTE: Gremlin.Net is an extension of the Gremlin.Net driver by Florian Hockmann (versions: 0.y.z) and is now included as part of the Apache TinkerPop project. +Please see the reference documentation at Apache TinkerPop for more information on usage. ../../build/tinkerpop.snk true Gremlin.Net http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fc36be1b/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 ff3b2a2..7aa5ba0 100644 --- a/gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj +++ b/gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj @@ -36,9 +36,7 @@ Apache TinkerPop⢠is a graph computing framework for both graph databases (OLT Gremlin.Net implements Gremlin within .NET. C# syntax has the same constructs as Java including "dot notation" for function chaining (a.b.c), round bracket function arguments (a(b,c)), and support for global namespaces (a(b()) vs a(__.b())). As such, anyone familiar with Gremlin-Java will immediately be able to work with Gremlin.Net. Moreover, there are a few added constructs to Gremlin.Net that make traversals a bit more succinct. -Please see the reference documentation at Apache TinkerPop for more information on usage. - -NOTE: Gremlin.Net is an extension of the Gremlin.Net driver by Florian Hockmann (versions: 0.y.z) and is now included as part of the Apache TinkerPop project. +Please see the reference documentation at Apache TinkerPop for more information on usage. ../../build/tinkerpop.snk true Gremlin.Net
[29/50] 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/e1e15fa1 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/e1e15fa1 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/e1e15fa1 Branch: refs/heads/TINKERPOP-1913 Commit: e1e15fa10a5a7f183be81143bfb8a902b483610a Parents: aad0102 1ca5ef3 Author: Stephen Mallette Authored: Wed Jul 25 07:01:18 2018 -0400 Committer: Stephen Mallette Committed: Wed Jul 25 07:01:18 2018 -0400 -- CHANGELOG.asciidoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/e1e15fa1/CHANGELOG.asciidoc --
[28/50] 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/1ca5ef3d Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/1ca5ef3d Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/1ca5ef3d Branch: refs/heads/TINKERPOP-1913 Commit: 1ca5ef3d15bfc7acc2f53268ec8a60f6f7e956c9 Parents: 3aa6dcf ecd944e Author: Stephen Mallette Authored: Wed Jul 25 07:01:05 2018 -0400 Committer: Stephen Mallette Committed: Wed Jul 25 07:01:05 2018 -0400 -- CHANGELOG.asciidoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/1ca5ef3d/CHANGELOG.asciidoc --
[24/50] 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/e0ffa3be Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/e0ffa3be Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/e0ffa3be Branch: refs/heads/TINKERPOP-1913 Commit: e0ffa3be37b83db50d3f613b4c5777a05e74b9fc Parents: acc7012 c398100 Author: Daniel Kuppitz Authored: Mon Jul 23 10:01:39 2018 -0700 Committer: Daniel Kuppitz Committed: Mon Jul 23 10:01:39 2018 -0700 -- .gitignore | 1 + CHANGELOG.asciidoc | 1 + docker/hadoop/.gitignore| 1 + .../traversal/step/branch/BranchStep.java | 51 +--- gremlin-test/features/branch/Choose.feature | 15 ++ .../traversal/step/branch/ChooseTest.java | 24 + 6 files changed, 86 insertions(+), 7 deletions(-) -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/e0ffa3be/CHANGELOG.asciidoc --
[46/50] 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/ffb8c3e4 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/ffb8c3e4 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/ffb8c3e4 Branch: refs/heads/TINKERPOP-1913 Commit: ffb8c3e4e6e8a87d9fea31f2a2f92deb7f809ac5 Parents: 445a8bf 0bd9b5a Author: Stephen Mallette Authored: Thu Jul 26 08:28:33 2018 -0400 Committer: Stephen Mallette Committed: Thu Jul 26 08:28:33 2018 -0400 -- CHANGELOG.asciidoc| 1 + .../traversal/dsl/graph/GraphTraversalSource.java | 18 +++--- .../dsl/graph/GraphTraversalSourceTest.java | 9 ++--- 3 files changed, 10 insertions(+), 18 deletions(-) -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ffb8c3e4/CHANGELOG.asciidoc -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ffb8c3e4/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversalSource.java --
tinkerpop git commit: Close server for auth tests prior to assertions
Repository: tinkerpop
Updated Branches:
refs/heads/tp33 ffb8c3e4e -> e55ffc643
Close server for auth tests prior to assertions
Further trying to flush logs to prevent random failure - hoping that killing
the server will do it and make these tests more stable CTR
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/e55ffc64
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/e55ffc64
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/e55ffc64
Branch: refs/heads/tp33
Commit: e55ffc6432a188b9629d00177b5e01cfb07c3f9a
Parents: ffb8c3e
Author: Stephen Mallette
Authored: Thu Jul 26 14:15:20 2018 -0400
Committer: Stephen Mallette
Committed: Thu Jul 26 14:15:20 2018 -0400
--
.../GremlinServerAuditLogIntegrateTest.java | 14 +
.../server/GremlinServerAuthIntegrateTest.java | 1 -
.../GremlinServerAuthKrb5IntegrateTest.java | 15 ++
.../tinkerpop/gremlin/server/KdcFixture.java| 21 ++--
4 files changed, 35 insertions(+), 16 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/e55ffc64/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerAuditLogIntegrateTest.java
--
diff --git
a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerAuditLogIntegrateTest.java
b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerAuditLogIntegrateTest.java
index c31ee69..0231bab 100644
---
a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerAuditLogIntegrateTest.java
+++
b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerAuditLogIntegrateTest.java
@@ -23,8 +23,6 @@ import org.apache.http.client.methods.HttpGet;
import org.apache.http.impl.client.CloseableHttpClient;
import org.apache.http.impl.client.HttpClients;
import org.apache.http.util.EntityUtils;
-import org.apache.log4j.Appender;
-import org.apache.log4j.LogManager;
import org.apache.log4j.Logger;
import org.apache.log4j.spi.LoggingEvent;
import static org.apache.log4j.Level.INFO;
@@ -165,6 +163,7 @@ public class GremlinServerAuditLogIntegrateTest extends
AbstractGremlinServerInt
}
// wait for logger to flush - (don't think there is a way to detect
this)
+stopServer();
Thread.sleep(1000);
// WebSocketChannelizer does not add SaslAuthenticationHandler for
AllowAllAuthenticator,
@@ -192,6 +191,10 @@ public class GremlinServerAuditLogIntegrateTest extends
AbstractGremlinServerInt
cluster.close();
}
+// wait for logger to flush - (don't think there is a way to detect
this)
+stopServer();
+Thread.sleep(1000);
+
final String simpleAuthenticatorName =
SimpleAuthenticator.class.getSimpleName();
final String authMsg = recordingAppender.getMessages().stream()
.filter(msg -> msg.contains("by " +
simpleAuthenticatorName)).iterator().next();
@@ -199,8 +202,6 @@ public class GremlinServerAuditLogIntegrateTest extends
AbstractGremlinServerInt
m.find();
final String address = m.group(1);
-// wait for logger to flush - (don't think there is a way to detect
this)
-Thread.sleep(1000);
assertTrue(recordingAppender.logContainsAny(AUDIT_LOGGER_NAME, INFO,
String.format("User %s with address %s authenticated by %s",
username, address, simpleAuthenticatorName)));
@@ -226,6 +227,7 @@ public class GremlinServerAuditLogIntegrateTest extends
AbstractGremlinServerInt
}
// wait for logger to flush - (don't think there is a way to detect
this)
+stopServer();
Thread.sleep(1000);
final List log = recordingAppender.getEvents();
@@ -260,6 +262,7 @@ public class GremlinServerAuditLogIntegrateTest extends
AbstractGremlinServerInt
}
// wait for logger to flush - (don't think there is a way to detect
this)
+stopServer();
Thread.sleep(1000);
final List log = recordingAppender.getEvents();
@@ -287,6 +290,7 @@ public class GremlinServerAuditLogIntegrateTest extends
AbstractGremlinServerInt
}
// wait for logger to flush - (don't think there is a way to detect
this)
+stopServer();
Thread.sleep(1000);
final List log = recordingAppender.getEvents();
@@ -322,6 +326,7 @@ public class GremlinServerAuditLogIntegrateTest extends
AbstractGremlinServerInt
}
// wait for logger to flush - (don't think there is a way to detect
this)
+stopServer();
Thread.sleep(1000);
final List log = recordingAppender.getEvents();
@@
[1/2] tinkerpop git commit: Close server for auth tests prior to assertions
Repository: tinkerpop
Updated Branches:
refs/heads/master 74930a998 -> a17bb4066
Close server for auth tests prior to assertions
Further trying to flush logs to prevent random failure - hoping that killing
the server will do it and make these tests more stable CTR
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/e55ffc64
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/e55ffc64
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/e55ffc64
Branch: refs/heads/master
Commit: e55ffc6432a188b9629d00177b5e01cfb07c3f9a
Parents: ffb8c3e
Author: Stephen Mallette
Authored: Thu Jul 26 14:15:20 2018 -0400
Committer: Stephen Mallette
Committed: Thu Jul 26 14:15:20 2018 -0400
--
.../GremlinServerAuditLogIntegrateTest.java | 14 +
.../server/GremlinServerAuthIntegrateTest.java | 1 -
.../GremlinServerAuthKrb5IntegrateTest.java | 15 ++
.../tinkerpop/gremlin/server/KdcFixture.java| 21 ++--
4 files changed, 35 insertions(+), 16 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/e55ffc64/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerAuditLogIntegrateTest.java
--
diff --git
a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerAuditLogIntegrateTest.java
b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerAuditLogIntegrateTest.java
index c31ee69..0231bab 100644
---
a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerAuditLogIntegrateTest.java
+++
b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerAuditLogIntegrateTest.java
@@ -23,8 +23,6 @@ import org.apache.http.client.methods.HttpGet;
import org.apache.http.impl.client.CloseableHttpClient;
import org.apache.http.impl.client.HttpClients;
import org.apache.http.util.EntityUtils;
-import org.apache.log4j.Appender;
-import org.apache.log4j.LogManager;
import org.apache.log4j.Logger;
import org.apache.log4j.spi.LoggingEvent;
import static org.apache.log4j.Level.INFO;
@@ -165,6 +163,7 @@ public class GremlinServerAuditLogIntegrateTest extends
AbstractGremlinServerInt
}
// wait for logger to flush - (don't think there is a way to detect
this)
+stopServer();
Thread.sleep(1000);
// WebSocketChannelizer does not add SaslAuthenticationHandler for
AllowAllAuthenticator,
@@ -192,6 +191,10 @@ public class GremlinServerAuditLogIntegrateTest extends
AbstractGremlinServerInt
cluster.close();
}
+// wait for logger to flush - (don't think there is a way to detect
this)
+stopServer();
+Thread.sleep(1000);
+
final String simpleAuthenticatorName =
SimpleAuthenticator.class.getSimpleName();
final String authMsg = recordingAppender.getMessages().stream()
.filter(msg -> msg.contains("by " +
simpleAuthenticatorName)).iterator().next();
@@ -199,8 +202,6 @@ public class GremlinServerAuditLogIntegrateTest extends
AbstractGremlinServerInt
m.find();
final String address = m.group(1);
-// wait for logger to flush - (don't think there is a way to detect
this)
-Thread.sleep(1000);
assertTrue(recordingAppender.logContainsAny(AUDIT_LOGGER_NAME, INFO,
String.format("User %s with address %s authenticated by %s",
username, address, simpleAuthenticatorName)));
@@ -226,6 +227,7 @@ public class GremlinServerAuditLogIntegrateTest extends
AbstractGremlinServerInt
}
// wait for logger to flush - (don't think there is a way to detect
this)
+stopServer();
Thread.sleep(1000);
final List log = recordingAppender.getEvents();
@@ -260,6 +262,7 @@ public class GremlinServerAuditLogIntegrateTest extends
AbstractGremlinServerInt
}
// wait for logger to flush - (don't think there is a way to detect
this)
+stopServer();
Thread.sleep(1000);
final List log = recordingAppender.getEvents();
@@ -287,6 +290,7 @@ public class GremlinServerAuditLogIntegrateTest extends
AbstractGremlinServerInt
}
// wait for logger to flush - (don't think there is a way to detect
this)
+stopServer();
Thread.sleep(1000);
final List log = recordingAppender.getEvents();
@@ -322,6 +326,7 @@ public class GremlinServerAuditLogIntegrateTest extends
AbstractGremlinServerInt
}
// wait for logger to flush - (don't think there is a way to detect
this)
+stopServer();
Thread.sleep(1000);
final List log = recordingAppender.getEvents();
@@
[2/2] 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/a17bb406 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/a17bb406 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/a17bb406 Branch: refs/heads/master Commit: a17bb4066c83b73df7e7c79f6625dc5fd389c836 Parents: 74930a9 e55ffc6 Author: Stephen Mallette Authored: Thu Jul 26 14:16:21 2018 -0400 Committer: Stephen Mallette Committed: Thu Jul 26 14:16:21 2018 -0400 -- .../GremlinServerAuditLogIntegrateTest.java | 14 + .../server/GremlinServerAuthIntegrateTest.java | 1 - .../GremlinServerAuthKrb5IntegrateTest.java | 15 ++ .../tinkerpop/gremlin/server/KdcFixture.java| 21 ++-- 4 files changed, 35 insertions(+), 16 deletions(-) -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a17bb406/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerAuditLogIntegrateTest.java -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a17bb406/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerAuthIntegrateTest.java -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a17bb406/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerAuthKrb5IntegrateTest.java --
[43/50] tinkerpop git commit: Merge branch 'tp32' into tp33
Merge branch 'tp32' into tp33 Conflicts: gremlin-test/features/map/Select.feature Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/445a8bf0 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/445a8bf0 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/445a8bf0 Branch: refs/heads/TINKERPOP-1913 Commit: 445a8bf0b75f8f6ee246c5bd9277f0e902db246c Parents: 5eaf312 3be3550 Author: Stephen Mallette Authored: Wed Jul 25 12:25:51 2018 -0400 Committer: Stephen Mallette Committed: Wed Jul 25 12:25:51 2018 -0400 -- .../Gherkin/GherkinTestRunner.cs | 3 +-- .../Gherkin/IgnoreException.cs | 3 --- .../gremlin-javascript/test/cucumber/feature-steps.js | 3 +-- gremlin-python/src/main/jython/radish/feature_steps.py | 2 +- gremlin-test/features/map/Select.feature | 13 + 5 files changed, 8 insertions(+), 16 deletions(-) -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/445a8bf0/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/IgnoreException.cs -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/445a8bf0/gremlin-javascript/src/main/javascript/gremlin-javascript/test/cucumber/feature-steps.js -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/445a8bf0/gremlin-test/features/map/Select.feature --
[20/50] 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/acc7012a Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/acc7012a Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/acc7012a Branch: refs/heads/TINKERPOP-1913 Commit: acc7012a48acaac47fc94f38e260b2048b027b9f Parents: 2596bcf 05432a7 Author: Stephen Mallette Authored: Sun Jul 22 15:11:20 2018 -0400 Committer: Stephen Mallette Committed: Sun Jul 22 15:11:20 2018 -0400 -- docs/src/recipes/collections.asciidoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --
[32/50] 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/dbbe4482 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/dbbe4482 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/dbbe4482 Branch: refs/heads/TINKERPOP-1913 Commit: dbbe4482ff5b7b892d68528eb5070cb8ca91b834 Parents: e1e15fa ebee26c Author: Stephen Mallette Authored: Wed Jul 25 07:43:53 2018 -0400 Committer: Stephen Mallette Committed: Wed Jul 25 07:43:53 2018 -0400 -- docs/src/reference/gremlin-variants.asciidoc | 3 +++ 1 file changed, 3 insertions(+) -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/dbbe4482/docs/src/reference/gremlin-variants.asciidoc --
[38/50] 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/7d4fb343 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/7d4fb343 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/7d4fb343 Branch: refs/heads/TINKERPOP-1913 Commit: 7d4fb343e36becfeebc4f08b8cd8a464268b6d24 Parents: a14cf28 1bd35dc Author: Stephen Mallette Authored: Wed Jul 25 09:46:23 2018 -0400 Committer: Stephen Mallette Committed: Wed Jul 25 09:46:23 2018 -0400 -- CHANGELOG.asciidoc| 1 + .../lib/structure/io/graph-serializer.js | 2 ++ .../lib/structure/io/type-serializers.js | 18 ++ .../gremlin-javascript/test/unit/graphson-test.js | 8 4 files changed, 29 insertions(+) -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7d4fb343/CHANGELOG.asciidoc --
[48/50] tinkerpop git commit: TINKERPOP-1913 Made status attributes available to the ResultSet
TINKERPOP-1913 Made status attributes available to the ResultSet
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/810ba442
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/810ba442
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/810ba442
Branch: refs/heads/TINKERPOP-1913
Commit: 810ba442029f1d63c32c4ed01f5ceee70e08c8bf
Parents: 74930a9
Author: Stephen Mallette
Authored: Wed Mar 7 10:29:11 2018 -0500
Committer: Stephen Mallette
Committed: Thu Jul 26 12:31:15 2018 -0400
--
.../tinkerpop/gremlin/driver/Handler.java | 13 +-
.../tinkerpop/gremlin/driver/ResultQueue.java | 2 +
.../tinkerpop/gremlin/driver/ResultSet.java | 12 +
.../tinkerpop/gremlin/driver/ResultSetTest.java | 25 ++
.../gremlin/server/op/AbstractOpProcessor.java | 48 ++--
.../op/traversal/TraversalOpProcessor.java | 10 +++-
.../server/GremlinResultSetIntegrateTest.java | 9
7 files changed, 111 insertions(+), 8 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/810ba442/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Handler.java
--
diff --git
a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Handler.java
b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Handler.java
index 68e1631..4677bee 100644
---
a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Handler.java
+++
b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Handler.java
@@ -259,9 +259,18 @@ final class Handler {
}
}
-// as this is a non-PARTIAL_CONTENT code - the stream is done
-if (response.getStatus().getCode() !=
ResponseStatusCode.PARTIAL_CONTENT)
+// the last message in a OK stream could have meta-data that
is useful to the result. note that error
+// handling of the status attributes is handled separately
above
+if (statusCode == ResponseStatusCode.SUCCESS || statusCode ==
ResponseStatusCode.NO_CONTENT) {
+// in 3.4.0 this should get refactored. i think the that
the markComplete() could just take the
+// status attributes as its argument - need to investigate
that further
+queue.statusAttributes =
response.getStatus().getAttributes();
+}
+
+// as this is a non-PARTIAL_CONTENT code - the stream is done.
+if (statusCode != ResponseStatusCode.PARTIAL_CONTENT) {
pending.remove(response.getRequestId()).markComplete();
+}
} finally {
// in the event of an exception above the exception is tossed
and handled by whatever channelpipeline
// error handling is at play.
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/810ba442/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ResultQueue.java
--
diff --git
a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ResultQueue.java
b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ResultQueue.java
index e21e265..7340763 100644
---
a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ResultQueue.java
+++
b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ResultQueue.java
@@ -56,6 +56,8 @@ final class ResultQueue {
private final Queue>,Integer>> waiting
= new ConcurrentLinkedQueue<>();
+Map statusAttributes = null;
+
public ResultQueue(final LinkedBlockingQueue
resultLinkedBlockingQueue, final CompletableFuture readComplete) {
this.resultLinkedBlockingQueue = resultLinkedBlockingQueue;
this.readComplete = readComplete;
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/810ba442/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ResultSet.java
--
diff --git
a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ResultSet.java
b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ResultSet.java
index f82876c..f608f06 100644
---
a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ResultSet.java
+++
b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ResultSet.java
@@ -21,8 +21,10 @@ package org.apache.tinkerpop.gremlin.driver;
import org.apache.tinkerpop.gremlin.driver.message.RequestMessage;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.Iterator;
import java.util.List;
+import java.util.Map;
[37/50] 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/1bd35dcc
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/1bd35dcc
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/1bd35dcc
Branch: refs/heads/TINKERPOP-1913
Commit: 1bd35dcc5383373ed07fb72fdba7da274f982497
Parents: 421839d db46c0f
Author: Stephen Mallette
Authored: Wed Jul 25 09:46:11 2018 -0400
Committer: Stephen Mallette
Committed: Wed Jul 25 09:46:11 2018 -0400
--
CHANGELOG.asciidoc| 1 +
.../lib/structure/io/graph-serializer.js | 2 ++
.../lib/structure/io/type-serializers.js | 18 ++
.../gremlin-javascript/test/unit/graphson-test.js | 8
4 files changed, 29 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/1bd35dcc/CHANGELOG.asciidoc
--
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/1bd35dcc/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/graph-serializer.js
--
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/1bd35dcc/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/type-serializers.js
--
diff --cc
gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/type-serializers.js
index 3b2b9e6,4bc2935..5044ee7
---
a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/type-serializers.js
+++
b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/type-serializers.js
@@@ -283,78 -293,9 +300,79 @@@ class TSerializer extends TypeSerialize
}
}
+class ArraySerializer extends TypeSerializer {
+ constructor(typeKey) {
+super();
+this.typeKey = typeKey;
+ }
+
+ deserialize(obj) {
+const value = obj[valueKey];
+if (!Array.isArray(value)) {
+ throw new Error('Expected Array, obtained: ' + value);
+}
+return value.map(x => this.reader.read(x));
+ }
+
+ /** @param {Array} item */
+ serialize(item) {
+return {
+ [typeKey]: this.typeKey,
+ [valueKey]: item.map(x => this.writer.adaptObject(x))
+};
+ }
+
+ canBeUsedFor(value) {
+return Array.isArray(value);
+ }
+}
+
+class MapSerializer extends TypeSerializer {
+ deserialize(obj) {
+const value = obj[valueKey];
+if (!Array.isArray(value)) {
+ throw new Error('Expected Array, obtained: ' + value);
+}
+const result = new Map();
+for (let i = 0; i < value.length; i += 2) {
+ result.set(this.reader.read(value[i]), this.reader.read(value[i + 1]));
+}
+return result;
+ }
+
+ /** @param {Map} map */
+ serialize(map) {
+const arr = [];
+map.forEach((v, k) => {
+ arr.push(this.writer.adaptObject(k));
+ arr.push(this.writer.adaptObject(v));
+});
+return {
+ [typeKey]: 'g:Map',
+ [valueKey]: arr
+};
+ }
+
+ canBeUsedFor(value) {
+return value instanceof Map;
+ }
+}
+
+class ListSerializer extends ArraySerializer {
+ constructor() {
+super('g:List');
+ }
+}
+
+class SetSerializer extends ArraySerializer {
+ constructor() {
+super('g:Set');
+ }
+}
+
module.exports = {
BytecodeSerializer,
+ DateSerializer,
EdgeSerializer,
EnumSerializer,
LambdaSerializer,
[40/50] 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/5eaf312c Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/5eaf312c Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/5eaf312c Branch: refs/heads/TINKERPOP-1913 Commit: 5eaf312c000d3145707513f20109956f5f97265a Parents: 1bd35dc fd64360 Author: Stephen Mallette Authored: Wed Jul 25 11:30:52 2018 -0400 Committer: Stephen Mallette Committed: Wed Jul 25 11:30:52 2018 -0400 -- .../gremlin-javascript/lib/structure/io/type-serializers.js | 2 +- .../javascript/gremlin-javascript/test/unit/graphson-test.js | 7 +-- 2 files changed, 6 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/5eaf312c/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/type-serializers.js --
[27/50] tinkerpop git commit: Minor fix in formatting CTR
Minor fix in formatting CTR Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/ecd944e6 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/ecd944e6 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/ecd944e6 Branch: refs/heads/TINKERPOP-1913 Commit: ecd944e6018ddd87a917cde82541d2068a267ae4 Parents: f9ad72a Author: Stephen Mallette Authored: Wed Jul 25 07:00:45 2018 -0400 Committer: Stephen Mallette Committed: Wed Jul 25 07:00:45 2018 -0400 -- CHANGELOG.asciidoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ecd944e6/CHANGELOG.asciidoc -- diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc index 6270880..f076ba1 100644 --- a/CHANGELOG.asciidoc +++ b/CHANGELOG.asciidoc @@ -33,7 +33,7 @@ image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima * 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 `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.
[35/50] 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/a14cf28f Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/a14cf28f Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/a14cf28f Branch: refs/heads/TINKERPOP-1913 Commit: a14cf28f45742f47f15b768a90355ca9e9e89e17 Parents: dbbe448 421839d Author: Stephen Mallette Authored: Wed Jul 25 08:59:39 2018 -0400 Committer: Stephen Mallette Committed: Wed Jul 25 08:59:39 2018 -0400 -- docs/src/reference/gremlin-variants.asciidoc | 2 +- docs/src/reference/the-traversal.asciidoc| 63 +++ 2 files changed, 64 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a14cf28f/docs/src/reference/gremlin-variants.asciidoc -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a14cf28f/docs/src/reference/the-traversal.asciidoc --
[39/50] tinkerpop git commit: Fixed a problem with writing GraphSON Date in js CTR
Fixed a problem with writing GraphSON Date in js CTR
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/fd643609
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/fd643609
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/fd643609
Branch: refs/heads/TINKERPOP-1913
Commit: fd643609a8d469130c89dde94d50b66ef0fadf0f
Parents: db46c0f
Author: Stephen Mallette
Authored: Wed Jul 25 11:30:33 2018 -0400
Committer: Stephen Mallette
Committed: Wed Jul 25 11:30:33 2018 -0400
--
.../gremlin-javascript/lib/structure/io/type-serializers.js | 2 +-
.../javascript/gremlin-javascript/test/unit/graphson-test.js | 7 +--
2 files changed, 6 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fd643609/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/type-serializers.js
--
diff --git
a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/type-serializers.js
b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/type-serializers.js
index 4bc2935..fdf049f 100644
---
a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/type-serializers.js
+++
b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/type-serializers.js
@@ -65,7 +65,7 @@ class DateSerializer extends TypeSerializer {
serialize(item) {
return {
[typeKey]: 'g:Date',
- [valueKey]: item.value.getTime()
+ [valueKey]: item.getTime()
};
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fd643609/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphson-test.js
--
diff --git
a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphson-test.js
b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphson-test.js
index 8f749f7..b459407 100644
---
a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphson-test.js
+++
b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphson-test.js
@@ -50,8 +50,6 @@ describe('GraphSONReader', function () {
const obj = { "@type" : "g:Date", "@value" : 1481750076295 };
const reader = new GraphSONReader();
const result = reader.read(obj);
-console.log("++" + obj);
-console.log("++" + result);
assert.ok(result instanceof Date);
});
it('should parse vertices from GraphSON', function () {
@@ -104,6 +102,11 @@ describe('GraphSONWriter', function () {
const writer = new GraphSONWriter();
assert.strictEqual(writer.write(2), '2');
});
+ it('should write Date', function() {
+const writer = new GraphSONWriter();
+const expected = JSON.stringify({ "@type" : "g:Date", "@value" :
1481750076295 });
+assert.strictEqual(writer.write(new Date(1481750076295)), expected);
+ });
it('should write boolean values', function () {
const writer = new GraphSONWriter();
assert.strictEqual(writer.write(true), 'true');
[33/50] tinkerpop git commit: Added GLV specific warnings in the step docs to point out step naming differences CTR
Added GLV specific warnings in the step docs to point out step naming
differences CTR
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/f56a3e72
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/f56a3e72
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/f56a3e72
Branch: refs/heads/TINKERPOP-1913
Commit: f56a3e724e08c33b55b0d131438db66b95c4e54d
Parents: 9986493
Author: Stephen Mallette
Authored: Wed Jul 25 08:58:41 2018 -0400
Committer: Stephen Mallette
Committed: Wed Jul 25 08:58:41 2018 -0400
--
docs/src/reference/gremlin-variants.asciidoc | 2 +-
docs/src/reference/the-traversal.asciidoc| 63 +++
2 files changed, 64 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f56a3e72/docs/src/reference/gremlin-variants.asciidoc
--
diff --git a/docs/src/reference/gremlin-variants.asciidoc
b/docs/src/reference/gremlin-variants.asciidoc
index 04090b5..e8b4c21 100644
--- a/docs/src/reference/gremlin-variants.asciidoc
+++ b/docs/src/reference/gremlin-variants.asciidoc
@@ -88,7 +88,7 @@ link:https://en.wikipedia.org/wiki/CPython[CPython] machine.
Python's syntax has
namespaces (`a(b())` vs `a(__.b())`). As such, anyone familiar with
Gremlin-Java will immediately be able to work
with Gremlin-Python. Moreover, there are a few added constructs to
Gremlin-Python that make traversals a bit more succinct.
-WARNING: In Python, `as`, `in`, `and`, `or`, `is`, `not`, `from`, and `global`
are reserved words. Gremlin-Python simply
+WARNING: In Python, `and`, `as`, `from`, `global`, `in`, `is`, `not`, and `or`
are reserved words. Gremlin-Python simply
postfixes `_` to the end of these terms for their use with graph traversal.
For instance: `g.V().as_('a').in_().as_('b').select('a','b')`.
To install Gremlin-Python, use Python's
link:https://en.wikipedia.org/wiki/Pip_(package_manager)[pip] package manager.
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f56a3e72/docs/src/reference/the-traversal.asciidoc
--
diff --git a/docs/src/reference/the-traversal.asciidoc
b/docs/src/reference/the-traversal.asciidoc
index 8cc6ac0..057ec6a 100644
--- a/docs/src/reference/the-traversal.asciidoc
+++ b/docs/src/reference/the-traversal.asciidoc
@@ -315,6 +315,11 @@
link:++http://tinkerpop.apache.org/javadocs/x.y.z/core/org/apache/tinkerpop/grem
The `and()`-step ensures that all provided traversals yield a result
(*filter*). Please see <> for or-semantics.
+[NOTE, caption=Python]
+
+The term `and` is a reserved word in Python, and therefore must be referred to
in Gremlin with `and_()`.
+
+
[gremlin-groovy,modern]
g.V().and(
@@ -345,6 +350,17 @@ The `as()`-step is not a real step, but a "step modulator"
similar to <>,
<>, and path.
+[NOTE, caption=Groovy]
+
+The term `as` is a reserved word in Groovy, and when therefore used as part of
an anonymous traversal must be referred
+to in Gremlin with the double underscore `__.as()`.
+
+
+[NOTE, caption=Python]
+
+The term `as` is a reserved word in Python, and therefore must be referred to
in Gremlin with `as_()`.
+
+
[gremlin-groovy,modern]
g.V().as('a').out('created').as('b').select('a','b')<1>
@@ -809,6 +825,16 @@ means by which they are added. The general pattern is
`step().from()`. See <>, <>,
<>, and <>.
+[NOTE, caption=Javasacript]
+
+The term `from` is a reserved word in Javascript, and therefore must be
referred to in Gremlin with `from_()`.
+
+
+[NOTE, caption=Python]
+
+The term `from` is a reserved word in Python, and therefore must be referred
to in Gremlin with `from_()`.
+
+
*Additional References*
link:++http://tinkerpop.apache.org/javadocs/x.y.z/core/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.html#from-java.lang.String-++[`from(String)`],
@@ -1045,6 +1071,11 @@
link:++http://tinkerpop.apache.org/javadocs/x.y.z/core/org/apache/tinkerpop/grem
It is possible to filter scalar values using `is()`-step (*filter*).
+[NOTE, caption=Python]
+
+The term `is` is a reserved word in Python, and therefore must be referred to
in Gremlin with `is_()`.
+
+
[gremlin-groovy,modern]
g.V().values('age').is(32)
@@ -1482,6 +1513,17 @@
link:++http://tinkerpop.apache.org/javadocs/x.y.z/core/org/apache/tinkerpop/grem
The `not()`-step (*filter*) removes objects from the traversal stream when the
traversal provided as an argument
returns an object.
+[NOTE, caption=Groovy]
+
+The term `not` is a reserved word in Groovy, and when therefore used as part
of an anonymous traversal must be referred
+to in Gremlin
[17/50] 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/2596bcf0 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/2596bcf0 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/2596bcf0 Branch: refs/heads/TINKERPOP-1913 Commit: 2596bcf02680b201ddf1c71b6f74ec2783435331 Parents: c21aa28 b757173 Author: Florian Hockmann Authored: Sun Jul 22 15:56:33 2018 +0200 Committer: Florian Hockmann Committed: Sun Jul 22 15:56:33 2018 +0200 -- gremlin-dotnet/glv/Gremlin.Net.csproj.template| 4 +--- gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/2596bcf0/gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj --
[47/50] 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/74930a99 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/74930a99 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/74930a99 Branch: refs/heads/TINKERPOP-1913 Commit: 74930a998c5de9dfd58ad8023dceac4ffcad6b60 Parents: 5f912ea ffb8c3e Author: Stephen Mallette Authored: Thu Jul 26 08:28:40 2018 -0400 Committer: Stephen Mallette Committed: Thu Jul 26 08:28:40 2018 -0400 -- CHANGELOG.asciidoc| 1 + .../traversal/dsl/graph/GraphTraversalSource.java | 18 +++--- .../dsl/graph/GraphTraversalSourceTest.java | 9 ++--- 3 files changed, 10 insertions(+), 18 deletions(-) -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/74930a99/CHANGELOG.asciidoc --
[16/50] 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/b757173b Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/b757173b Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/b757173b Branch: refs/heads/TINKERPOP-1913 Commit: b757173b1c036e97d58c2abf7584922c0aa6870f Parents: f9f0112 fc36be1 Author: Florian Hockmann Authored: Sun Jul 22 15:54:14 2018 +0200 Committer: Florian Hockmann Committed: Sun Jul 22 15:54:14 2018 +0200 -- gremlin-dotnet/glv/Gremlin.Net.csproj.template| 4 +--- gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b757173b/gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj --
[25/50] tinkerpop git commit: Fixed bad merge (NumberHelper package name)
Fixed bad merge (NumberHelper package name) Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/3aa6dcf4 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/3aa6dcf4 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/3aa6dcf4 Branch: refs/heads/TINKERPOP-1913 Commit: 3aa6dcf413d16feaae4e020b60e029e62521e7a9 Parents: c398100 Author: Daniel Kuppitz Authored: Mon Jul 23 11:01:03 2018 -0700 Committer: Daniel Kuppitz Committed: Mon Jul 23 11:01:03 2018 -0700 -- .../gremlin/process/traversal/step/branch/BranchStep.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/3aa6dcf4/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/branch/BranchStep.java -- diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/branch/BranchStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/branch/BranchStep.java index 1ced91c..e35d51e 100644 --- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/branch/BranchStep.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/branch/BranchStep.java @@ -18,7 +18,6 @@ */ package org.apache.tinkerpop.gremlin.process.traversal.step.branch; -import org.apache.tinkerpop.gremlin.process.traversal.NumberHelper; import org.apache.tinkerpop.gremlin.process.traversal.Traversal; import org.apache.tinkerpop.gremlin.process.traversal.Traverser; import org.apache.tinkerpop.gremlin.process.traversal.step.Barrier; @@ -31,6 +30,7 @@ import org.apache.tinkerpop.gremlin.process.traversal.util.FastNoSuchElementExce import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalHelper; import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalUtil; import org.apache.tinkerpop.gremlin.structure.util.StringFactory; +import org.apache.tinkerpop.gremlin.util.NumberHelper; import java.util.ArrayList; import java.util.Collections;
[10/50] tinkerpop git commit: Expose pick object in module.exports
Expose pick object in module.exports
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/c324002c
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/c324002c
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/c324002c
Branch: refs/heads/TINKERPOP-1913
Commit: c324002c7d2184b87ef1e90067c318ebf727311f
Parents: 0272a2e
Author: arings
Authored: Sun Jul 15 19:51:08 2018 +0200
Committer: Jorge Bay Gondra
Committed: Fri Jul 20 10:21:59 2018 +0200
--
.../src/main/javascript/gremlin-javascript/index.js | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/c324002c/gremlin-javascript/src/main/javascript/gremlin-javascript/index.js
--
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/index.js
b/gremlin-javascript/src/main/javascript/gremlin-javascript/index.js
index 2ebae48..d4c6d88 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/index.js
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/index.js
@@ -54,6 +54,7 @@ module.exports = {
direction: t.direction,
operator: t.operator,
order: t.order,
+pick: t.pick,
pop: t.pop,
scope: t.scope,
t: t.t,
@@ -74,4 +75,4 @@ module.exports = {
VertexProperty: graph.VertexProperty,
toLong: utils.toLong
}
-};
\ No newline at end of file
+};
[36/50] tinkerpop git commit: Added Date GraphSON serialization for Javascript CTR
Added Date GraphSON serialization for Javascript CTR
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/db46c0f6
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/db46c0f6
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/db46c0f6
Branch: refs/heads/TINKERPOP-1913
Commit: db46c0f67fb1f93b9ea76032dbd2a852c24effd4
Parents: f56a3e7
Author: Stephen Mallette
Authored: Wed Jul 25 09:45:30 2018 -0400
Committer: Stephen Mallette
Committed: Wed Jul 25 09:45:30 2018 -0400
--
CHANGELOG.asciidoc| 1 +
.../lib/structure/io/graph-serializer.js | 2 ++
.../lib/structure/io/type-serializers.js | 18 ++
.../gremlin-javascript/test/unit/graphson-test.js | 8
4 files changed, 29 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/db46c0f6/CHANGELOG.asciidoc
--
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index f076ba1..0f2b18b 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -24,6 +24,7 @@
image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
=== TinkerPop 3.2.10 (Release Date: NOT OFFICIALLY RELEASED YET)
* Match numbers in `choose()` options using `NumberHelper` (match values,
ignore data type).
+* Added support for GraphSON serialization of `Date` in Javascript.
* Fixed bug in Java driver where an disorderly shutdown of the server would
cause the client to hang.
* Added a dotnet template project that should make it easier to get started
with Gremlin.Net.
* Removed `ThreadInterruptCustomizerProvider` from documentation as a way to
timeout.
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/db46c0f6/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/graph-serializer.js
--
diff --git
a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/graph-serializer.js
b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/graph-serializer.js
index df05659..55b0265 100644
---
a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/graph-serializer.js
+++
b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/graph-serializer.js
@@ -155,6 +155,7 @@ const deserializers = {
'g:Int64': typeSerializers.NumberSerializer,
'g:Float': typeSerializers.NumberSerializer,
'g:Double': typeSerializers.NumberSerializer,
+ 'g:Date': typeSerializers.DateSerializer,
'g:Vertex': typeSerializers.VertexSerializer,
'g:Edge': typeSerializers.EdgeSerializer,
'g:VertexProperty': typeSerializers.VertexPropertySerializer,
@@ -165,6 +166,7 @@ const deserializers = {
const serializers = [
typeSerializers.NumberSerializer,
+ typeSerializers.DateSerializer,
typeSerializers.BytecodeSerializer,
typeSerializers.TraverserSerializer,
typeSerializers.PSerializer,
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/db46c0f6/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/type-serializers.js
--
diff --git
a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/type-serializers.js
b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/type-serializers.js
index 304888f..4bc2935 100644
---
a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/type-serializers.js
+++
b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/type-serializers.js
@@ -61,6 +61,23 @@ class NumberSerializer extends TypeSerializer {
}
}
+class DateSerializer extends TypeSerializer {
+ serialize(item) {
+return {
+ [typeKey]: 'g:Date',
+ [valueKey]: item.value.getTime()
+};
+ }
+
+ deserialize(obj) {
+return new Date(obj[valueKey]);
+ }
+
+ canBeUsedFor(value) {
+return (value instanceof Date);
+ }
+}
+
class LongSerializer extends TypeSerializer {
serialize(item) {
return {
@@ -278,6 +295,7 @@ class TSerializer extends TypeSerializer {
module.exports = {
BytecodeSerializer,
+ DateSerializer,
EdgeSerializer,
EnumSerializer,
LambdaSerializer,
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/db46c0f6/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphson-test.js
--
diff --git
a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphson-test.js
b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/graphson-test.js
index 8bc7571..8f749f7 100644
---
[23/50] 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/c3981000 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/c3981000 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/c3981000 Branch: refs/heads/TINKERPOP-1913 Commit: c3981000234faf03f4ea4bc1da8086bc34fb3140 Parents: 05432a7 f9ad72a Author: Daniel Kuppitz Authored: Mon Jul 23 10:01:23 2018 -0700 Committer: Daniel Kuppitz Committed: Mon Jul 23 10:01:23 2018 -0700 -- .gitignore | 1 + CHANGELOG.asciidoc | 1 + docker/hadoop/.gitignore| 1 + docker/hadoop/Dockerfile| 25 -- .../traversal/step/branch/BranchStep.java | 51 +--- gremlin-test/features/branch/Choose.feature | 15 ++ .../traversal/step/branch/ChooseTest.java | 24 + 7 files changed, 86 insertions(+), 32 deletions(-) -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/c3981000/.gitignore -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/c3981000/CHANGELOG.asciidoc --
[11/50] tinkerpop git commit: Merge pull request #890 from arings/TINKERPOP-1507-JS
Merge pull request #890 from arings/TINKERPOP-1507-JS Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/a7aed51d Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/a7aed51d Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/a7aed51d Branch: refs/heads/TINKERPOP-1913 Commit: a7aed51d29dbf9886531b8dddb00b0b74f9e8699 Parents: 0272a2e c324002 Author: Jorge Bay Gondra Authored: Fri Jul 20 10:24:47 2018 +0200 Committer: Jorge Bay Gondra Committed: Fri Jul 20 10:24:47 2018 +0200 -- .../src/main/javascript/gremlin-javascript/index.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --
[41/50] 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/c2ffd946 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/c2ffd946 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/c2ffd946 Branch: refs/heads/TINKERPOP-1913 Commit: c2ffd946e61fb2704314ad5ccee0364318229190 Parents: 7d4fb34 5eaf312 Author: Stephen Mallette Authored: Wed Jul 25 11:30:59 2018 -0400 Committer: Stephen Mallette Committed: Wed Jul 25 11:30:59 2018 -0400 -- .../gremlin-javascript/lib/structure/io/type-serializers.js | 2 +- .../javascript/gremlin-javascript/test/unit/graphson-test.js | 7 +-- 2 files changed, 6 insertions(+), 3 deletions(-) --
[44/50] 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/5f912eab Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/5f912eab Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/5f912eab Branch: refs/heads/TINKERPOP-1913 Commit: 5f912eab0ff53f7301ff87cef2fd05eb4dda0a34 Parents: c2ffd94 445a8bf Author: Stephen Mallette Authored: Wed Jul 25 12:26:00 2018 -0400 Committer: Stephen Mallette Committed: Wed Jul 25 12:26:00 2018 -0400 -- .../Gherkin/GherkinTestRunner.cs | 3 +-- .../Gherkin/IgnoreException.cs | 3 --- .../gremlin-javascript/test/cucumber/feature-steps.js | 3 +-- gremlin-python/src/main/jython/radish/feature_steps.py | 2 +- gremlin-test/features/map/Select.feature | 13 + 5 files changed, 8 insertions(+), 16 deletions(-) -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/5f912eab/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/5f912eab/gremlin-test/features/map/Select.feature --
[13/50] 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/d6a14265 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/d6a14265 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/d6a14265 Branch: refs/heads/TINKERPOP-1913 Commit: d6a14265a10303404efa457794485e65f353c840 Parents: ce73ceb f9f0112 Author: Jorge Bay Gondra Authored: Fri Jul 20 10:27:36 2018 +0200 Committer: Jorge Bay Gondra Committed: Fri Jul 20 10:27:36 2018 +0200 -- .../src/main/javascript/gremlin-javascript/index.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --
[14/50] tinkerpop git commit: This closes #890
This closes #890 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/c21aa284 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/c21aa284 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/c21aa284 Branch: refs/heads/TINKERPOP-1913 Commit: c21aa284212b52fbc4e29b5d8ee081f405e4cbbc Parents: d6a1426 Author: Jorge Bay Gondra Authored: Fri Jul 20 11:23:40 2018 +0200 Committer: Jorge Bay Gondra Committed: Fri Jul 20 11:23:40 2018 +0200 -- --
[19/50] 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/05432a79 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/05432a79 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/05432a79 Branch: refs/heads/TINKERPOP-1913 Commit: 05432a79296dd6154233a2b62685dbf60f9eb16f Parents: b757173 ec561d8 Author: Stephen Mallette Authored: Sun Jul 22 15:11:05 2018 -0400 Committer: Stephen Mallette Committed: Sun Jul 22 15:11:05 2018 -0400 -- docs/src/recipes/collections.asciidoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/05432a79/docs/src/recipes/collections.asciidoc --
[45/50] tinkerpop git commit: Throw exception if withRemote() is called multiple times during configuration
Throw exception if withRemote() is called multiple times during configuration
This is a change in behavior. Prior to this we would have quietly closed the
connection, but that's a little too sneaky. Also, the connection was being
assigned to the current TraversalSource as well as the clone. Not sure why that
was happening as the clone was really the only thing that would use it after
the call to withRemote(), so the construction was also corrected. CTR
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/0bd9b5ae
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/0bd9b5ae
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/0bd9b5ae
Branch: refs/heads/TINKERPOP-1913
Commit: 0bd9b5ae7a1bcfda2754136a2eaf4e421908
Parents: 3be3550
Author: Stephen Mallette
Authored: Thu Jul 26 08:25:02 2018 -0400
Committer: Stephen Mallette
Committed: Thu Jul 26 08:25:02 2018 -0400
--
CHANGELOG.asciidoc| 1 +
.../traversal/dsl/graph/GraphTraversalSource.java | 18 +++---
.../dsl/graph/GraphTraversalSourceTest.java | 9 ++---
3 files changed, 10 insertions(+), 18 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0bd9b5ae/CHANGELOG.asciidoc
--
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 0f2b18b..b6e85ce 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -28,6 +28,7 @@
image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
* Fixed bug in Java driver where an disorderly shutdown of the server would
cause the client to hang.
* Added a dotnet template project that should make it easier to get started
with Gremlin.Net.
* Removed `ThreadInterruptCustomizerProvider` from documentation as a way to
timeout.
+* Changed behavior of `withRemote()` if called multiple times so as to simply
throw an exception and not perform the side-effect of auto-closing.
* Added Docker images for Gremlin Console and Gremlin Server.
* 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.
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0bd9b5ae/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversalSource.java
--
diff --git
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversalSource.java
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversalSource.java
index baba19c..faf9459 100644
---
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversalSource.java
+++
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversalSource.java
@@ -302,19 +302,15 @@ public class GraphTraversalSource implements
TraversalSource {
*/
@Override
public GraphTraversalSource withRemote(final RemoteConnection connection) {
-try {
-// check if someone called withRemote() more than once, so just
release resources on the initial
-// connection as you can't have more than one. maybe better to
toss IllegalStateException??
-if (this.connection != null)
-this.connection.close();
-} catch (Exception ignored) {
-// not sure there's anything to do here
-}
+// check if someone called withRemote() more than once, so just
release resources on the initial
+// connection as you can't have more than one. maybe better to toss
IllegalStateException??
+if (this.connection != null)
+throw new IllegalStateException(String.format("TraversalSource
already configured with a RemoteConnection [%s]", connection));
-this.connection = connection;
-final TraversalSource clone = this.clone();
+final GraphTraversalSource clone = this.clone();
+clone.connection = connection;
clone.getStrategies().addStrategies(new RemoteStrategy(connection));
-return (GraphTraversalSource) clone;
+return clone;
}
SPAWNS
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0bd9b5ae/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversalSourceTest.java
--
diff --git
a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversalSourceTest.java
[07/50] 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/398ab9c9 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/398ab9c9 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/398ab9c9 Branch: refs/heads/TINKERPOP-1913 Commit: 398ab9c90b41592759e7b14406b157ce7eed7b6d Parents: 0518927 0272a2e Author: Stephen Mallette Authored: Wed Jul 18 16:30:26 2018 -0400 Committer: Stephen Mallette Committed: Wed Jul 18 16:30:26 2018 -0400 -- .../java/org/apache/tinkerpop/gremlin/driver/Handler.java | 7 +-- 1 file changed, 5 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/398ab9c9/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Handler.java --
[05/50] tinkerpop git commit: Merge branch 'TINKERPOP-1987'
Merge branch 'TINKERPOP-1987' Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/62b17e96 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/62b17e96 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/62b17e96 Branch: refs/heads/TINKERPOP-1913 Commit: 62b17e961e1bf93add063797277ff5762aebde67 Parents: f7e6c0e 07ca64e Author: Stephen Mallette Authored: Tue Jul 17 13:46:28 2018 -0400 Committer: Stephen Mallette Committed: Tue Jul 17 13:46:28 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/62b17e96/CHANGELOG.asciidoc -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/62b17e96/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/GraphTraversal.cs --
[01/50] tinkerpop git commit: Merge branch 'pr-876' [Forced Update!]
Repository: tinkerpop Updated Branches: refs/heads/TINKERPOP-1913 40dc50db3 -> efddb703f (forced update) Merge branch 'pr-876' Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/fe104acc Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/fe104acc Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/fe104acc Branch: refs/heads/TINKERPOP-1913 Commit: fe104acc1a3212c04cd78eeb3c924ba2ab8efd09 Parents: ea6884a d5de5d8 Author: Stephen Mallette Authored: Tue Jul 17 11:11:49 2018 -0400 Committer: Stephen Mallette Committed: Tue Jul 17 11:11:49 2018 -0400 -- CHANGELOG.asciidoc | 1 + docs/src/reference/the-traversal.asciidoc | 17 ++ docs/src/upgrade/release-3.4.x.asciidoc | 16 ++ .../gremlin/process/traversal/Traverser.java| 23 ++- .../traversal/dsl/graph/GraphTraversal.java | 32 +++- .../gremlin/process/traversal/dsl/graph/__.java | 14 ++ .../traversal/step/branch/RepeatStep.java | 24 ++- .../process/traversal/step/map/LoopsStep.java | 26 ++- .../optimization/RepeatUnrollStrategy.java | 5 +- .../B_LP_NL_O_P_S_SE_SL_Traverser.java | 156 +++ .../B_LP_NL_O_P_S_SE_SL_TraverserGenerator.java | 58 ++ .../traverser/B_LP_NL_O_S_SE_SL_Traverser.java | 155 +++ .../B_LP_NL_O_S_SE_SL_TraverserGenerator.java | 58 ++ .../traverser/B_NL_O_S_SE_SL_Traverser.java | 158 +++ .../B_NL_O_S_SE_SL_TraverserGenerator.java | 56 ++ .../traverser/B_O_S_SE_SL_Traverser.java| 26 ++- .../LP_NL_O_OB_P_S_SE_SL_Traverser.java | 156 +++ ...LP_NL_O_OB_P_S_SE_SL_TraverserGenerator.java | 60 ++ .../traverser/LP_NL_O_OB_S_SE_SL_Traverser.java | 156 +++ .../LP_NL_O_OB_S_SE_SL_TraverserGenerator.java | 59 ++ .../traverser/NL_O_OB_S_SE_SL_Traverser.java| 156 +++ .../NL_O_OB_S_SE_SL_TraverserGenerator.java | 58 ++ .../traverser/O_OB_S_SE_SL_Traverser.java | 26 ++- .../traversal/traverser/ProjectedTraverser.java | 14 +- .../traverser/util/AbstractTraverser.java | 13 +- .../util/DefaultTraverserGeneratorFactory.java | 26 ++- .../traverser/util/EmptyTraverser.java | 12 +- .../traverser/util/LabelledCounter.java | 83 .../gremlin/structure/io/gryo/GryoVersion.java | 35 +++- .../traversal/step/branch/RepeatStepTest.java | 4 +- .../optimization/RepeatUnrollStrategyTest.java | 7 + .../DefaultTraverserGeneratorFactoryTest.java | 10 + .../Process/Traversal/GraphTraversal.cs | 18 ++ .../src/Gremlin.Net/Process/Traversal/__.cs | 16 ++ gremlin-test/features/branch/Repeat.feature | 110 +++ .../traversal/step/branch/RepeatTest.java | 191 +++ 36 files changed, 2003 insertions(+), 32 deletions(-) -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fe104acc/CHANGELOG.asciidoc -- diff --cc CHANGELOG.asciidoc index 7e3b705,4dc106d..ff3d9b5 --- a/CHANGELOG.asciidoc +++ b/CHANGELOG.asciidoc @@@ -36,11 -36,11 +36,12 @@@ This release also includes changes fro * Allowed `GraphProvider` to expose a cached `Graph.Feature` object so that the test suite could re-use them to speed test runs. * Fixed a bug in `ReducingBarrierStep`, that returned the provided seed value despite no elements being available. * Changed the order of `select()` scopes. The order is now: maps, side-effects, paths. -* Removed previously deprecated Credentials DSL infrastructure. * Moved `TraversalEngine` to `gremlin-test` as it has long been only used in testing infrastructure. + * Nested loop support added allowing `repeat()` steps to be nested. * Events from `EventStrategy` raised from "new" mutations will now return a `KeyedVertexProperty` or `KeyedProperty` as is appropriate. * `MutationListener#vertexPropertyChanged(Vertex, VertexProperty, Object, Object...)` no longer has a default implementation. +* Removed previously deprecated methods in `SubgraphStrategy` and `PartitionStrategy` builders. +* Removed previously deprecated Credentials DSL infrastructure. * Removed previously deprecated `MutationListener#vertexPropertyChanged(Vertex, Property, Object, Object...)`. * Removed previously deprecated `OpSelectorHandler` constructor. * Removed previously deprecated `close()` from `GremlinGroovyScriptEngine` which no longer implements `AutoCloseable`. http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fe104acc/docs/src/upgrade/release-3.4.x.asciidoc --
[09/50] tinkerpop git commit: Replaced IBM Graph in providers with IBM Compose for JanusGraph. CTR.
Replaced IBM Graph in providers with IBM Compose for JanusGraph. CTR. Signed-off-by: Jason Plurad Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/ce73ceb1 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/ce73ceb1 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/ce73ceb1 Branch: refs/heads/TINKERPOP-1913 Commit: ce73ceb1666cac55fc97fdfa1501de529869d58b Parents: cdea42f Author: Jason Plurad Authored: Thu Jul 19 13:33:01 2018 -0400 Committer: Jason Plurad Committed: Thu Jul 19 13:34:11 2018 -0400 -- .../home/img/logos/ibm-compose-janusgraph-logo.png | Bin 0 -> 19024 bytes docs/site/home/img/logos/ibmgraph-logo.png | Bin 70338 -> 0 bytes docs/site/home/providers.html | 6 +++--- 3 files changed, 3 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ce73ceb1/docs/site/home/img/logos/ibm-compose-janusgraph-logo.png -- diff --git a/docs/site/home/img/logos/ibm-compose-janusgraph-logo.png b/docs/site/home/img/logos/ibm-compose-janusgraph-logo.png new file mode 100644 index 000..0d95447 Binary files /dev/null and b/docs/site/home/img/logos/ibm-compose-janusgraph-logo.png differ http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ce73ceb1/docs/site/home/img/logos/ibmgraph-logo.png -- diff --git a/docs/site/home/img/logos/ibmgraph-logo.png b/docs/site/home/img/logos/ibmgraph-logo.png deleted file mode 100644 index 83524ab..000 Binary files a/docs/site/home/img/logos/ibmgraph-logo.png and /dev/null differ http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ce73ceb1/docs/site/home/providers.html -- diff --git a/docs/site/home/providers.html b/docs/site/home/providers.html index 474d6f1..fc9aa5d 100644 --- a/docs/site/home/providers.html +++ b/docs/site/home/providers.html @@ -146,12 +146,12 @@ limitations under the License. -http://www.ibm.com/analytics/us/en/technology/cloud-data-services/graph/;> -http://www.ibm.com/analytics/us/en/technology/cloud-data-services/graph/;>IBM Graph is a scalable, easy-to-use, fully-managed graph database-as-a-service that is administered through IBM's Bluemix cloud platform. IBM Graph is available 24/7 and managed by a team of experts so developers can focus on building their application. Based on the Apache TinkerPop stack for building high-performance graph applications, IBM Graph provides users with a set of simplified HTTP API calls and the Gremlin graph traversal language. +https://compose.com/databases/janusgraph;> +IBM https://compose.com/databases/janusgraph;>Compose for JanusGraph provides a fully-managed, highly-available, and production-ready JanusGraph on AWS, GCP or IBM Cloud. Deployed in minutes, every JanusGraph deployment on Compose is built with highly available storage and graph engines. The JanusGraph Storage engine is a cluster of the Scylla database. As usage increases or application requirements change, users can vertically or horizontally scale the JanusGraph Engine and Storage to increase throughput or storage. http://janusgraph.org/;> - http://janusgraph.org/;>JanusGraph is an Apache2 licensed scalable, distributed graph database optimized for storing and querying graphs containing hundreds of billions of vertices and edges distributed across a multi-machine cluster. JanusGraph is a transactional database that can support thousands of concurrent users executing complex Gremlin traversals in real time. JanusGraph also provides an in-memory, compression-based OLAP processor as well as integrates with Apache TinkerPop's Spark OLAP processors. + http://janusgraph.org/;>JanusGraph is an Apache2 licensed scalable, distributed graph database optimized for storing and querying graphs containing hundreds of billions of vertices and edges distributed across a multi-machine cluster. JanusGraph is a transactional database that can support thousands of concurrent users executing complex Gremlin traversals in real time. JanusGraph also provides an in-memory, compression-based OLAP processor as well as integrates with Apache TinkerPop's Spark OLAP processors.
[18/50] tinkerpop git commit: Minor spelling error CTR
Minor spelling error CTR Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/ec561d8d Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/ec561d8d Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/ec561d8d Branch: refs/heads/TINKERPOP-1913 Commit: ec561d8d51c92b3f97aa9de4eace756d83018932 Parents: fc36be1 Author: Stephen Mallette Authored: Sun Jul 22 15:10:40 2018 -0400 Committer: Stephen Mallette Committed: Sun Jul 22 15:10:40 2018 -0400 -- docs/src/recipes/collections.asciidoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ec561d8d/docs/src/recipes/collections.asciidoc -- diff --git a/docs/src/recipes/collections.asciidoc b/docs/src/recipes/collections.asciidoc index d027376..257d661 100644 --- a/docs/src/recipes/collections.asciidoc +++ b/docs/src/recipes/collections.asciidoc @@ -21,7 +21,7 @@ image:gremlin-collections.png[width=400] Lists and maps form the basis for much of the processing in Gremlin traversals. They are core to how side-effects are typically held and how results are generally produced. Being able to pick them apart and reformat them is sometimes -required. This need to shape the date within a traversal may arise both at the +required. This need to shape the data within a traversal may arise both at the link:http://tinkerpop.apache.org/docs/current/reference/#terminal-steps[terminal step] of the traversal (technically just prior to the terminal step) or in the middle of a traversal. Considering the former, a transformation just prior to iteration will get the result into the form required by the application which would remove the need for additional
[30/50] tinkerpop git commit: Added warning for postfixes in gremlin-javascript CTR
Added warning for postfixes in gremlin-javascript CTR Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/9986493b Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/9986493b Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/9986493b Branch: refs/heads/TINKERPOP-1913 Commit: 9986493baed59c964673460324a5abcd2fbb2e98 Parents: ecd944e Author: Stephen Mallette Authored: Wed Jul 25 07:43:28 2018 -0400 Committer: Stephen Mallette Committed: Wed Jul 25 07:43:28 2018 -0400 -- docs/src/reference/gremlin-variants.asciidoc | 3 +++ 1 file changed, 3 insertions(+) -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/9986493b/docs/src/reference/gremlin-variants.asciidoc -- diff --git a/docs/src/reference/gremlin-variants.asciidoc b/docs/src/reference/gremlin-variants.asciidoc index 7a85ab1..04090b5 100644 --- a/docs/src/reference/gremlin-variants.asciidoc +++ b/docs/src/reference/gremlin-variants.asciidoc @@ -491,6 +491,9 @@ traversal source. Since Gremlin-JavaScript currently doesn't support lambda expressions, all traversals can be translated to Gremlin-Java on the remote location (e.g. Gremlin Server). +WARNING: In Javascript, `from` and `in` are reserved words. Gremlin-Javascript simply postfixes `_` to the end of +these terms for their use with graph traversal. For instance: `g.V().in_().out()` + IMPORTANT: Gremlin-JavaScriptâs `Traversal` base class supports the standard Gremlin methods such as `next()` and `toList()` Such "terminal" methods trigger the evaluation of the traversal.
[02/50] tinkerpop git commit: Finalized some variables CTR
Finalized some variables CTR
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/a546d260
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/a546d260
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/a546d260
Branch: refs/heads/TINKERPOP-1913
Commit: a546d260073e7c39435dbb367fa326c3e5fe5658
Parents: fe104ac
Author: Stephen Mallette
Authored: Tue Jul 17 13:13:53 2018 -0400
Committer: Stephen Mallette
Committed: Tue Jul 17 13:13:53 2018 -0400
--
.../process/traversal/dsl/graph/GraphTraversal.java | 2 +-
.../gremlin/process/traversal/dsl/graph/__.java | 2 +-
.../process/traversal/step/map/LoopsStep.java | 4 ++--
.../traverser/B_LP_NL_O_P_S_SE_SL_Traverser.java| 16
.../traverser/B_LP_NL_O_S_SE_SL_Traverser.java | 16
.../traverser/B_NL_O_S_SE_SL_Traverser.java | 16
.../traverser/LP_NL_O_OB_P_S_SE_SL_Traverser.java | 16
.../traverser/LP_NL_O_OB_S_SE_SL_Traverser.java | 16
.../traverser/NL_O_OB_S_SE_SL_Traverser.java| 16
.../traversal/traverser/ProjectedTraverser.java | 2 +-
.../traversal/traverser/util/LabelledCounter.java | 2 +-
11 files changed, 54 insertions(+), 54 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a546d260/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java
--
diff --git
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java
index 0a7eb95..63aa65d 100644
---
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java
+++
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java
@@ -658,7 +658,7 @@ public interface GraphTraversal extends Traversal {
* @see http://tinkerpop.apache.org/docs/${project.version}/reference/#loops-step;
target="_blank">Reference Documentation - Loops Step
* @since 3.4.0
*/
-public default GraphTraversal loops(String loopName) {
+public default GraphTraversal loops(final String loopName) {
this.asAdmin().getBytecode().addStep(Symbols.loops, loopName);
return this.asAdmin().addStep(new LoopsStep<>(this.asAdmin(),
loopName));
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a546d260/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/__.java
--
diff --git
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/__.java
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/__.java
index ae5c829..02eee79 100644
---
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/__.java
+++
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/__.java
@@ -326,7 +326,7 @@ public class __ {
/**
* @see GraphTraversal#loops(String)
*/
-public static GraphTraversal loops(String loopName) {
+public static GraphTraversal loops(final String loopName) {
return __.start().loops(loopName);
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a546d260/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/LoopsStep.java
--
diff --git
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/LoopsStep.java
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/LoopsStep.java
index 0a9167c..11d8729 100644
---
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/LoopsStep.java
+++
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/LoopsStep.java
@@ -39,12 +39,12 @@ public final class LoopsStep extends MapStep
{
}
@Override
-public boolean equals(Object o) {
+public boolean equals(final Object o) {
if (this == o) return true;
if (!(o instanceof LoopsStep)) return false;
if (!super.equals(o)) return false;
-LoopsStep loopsStep = (LoopsStep) o;
+final LoopsStep loopsStep = (LoopsStep) o;
return loopName != null ? loopName.equals(loopsStep.loopName) :
loopsStep.loopName == null;
}
[26/50] 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/aad01022 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/aad01022 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/aad01022 Branch: refs/heads/TINKERPOP-1913 Commit: aad0102275acde628d1224f6e1ffe498d478f6f6 Parents: e0ffa3b 3aa6dcf Author: Daniel Kuppitz Authored: Mon Jul 23 11:01:20 2018 -0700 Committer: Daniel Kuppitz Committed: Mon Jul 23 11:01:20 2018 -0700 -- .../gremlin/process/traversal/step/branch/BranchStep.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --
[42/50] tinkerpop git commit: Redefined gherkin test that was forcing list[list] assertions
Redefined gherkin test that was forcing list[list] assertions
Not sure we really needed the original assertion the way that it was. The fact
that we get a result means serialization for list[list] worked and we assert
correctness of the traversal in a reasonable way without list[list] so there
doesn't seem to be much need to complicate the logic of the gherkin runners to
support that CTR
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/3be3550d
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/3be3550d
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/3be3550d
Branch: refs/heads/TINKERPOP-1913
Commit: 3be3550d191fc894639cfe2aae5447eb7bad3cbf
Parents: fd64360
Author: Stephen Mallette
Authored: Wed Jul 25 12:16:09 2018 -0400
Committer: Stephen Mallette
Committed: Wed Jul 25 12:16:09 2018 -0400
--
.../Gherkin/GherkinTestRunner.cs | 3 +--
.../Gherkin/IgnoreException.cs | 3 ---
.../gremlin-javascript/test/cucumber/feature-steps.js | 3 +--
gremlin-python/src/main/jython/radish/feature_steps.py | 2 +-
gremlin-test/features/map/Select.feature | 13 +
5 files changed, 8 insertions(+), 16 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/3be3550d/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
--
diff --git
a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
index 787cca9..3802da5 100644
---
a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
+++
b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
@@ -41,8 +41,7 @@ namespace Gremlin.Net.IntegrationTest.Gherkin
new Dictionary()
{
{ "g_injectX1X_chooseXisX1X__constantX10Xfold__foldX",
IgnoreReason.NoReason },
-{ "g_injectX2X_chooseXisX1X__constantX10Xfold__foldX",
IgnoreReason.NoReason },
-{ "g_V_asXa_bX_out_asXcX_path_selectXkeysX",
IgnoreReason.EmbeddedListAssertion }
+{ "g_injectX2X_chooseXisX1X__constantX10Xfold__foldX",
IgnoreReason.NoReason }
};
private static class Keywords
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/3be3550d/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/IgnoreException.cs
--
diff --git
a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/IgnoreException.cs
b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/IgnoreException.cs
index 368713d..6198f1d 100644
--- a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/IgnoreException.cs
+++ b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/IgnoreException.cs
@@ -40,9 +40,6 @@ namespace Gremlin.Net.IntegrationTest.Gherkin
string reasonSuffix = null;
switch (reason)
{
-case IgnoreReason.EmbeddedListAssertion:
-reasonSuffix = "This test returns an embedded list in the
result and the Gherkin processor does not parse that correctly";
-break;
case IgnoreReason.NoReason:
reasonSuffix = "";
break;
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/3be3550d/gremlin-javascript/src/main/javascript/gremlin-javascript/test/cucumber/feature-steps.js
--
diff --git
a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/cucumber/feature-steps.js
b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/cucumber/feature-steps.js
index 53f457d..3976348 100644
---
a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/cucumber/feature-steps.js
+++
b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/cucumber/feature-steps.js
@@ -55,13 +55,12 @@ const parsers = [
const ignoreReason = {
lambdaNotSupported: 'Lambdas are not supported on gremlin-javascript',
- embeddedListAssertion: '"This test returns an embedded list in the result
and the Gherkin processor does not parse that correctly"',
needsFurtherInvestigation: '',
};
const ignoredScenarios = {
// An associative array containing the scenario name as key, for example:
- 'g_V_asXa_bX_out_asXcX_path_selectXkeysX': new
IgnoreError(ignoreReason.embeddedListAssertion),
+ // 'g_V_asXa_bX_out_asXcX_path_selectXkeysX': new
IgnoreError(ignoreReason.embeddedListAssertion),
};
defineSupportCode(function(methods) {
[03/50] tinkerpop git commit: Merge branch 'TINKERPOP-1864' into tp33
Merge branch 'TINKERPOP-1864' into tp33 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/05189276 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/05189276 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/05189276 Branch: refs/heads/TINKERPOP-1913 Commit: 05189276768741d56e4e0fc5e229eb702bc33f62 Parents: 4639758 fe447ea Author: Stephen Mallette Authored: Tue Jul 17 13:42:44 2018 -0400 Committer: Stephen Mallette Committed: Tue Jul 17 13:42:44 2018 -0400 -- gremlin-python/pom.xml | 10 +- gremlin-python/src/main/jython/radish/terrain.py | 12 +++- gremlin-python/src/main/jython/setup.py | 2 +- 3 files changed, 21 insertions(+), 3 deletions(-) --
[34/50] 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/421839d2 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/421839d2 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/421839d2 Branch: refs/heads/TINKERPOP-1913 Commit: 421839d2744d679afe922e55e814b34fb61cfec5 Parents: ebee26c f56a3e7 Author: Stephen Mallette Authored: Wed Jul 25 08:59:31 2018 -0400 Committer: Stephen Mallette Committed: Wed Jul 25 08:59:31 2018 -0400 -- docs/src/reference/gremlin-variants.asciidoc | 2 +- docs/src/reference/the-traversal.asciidoc| 63 +++ 2 files changed, 64 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/421839d2/docs/src/reference/gremlin-variants.asciidoc -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/421839d2/docs/src/reference/the-traversal.asciidoc --
[22/50] tinkerpop git commit: Simpler PickTokenKey::toString() implementation
Simpler PickTokenKey::toString() implementation
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/f9ad72a2
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/f9ad72a2
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/f9ad72a2
Branch: refs/heads/TINKERPOP-1913
Commit: f9ad72a2526908ec00435d26407ebd183b6f7de5
Parents: f565345
Author: Daniel Kuppitz
Authored: Mon Jul 23 09:52:02 2018 -0700
Committer: Daniel Kuppitz
Committed: Mon Jul 23 09:52:38 2018 -0700
--
.../gremlin/process/traversal/step/branch/BranchStep.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f9ad72a2/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/branch/BranchStep.java
--
diff --git
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/branch/BranchStep.java
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/branch/BranchStep.java
index 6c38351..1ced91c 100644
---
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/branch/BranchStep.java
+++
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/branch/BranchStep.java
@@ -260,7 +260,7 @@ public class BranchStep extends
ComputerAwareStep implements Trav
@Override
public String toString() {
-return "PickTokenKey(" + number + ")";
+return number.toString();
}
}
}
[06/50] tinkerpop git commit: TINKERPOP-1999 Fixed bug introduced in previous fix to this issue
TINKERPOP-1999 Fixed bug introduced in previous fix to this issue
The problem was introduced at 3dcabd4f1b23fecde28c79a10502ad562d934c8d - by
throwing an exception on the client in channelInactive() it would trigger
double reporting of exception in normal shutdowns and other odd behavior
including errors in doc generation. Instead of an exception we just release
pending messages which releases any blocked threads (which was the original
nature of the problem this issue set out to fix). CTR
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/0272a2e4
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/0272a2e4
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/0272a2e4
Branch: refs/heads/TINKERPOP-1913
Commit: 0272a2e42cd7cafaf7e51b6ef56f5cd6e5b3d691
Parents: 6c6ab32
Author: Stephen Mallette
Authored: Wed Jul 18 11:06:43 2018 -0400
Committer: Stephen Mallette
Committed: Wed Jul 18 11:06:43 2018 -0400
--
.../java/org/apache/tinkerpop/gremlin/driver/Handler.java | 7 +--
1 file changed, 5 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0272a2e4/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Handler.java
--
diff --git
a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Handler.java
b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Handler.java
index a6528b2..b8d9078 100644
---
a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Handler.java
+++
b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Handler.java
@@ -205,7 +205,10 @@ final class Handler {
// occurs when the server shutsdown in a disorderly fashion,
otherwise in an orderly shutdown the server
// should fire off a close message which will properly release the
driver.
super.channelInactive(ctx);
-throw new IllegalStateException("Connection to server is no longer
active");
+
+// the channel isn't going to get anymore results as it is closed
so release all pending requests
+pending.values().forEach(val -> val.markError(new
IllegalStateException("Connection to server is no longer active")));
+pending.clear();
}
@Override
@@ -277,7 +280,7 @@ final class Handler {
// serialization exceptions should not close the channel - that's
worth a retry
if
(!IteratorUtils.anyMatch(ExceptionUtils.getThrowableList(cause).iterator(), t
-> t instanceof SerializationException))
-ctx.close();
+if (ctx.channel().isActive()) ctx.close();
}
}
[31/50] 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/ebee26c4 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/ebee26c4 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/ebee26c4 Branch: refs/heads/TINKERPOP-1913 Commit: ebee26c47fd3ec341d95fcdd6d87190d27e37f27 Parents: 1ca5ef3 9986493 Author: Stephen Mallette Authored: Wed Jul 25 07:43:46 2018 -0400 Committer: Stephen Mallette Committed: Wed Jul 25 07:43:46 2018 -0400 -- docs/src/reference/gremlin-variants.asciidoc | 3 +++ 1 file changed, 3 insertions(+) -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ebee26c4/docs/src/reference/gremlin-variants.asciidoc --
[12/50] 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/f9f0112f Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/f9f0112f Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/f9f0112f Branch: refs/heads/TINKERPOP-1913 Commit: f9f0112f2e0e1899223754a9f0cb1377836dd685 Parents: 398ab9c a7aed51 Author: Jorge Bay Gondra Authored: Fri Jul 20 10:27:20 2018 +0200 Committer: Jorge Bay Gondra Committed: Fri Jul 20 10:27:20 2018 +0200 -- .../src/main/javascript/gremlin-javascript/index.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --
[21/50] tinkerpop git commit: TINKERPOP-2011 Treat numerical options in `ChooseStep` as in any other numerical comparison (value matters, data type does not).
TINKERPOP-2011 Treat numerical options in `ChooseStep` as in any other numerical comparison (value matters, data type does not). Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/f565345b Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/f565345b Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/f565345b Branch: refs/heads/TINKERPOP-1913 Commit: f565345b03b69d06e9770e7acab4435f355df8d0 Parents: ec561d8 Author: Daniel Kuppitz Authored: Wed Jul 18 12:34:16 2018 -0700 Committer: Daniel Kuppitz Committed: Mon Jul 23 09:52:38 2018 -0700 -- .gitignore | 1 + CHANGELOG.asciidoc | 1 + docker/hadoop/.gitignore| 1 + docker/hadoop/Dockerfile| 25 -- .../traversal/step/branch/BranchStep.java | 51 +--- .../step/branch/GroovyChooseTest.groovy | 5 ++ gremlin-test/features/branch/Choose.feature | 15 ++ .../traversal/step/branch/ChooseTest.java | 24 + 8 files changed, 91 insertions(+), 32 deletions(-) -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f565345b/.gitignore -- diff --git a/.gitignore b/.gitignore index a27eb44..fa8dac6 100644 --- a/.gitignore +++ b/.gitignore @@ -32,3 +32,4 @@ tools/ *nupkg NuGet.Config nuget*.exe +/Dockerfile http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f565345b/CHANGELOG.asciidoc -- diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc index f50b9ec..6270880 100644 --- a/CHANGELOG.asciidoc +++ b/CHANGELOG.asciidoc @@ -23,6 +23,7 @@ image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima [[release-3-2-10]] === TinkerPop 3.2.10 (Release Date: NOT OFFICIALLY RELEASED YET) +* Match numbers in `choose()` options using `NumberHelper` (match values, ignore data type). * Fixed bug in Java driver where an disorderly shutdown of the server would cause the client to hang. * Added a dotnet template project that should make it easier to get started with Gremlin.Net. * Removed `ThreadInterruptCustomizerProvider` from documentation as a way to timeout. http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f565345b/docker/hadoop/.gitignore -- diff --git a/docker/hadoop/.gitignore b/docker/hadoop/.gitignore new file mode 100644 index 000..9414382 --- /dev/null +++ b/docker/hadoop/.gitignore @@ -0,0 +1 @@ +Dockerfile http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f565345b/docker/hadoop/Dockerfile -- diff --git a/docker/hadoop/Dockerfile b/docker/hadoop/Dockerfile deleted file mode 100644 index 86b2598..000 --- a/docker/hadoop/Dockerfile +++ /dev/null @@ -1,25 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. - -FROM tinkerpop:base - -MAINTAINER Daniel Kuppitz - -ENV HADOOP_VERSION 2.7.2 - -COPY install.sh /usr/local/sbin/install-hadoop.sh -RUN /usr/local/sbin/install-hadoop.sh http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f565345b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/branch/BranchStep.java -- diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/branch/BranchStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/branch/BranchStep.java index 0b1a059..6c38351 100644 --- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/branch/BranchStep.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/branch/BranchStep.java @@ -18,6 +18,7 @@ */ package org.apache.tinkerpop.gremlin.process.traversal.step.branch; +import
[04/50] 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/f7e6c0e1 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/f7e6c0e1 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/f7e6c0e1 Branch: refs/heads/TINKERPOP-1913 Commit: f7e6c0e1e3fda8c1bc68dedf4934f4a29622cac1 Parents: a546d26 0518927 Author: Stephen Mallette Authored: Tue Jul 17 13:42:50 2018 -0400 Committer: Stephen Mallette Committed: Tue Jul 17 13:42:50 2018 -0400 -- gremlin-python/pom.xml | 10 +- gremlin-python/src/main/jython/radish/terrain.py | 12 +++- gremlin-python/src/main/jython/setup.py | 2 +- 3 files changed, 21 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f7e6c0e1/gremlin-python/pom.xml --
[1/3] tinkerpop git commit: Throw exception if withRemote() is called multiple times during configuration
Repository: tinkerpop
Updated Branches:
refs/heads/master 5f912eab0 -> 74930a998
Throw exception if withRemote() is called multiple times during configuration
This is a change in behavior. Prior to this we would have quietly closed the
connection, but that's a little too sneaky. Also, the connection was being
assigned to the current TraversalSource as well as the clone. Not sure why that
was happening as the clone was really the only thing that would use it after
the call to withRemote(), so the construction was also corrected. CTR
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/0bd9b5ae
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/0bd9b5ae
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/0bd9b5ae
Branch: refs/heads/master
Commit: 0bd9b5ae7a1bcfda2754136a2eaf4e421908
Parents: 3be3550
Author: Stephen Mallette
Authored: Thu Jul 26 08:25:02 2018 -0400
Committer: Stephen Mallette
Committed: Thu Jul 26 08:25:02 2018 -0400
--
CHANGELOG.asciidoc| 1 +
.../traversal/dsl/graph/GraphTraversalSource.java | 18 +++---
.../dsl/graph/GraphTraversalSourceTest.java | 9 ++---
3 files changed, 10 insertions(+), 18 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0bd9b5ae/CHANGELOG.asciidoc
--
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 0f2b18b..b6e85ce 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -28,6 +28,7 @@
image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
* Fixed bug in Java driver where an disorderly shutdown of the server would
cause the client to hang.
* Added a dotnet template project that should make it easier to get started
with Gremlin.Net.
* Removed `ThreadInterruptCustomizerProvider` from documentation as a way to
timeout.
+* Changed behavior of `withRemote()` if called multiple times so as to simply
throw an exception and not perform the side-effect of auto-closing.
* Added Docker images for Gremlin Console and Gremlin Server.
* 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.
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0bd9b5ae/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversalSource.java
--
diff --git
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversalSource.java
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversalSource.java
index baba19c..faf9459 100644
---
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversalSource.java
+++
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversalSource.java
@@ -302,19 +302,15 @@ public class GraphTraversalSource implements
TraversalSource {
*/
@Override
public GraphTraversalSource withRemote(final RemoteConnection connection) {
-try {
-// check if someone called withRemote() more than once, so just
release resources on the initial
-// connection as you can't have more than one. maybe better to
toss IllegalStateException??
-if (this.connection != null)
-this.connection.close();
-} catch (Exception ignored) {
-// not sure there's anything to do here
-}
+// check if someone called withRemote() more than once, so just
release resources on the initial
+// connection as you can't have more than one. maybe better to toss
IllegalStateException??
+if (this.connection != null)
+throw new IllegalStateException(String.format("TraversalSource
already configured with a RemoteConnection [%s]", connection));
-this.connection = connection;
-final TraversalSource clone = this.clone();
+final GraphTraversalSource clone = this.clone();
+clone.connection = connection;
clone.getStrategies().addStrategies(new RemoteStrategy(connection));
-return (GraphTraversalSource) clone;
+return clone;
}
SPAWNS
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0bd9b5ae/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversalSourceTest.java
--
diff --git
[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/ffb8c3e4 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/ffb8c3e4 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/ffb8c3e4 Branch: refs/heads/tp33 Commit: ffb8c3e4e6e8a87d9fea31f2a2f92deb7f809ac5 Parents: 445a8bf 0bd9b5a Author: Stephen Mallette Authored: Thu Jul 26 08:28:33 2018 -0400 Committer: Stephen Mallette Committed: Thu Jul 26 08:28:33 2018 -0400 -- CHANGELOG.asciidoc| 1 + .../traversal/dsl/graph/GraphTraversalSource.java | 18 +++--- .../dsl/graph/GraphTraversalSourceTest.java | 9 ++--- 3 files changed, 10 insertions(+), 18 deletions(-) -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ffb8c3e4/CHANGELOG.asciidoc -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ffb8c3e4/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversalSource.java --
[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/ffb8c3e4 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/ffb8c3e4 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/ffb8c3e4 Branch: refs/heads/master Commit: ffb8c3e4e6e8a87d9fea31f2a2f92deb7f809ac5 Parents: 445a8bf 0bd9b5a Author: Stephen Mallette Authored: Thu Jul 26 08:28:33 2018 -0400 Committer: Stephen Mallette Committed: Thu Jul 26 08:28:33 2018 -0400 -- CHANGELOG.asciidoc| 1 + .../traversal/dsl/graph/GraphTraversalSource.java | 18 +++--- .../dsl/graph/GraphTraversalSourceTest.java | 9 ++--- 3 files changed, 10 insertions(+), 18 deletions(-) -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ffb8c3e4/CHANGELOG.asciidoc -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ffb8c3e4/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversalSource.java --
tinkerpop git commit: Throw exception if withRemote() is called multiple times during configuration
Repository: tinkerpop
Updated Branches:
refs/heads/tp32 3be3550d1 -> 0bd9b5ae7
Throw exception if withRemote() is called multiple times during configuration
This is a change in behavior. Prior to this we would have quietly closed the
connection, but that's a little too sneaky. Also, the connection was being
assigned to the current TraversalSource as well as the clone. Not sure why that
was happening as the clone was really the only thing that would use it after
the call to withRemote(), so the construction was also corrected. CTR
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/0bd9b5ae
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/0bd9b5ae
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/0bd9b5ae
Branch: refs/heads/tp32
Commit: 0bd9b5ae7a1bcfda2754136a2eaf4e421908
Parents: 3be3550
Author: Stephen Mallette
Authored: Thu Jul 26 08:25:02 2018 -0400
Committer: Stephen Mallette
Committed: Thu Jul 26 08:25:02 2018 -0400
--
CHANGELOG.asciidoc| 1 +
.../traversal/dsl/graph/GraphTraversalSource.java | 18 +++---
.../dsl/graph/GraphTraversalSourceTest.java | 9 ++---
3 files changed, 10 insertions(+), 18 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0bd9b5ae/CHANGELOG.asciidoc
--
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 0f2b18b..b6e85ce 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -28,6 +28,7 @@
image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
* Fixed bug in Java driver where an disorderly shutdown of the server would
cause the client to hang.
* Added a dotnet template project that should make it easier to get started
with Gremlin.Net.
* Removed `ThreadInterruptCustomizerProvider` from documentation as a way to
timeout.
+* Changed behavior of `withRemote()` if called multiple times so as to simply
throw an exception and not perform the side-effect of auto-closing.
* Added Docker images for Gremlin Console and Gremlin Server.
* 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.
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0bd9b5ae/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversalSource.java
--
diff --git
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversalSource.java
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversalSource.java
index baba19c..faf9459 100644
---
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversalSource.java
+++
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversalSource.java
@@ -302,19 +302,15 @@ public class GraphTraversalSource implements
TraversalSource {
*/
@Override
public GraphTraversalSource withRemote(final RemoteConnection connection) {
-try {
-// check if someone called withRemote() more than once, so just
release resources on the initial
-// connection as you can't have more than one. maybe better to
toss IllegalStateException??
-if (this.connection != null)
-this.connection.close();
-} catch (Exception ignored) {
-// not sure there's anything to do here
-}
+// check if someone called withRemote() more than once, so just
release resources on the initial
+// connection as you can't have more than one. maybe better to toss
IllegalStateException??
+if (this.connection != null)
+throw new IllegalStateException(String.format("TraversalSource
already configured with a RemoteConnection [%s]", connection));
-this.connection = connection;
-final TraversalSource clone = this.clone();
+final GraphTraversalSource clone = this.clone();
+clone.connection = connection;
clone.getStrategies().addStrategies(new RemoteStrategy(connection));
-return (GraphTraversalSource) clone;
+return clone;
}
SPAWNS
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0bd9b5ae/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversalSourceTest.java
--
diff --git
[1/2] tinkerpop git commit: Throw exception if withRemote() is called multiple times during configuration
Repository: tinkerpop
Updated Branches:
refs/heads/tp33 445a8bf0b -> ffb8c3e4e
Throw exception if withRemote() is called multiple times during configuration
This is a change in behavior. Prior to this we would have quietly closed the
connection, but that's a little too sneaky. Also, the connection was being
assigned to the current TraversalSource as well as the clone. Not sure why that
was happening as the clone was really the only thing that would use it after
the call to withRemote(), so the construction was also corrected. CTR
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/0bd9b5ae
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/0bd9b5ae
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/0bd9b5ae
Branch: refs/heads/tp33
Commit: 0bd9b5ae7a1bcfda2754136a2eaf4e421908
Parents: 3be3550
Author: Stephen Mallette
Authored: Thu Jul 26 08:25:02 2018 -0400
Committer: Stephen Mallette
Committed: Thu Jul 26 08:25:02 2018 -0400
--
CHANGELOG.asciidoc| 1 +
.../traversal/dsl/graph/GraphTraversalSource.java | 18 +++---
.../dsl/graph/GraphTraversalSourceTest.java | 9 ++---
3 files changed, 10 insertions(+), 18 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0bd9b5ae/CHANGELOG.asciidoc
--
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 0f2b18b..b6e85ce 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -28,6 +28,7 @@
image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
* Fixed bug in Java driver where an disorderly shutdown of the server would
cause the client to hang.
* Added a dotnet template project that should make it easier to get started
with Gremlin.Net.
* Removed `ThreadInterruptCustomizerProvider` from documentation as a way to
timeout.
+* Changed behavior of `withRemote()` if called multiple times so as to simply
throw an exception and not perform the side-effect of auto-closing.
* Added Docker images for Gremlin Console and Gremlin Server.
* 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.
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0bd9b5ae/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversalSource.java
--
diff --git
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversalSource.java
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversalSource.java
index baba19c..faf9459 100644
---
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversalSource.java
+++
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversalSource.java
@@ -302,19 +302,15 @@ public class GraphTraversalSource implements
TraversalSource {
*/
@Override
public GraphTraversalSource withRemote(final RemoteConnection connection) {
-try {
-// check if someone called withRemote() more than once, so just
release resources on the initial
-// connection as you can't have more than one. maybe better to
toss IllegalStateException??
-if (this.connection != null)
-this.connection.close();
-} catch (Exception ignored) {
-// not sure there's anything to do here
-}
+// check if someone called withRemote() more than once, so just
release resources on the initial
+// connection as you can't have more than one. maybe better to toss
IllegalStateException??
+if (this.connection != null)
+throw new IllegalStateException(String.format("TraversalSource
already configured with a RemoteConnection [%s]", connection));
-this.connection = connection;
-final TraversalSource clone = this.clone();
+final GraphTraversalSource clone = this.clone();
+clone.connection = connection;
clone.getStrategies().addStrategies(new RemoteStrategy(connection));
-return (GraphTraversalSource) clone;
+return clone;
}
SPAWNS
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0bd9b5ae/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversalSourceTest.java
--
diff --git
[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/74930a99 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/74930a99 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/74930a99 Branch: refs/heads/master Commit: 74930a998c5de9dfd58ad8023dceac4ffcad6b60 Parents: 5f912ea ffb8c3e Author: Stephen Mallette Authored: Thu Jul 26 08:28:40 2018 -0400 Committer: Stephen Mallette Committed: Thu Jul 26 08:28:40 2018 -0400 -- CHANGELOG.asciidoc| 1 + .../traversal/dsl/graph/GraphTraversalSource.java | 18 +++--- .../dsl/graph/GraphTraversalSourceTest.java | 9 ++--- 3 files changed, 10 insertions(+), 18 deletions(-) -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/74930a99/CHANGELOG.asciidoc --
