Repository: tajo Updated Branches: refs/heads/master 2d7212c83 -> 9c99f2ba0
TAJO-1677: Remove unnecessary messages for the Travis CI build. (jaehwa) Closes #625 Project: http://git-wip-us.apache.org/repos/asf/tajo/repo Commit: http://git-wip-us.apache.org/repos/asf/tajo/commit/9c99f2ba Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/9c99f2ba Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/9c99f2ba Branch: refs/heads/master Commit: 9c99f2ba0574ef7f8df6a8546c0e38745e310b39 Parents: 2d7212c Author: JaeHwa Jung <[email protected]> Authored: Tue Jul 14 16:02:48 2015 +0900 Committer: JaeHwa Jung <[email protected]> Committed: Tue Jul 14 16:03:28 2015 +0900 ---------------------------------------------------------------------- .travis.yml | 2 +- CHANGES | 2 ++ .../tajo/util/graph/TestSimpleDirectedGraph.java | 7 ++++++- .../engine/planner/physical/TestBSTIndexExec.java | 4 ++-- .../planner/physical/TestExternalSortExec.java | 3 --- .../physical/TestProgressExternalSortExec.java | 2 -- .../apache/tajo/engine/query/TestSortQuery.java | 2 -- .../tajo/querymaster/TestTaskStatusUpdate.java | 3 --- .../java/org/apache/tajo/storage/TestRowFile.java | 8 ++++++-- .../tajo/util/metrics/TestSystemMetrics.java | 4 +++- .../tajo/worker/TestNodeResourceManager.java | 3 --- .../ws/rs/netty/NettyRestHandlerContainer.java | 4 ++++ .../tajo/ws/rs/netty/NettyRestServerListener.java | 18 ++++++++++++------ .../tajo/storage/TestDelimitedTextFile.java | 5 ++++- 14 files changed, 40 insertions(+), 27 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tajo/blob/9c99f2ba/.travis.yml ---------------------------------------------------------------------- diff --git a/.travis.yml b/.travis.yml index 61d56fb..ef8fd97 100644 --- a/.travis.yml +++ b/.travis.yml @@ -37,4 +37,4 @@ before_install: ulimit -t 514029 install: ./dev-support/travis-install-dependencies.sh script: - mvn clean install -Pparallel-test -DLOG_LEVEL=WARN -Dmaven.fork.count=2 + mvn clean install -q -ff -Dsurefire.useFile=false -Pparallel-test -DLOG_LEVEL=WARN -Dmaven.fork.count=2 http://git-wip-us.apache.org/repos/asf/tajo/blob/9c99f2ba/CHANGES ---------------------------------------------------------------------- diff --git a/CHANGES b/CHANGES index 9cf93cf..252b8ed 100644 --- a/CHANGES +++ b/CHANGES @@ -29,6 +29,8 @@ Release 0.11.0 - unreleased IMPROVEMENT + TAJO-1677: Remove unnecessary messages for the Travis CI build. (jaehwa) + TAJO-1672: Removing rest api to create table POST /databases/{database-name}/tables interface (Contributed by DaeMyung Kang, Committed by jaehwa) http://git-wip-us.apache.org/repos/asf/tajo/blob/9c99f2ba/tajo-common/src/test/java/org/apache/tajo/util/graph/TestSimpleDirectedGraph.java ---------------------------------------------------------------------- diff --git a/tajo-common/src/test/java/org/apache/tajo/util/graph/TestSimpleDirectedGraph.java b/tajo-common/src/test/java/org/apache/tajo/util/graph/TestSimpleDirectedGraph.java index a3b10a4..676d39f 100644 --- a/tajo-common/src/test/java/org/apache/tajo/util/graph/TestSimpleDirectedGraph.java +++ b/tajo-common/src/test/java/org/apache/tajo/util/graph/TestSimpleDirectedGraph.java @@ -18,6 +18,8 @@ package org.apache.tajo.util.graph; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.apache.tajo.util.graph.DirectedGraphVisitor; import org.apache.tajo.util.graph.SimpleDirectedGraph; import org.junit.Test; @@ -29,6 +31,7 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; public class TestSimpleDirectedGraph { + private static final Log LOG = LogFactory.getLog(TestSimpleDirectedGraph.class); @Test public final void test() { @@ -73,7 +76,9 @@ public class TestSimpleDirectedGraph { @Override public void visit(Stack<String> stack, String s) { - System.out.println("===> " + s); + if(LOG.isDebugEnabled()) { + LOG.debug("Element:" + s); + } } } } http://git-wip-us.apache.org/repos/asf/tajo/blob/9c99f2ba/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestBSTIndexExec.java ---------------------------------------------------------------------- diff --git a/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestBSTIndexExec.java b/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestBSTIndexExec.java index b4a6063..e577881 100644 --- a/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestBSTIndexExec.java +++ b/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestBSTIndexExec.java @@ -143,8 +143,8 @@ public class TestBSTIndexExec { writer.close(); TableDesc desc = new TableDesc( - CatalogUtil.buildFQName(TajoConstants.DEFAULT_DATABASE_NAME, "employee"), schema, meta, - sm.getTableUri(TajoConstants.DEFAULT_DATABASE_NAME, "employee")); + CatalogUtil.buildFQName(TajoConstants.DEFAULT_DATABASE_NAME, "employee"), schema, meta, + tablePath.toUri()); catalog.createTable(desc); analyzer = new SQLAnalyzer(); http://git-wip-us.apache.org/repos/asf/tajo/blob/9c99f2ba/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 cf5220e..2578de6 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 @@ -98,9 +98,6 @@ public class TestExternalSortExec { appender.flush(); appender.close(); - System.out.println(appender.getStats().getNumRows() + " rows (" + (appender.getStats().getNumBytes() / 1048576) + - " MB)"); - employee = new TableDesc("default.employee", schema, employeeMeta, employeePath.toUri()); catalog.createTable(employee); analyzer = new SQLAnalyzer(); http://git-wip-us.apache.org/repos/asf/tajo/blob/9c99f2ba/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestProgressExternalSortExec.java ---------------------------------------------------------------------- diff --git a/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestProgressExternalSortExec.java b/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestProgressExternalSortExec.java index d1da787..d79d292 100644 --- a/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestProgressExternalSortExec.java +++ b/tajo-core/src/test/java/org/apache/tajo/engine/planner/physical/TestProgressExternalSortExec.java @@ -102,8 +102,6 @@ public class TestProgressExternalSortExec { appender.flush(); appender.close(); - System.out.println(appender.getStats().getNumRows() + " rows (" + appender.getStats().getNumBytes() + " Bytes)"); - testDataStats = appender.getStats(); employee = new TableDesc( CatalogUtil.buildFQName(TajoConstants.DEFAULT_DATABASE_NAME, "employee"), schema, employeeMeta, http://git-wip-us.apache.org/repos/asf/tajo/blob/9c99f2ba/tajo-core/src/test/java/org/apache/tajo/engine/query/TestSortQuery.java ---------------------------------------------------------------------- diff --git a/tajo-core/src/test/java/org/apache/tajo/engine/query/TestSortQuery.java b/tajo-core/src/test/java/org/apache/tajo/engine/query/TestSortQuery.java index 24b525d..47ce377 100644 --- a/tajo-core/src/test/java/org/apache/tajo/engine/query/TestSortQuery.java +++ b/tajo-core/src/test/java/org/apache/tajo/engine/query/TestSortQuery.java @@ -24,7 +24,6 @@ import org.apache.tajo.TajoConstants; import org.apache.tajo.TajoTestingCluster; import org.apache.tajo.catalog.Schema; import org.apache.tajo.common.TajoDataTypes.Type; -import org.apache.tajo.conf.TajoConf; import org.apache.tajo.conf.TajoConf.ConfVars; import org.apache.tajo.storage.StorageConstants; import org.apache.tajo.util.KeyValueSet; @@ -68,7 +67,6 @@ public class TestSortQuery extends QueryTestCaseBase { @Test public final void testSortWithAlias3() throws Exception { ResultSet res = executeQuery(); - System.out.println(resultSetToString(res)); cleanupQuery(res); } http://git-wip-us.apache.org/repos/asf/tajo/blob/9c99f2ba/tajo-core/src/test/java/org/apache/tajo/querymaster/TestTaskStatusUpdate.java ---------------------------------------------------------------------- diff --git a/tajo-core/src/test/java/org/apache/tajo/querymaster/TestTaskStatusUpdate.java b/tajo-core/src/test/java/org/apache/tajo/querymaster/TestTaskStatusUpdate.java index ab5375c..e237139 100644 --- a/tajo-core/src/test/java/org/apache/tajo/querymaster/TestTaskStatusUpdate.java +++ b/tajo-core/src/test/java/org/apache/tajo/querymaster/TestTaskStatusUpdate.java @@ -100,9 +100,6 @@ public class TestTaskStatusUpdate extends QueryTestCaseBase { */ res = executeQuery(); - String actualResult = resultSetToString(res); - System.out.println(actualResult); - // in/out * stage(4) long[] expectedNumRows = new long[]{2, 2, 5, 5, 7, 2, 2, 2}; long[] expectedNumBytes = new long[]{8, 34, 20, 75, 109, 34, 34, 18}; http://git-wip-us.apache.org/repos/asf/tajo/blob/9c99f2ba/tajo-core/src/test/java/org/apache/tajo/storage/TestRowFile.java ---------------------------------------------------------------------- diff --git a/tajo-core/src/test/java/org/apache/tajo/storage/TestRowFile.java b/tajo-core/src/test/java/org/apache/tajo/storage/TestRowFile.java index f48a71e..e45dd75 100644 --- a/tajo-core/src/test/java/org/apache/tajo/storage/TestRowFile.java +++ b/tajo-core/src/test/java/org/apache/tajo/storage/TestRowFile.java @@ -19,6 +19,8 @@ package org.apache.tajo.storage; import com.google.common.collect.Sets; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.apache.hadoop.fs.FileStatus; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; @@ -45,6 +47,8 @@ import java.util.Set; import static org.junit.Assert.assertEquals; public class TestRowFile { + private static final Log LOG = LogFactory.getLog(TestRowFile.class); + private TajoTestingCluster cluster; private TajoConf conf; @@ -126,8 +130,8 @@ public class TestRowFile { scanner = new RowFile.RowFileScanner(conf, schema, meta, fragment); scanner.init(); while ((tuple=scanner.next()) != null) { - if (!idSet.remove(tuple.getInt4(0))) { - System.out.println("duplicated! " + tuple.getInt4(0)); + if (!idSet.remove(tuple.getInt4(0)) && LOG.isDebugEnabled()) { + LOG.debug("duplicated! " + tuple.getInt4(0)); } tupleCnt++; } http://git-wip-us.apache.org/repos/asf/tajo/blob/9c99f2ba/tajo-core/src/test/java/org/apache/tajo/util/metrics/TestSystemMetrics.java ---------------------------------------------------------------------- diff --git a/tajo-core/src/test/java/org/apache/tajo/util/metrics/TestSystemMetrics.java b/tajo-core/src/test/java/org/apache/tajo/util/metrics/TestSystemMetrics.java index a4af64c..51622b5 100644 --- a/tajo-core/src/test/java/org/apache/tajo/util/metrics/TestSystemMetrics.java +++ b/tajo-core/src/test/java/org/apache/tajo/util/metrics/TestSystemMetrics.java @@ -54,12 +54,14 @@ public class TestSystemMetrics { out.write("reporter.file=org.apache.tajo.util.metrics.reporter.MetricsFileScheduledReporter\n".getBytes()); out.write("reporter.console=org.apache.tajo.util.metrics.reporter.MetricsConsoleScheduledReporter\n".getBytes()); + out.write("test-file-group-jvm.reporters=console\n".getBytes()); out.write("test-file-group.reporters=file\n".getBytes()); out.write("test-console-group.reporters=console\n".getBytes()); out.write("test-find-console-group.reporters=console,file\n".getBytes()); out.write(("test-file-group.file.filename=" + metricsOutputFile.toUri().getPath() + "\n").getBytes()); out.write("test-file-group.file.period=5\n".getBytes()); + out.close(); } @Test @@ -71,7 +73,7 @@ public class TestSystemMetrics { Collection<TajoMetricsScheduledReporter> reporters = tajoSystemMetrics.getMetricsReporters(); - assertEquals(1, reporters.size()); + assertEquals(2, reporters.size()); TajoMetricsScheduledReporter reporter = reporters.iterator().next(); assertEquals(5, reporter.getPeriod()); http://git-wip-us.apache.org/repos/asf/tajo/blob/9c99f2ba/tajo-core/src/test/java/org/apache/tajo/worker/TestNodeResourceManager.java ---------------------------------------------------------------------- diff --git a/tajo-core/src/test/java/org/apache/tajo/worker/TestNodeResourceManager.java b/tajo-core/src/test/java/org/apache/tajo/worker/TestNodeResourceManager.java index 2cee7d0..0f58854 100644 --- a/tajo-core/src/test/java/org/apache/tajo/worker/TestNodeResourceManager.java +++ b/tajo-core/src/test/java/org/apache/tajo/worker/TestNodeResourceManager.java @@ -253,7 +253,6 @@ public class TestNodeResourceManager { fail(e.getMessage()); } } - System.out.println(Thread.currentThread().getName() + " complete requests: " + complete); totalComplete.addAndGet(complete); } }) @@ -264,8 +263,6 @@ public class TestNodeResourceManager { future.get(); } - System.out.println(parallelCount + " Thread, completed requests: " + totalComplete.get() + ", canceled requests:" - + totalCanceled.get() + ", " + +(System.currentTimeMillis() - startTime) + " ms elapsed"); executor.shutdown(); assertEquals(taskSize, totalComplete.get()); } http://git-wip-us.apache.org/repos/asf/tajo/blob/9c99f2ba/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 76b81c3..4e51ca2 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 @@ -75,6 +75,10 @@ public class NettyRestHandlerContainer extends ChannelDuplexHandler implements C lifecycleListener = ConfigHelper.getContainerLifecycleListener(applicationHandler); } + public ApplicationHandler getApplicationHandler() { + return applicationHandler; + } + @Override public ResourceConfig getConfiguration() { return applicationHandler.getConfiguration(); http://git-wip-us.apache.org/repos/asf/tajo/blob/9c99f2ba/tajo-rpc/tajo-ws-rs/src/main/java/org/apache/tajo/ws/rs/netty/NettyRestServerListener.java ---------------------------------------------------------------------- diff --git a/tajo-rpc/tajo-ws-rs/src/main/java/org/apache/tajo/ws/rs/netty/NettyRestServerListener.java b/tajo-rpc/tajo-ws-rs/src/main/java/org/apache/tajo/ws/rs/netty/NettyRestServerListener.java index ecd5bb0..c4acc04 100644 --- a/tajo-rpc/tajo-ws-rs/src/main/java/org/apache/tajo/ws/rs/netty/NettyRestServerListener.java +++ b/tajo-rpc/tajo-ws-rs/src/main/java/org/apache/tajo/ws/rs/netty/NettyRestServerListener.java @@ -42,16 +42,22 @@ public class NettyRestServerListener implements RpcEventListener { @Override public void onAfterShutdown(Object obj) { - ApplicationHandler applicationHandler = new ApplicationHandler(container.getConfiguration()); - ContainerLifecycleListener lifecycleListener = ConfigHelper.getContainerLifecycleListener(applicationHandler); - lifecycleListener.onShutdown(container); + if (container instanceof NettyRestHandlerContainer) { + NettyRestHandlerContainer restHandlerContainer = ((NettyRestHandlerContainer) container); + ApplicationHandler applicationHandler = restHandlerContainer.getApplicationHandler(); + ContainerLifecycleListener lifecycleListener = ConfigHelper.getContainerLifecycleListener(applicationHandler); + lifecycleListener.onShutdown(container); + } } @Override public void onAfterStart(Object obj) { - ApplicationHandler applicationHandler = new ApplicationHandler(container.getConfiguration()); - ContainerLifecycleListener lifecycleListener = ConfigHelper.getContainerLifecycleListener(applicationHandler); - lifecycleListener.onStartup(container); + if (container instanceof NettyRestHandlerContainer) { + NettyRestHandlerContainer restHandlerContainer = ((NettyRestHandlerContainer) container); + ApplicationHandler applicationHandler = restHandlerContainer.getApplicationHandler(); + ContainerLifecycleListener lifecycleListener = ConfigHelper.getContainerLifecycleListener(applicationHandler); + lifecycleListener.onStartup(container); + } } @Override http://git-wip-us.apache.org/repos/asf/tajo/blob/9c99f2ba/tajo-storage/tajo-storage-hdfs/src/test/java/org/apache/tajo/storage/TestDelimitedTextFile.java ---------------------------------------------------------------------- diff --git a/tajo-storage/tajo-storage-hdfs/src/test/java/org/apache/tajo/storage/TestDelimitedTextFile.java b/tajo-storage/tajo-storage-hdfs/src/test/java/org/apache/tajo/storage/TestDelimitedTextFile.java index ca5885c..ba3a5a8 100644 --- a/tajo-storage/tajo-storage-hdfs/src/test/java/org/apache/tajo/storage/TestDelimitedTextFile.java +++ b/tajo-storage/tajo-storage-hdfs/src/test/java/org/apache/tajo/storage/TestDelimitedTextFile.java @@ -19,6 +19,8 @@ package org.apache.tajo.storage; import com.google.common.base.Preconditions; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileStatus; import org.apache.hadoop.fs.FileSystem; @@ -41,6 +43,7 @@ import java.net.URL; import static org.junit.Assert.*; public class TestDelimitedTextFile { + private static final Log LOG = LogFactory.getLog(TestDelimitedTextFile.class); private static Schema schema = new Schema(); @@ -133,7 +136,7 @@ public class TestDelimitedTextFile { try { scanner.next(); } catch (IOException ioe) { - System.out.println(ioe); + LOG.error(ioe); return; } finally { scanner.close();
