Repository: tez Updated Branches: refs/heads/master 788c1ad7f -> 87f62a35b
TEZ-3393. Remove extra jetty dependency from Shuffle Handler (jeagles) Project: http://git-wip-us.apache.org/repos/asf/tez/repo Commit: http://git-wip-us.apache.org/repos/asf/tez/commit/bae21b42 Tree: http://git-wip-us.apache.org/repos/asf/tez/tree/bae21b42 Diff: http://git-wip-us.apache.org/repos/asf/tez/diff/bae21b42 Branch: refs/heads/master Commit: bae21b428cdb621f566c361a063e29b2ed522dba Parents: 50541ff Author: Jonathan Eagles <[email protected]> Authored: Tue Aug 2 15:26:04 2016 -0500 Committer: Jonathan Eagles <[email protected]> Committed: Tue Aug 2 15:26:04 2016 -0500 ---------------------------------------------------------------------- TEZ-3334-CHANGES.txt | 1 + tez-plugins/tez-aux-services/pom.xml | 4 ---- .../org/apache/tez/auxservices/ShuffleHandler.java | 10 +++++----- .../apache/tez/auxservices/TestShuffleHandler.java | 16 ++++++++-------- 4 files changed, 14 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tez/blob/bae21b42/TEZ-3334-CHANGES.txt ---------------------------------------------------------------------- diff --git a/TEZ-3334-CHANGES.txt b/TEZ-3334-CHANGES.txt index 7a41a1f..6e51be2 100644 --- a/TEZ-3334-CHANGES.txt +++ b/TEZ-3334-CHANGES.txt @@ -8,3 +8,4 @@ ALL CHANGES: TEZ-3377. Remove ShuffleHandler dependency on mapred.FadvisedChunkedFile and mapred.FadvisedFileRegion TEZ-3380. Shuffle Handler: Replace primitive wrapper's valueOf method with parse* method to avoid unnecessary boxing/unboxing TEZ-3355. Tez Custom Shuffle Handler POC + TEZ-3393. Remove extra jetty dependency from Shuffle Handler http://git-wip-us.apache.org/repos/asf/tez/blob/bae21b42/tez-plugins/tez-aux-services/pom.xml ---------------------------------------------------------------------- diff --git a/tez-plugins/tez-aux-services/pom.xml b/tez-plugins/tez-aux-services/pom.xml index c30555b..a8876a7 100644 --- a/tez-plugins/tez-aux-services/pom.xml +++ b/tez-plugins/tez-aux-services/pom.xml @@ -68,10 +68,6 @@ <groupId>org.apache.tez</groupId> <artifactId>tez-mapreduce</artifactId> </dependency> - <dependency> - <groupId>org.mortbay.jetty</groupId> - <artifactId>jetty</artifactId> - </dependency> </dependencies> <build> http://git-wip-us.apache.org/repos/asf/tez/blob/bae21b42/tez-plugins/tez-aux-services/src/main/java/org/apache/tez/auxservices/ShuffleHandler.java ---------------------------------------------------------------------- diff --git a/tez-plugins/tez-aux-services/src/main/java/org/apache/tez/auxservices/ShuffleHandler.java b/tez-plugins/tez-aux-services/src/main/java/org/apache/tez/auxservices/ShuffleHandler.java index ca49ecc..4cc6c4e 100644 --- a/tez-plugins/tez-aux-services/src/main/java/org/apache/tez/auxservices/ShuffleHandler.java +++ b/tez-plugins/tez-aux-services/src/main/java/org/apache/tez/auxservices/ShuffleHandler.java @@ -119,6 +119,7 @@ import org.jboss.netty.channel.socket.nio.NioServerSocketChannelFactory; import org.jboss.netty.handler.codec.frame.TooLongFrameException; import org.jboss.netty.handler.codec.http.DefaultHttpResponse; import org.jboss.netty.handler.codec.http.HttpChunkAggregator; +import org.jboss.netty.handler.codec.http.HttpHeaders; import org.jboss.netty.handler.codec.http.HttpRequest; import org.jboss.netty.handler.codec.http.HttpRequestDecoder; import org.jboss.netty.handler.codec.http.HttpResponse; @@ -128,7 +129,6 @@ import org.jboss.netty.handler.codec.http.QueryStringDecoder; import org.jboss.netty.handler.ssl.SslHandler; import org.jboss.netty.handler.stream.ChunkedWriteHandler; import org.jboss.netty.util.CharsetUtil; -import org.mortbay.jetty.HttpHeaders; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Charsets; @@ -1119,12 +1119,12 @@ public class ShuffleHandler extends AuxiliaryService { if (LOG.isDebugEnabled()) { LOG.debug("Setting connection close header..."); } - response.setHeader(HttpHeaders.CONNECTION, CONNECTION_CLOSE); + response.setHeader(HttpHeaders.Names.CONNECTION, CONNECTION_CLOSE); } else { - response.setHeader(HttpHeaders.CONTENT_LENGTH, + response.setHeader(HttpHeaders.Names.CONTENT_LENGTH, String.valueOf(contentLength)); - response.setHeader(HttpHeaders.CONNECTION, HttpHeaders.KEEP_ALIVE); - response.setHeader(HttpHeaders.KEEP_ALIVE, "timeout=" + response.setHeader(HttpHeaders.Names.CONNECTION, HttpHeaders.Values.KEEP_ALIVE); + response.setHeader(HttpHeaders.Values.KEEP_ALIVE, "timeout=" + connectionKeepAliveTimeOut); LOG.info("Content Length in shuffle : " + contentLength); } http://git-wip-us.apache.org/repos/asf/tez/blob/bae21b42/tez-plugins/tez-aux-services/src/test/java/org/apache/tez/auxservices/TestShuffleHandler.java ---------------------------------------------------------------------- diff --git a/tez-plugins/tez-aux-services/src/test/java/org/apache/tez/auxservices/TestShuffleHandler.java b/tez-plugins/tez-aux-services/src/test/java/org/apache/tez/auxservices/TestShuffleHandler.java index ffab7dd..2ce306d 100644 --- a/tez-plugins/tez-aux-services/src/test/java/org/apache/tez/auxservices/TestShuffleHandler.java +++ b/tez-plugins/tez-aux-services/src/test/java/org/apache/tez/auxservices/TestShuffleHandler.java @@ -85,6 +85,7 @@ import org.jboss.netty.channel.socket.SocketChannel; import org.jboss.netty.channel.MessageEvent; import org.jboss.netty.channel.AbstractChannel; import org.jboss.netty.handler.codec.http.DefaultHttpResponse; +import org.jboss.netty.handler.codec.http.HttpHeaders; import org.jboss.netty.handler.codec.http.HttpRequest; import org.jboss.netty.handler.codec.http.HttpResponse; import org.jboss.netty.handler.codec.http.HttpResponseStatus; @@ -94,7 +95,6 @@ import org.junit.Test; import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; import org.mockito.Mockito; -import org.mortbay.jetty.HttpHeaders; public class TestShuffleHandler { static final long MiB = 1024 * 1024; @@ -303,7 +303,7 @@ public class TestShuffleHandler { conn.connect(); DataInputStream input = new DataInputStream(conn.getInputStream()); Assert.assertEquals(HttpURLConnection.HTTP_OK, conn.getResponseCode()); - Assert.assertEquals("close", conn.getHeaderField(HttpHeaders.CONNECTION)); + Assert.assertEquals("close", conn.getHeaderField(HttpHeaders.Names.CONNECTION)); ShuffleHeader header = new ShuffleHeader(); header.readFields(input); input.close(); @@ -418,10 +418,10 @@ public class TestShuffleHandler { ShuffleHeader.DEFAULT_HTTP_HEADER_VERSION); conn.connect(); DataInputStream input = new DataInputStream(conn.getInputStream()); - Assert.assertEquals(HttpHeaders.KEEP_ALIVE, - conn.getHeaderField(HttpHeaders.CONNECTION)); + Assert.assertEquals(HttpHeaders.Values.KEEP_ALIVE, + conn.getHeaderField(HttpHeaders.Names.CONNECTION)); Assert.assertEquals("timeout=1", - conn.getHeaderField(HttpHeaders.KEEP_ALIVE)); + conn.getHeaderField(HttpHeaders.Values.KEEP_ALIVE)); Assert.assertEquals(HttpURLConnection.HTTP_OK, conn.getResponseCode()); ShuffleHeader header = new ShuffleHeader(); header.readFields(input); @@ -438,10 +438,10 @@ public class TestShuffleHandler { ShuffleHeader.DEFAULT_HTTP_HEADER_VERSION); conn.connect(); input = new DataInputStream(conn.getInputStream()); - Assert.assertEquals(HttpHeaders.KEEP_ALIVE, - conn.getHeaderField(HttpHeaders.CONNECTION)); + Assert.assertEquals(HttpHeaders.Values.KEEP_ALIVE, + conn.getHeaderField(HttpHeaders.Names.CONNECTION)); Assert.assertEquals("timeout=1", - conn.getHeaderField(HttpHeaders.KEEP_ALIVE)); + conn.getHeaderField(HttpHeaders.Values.KEEP_ALIVE)); Assert.assertEquals(HttpURLConnection.HTTP_OK, conn.getResponseCode()); header = new ShuffleHeader(); header.readFields(input);
