From 7972ae764b8aef1c2bc2cd07d4cd4f3b14a4aef2 Mon Sep 17 00:00:00 2001 From: Ted Yu Date: Sat, 4 Oct 2014 00:40:22 +0000 Subject: [PATCH] HBASE-12137 Alter table add cf doesn't do compression test (Virag Kothari) --- .../java/org/apache/hadoop/hbase/master/HMaster.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) 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 eef0a09f3d0..2a7120d5b25 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,18 +1376,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); } }