Repository: incubator-tephra Updated Branches: refs/heads/hbase12-support [created] 23268559d
Support for HBase v1.2 Project: http://git-wip-us.apache.org/repos/asf/incubator-tephra/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-tephra/commit/23268559 Tree: http://git-wip-us.apache.org/repos/asf/incubator-tephra/tree/23268559 Diff: http://git-wip-us.apache.org/repos/asf/incubator-tephra/diff/23268559 Branch: refs/heads/hbase12-support Commit: 23268559d93d6c9c28aaf2fdf3934fd10ec03b9a Parents: 3918b8a Author: Gokul Gunasekaran <[email protected]> Authored: Thu May 12 18:49:42 2016 -0700 Committer: Gokul Gunasekaran <[email protected]> Committed: Thu May 12 18:49:42 2016 -0700 ---------------------------------------------------------------------- .../main/java/org/apache/tephra/util/HBaseVersion.java | 11 ++--------- .../apache/tephra/util/HBaseVersionSpecificFactory.java | 2 +- .../java/org/apache/tephra/util/HBaseVersionTest.java | 3 +++ 3 files changed, 6 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-tephra/blob/23268559/tephra-core/src/main/java/org/apache/tephra/util/HBaseVersion.java ---------------------------------------------------------------------- diff --git a/tephra-core/src/main/java/org/apache/tephra/util/HBaseVersion.java b/tephra-core/src/main/java/org/apache/tephra/util/HBaseVersion.java index 687e46d..e868c6b 100644 --- a/tephra-core/src/main/java/org/apache/tephra/util/HBaseVersion.java +++ b/tephra-core/src/main/java/org/apache/tephra/util/HBaseVersion.java @@ -51,7 +51,7 @@ public class HBaseVersion { HBASE_10("1.0"), HBASE_10_CDH("1.0-cdh"), HBASE_11("1.1"), - HBASE_12_CDH("1.2-cdh"), + HBASE_12("1.2"), UNKNOWN("unknown"); final String majorVersion; @@ -88,14 +88,7 @@ public class HBaseVersion { } else if (versionString.startsWith(HBASE_11_VERSION)) { currentVersion = Version.HBASE_11; } else if (versionString.startsWith(HBASE_12_VERSION)) { - VersionNumber ver = VersionNumber.create(versionString); - if (ver.getClassifier() != null && ver.getClassifier().startsWith(CDH_CLASSIFIER)) { - currentVersion = Version.HBASE_12_CDH; - } else { - // CDH 5.7 comes with HBase version 1.2.0-CDH5.7.0. However currently there is no - // other hadoop distribution that uses HBase 1.2, so the version is set here to UNKNOWN. - currentVersion = Version.UNKNOWN; - } + currentVersion = Version.HBASE_12; } else { currentVersion = Version.UNKNOWN; } http://git-wip-us.apache.org/repos/asf/incubator-tephra/blob/23268559/tephra-core/src/main/java/org/apache/tephra/util/HBaseVersionSpecificFactory.java ---------------------------------------------------------------------- diff --git a/tephra-core/src/main/java/org/apache/tephra/util/HBaseVersionSpecificFactory.java b/tephra-core/src/main/java/org/apache/tephra/util/HBaseVersionSpecificFactory.java index ebbbd18..9153296 100644 --- a/tephra-core/src/main/java/org/apache/tephra/util/HBaseVersionSpecificFactory.java +++ b/tephra-core/src/main/java/org/apache/tephra/util/HBaseVersionSpecificFactory.java @@ -49,7 +49,7 @@ public abstract class HBaseVersionSpecificFactory<T> implements Provider<T> { instance = createInstance(getHBase10CDHClassname()); break; case HBASE_11: - case HBASE_12_CDH: + case HBASE_12: instance = createInstance(getHBase11Classname()); break; case UNKNOWN: http://git-wip-us.apache.org/repos/asf/incubator-tephra/blob/23268559/tephra-core/src/test/java/org/apache/tephra/util/HBaseVersionTest.java ---------------------------------------------------------------------- diff --git a/tephra-core/src/test/java/org/apache/tephra/util/HBaseVersionTest.java b/tephra-core/src/test/java/org/apache/tephra/util/HBaseVersionTest.java index a2344ba..27f4032 100644 --- a/tephra-core/src/test/java/org/apache/tephra/util/HBaseVersionTest.java +++ b/tephra-core/src/test/java/org/apache/tephra/util/HBaseVersionTest.java @@ -81,6 +81,9 @@ public class HBaseVersionTest { ver = HBaseVersion.VersionNumber.create("1.2.0-CDH5.7.0"); assertVersionNumber(ver, 1, 2, 0, "CDH5.7.0", false); + + ver = HBaseVersion.VersionNumber.create("1.2.1"); + assertVersionNumber(ver, 1, 2, 1, null, false); } private void assertVersionNumber(HBaseVersion.VersionNumber version, Integer expectedMajor, Integer expectedMinor,
