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 2015/01/26 05:17:16 UTC
[2/5] tajo git commit: TAJO-1303: CDH cannot pass hadoop version
check test
TAJO-1303: CDH cannot pass hadoop version check test
Project: http://git-wip-us.apache.org/repos/asf/tajo/repo
Commit: http://git-wip-us.apache.org/repos/asf/tajo/commit/0024c75e
Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/0024c75e
Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/0024c75e
Branch: refs/heads/index_support
Commit: 0024c75e9a36c6c90ab168f002101725f753f945
Parents: f80ec42
Author: Jihun Kang <ji...@apache.org>
Authored: Fri Jan 23 09:27:41 2015 +0900
Committer: Jihun Kang <ji...@apache.org>
Committed: Fri Jan 23 09:27:41 2015 +0900
----------------------------------------------------------------------
CHANGES | 3 +++
.../org/apache/tajo/rule/base/CheckHadoopRuntimeVersionRule.java | 4 ++--
2 files changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tajo/blob/0024c75e/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index 0df8983..6ba73fe 100644
--- a/CHANGES
+++ b/CHANGES
@@ -169,6 +169,9 @@ Release 0.10.0 - unreleased
BUG FIXES
+ TAJO-1303: CDH cannot pass hadoop version check test.
+ (Keuntae Park via jihun)
+
TAJO-1308: QueryInprogress can not release when query is QUERY_ERROR.
(jinho)
http://git-wip-us.apache.org/repos/asf/tajo/blob/0024c75e/tajo-common/src/main/java/org/apache/tajo/rule/base/CheckHadoopRuntimeVersionRule.java
----------------------------------------------------------------------
diff --git a/tajo-common/src/main/java/org/apache/tajo/rule/base/CheckHadoopRuntimeVersionRule.java b/tajo-common/src/main/java/org/apache/tajo/rule/base/CheckHadoopRuntimeVersionRule.java
index 73feb10..bfd9707 100644
--- a/tajo-common/src/main/java/org/apache/tajo/rule/base/CheckHadoopRuntimeVersionRule.java
+++ b/tajo-common/src/main/java/org/apache/tajo/rule/base/CheckHadoopRuntimeVersionRule.java
@@ -54,10 +54,10 @@ public class CheckHadoopRuntimeVersionRule implements SelfDiagnosisRule {
private int[] getVersion() {
int[] version = new int[0];
- String versionString = versionInfo.getProperty("version");
+ String versionString = versionInfo.getProperty("version").split("-")[0];
if (versionString != null && !versionString.isEmpty()) {
- Validators.patternMatch("\\d+\\.\\d+\\.\\d+").validate(versionString, true);
+ Validators.patternMatch("\\d+\\.\\d+\\.\\d+.*").validate(versionString, true);
String[] versionArray = versionString.split("\\.");
version = new int[versionArray.length];