hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From st...@apache.org
Subject hbase git commit: HBASE-14510 Fix coprocessor handling of duplicate classes (Yerui Sun)
Date Tue, 29 Sep 2015 22:36:32 GMT
Repository: hbase
Updated Branches:
  refs/heads/branch-1.2 a2db17b79 -> d4ad553f0


HBASE-14510 Fix coprocessor handling of duplicate classes (Yerui Sun)


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/d4ad553f
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/d4ad553f
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/d4ad553f

Branch: refs/heads/branch-1.2
Commit: d4ad553f0b5e1107ed15e0b2ea7b352521e47287
Parents: a2db17b
Author: stack <stack@apache.org>
Authored: Tue Sep 29 15:01:10 2015 -0700
Committer: stack <stack@apache.org>
Committed: Tue Sep 29 15:36:19 2015 -0700

----------------------------------------------------------------------
 .../src/main/java/org/apache/hadoop/hbase/HTableDescriptor.java    | 1 -
 hbase-shell/src/main/ruby/hbase/admin.rb                           | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/d4ad553f/hbase-client/src/main/java/org/apache/hadoop/hbase/HTableDescriptor.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/HTableDescriptor.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/HTableDescriptor.java
index e464b79..1ba4939 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/HTableDescriptor.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/HTableDescriptor.java
@@ -1361,7 +1361,6 @@ public class HTableDescriptor implements WritableComparable<HTableDescriptor>
{
    * {@link HConstants#CP_HTD_ATTR_VALUE_PATTERN}
    * @throws IOException
    */
-  // Pity about ugly method name. addCoprocessor(String) already taken above.
   public HTableDescriptor addCoprocessorWithSpec(final String specStr) throws IOException
{
     String className = getCoprocessorClassNameFromSpecStr(specStr);
     if (className == null) {

http://git-wip-us.apache.org/repos/asf/hbase/blob/d4ad553f/hbase-shell/src/main/ruby/hbase/admin.rb
----------------------------------------------------------------------
diff --git a/hbase-shell/src/main/ruby/hbase/admin.rb b/hbase-shell/src/main/ruby/hbase/admin.rb
index 3995bad..5d1addd 100644
--- a/hbase-shell/src/main/ruby/hbase/admin.rb
+++ b/hbase-shell/src/main/ruby/hbase/admin.rb
@@ -584,7 +584,7 @@ module Hbase
             if (k =~ /coprocessor/i)
               v = String.new(value)
               v.strip!
-              htd.addCoprocessor(v)
+              htd.addCoprocessorWithSpec(v)
               valid_coproc_keys << key
             end
           end


Mime
View raw message