hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From te...@apache.org
Subject git commit: HBASE-12137 Alter table add cf doesn't do compression test (Virag Kothari)
Date Sat, 04 Oct 2014 00:40:27 GMT
Repository: hbase
Updated Branches:
  refs/heads/master ef35182f1 -> 7972ae764


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/7972ae76
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/7972ae76
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/7972ae76

Branch: refs/heads/master
Commit: 7972ae764b8aef1c2bc2cd07d4cd4f3b14a4aef2
Parents: ef35182
Author: Ted Yu <tedyu@apache.org>
Authored: Sat Oct 4 00:40:22 2014 +0000
Committer: Ted Yu <tedyu@apache.org>
Committed: Sat Oct 4 00:40:22 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/7972ae76/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 eef0a09..2a7120d 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);
     }
   }
 


Mime
View raw message