Repository: hbase Updated Branches: refs/heads/branch-1 073ca6a51 -> 23adb7a4f
HBASE-12137 Alter table add cf doesn't do compression test (Virag Kothari) Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/23adb7a4 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/23adb7a4 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/23adb7a4 Branch: refs/heads/branch-1 Commit: 23adb7a4f75b9710723c424686510eac361098d3 Parents: 073ca6a Author: Ted Yu <[email protected]> Authored: Sat Oct 4 00:39:40 2014 +0000 Committer: Ted Yu <[email protected]> Committed: Sat Oct 4 00:39:40 2014 +0000 ---------------------------------------------------------------------- .../main/java/org/apache/hadoop/hbase/master/HMaster.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/23adb7a4/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 6e0f9f6..df59b02 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 @@ -1370,18 +1370,19 @@ public class HMaster extends HRegionServer implements MasterServices, Server { } @Override - public void addColumn(final TableName tableName, final HColumnDescriptor column) + public void addColumn(final TableName tableName, final HColumnDescriptor columnDescriptor) throws IOException { checkInitialized(); + checkCompression(columnDescriptor); if (cpHost != null) { - if (cpHost.preAddColumn(tableName, column)) { + if (cpHost.preAddColumn(tableName, columnDescriptor)) { return; } } //TODO: we should process this (and some others) in an executor - new TableAddFamilyHandler(tableName, column, this, this).prepare().process(); + new TableAddFamilyHandler(tableName, columnDescriptor, this, this).prepare().process(); if (cpHost != null) { - cpHost.postAddColumn(tableName, column); + cpHost.postAddColumn(tableName, columnDescriptor); } }
