You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by te...@apache.org on 2015/05/29 18:14:49 UTC
hbase git commit: HBASE-13776 Revert due to
warnOrThrowExceptionForFailure() absent in 1.0
Repository: hbase
Updated Branches:
refs/heads/branch-1.0 51d8eca31 -> 1c5068282
HBASE-13776 Revert due to warnOrThrowExceptionForFailure() absent in 1.0
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/1c506828
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/1c506828
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/1c506828
Branch: refs/heads/branch-1.0
Commit: 1c506828266aaf591e89a932c6612934987776e6
Parents: 51d8eca
Author: tedyu <yu...@gmail.com>
Authored: Fri May 29 09:14:48 2015 -0700
Committer: tedyu <yu...@gmail.com>
Committed: Fri May 29 09:14:48 2015 -0700
----------------------------------------------------------------------
.../main/java/org/apache/hadoop/hbase/master/HMaster.java | 9 ---------
.../org/apache/hadoop/hbase/client/TestFromClientSide.java | 8 --------
2 files changed, 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/1c506828/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
index 7e1233e..bc30e26 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
@@ -1376,15 +1376,6 @@ public class HMaster extends HRegionServer implements MasterServices, Server {
}
// max versions already being checked
- // HBASE-13776 Setting illegal versions for HColumnDescriptor
- // does not throw IllegalArgumentException
- // check minVersions <= maxVerions
- if (hcd.getMinVersions() > hcd.getMaxVersions()) {
- String message = "Min versions for column family " + hcd.getNameAsString()
- + " must be less than the Max versions.";
- warnOrThrowExceptionForFailure(logWarn, CONF_KEY, message, null);
- }
-
// check replication scope
if (hcd.getScope() < 0) {
throw new DoNotRetryIOException("Replication scope for column family "
http://git-wip-us.apache.org/repos/asf/hbase/blob/1c506828/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSide.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSide.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSide.java
index 85c0475..f1eb053 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSide.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSide.java
@@ -5559,14 +5559,6 @@ public class TestFromClientSide {
}
checkTableIsLegal(htd);
- // HBASE-13776 Setting illegal versions for HColumnDescriptor
- // does not throw IllegalArgumentException
- // finally, minVersions must be less than or equal to maxVersions
- hcd.setMaxVersions(4);
- hcd.setMinVersions(5);
- checkTableIsIllegal(htd);
- hcd.setMinVersions(3);
-
hcd.setScope(-1);
checkTableIsIllegal(htd);
hcd.setScope(0);