Repository: tajo Updated Branches: refs/heads/master 69895422c -> 3363d9c4d
TAJO-1526: Investigate the frequent failures of Travis CI. Closes #521 Project: http://git-wip-us.apache.org/repos/asf/tajo/repo Commit: http://git-wip-us.apache.org/repos/asf/tajo/commit/3363d9c4 Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/3363d9c4 Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/3363d9c4 Branch: refs/heads/master Commit: 3363d9c4d68fe6edba078825f7cfb8463ef71661 Parents: 6989542 Author: Jihoon Son <[email protected]> Authored: Wed Apr 8 19:41:18 2015 +0900 Committer: Jihoon Son <[email protected]> Committed: Wed Apr 8 19:41:35 2015 +0900 ---------------------------------------------------------------------- CHANGES | 2 + tajo-core/pom.xml | 4 +- .../planner/physical/TestExternalSortExec.java | 8 +++- .../ws/rs/netty/NettyRestHandlerContainer.java | 48 +++++++------------- 4 files changed, 26 insertions(+), 36 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tajo/blob/3363d9c4/CHANGES ---------------------------------------------------------------------- diff --git a/CHANGES b/CHANGES index fba55e9..dfcdf25 100644 --- a/CHANGES +++ b/CHANGES @@ -144,6 +144,8 @@ Release 0.11.0 - unreleased TASKS + TAJO-1526: Investigate the frequent failures of Travis CI. (jihoon) + TAJO-1462: Replace CSV examples into TEXT examples in docs. (Contributed by Dongjoon Hyun, Committed by jihoon) http://git-wip-us.apache.org/repos/asf/tajo/blob/3363d9c4/tajo-core/pom.xml ---------------------------------------------------------------------- diff --git a/tajo-core/pom.xml b/tajo-core/pom.xml index cce6aaa..a9403d5 100644 --- a/tajo-core/pom.xml +++ b/tajo-core/pom.xml @@ -91,7 +91,7 @@ <systemProperties> <tajo.test>TRUE</tajo.test> </systemProperties> - <argLine>-Xms512m -Xmx1024m -XX:MaxPermSize=128m -Dfile.encoding=UTF-8</argLine> + <argLine>-Xms512m -Xmx1024m -XX:MaxPermSize=152m -Dfile.encoding=UTF-8</argLine> </configuration> </plugin> <plugin> @@ -797,7 +797,7 @@ <configuration combine.self="override"> <forkCount>${maven.fork.count}</forkCount> <reuseForks>true</reuseForks> - <argLine>-Xms512m -Xmx1024m -XX:MaxPermSize=128m -Dfile.encoding=UTF-8</argLine> + <argLine>-Xms512m -Xmx1024m -XX:MaxPermSize=152m -Dfile.encoding=UTF-8</argLine> <useSystemClassLoader>true</useSystemClassLoader> <useManifestOnlyJar>true</useManifestOnlyJar> <systemProperties> http://git-wip-us.apache.org/repos/asf/tajo/blob/3363d9c4/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestExternalSortExec.java ---------------------------------------------------------------------- diff --git a/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestExternalSortExec.java b/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestExternalSortExec.java index 946e0f3..0ef8294 100644 --- a/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestExternalSortExec.java +++ b/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestExternalSortExec.java @@ -61,7 +61,7 @@ public class TestExternalSortExec { private LogicalPlanner planner; private Path testDir; - private final int numTuple = 3000000; + private final int numTuple = 100000; private Random rnd = new Random(System.currentTimeMillis()); private TableDesc employee; @@ -136,13 +136,17 @@ public class TestExternalSortExec { ProjectionExec proj = (ProjectionExec) exec; // TODO - should be planed with user's optimization hint + ExternalSortExec extSort; if (!(proj.getChild() instanceof ExternalSortExec)) { UnaryPhysicalExec sortExec = proj.getChild(); SeqScanExec scan = sortExec.getChild(); - ExternalSortExec extSort = new ExternalSortExec(ctx, ((MemSortExec)sortExec).getPlan(), scan); + extSort = new ExternalSortExec(ctx, ((MemSortExec)sortExec).getPlan(), scan); proj.setChild(extSort); + } else { + extSort = proj.getChild(); } + extSort.setSortBufferBytesNum(1024*1024); Tuple tuple; Tuple preVal = null; http://git-wip-us.apache.org/repos/asf/tajo/blob/3363d9c4/tajo-rpc/tajo-ws-rs/src/main/java/org/apache/tajo/ws/rs/netty/NettyRestHandlerContainer.java ---------------------------------------------------------------------- diff --git a/tajo-rpc/tajo-ws-rs/src/main/java/org/apache/tajo/ws/rs/netty/NettyRestHandlerContainer.java b/tajo-rpc/tajo-ws-rs/src/main/java/org/apache/tajo/ws/rs/netty/NettyRestHandlerContainer.java index 81d1eeb..76b81c3 100644 --- a/tajo-rpc/tajo-ws-rs/src/main/java/org/apache/tajo/ws/rs/netty/NettyRestHandlerContainer.java +++ b/tajo-rpc/tajo-ws-rs/src/main/java/org/apache/tajo/ws/rs/netty/NettyRestHandlerContainer.java @@ -18,53 +18,37 @@ package org.apache.tajo.ws.rs.netty; -import java.io.OutputStream; -import java.net.InetSocketAddress; -import java.net.URI; -import java.net.URISyntaxException; -import java.security.Principal; -import java.util.List; -import java.util.Map.Entry; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.atomic.AtomicBoolean; - import io.netty.buffer.*; -import io.netty.channel.ChannelDuplexHandler; -import io.netty.channel.ChannelFuture; -import io.netty.channel.ChannelFutureListener; +import io.netty.channel.*; import io.netty.channel.ChannelHandler.Sharable; -import io.netty.channel.ChannelHandlerContext; -import io.netty.channel.ChannelPromise; -import io.netty.handler.codec.http.DefaultFullHttpResponse; -import io.netty.handler.codec.http.FullHttpRequest; -import io.netty.handler.codec.http.FullHttpResponse; -import io.netty.handler.codec.http.HttpHeaders; -import io.netty.handler.codec.http.HttpResponseStatus; -import io.netty.handler.codec.http.HttpVersion; -import io.netty.handler.codec.http.LastHttpContent; +import io.netty.handler.codec.http.*; import io.netty.handler.ssl.SslHandler; import io.netty.util.CharsetUtil; import io.netty.util.ReferenceCountUtil; import io.netty.util.concurrent.GenericFutureListener; - -import javax.ws.rs.core.Application; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.SecurityContext; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.glassfish.hk2.api.ServiceLocator; import org.glassfish.jersey.internal.MapPropertiesDelegate; -import org.glassfish.jersey.server.ApplicationHandler; -import org.glassfish.jersey.server.ContainerException; -import org.glassfish.jersey.server.ContainerRequest; -import org.glassfish.jersey.server.ContainerResponse; -import org.glassfish.jersey.server.ResourceConfig; +import org.glassfish.jersey.server.*; import org.glassfish.jersey.server.internal.ConfigHelper; import org.glassfish.jersey.server.spi.Container; import org.glassfish.jersey.server.spi.ContainerLifecycleListener; import org.glassfish.jersey.server.spi.ContainerResponseWriter; +import javax.ws.rs.core.Application; +import javax.ws.rs.core.MultivaluedMap; +import javax.ws.rs.core.SecurityContext; +import java.io.OutputStream; +import java.net.InetSocketAddress; +import java.net.URI; +import java.net.URISyntaxException; +import java.security.Principal; +import java.util.List; +import java.util.Map.Entry; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.AtomicBoolean; + /** * Jersy Container implementation on Netty */
