You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tajo.apache.org by hy...@apache.org on 2014/04/21 13:13:00 UTC
[6/9] git commit: TAJO-675: maximum frame size of frameDecoder should
be increased. (jinho)
TAJO-675: maximum frame size of frameDecoder should be increased. (jinho)
Project: http://git-wip-us.apache.org/repos/asf/tajo/repo
Commit: http://git-wip-us.apache.org/repos/asf/tajo/commit/c367377f
Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/c367377f
Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/c367377f
Branch: refs/heads/window_function
Commit: c367377fa2887458fd246b7481cfc49865dc5ff9
Parents: 2b27f7d
Author: jinossy <ji...@gmail.com>
Authored: Mon Apr 21 16:21:48 2014 +0900
Committer: jinossy <ji...@gmail.com>
Committed: Mon Apr 21 16:21:48 2014 +0900
----------------------------------------------------------------------
CHANGES.txt | 2 ++
.../main/java/org/apache/tajo/rpc/ProtoPipelineFactory.java | 9 ++++-----
2 files changed, 6 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tajo/blob/c367377f/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 0fcc83d..7f22b06 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -334,6 +334,8 @@ Release 0.8.0 - unreleased
BUG FIXES
+ TAJO-675: maximum frame size of frameDecoder should be increased. (jinho)
+
TAJO-748: Shuffle output numbers of join may be inconsistent. (jaehwa)
TAJO-777: Partition column in function parameter occurs NPE.
http://git-wip-us.apache.org/repos/asf/tajo/blob/c367377f/tajo-rpc/src/main/java/org/apache/tajo/rpc/ProtoPipelineFactory.java
----------------------------------------------------------------------
diff --git a/tajo-rpc/src/main/java/org/apache/tajo/rpc/ProtoPipelineFactory.java b/tajo-rpc/src/main/java/org/apache/tajo/rpc/ProtoPipelineFactory.java
index b2a2004..7aa03e7 100644
--- a/tajo-rpc/src/main/java/org/apache/tajo/rpc/ProtoPipelineFactory.java
+++ b/tajo-rpc/src/main/java/org/apache/tajo/rpc/ProtoPipelineFactory.java
@@ -23,10 +23,10 @@ import org.jboss.netty.channel.ChannelPipeline;
import org.jboss.netty.channel.ChannelPipelineFactory;
import org.jboss.netty.channel.ChannelUpstreamHandler;
import org.jboss.netty.channel.Channels;
-import org.jboss.netty.handler.codec.frame.LengthFieldBasedFrameDecoder;
-import org.jboss.netty.handler.codec.frame.LengthFieldPrepender;
import org.jboss.netty.handler.codec.protobuf.ProtobufDecoder;
import org.jboss.netty.handler.codec.protobuf.ProtobufEncoder;
+import org.jboss.netty.handler.codec.protobuf.ProtobufVarint32FrameDecoder;
+import org.jboss.netty.handler.codec.protobuf.ProtobufVarint32LengthFieldPrepender;
public class ProtoPipelineFactory implements ChannelPipelineFactory {
private final ChannelUpstreamHandler handler;
@@ -40,10 +40,9 @@ public class ProtoPipelineFactory implements ChannelPipelineFactory {
public ChannelPipeline getPipeline() throws Exception {
ChannelPipeline p = Channels.pipeline();
- p.addLast("frameDecoder", new LengthFieldBasedFrameDecoder(1048576*2, 0, 4,
- 0, 4));
+ p.addLast("frameDecoder", new ProtobufVarint32FrameDecoder());
p.addLast("protobufDecoder", new ProtobufDecoder(defaultInstance));
- p.addLast("frameEncoder", new LengthFieldPrepender(4));
+ p.addLast("frameEncoder", new ProtobufVarint32LengthFieldPrepender());
p.addLast("protobufEncoder", new ProtobufEncoder());
p.addLast("handler", handler);
return p;