You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by sp...@apache.org on 2016/08/25 12:53:30 UTC

[1/2] tinkerpop git commit: Increase max frame size so that tests can succeed under GraphSON 2.0

Repository: tinkerpop
Updated Branches:
  refs/heads/TINKERPOP-1278 af4f9237f -> 192da0a11


Increase max frame size so that tests can succeed under GraphSON 2.0

Apparently, graphson needs a larger setting for some tests than gryo.


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/db884243
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/db884243
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/db884243

Branch: refs/heads/TINKERPOP-1278
Commit: db8842436f7ca4c6980ebad27f2fca3cbf7c2fd5
Parents: d5ff0ad
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Thu Aug 25 08:51:48 2016 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Thu Aug 25 08:51:48 2016 -0400

----------------------------------------------------------------------
 .../tinkerpop/gremlin/driver/remote/RemoteGraphProvider.java      | 2 +-
 .../org/apache/tinkerpop/gremlin/server/ServerTestHelper.java     | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/db884243/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/driver/remote/RemoteGraphProvider.java
----------------------------------------------------------------------
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/driver/remote/RemoteGraphProvider.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/driver/remote/RemoteGraphProvider.java
index a4dff94..8b68c35 100644
--- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/driver/remote/RemoteGraphProvider.java
+++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/driver/remote/RemoteGraphProvider.java
@@ -49,7 +49,7 @@ public class RemoteGraphProvider extends AbstractGraphProvider {
     private static GremlinServer server;
     private final Map<String, RemoteGraph> remoteCache = new HashMap<>();
     private final Cluster cluster = Cluster.open();
-    //private final Cluster cluster = Cluster.build().serializer(Serializers.GRAPHSON_V2D0).create();
+    //private final Cluster cluster = Cluster.build().maxContentLength(1024000).serializer(Serializers.GRAPHSON_V2D0).create();
     private final Client client = cluster.connect();
 
     static {

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/db884243/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/ServerTestHelper.java
----------------------------------------------------------------------
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/ServerTestHelper.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/ServerTestHelper.java
index e846673..3a82537 100644
--- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/ServerTestHelper.java
+++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/ServerTestHelper.java
@@ -45,5 +45,8 @@ public class ServerTestHelper {
                     kv.setValue(homeDir + File.separator + kv.getValue());
                     return kv;
                 }).collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
+
+        overridenSettings.maxContentLength = 1024000;
+        overridenSettings.maxChunkSize =1024000;
     }
 }


[2/2] tinkerpop git commit: Merge remote-tracking branch 'origin/TINKERPOP-1278' into TINKERPOP-1278

Posted by sp...@apache.org.
Merge remote-tracking branch 'origin/TINKERPOP-1278' into TINKERPOP-1278


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/192da0a1
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/192da0a1
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/192da0a1

Branch: refs/heads/TINKERPOP-1278
Commit: 192da0a1127b5386f5efad976a6969304b6919dd
Parents: db88424 af4f923
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Thu Aug 25 08:53:20 2016 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Thu Aug 25 08:53:20 2016 -0400

----------------------------------------------------------------------
 .../gremlin/groovy/GroovyEnvironmentSuite.java  |  1 +
 .../gremlin/groovy/GroovyTranslatorTest.java    | 90 --------------------
 .../groovy/jsr223/GroovyTranslatorTest.java     | 90 ++++++++++++++++++++
 3 files changed, 91 insertions(+), 90 deletions(-)
----------------------------------------------------------------------