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/05/09 04:27:17 UTC
git commit: TAJO-814: Set up Travis CI builds.
Repository: tajo
Updated Branches:
refs/heads/master 9ec9ac18b -> 5e8c0bd68
TAJO-814: Set up Travis CI builds.
Fixes #8.
Project: http://git-wip-us.apache.org/repos/asf/tajo/repo
Commit: http://git-wip-us.apache.org/repos/asf/tajo/commit/5e8c0bd6
Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/5e8c0bd6
Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/5e8c0bd6
Branch: refs/heads/master
Commit: 5e8c0bd68cebc9da1962cffd6289e06e15259d75
Parents: 9ec9ac1
Author: Hyunsik Choi <hy...@apache.org>
Authored: Fri May 9 11:23:52 2014 +0900
Committer: Hyunsik Choi <hy...@apache.org>
Committed: Fri May 9 11:24:55 2014 +0900
----------------------------------------------------------------------
.travis.yml | 33 +++++++++++++++++
CHANGES | 4 +-
dev-support/travis-install-dependencies.sh | 39 ++++++++++++++++++++
.../src/test/resources/log4j.properties | 2 +-
tajo-client/src/main/resources/log4j.properties | 4 +-
tajo-common/src/main/java/log4j.properties | 2 +-
tajo-common/src/test/java/log4j.properties | 2 +-
tajo-core/src/main/java/log4j.properties | 4 +-
.../rewrite/BasicQueryRewriteEngine.java | 4 +-
.../planner/rewrite/ProjectionPushDownRule.java | 1 -
.../org/apache/tajo/master/GlobalEngine.java | 8 ++--
tajo-core/src/main/resources/log4j.properties | 4 +-
tajo-core/src/test/java/log4j.properties | 4 +-
tajo-core/src/test/resources/log4j.properties | 4 +-
tajo-jdbc/src/main/resources/log4j.properties | 4 +-
tajo-rpc/src/test/java/log4j.properties | 2 +-
.../org/apache/tajo/storage/v2/DiskUtil.java | 2 +-
.../apache/tajo/storage/v2/ScanScheduler.java | 3 ++
18 files changed, 103 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tajo/blob/5e8c0bd6/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000..e509f80
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,33 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+language: java
+
+git:
+ depth: 150
+
+jdk:
+ - openjdk6
+
+env: PATH=$PATH:$HOME/local/bin
+
+cache:
+ directories:
+ - $HOME/.m2
+ - $HOME/local
+
+install: ./dev-support/travis-install-dependencies.sh
+
+script: mvn clean install -Phcatalog-0.12.0 -q | grep -v 'INFO:'
http://git-wip-us.apache.org/repos/asf/tajo/blob/5e8c0bd6/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index abd5a9f..4c71474 100644
--- a/CHANGES
+++ b/CHANGES
@@ -58,8 +58,10 @@ Release 0.9.0 - unreleased
TASKS
+ TAJO-814: Set up Travis CI builds. (hyunsik)
+
TAJO-820: Add missing license header to 0.8.0 release announcement.
- (hyunsik)
+ (hyunsik)
TAJO-810: TAJO-810: Update Tajo site for 0.8.0 release. (hyunsik)
http://git-wip-us.apache.org/repos/asf/tajo/blob/5e8c0bd6/dev-support/travis-install-dependencies.sh
----------------------------------------------------------------------
diff --git a/dev-support/travis-install-dependencies.sh b/dev-support/travis-install-dependencies.sh
new file mode 100755
index 0000000..2f77ffa
--- /dev/null
+++ b/dev-support/travis-install-dependencies.sh
@@ -0,0 +1,39 @@
+#!/bin/bash -x
+
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+PROTOBUF_VERSION=2.5.0
+INSTALL=${HOME}/local
+
+if [ ! -d ${INSTALL} ]; then
+ echo "mkdir -p ${INSTALL}"
+ mkdir -p ${INSTALL}
+fi
+
+if [ ! -f ${INSTALL}/bin/protoc ]; then
+ cd ${INSTALL}
+ echo "Fetching protobuf"
+ N="protobuf-${PROTOBUF_VERSION}"
+ wget -q https://protobuf.googlecode.com/files/${N}.tar.gz
+ tar -xzvf ${N}.tar.gz > /dev/null
+ rm ${N}.tar.gz
+
+ echo "Building protobuf"
+ cd ${N}
+ ./configure --with-pic --prefix=${INSTALL} --with-gflags=${INSTALL} > /dev/null
+ make -j4 install > /dev/null
+fi
http://git-wip-us.apache.org/repos/asf/tajo/blob/5e8c0bd6/tajo-catalog/tajo-catalog-server/src/test/resources/log4j.properties
----------------------------------------------------------------------
diff --git a/tajo-catalog/tajo-catalog-server/src/test/resources/log4j.properties b/tajo-catalog/tajo-catalog-server/src/test/resources/log4j.properties
index 2b42975..237ceaf 100644
--- a/tajo-catalog/tajo-catalog-server/src/test/resources/log4j.properties
+++ b/tajo-catalog/tajo-catalog-server/src/test/resources/log4j.properties
@@ -22,4 +22,4 @@ log4j.rootLogger=info,stdout
log4j.threshhold=INFO
log4j.appender.stdout=org.apache.log4j.ConsoleAppender
log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=%d{ISO8601} %-5p %c{2} (%F:%M(%L)) - %m%n
+log4j.appender.stdout.layout.ConversionPattern=%d{ISO8601} %p: %c (%M(%L)) - %m%n
http://git-wip-us.apache.org/repos/asf/tajo/blob/5e8c0bd6/tajo-client/src/main/resources/log4j.properties
----------------------------------------------------------------------
diff --git a/tajo-client/src/main/resources/log4j.properties b/tajo-client/src/main/resources/log4j.properties
index 11d9ad2..ef17197 100644
--- a/tajo-client/src/main/resources/log4j.properties
+++ b/tajo-client/src/main/resources/log4j.properties
@@ -22,6 +22,6 @@ log4j.rootLogger=info,stdout
log4j.threshhold=INFO
log4j.appender.stdout=org.apache.log4j.ConsoleAppender
log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=%d{ISO8601} %-5p %c{2} (%F:%M(%L)) - %m%n
+log4j.appender.stdout.layout.ConversionPattern=%d{ISO8601} %p: %c (%M(%L)) - %m%n
-log4j.logger.org.apache.tajo.cli=FATAL
\ No newline at end of file
+log4j.logger.org.apache.tajo.cli=FATAL
http://git-wip-us.apache.org/repos/asf/tajo/blob/5e8c0bd6/tajo-common/src/main/java/log4j.properties
----------------------------------------------------------------------
diff --git a/tajo-common/src/main/java/log4j.properties b/tajo-common/src/main/java/log4j.properties
index 29cb6a8..8af8ce3 100644
--- a/tajo-common/src/main/java/log4j.properties
+++ b/tajo-common/src/main/java/log4j.properties
@@ -16,4 +16,4 @@ log4j.rootLogger=info,stdout
log4j.threshhold=ALL
log4j.appender.stdout=org.apache.log4j.ConsoleAppender
log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=%d{ISO8601} %-5p %c{2} (%F:%M(%L)) - %m%n
+log4j.appender.stdout.layout.ConversionPattern=%d{ISO8601} %p: %c (%M(%L)) - %m%n
http://git-wip-us.apache.org/repos/asf/tajo/blob/5e8c0bd6/tajo-common/src/test/java/log4j.properties
----------------------------------------------------------------------
diff --git a/tajo-common/src/test/java/log4j.properties b/tajo-common/src/test/java/log4j.properties
index c1ac487..2c4d991 100644
--- a/tajo-common/src/test/java/log4j.properties
+++ b/tajo-common/src/test/java/log4j.properties
@@ -22,4 +22,4 @@ log4j.rootLogger=info,stdout
log4j.threshhold=ALL
log4j.appender.stdout=org.apache.log4j.ConsoleAppender
log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=%d{ISO8601} %-5p %c{2} (%F:%M(%L)) - %m%n
+log4j.appender.stdout.layout.ConversionPattern=%d{ISO8601} %p: %c (%M(%L)) - %m%n
http://git-wip-us.apache.org/repos/asf/tajo/blob/5e8c0bd6/tajo-core/src/main/java/log4j.properties
----------------------------------------------------------------------
diff --git a/tajo-core/src/main/java/log4j.properties b/tajo-core/src/main/java/log4j.properties
index 15e5778..3f43f8f 100644
--- a/tajo-core/src/main/java/log4j.properties
+++ b/tajo-core/src/main/java/log4j.properties
@@ -22,9 +22,9 @@ log4j.rootLogger=info,stdout,EventCounter
log4j.threshhold=ALL
log4j.appender.stdout=org.apache.log4j.ConsoleAppender
log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=%d{ISO8601} %-5p %c{2} (%F:%M(%L)) - %m%n
+log4j.appender.stdout.layout.ConversionPattern=%d{ISO8601} %p: %c (%M(%L)) - %m%n
log4j.logger.org.apache.hadoop=WARN
log4j.logger.org.apache.hadoop.conf=ERROR
-log4j.appender.EventCounter=org.apache.tajo.util.metrics.TajoLogEventCounter
\ No newline at end of file
+log4j.appender.EventCounter=org.apache.tajo.util.metrics.TajoLogEventCounter
http://git-wip-us.apache.org/repos/asf/tajo/blob/5e8c0bd6/tajo-core/src/main/java/org/apache/tajo/engine/planner/rewrite/BasicQueryRewriteEngine.java
----------------------------------------------------------------------
diff --git a/tajo-core/src/main/java/org/apache/tajo/engine/planner/rewrite/BasicQueryRewriteEngine.java b/tajo-core/src/main/java/org/apache/tajo/engine/planner/rewrite/BasicQueryRewriteEngine.java
index 3b4b712..6b3ed1e 100644
--- a/tajo-core/src/main/java/org/apache/tajo/engine/planner/rewrite/BasicQueryRewriteEngine.java
+++ b/tajo-core/src/main/java/org/apache/tajo/engine/planner/rewrite/BasicQueryRewriteEngine.java
@@ -61,7 +61,9 @@ public class BasicQueryRewriteEngine implements QueryRewriteEngine {
rule = rewriteRule.getValue();
if (rule.isEligible(plan)) {
plan = rule.rewrite(plan);
- LOG.info("The rule \"" + rule.getName() + " \" rewrites the query.");
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("The rule \"" + rule.getName() + " \" rewrites the query.");
+ }
}
}
http://git-wip-us.apache.org/repos/asf/tajo/blob/5e8c0bd6/tajo-core/src/main/java/org/apache/tajo/engine/planner/rewrite/ProjectionPushDownRule.java
----------------------------------------------------------------------
diff --git a/tajo-core/src/main/java/org/apache/tajo/engine/planner/rewrite/ProjectionPushDownRule.java b/tajo-core/src/main/java/org/apache/tajo/engine/planner/rewrite/ProjectionPushDownRule.java
index 668ed68..c21c087 100644
--- a/tajo-core/src/main/java/org/apache/tajo/engine/planner/rewrite/ProjectionPushDownRule.java
+++ b/tajo-core/src/main/java/org/apache/tajo/engine/planner/rewrite/ProjectionPushDownRule.java
@@ -55,7 +55,6 @@ public class ProjectionPushDownRule extends
LogicalNode toBeOptimized = plan.getRootBlock().getRoot();
if (PlannerUtil.checkIfDDLPlan(toBeOptimized) || !plan.getRootBlock().hasTableExpression()) {
- LOG.info("This query skips the logical optimization step.");
return false;
}
http://git-wip-us.apache.org/repos/asf/tajo/blob/5e8c0bd6/tajo-core/src/main/java/org/apache/tajo/master/GlobalEngine.java
----------------------------------------------------------------------
diff --git a/tajo-core/src/main/java/org/apache/tajo/master/GlobalEngine.java b/tajo-core/src/main/java/org/apache/tajo/master/GlobalEngine.java
index c87ad84..4155609 100644
--- a/tajo-core/src/main/java/org/apache/tajo/master/GlobalEngine.java
+++ b/tajo-core/src/main/java/org/apache/tajo/master/GlobalEngine.java
@@ -339,9 +339,11 @@ public class GlobalEngine extends AbstractService {
}
LogicalPlan plan = planner.createPlan(session, expression);
- LOG.info("=============================================");
- LOG.info("Non Optimized Query: \n" + plan.toString());
- LOG.info("=============================================");
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("=============================================");
+ LOG.debug("Non Optimized Query: \n" + plan.toString());
+ LOG.debug("=============================================");
+ }
optimizer.optimize(plan);
LOG.info("=============================================");
LOG.info("Optimized Query: \n" + plan.toString());
http://git-wip-us.apache.org/repos/asf/tajo/blob/5e8c0bd6/tajo-core/src/main/resources/log4j.properties
----------------------------------------------------------------------
diff --git a/tajo-core/src/main/resources/log4j.properties b/tajo-core/src/main/resources/log4j.properties
index 007c8f5..772763e 100644
--- a/tajo-core/src/main/resources/log4j.properties
+++ b/tajo-core/src/main/resources/log4j.properties
@@ -22,7 +22,7 @@ log4j.rootLogger=info,stdout
log4j.threshhold=INFO
log4j.appender.stdout=org.apache.log4j.ConsoleAppender
log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=%d{ISO8601} %-5p %c{2} (%F:%M(%L)) - %m%n
+log4j.appender.stdout.layout.ConversionPattern=%d{ISO8601} %p: %c (%M(%L)) - %m%n
log4j.logger.org.apache.hadoop=WARN
-log4j.logger.org.apache.hadoop.conf=ERROR
\ No newline at end of file
+log4j.logger.org.apache.hadoop.conf=ERROR
http://git-wip-us.apache.org/repos/asf/tajo/blob/5e8c0bd6/tajo-core/src/test/java/log4j.properties
----------------------------------------------------------------------
diff --git a/tajo-core/src/test/java/log4j.properties b/tajo-core/src/test/java/log4j.properties
index 749124c..48f9d8e 100644
--- a/tajo-core/src/test/java/log4j.properties
+++ b/tajo-core/src/test/java/log4j.properties
@@ -22,7 +22,7 @@ log4j.rootLogger=info,stdout
log4j.threshhold=ALL
log4j.appender.stdout=org.apache.log4j.ConsoleAppender
log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=%d{ISO8601} %-5p %c{2} (%F:%M(%L)) - %m%n
+log4j.appender.stdout.layout.ConversionPattern=%d{ISO8601} %p: %c (%M(%L)) - %m%n
log4j.logger.org.apache.hadoop=WARN
-log4j.logger.org.apache.hadoop.conf=ERROR
\ No newline at end of file
+log4j.logger.org.apache.hadoop.conf=ERROR
http://git-wip-us.apache.org/repos/asf/tajo/blob/5e8c0bd6/tajo-core/src/test/resources/log4j.properties
----------------------------------------------------------------------
diff --git a/tajo-core/src/test/resources/log4j.properties b/tajo-core/src/test/resources/log4j.properties
index 145703c..307608e 100644
--- a/tajo-core/src/test/resources/log4j.properties
+++ b/tajo-core/src/test/resources/log4j.properties
@@ -22,7 +22,7 @@ log4j.rootLogger=info,stdout
log4j.threshhold=INFO
log4j.appender.stdout=org.apache.log4j.ConsoleAppender
log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=%d{ISO8601} %-5p %c{2} (%F:%M(%L)) - %m%n
+log4j.appender.stdout.layout.ConversionPattern=%d{ISO8601} %p: %c (%M(%L)) - %m%n
-log4j.logger.org.apache.hadoop=WARN
\ No newline at end of file
+log4j.logger.org.apache.hadoop=WARN
http://git-wip-us.apache.org/repos/asf/tajo/blob/5e8c0bd6/tajo-jdbc/src/main/resources/log4j.properties
----------------------------------------------------------------------
diff --git a/tajo-jdbc/src/main/resources/log4j.properties b/tajo-jdbc/src/main/resources/log4j.properties
index 606f2d4..8f74c49 100644
--- a/tajo-jdbc/src/main/resources/log4j.properties
+++ b/tajo-jdbc/src/main/resources/log4j.properties
@@ -22,6 +22,6 @@ log4j.rootLogger=info,stdout
log4j.threshhold=INFO
log4j.appender.stdout=org.apache.log4j.ConsoleAppender
log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=%d{ISO8601} %-5p %c{2} (%F:%M(%L)) - %m%n
+log4j.appender.stdout.layout.ConversionPattern=%d{ISO8601} %p: %c (%M(%L)) - %m%n
-log4j.logger.org.apache.tajo.jdbc=FATAL
\ No newline at end of file
+log4j.logger.org.apache.tajo.jdbc=FATAL
http://git-wip-us.apache.org/repos/asf/tajo/blob/5e8c0bd6/tajo-rpc/src/test/java/log4j.properties
----------------------------------------------------------------------
diff --git a/tajo-rpc/src/test/java/log4j.properties b/tajo-rpc/src/test/java/log4j.properties
index c1ac487..2c4d991 100644
--- a/tajo-rpc/src/test/java/log4j.properties
+++ b/tajo-rpc/src/test/java/log4j.properties
@@ -22,4 +22,4 @@ log4j.rootLogger=info,stdout
log4j.threshhold=ALL
log4j.appender.stdout=org.apache.log4j.ConsoleAppender
log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=%d{ISO8601} %-5p %c{2} (%F:%M(%L)) - %m%n
+log4j.appender.stdout.layout.ConversionPattern=%d{ISO8601} %p: %c (%M(%L)) - %m%n
http://git-wip-us.apache.org/repos/asf/tajo/blob/5e8c0bd6/tajo-storage/src/main/java/org/apache/tajo/storage/v2/DiskUtil.java
----------------------------------------------------------------------
diff --git a/tajo-storage/src/main/java/org/apache/tajo/storage/v2/DiskUtil.java b/tajo-storage/src/main/java/org/apache/tajo/storage/v2/DiskUtil.java
index d5873bb..66827c2 100644
--- a/tajo-storage/src/main/java/org/apache/tajo/storage/v2/DiskUtil.java
+++ b/tajo-storage/src/main/java/org/apache/tajo/storage/v2/DiskUtil.java
@@ -133,7 +133,7 @@ public class DiskUtil {
return new String(result, 0, length);
}
- private static List<DiskDeviceInfo> getDefaultDiskDeviceInfos() {
+ public static List<DiskDeviceInfo> getDefaultDiskDeviceInfos() {
DiskDeviceInfo diskDeviceInfo = new DiskDeviceInfo(0);
diskDeviceInfo.setName("default");
http://git-wip-us.apache.org/repos/asf/tajo/blob/5e8c0bd6/tajo-storage/src/main/java/org/apache/tajo/storage/v2/ScanScheduler.java
----------------------------------------------------------------------
diff --git a/tajo-storage/src/main/java/org/apache/tajo/storage/v2/ScanScheduler.java b/tajo-storage/src/main/java/org/apache/tajo/storage/v2/ScanScheduler.java
index 71c4d93..fe852a0 100644
--- a/tajo-storage/src/main/java/org/apache/tajo/storage/v2/ScanScheduler.java
+++ b/tajo-storage/src/main/java/org/apache/tajo/storage/v2/ScanScheduler.java
@@ -53,6 +53,9 @@ public final class ScanScheduler extends Thread {
try {
List<DiskDeviceInfo> deviceInfos = DiskUtil.getDiskDeviceInfos();
+ if (deviceInfos.size() == 0) {
+ deviceInfos = DiskUtil.getDefaultDiskDeviceInfos();
+ }
for(DiskDeviceInfo eachInfo: deviceInfos) {
LOG.info("Create DiskScanQueue:" + eachInfo.getName());
diskDeviceInfoMap.put(eachInfo.getId(), eachInfo);