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/22 16:39:01 UTC
tinkerpop git commit: Bumped to netty 4.0.40.final
Repository: tinkerpop
Updated Branches:
refs/heads/TINKERPOP-1386 [created] 49dcb61c1
Bumped to netty 4.0.40.final
Hand to modify the WebSocketClient slightly as it was taking advantage of a bug in netty that was fixed at 4.0.35.final: https://github.com/netty/netty/commit/2e6544fc0e2581f96652be02d86e777e8e0493bc#diff-e4e87d5bebf757b077c19618841f41a6R56
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/49dcb61c
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/49dcb61c
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/49dcb61c
Branch: refs/heads/TINKERPOP-1386
Commit: 49dcb61c152f2bb59c8cc5ae21742ae087e22e70
Parents: da47a21
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Mon Aug 22 12:37:22 2016 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Mon Aug 22 12:37:22 2016 -0400
----------------------------------------------------------------------
CHANGELOG.asciidoc | 3 ++-
gremlin-driver/pom.xml | 2 +-
.../tinkerpop/gremlin/driver/simple/WebSocketClient.java | 10 ++++++----
3 files changed, 9 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/49dcb61c/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 1b93ecd..54618df 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -26,7 +26,8 @@ image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
TinkerPop 3.2.2 (NOT OFFICIALLY RELEASED YET)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-* Included GraphSON as a default serializer (in addition to Gryo, which was already present) in Gremlin Server if none are defined
+* Included GraphSON as a default serializer (in addition to Gryo, which was already present) in Gremlin Server if none are defined.
+* Bumped to Netty 4.0.40.final.
* Defaulted the `gremlinPool` setting in Gremlin Server to be zero, which will instructs it to use `Runtime.availableProcessors()` for that settings.
* Changed scope of log4j dependencies so that they would only be used in tests and the binary distributions of Gremlin Console and Server.
* Deprecated `Io.Builder.registry()` in favor of the newly introduced `Io.Builder.onMapper()`.
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/49dcb61c/gremlin-driver/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-driver/pom.xml b/gremlin-driver/pom.xml
index beeddf7..1fc9e43 100644
--- a/gremlin-driver/pom.xml
+++ b/gremlin-driver/pom.xml
@@ -26,7 +26,7 @@ limitations under the License.
<artifactId>gremlin-driver</artifactId>
<name>Apache TinkerPop :: Gremlin Driver</name>
<properties>
- <netty.version>4.0.34.Final</netty.version>
+ <netty.version>4.0.40.Final</netty.version>
</properties>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/49dcb61c/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/simple/WebSocketClient.java
----------------------------------------------------------------------
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/simple/WebSocketClient.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/simple/WebSocketClient.java
index 4f21f3c..0148ac9 100644
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/simple/WebSocketClient.java
+++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/simple/WebSocketClient.java
@@ -20,6 +20,7 @@ package org.apache.tinkerpop.gremlin.driver.simple;
import io.netty.buffer.PooledByteBufAllocator;
import io.netty.channel.ChannelOption;
+import io.netty.handler.codec.http.HttpHeaders;
import org.apache.tinkerpop.gremlin.driver.MessageSerializer;
import org.apache.tinkerpop.gremlin.driver.handler.WebSocketClientHandler;
import org.apache.tinkerpop.gremlin.driver.handler.WebSocketGremlinRequestEncoder;
@@ -40,6 +41,7 @@ import io.netty.handler.codec.http.websocketx.WebSocketVersion;
import java.io.IOException;
import java.net.URI;
+import java.util.concurrent.TimeUnit;
/**
* A simple, non-thread safe Gremlin Server client using websockets. Typical use is for testing and demonstration.
@@ -50,7 +52,7 @@ public class WebSocketClient extends AbstractClient {
private final Channel channel;
public WebSocketClient() {
- this(URI.create("ws://localhost:8182"));
+ this(URI.create("ws://localhost:8182/gremlin"));
}
public WebSocketClient(final URI uri) {
@@ -66,7 +68,7 @@ public class WebSocketClient extends AbstractClient {
final WebSocketClientHandler wsHandler =
new WebSocketClientHandler(
WebSocketClientHandshakerFactory.newHandshaker(
- uri, WebSocketVersion.V13, null, false, new DefaultHttpHeaders()));
+ uri, WebSocketVersion.V13, null, false, HttpHeaders.EMPTY_HEADERS, 65536));
final MessageSerializer serializer = new GryoMessageSerializerV1d0();
b.channel(NioSocketChannel.class)
.handler(new ChannelInitializer<SocketChannel>() {
@@ -75,7 +77,7 @@ public class WebSocketClient extends AbstractClient {
final ChannelPipeline p = ch.pipeline();
p.addLast(
new HttpClientCodec(),
- new HttpObjectAggregator(8192),
+ new HttpObjectAggregator(65536),
wsHandler,
new WebSocketGremlinRequestEncoder(true, serializer),
new WebSocketGremlinResponseDecoder(serializer),
@@ -84,7 +86,7 @@ public class WebSocketClient extends AbstractClient {
});
channel = b.connect(uri.getHost(), uri.getPort()).sync().channel();
- wsHandler.handshakeFuture().sync();
+ wsHandler.handshakeFuture().get(10000, TimeUnit.MILLISECONDS);
} catch (Exception ex) {
throw new RuntimeException(ex);
}