From a5259c964f56dbb681bd5bd50f6fb3720fea69f6 Mon Sep 17 00:00:00 2001 From: swlsw Date: Fri, 27 Mar 2015 09:35:01 +0900 Subject: [PATCH] TAJO-1455: Change a variable name from PullServer into pullServer --- .../org/apache/tajo/pullserver/PullServerAuxService.java | 8 ++++---- .../org/apache/tajo/pullserver/TajoPullServerService.java | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/tajo-pullserver/src/main/java/org/apache/tajo/pullserver/PullServerAuxService.java b/tajo-pullserver/src/main/java/org/apache/tajo/pullserver/PullServerAuxService.java index fba05934fa..c1f2d30494 100644 --- a/tajo-pullserver/src/main/java/org/apache/tajo/pullserver/PullServerAuxService.java +++ b/tajo-pullserver/src/main/java/org/apache/tajo/pullserver/PullServerAuxService.java @@ -238,7 +238,7 @@ public synchronized void start() { accepted.add(future.channel()); port = ((InetSocketAddress)future.channel().localAddress()).getPort(); conf.set(ConfVars.PULLSERVER_PORT.varname, Integer.toString(port)); - initializer.PullServer.setPort(port); + initializer.pullServer.setPort(port); LOG.info(getName() + " listening on port " + port); super.start(); @@ -288,11 +288,11 @@ public synchronized ByteBuffer getMetaData() { class HttpChannelInitializer extends ChannelInitializer { - final PullServer PullServer; + final PullServer pullServer; private SSLFactory sslFactory; public HttpChannelInitializer(Configuration conf) throws Exception { - PullServer = new PullServer(conf); + pullServer = new PullServer(conf); if (conf.getBoolean(ConfVars.SHUFFLE_SSL_ENABLED_KEY.varname, ConfVars.SHUFFLE_SSL_ENABLED_KEY.defaultBoolVal)) { sslFactory = new SSLFactory(SSLFactory.Mode.SERVER, conf); @@ -317,7 +317,7 @@ protected void initChannel(Channel channel) throws Exception { pipeline.addLast("decoder", new HttpRequestDecoder()); pipeline.addLast("aggregator", new HttpObjectAggregator(1 << 16)); pipeline.addLast("chunking", new ChunkedWriteHandler()); - pipeline.addLast("shuffle", PullServer); + pipeline.addLast("shuffle", pullServer); // TODO factor security manager into pipeline // TODO factor out encode/decode to permit binary shuffle // TODO factor out decode of index to permit alt. models diff --git a/tajo-pullserver/src/main/java/org/apache/tajo/pullserver/TajoPullServerService.java b/tajo-pullserver/src/main/java/org/apache/tajo/pullserver/TajoPullServerService.java index 0744b9fbbf..b88abdac99 100644 --- a/tajo-pullserver/src/main/java/org/apache/tajo/pullserver/TajoPullServerService.java +++ b/tajo-pullserver/src/main/java/org/apache/tajo/pullserver/TajoPullServerService.java @@ -249,7 +249,7 @@ public synchronized void serviceInit(Configuration conf) throws Exception { accepted.add(future.channel()); port = ((InetSocketAddress)future.channel().localAddress()).getPort(); conf.set(ConfVars.PULLSERVER_PORT.varname, Integer.toString(port)); - channelInitializer.PullServer.setPort(port); + channelInitializer.pullServer.setPort(port); LOG.info(getName() + " listening on port " + port); sslFileBufferSize = conf.getInt(SUFFLE_SSL_FILE_BUFFER_SIZE_KEY, @@ -353,11 +353,11 @@ public synchronized ByteBuffer getMeta() { class HttpChannelInitializer extends ChannelInitializer { - final PullServer PullServer; + final PullServer pullServer; private SSLFactory sslFactory; public HttpChannelInitializer(Configuration conf) throws Exception { - PullServer = new PullServer(conf); + pullServer = new PullServer(conf); if (conf.getBoolean(ConfVars.SHUFFLE_SSL_ENABLED_KEY.varname, ConfVars.SHUFFLE_SSL_ENABLED_KEY.defaultBoolVal)) { sslFactory = new SSLFactory(SSLFactory.Mode.SERVER, conf); @@ -383,7 +383,7 @@ protected void initChannel(SocketChannel channel) throws Exception { pipeline.addLast("codec", new HttpServerCodec(4096, 8192, maxChunkSize)); pipeline.addLast("aggregator", new HttpObjectAggregator(1 << 16)); pipeline.addLast("chunking", new ChunkedWriteHandler()); - pipeline.addLast("shuffle", PullServer); + pipeline.addLast("shuffle", pullServer); // TODO factor security manager into pipeline // TODO factor out encode/decode to permit binary shuffle // TODO factor out decode of index to permit alt. models