You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by bu...@apache.org on 2018/05/31 19:19:52 UTC
[2/2] hbase git commit: HBASE-20444 Addendum keep folks from looking
at raw version component array.
HBASE-20444 Addendum keep folks from looking at raw version component array.
Signed-off-by: Andrew Purtell <ap...@apache.org>
Conflicts:
hbase-server/src/main/java/org/apache/hadoop/hbase/util/HBaseFsck.java
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/4b635576
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/4b635576
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/4b635576
Branch: refs/heads/branch-1
Commit: 4b635576823b01154539314a9633607d0d95d937
Parents: d576e9a
Author: Sean Busbey <bu...@apache.org>
Authored: Wed May 30 22:23:56 2018 -0500
Committer: Sean Busbey <bu...@apache.org>
Committed: Thu May 31 14:19:14 2018 -0500
----------------------------------------------------------------------
.../main/java/org/apache/hadoop/hbase/util/VersionInfo.java | 2 +-
.../java/org/apache/hadoop/hbase/util/TestVersionInfo.java | 8 ++++++++
2 files changed, 9 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/4b635576/hbase-common/src/main/java/org/apache/hadoop/hbase/util/VersionInfo.java
----------------------------------------------------------------------
diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/util/VersionInfo.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/util/VersionInfo.java
index d4052eb..841914f 100644
--- a/hbase-common/src/main/java/org/apache/hadoop/hbase/util/VersionInfo.java
+++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/util/VersionInfo.java
@@ -142,7 +142,7 @@ public class VersionInfo {
* "4.5.6-UNKNOW" returns ["4", "5", "6", "-4"]
* @return the components of the version string
*/
- static String[] getVersionComponents(final String version) {
+ private static String[] getVersionComponents(final String version) {
assert(version != null);
String[] strComps = version.split("[\\.-]");
assert(strComps.length > 0);
http://git-wip-us.apache.org/repos/asf/hbase/blob/4b635576/hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestVersionInfo.java
----------------------------------------------------------------------
diff --git a/hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestVersionInfo.java b/hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestVersionInfo.java
index 371d03d..b7338f5 100644
--- a/hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestVersionInfo.java
+++ b/hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestVersionInfo.java
@@ -49,5 +49,13 @@ public class TestVersionInfo {
assertTrue(VersionInfo.compareVersion("3.0.0-alpha-2", "3.0.0-alpha-11") < 0);
assertTrue(VersionInfo.compareVersion("3.0.0-beta-2", "3.0.0-beta-11") < 0);
assertTrue(VersionInfo.compareVersion("2.0.0-foobar", "2.0.0.1") < 0);
+ assertTrue(VersionInfo.compareVersion("2.any.any", "2.0.0") < 0);
+ assertTrue(VersionInfo.compareVersion("2.0.0", "2.any.any") > 0);
+ assertTrue(VersionInfo.compareVersion("2.any.any", "2.0.0-alpha-1") < 0);
+ assertTrue(VersionInfo.compareVersion("2.0.0-alpha-1", "2.any.any") > 0);
+ assertTrue(VersionInfo.compareVersion("2.any.any", "2.0.0-beta-5-SNAPSHOT") < 0);
+ assertTrue(VersionInfo.compareVersion("2.0.0-beta-5-SNAPSHOT", "2.any.any") > 0);
+ assertTrue(VersionInfo.compareVersion("2.any.any", "1.4.4") > 0);
+ assertTrue(VersionInfo.compareVersion("1.4.4", "2.any.any") < 0);
}
}
\ No newline at end of file