You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tajo.apache.org by ji...@apache.org on 2014/12/15 10:58:52 UTC
[1/2] tajo git commit: TAJO-1246: HBase info port conflict
occasionally causes unit test failures in Jenkins CI.
Repository: tajo
Updated Branches:
refs/heads/index_support a76be0fe3 -> 5893d2c98
TAJO-1246: HBase info port conflict occasionally causes unit test failures in Jenkins CI.
Closes #300
Project: http://git-wip-us.apache.org/repos/asf/tajo/repo
Commit: http://git-wip-us.apache.org/repos/asf/tajo/commit/82dfb17c
Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/82dfb17c
Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/82dfb17c
Branch: refs/heads/index_support
Commit: 82dfb17ca9878de90ab6b92b0c56a918789191cb
Parents: 5e043bd
Author: Hyunsik Choi <hy...@apache.org>
Authored: Mon Dec 15 18:08:54 2014 +0900
Committer: Hyunsik Choi <hy...@apache.org>
Committed: Mon Dec 15 18:08:54 2014 +0900
----------------------------------------------------------------------
CHANGES | 3 +++
tajo-core/pom.xml | 6 ++++++
.../src/test/java/org/apache/tajo/HBaseTestClusterUtil.java | 2 ++
tajo-storage/tajo-storage-hbase/pom.xml | 6 ++++++
4 files changed, 17 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tajo/blob/82dfb17c/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index e41ea56..98c533b 100644
--- a/CHANGES
+++ b/CHANGES
@@ -109,6 +109,9 @@ Release 0.9.1 - unreleased
BUG FIXES
+ TAJO-1246: HBase info port conflict occasionally causes unit test
+ failures in Jenkins CI. (hyunsik)
+
TAJO-1242: Json scanner can not read some case of trucated text. (jinho)
TAJO-1239: ORDER BY with null column desc miss some data.
http://git-wip-us.apache.org/repos/asf/tajo/blob/82dfb17c/tajo-core/pom.xml
----------------------------------------------------------------------
diff --git a/tajo-core/pom.xml b/tajo-core/pom.xml
index a6fb5a5..8065e9d 100644
--- a/tajo-core/pom.xml
+++ b/tajo-core/pom.xml
@@ -433,6 +433,12 @@
<version>${hbase.version}</version>
<type>test-jar</type>
<scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <artifactId>jdk.tools</artifactId>
+ <groupId>jdk.tools</groupId>
+ </exclusion>
+ </exclusions>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/tajo/blob/82dfb17c/tajo-core/src/test/java/org/apache/tajo/HBaseTestClusterUtil.java
----------------------------------------------------------------------
diff --git a/tajo-core/src/test/java/org/apache/tajo/HBaseTestClusterUtil.java b/tajo-core/src/test/java/org/apache/tajo/HBaseTestClusterUtil.java
index a8e4a5c..fe2e281 100644
--- a/tajo-core/src/test/java/org/apache/tajo/HBaseTestClusterUtil.java
+++ b/tajo-core/src/test/java/org/apache/tajo/HBaseTestClusterUtil.java
@@ -104,6 +104,8 @@ public class HBaseTestClusterUtil {
createRootDir();
Configuration c = HBaseConfiguration.create(this.conf);
+ // randomize hbase info port
+ c.setInt(HConstants.MASTER_INFO_PORT, 0);
hbaseCluster = new MiniHBaseCluster(c, 1);
http://git-wip-us.apache.org/repos/asf/tajo/blob/82dfb17c/tajo-storage/tajo-storage-hbase/pom.xml
----------------------------------------------------------------------
diff --git a/tajo-storage/tajo-storage-hbase/pom.xml b/tajo-storage/tajo-storage-hbase/pom.xml
index e37149d..b78c407 100644
--- a/tajo-storage/tajo-storage-hbase/pom.xml
+++ b/tajo-storage/tajo-storage-hbase/pom.xml
@@ -304,6 +304,12 @@ limitations under the License.
<artifactId>hbase-client</artifactId>
<version>${hbase.version}</version>
<scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <artifactId>jdk.tools</artifactId>
+ <groupId>jdk.tools</groupId>
+ </exclusion>
+ </exclusions>
</dependency>
</dependencies>
[2/2] tajo git commit: Merge branch 'master' of
http://git-wip-us.apache.org/repos/asf/tajo into index_support
Posted by ji...@apache.org.
Merge branch 'master' of http://git-wip-us.apache.org/repos/asf/tajo into index_support
Project: http://git-wip-us.apache.org/repos/asf/tajo/repo
Commit: http://git-wip-us.apache.org/repos/asf/tajo/commit/5893d2c9
Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/5893d2c9
Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/5893d2c9
Branch: refs/heads/index_support
Commit: 5893d2c98f81750c20414b6f8fe27a7f79854e2f
Parents: a76be0f 82dfb17
Author: Jihoon Son <ji...@apache.org>
Authored: Mon Dec 15 18:58:27 2014 +0900
Committer: Jihoon Son <ji...@apache.org>
Committed: Mon Dec 15 18:58:27 2014 +0900
----------------------------------------------------------------------
CHANGES | 3 +++
tajo-core/pom.xml | 6 ++++++
.../src/test/java/org/apache/tajo/HBaseTestClusterUtil.java | 2 ++
tajo-storage/tajo-storage-hbase/pom.xml | 6 ++++++
4 files changed, 17 insertions(+)
----------------------------------------------------------------------