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:37:18 GMT
Repository: hbase
Updated Branches:
  refs/heads/branch-1.0 8ea34aea0 -> ae1c011ab


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

Branch: refs/heads/branch-1.0
Commit: ae1c011ab136bc6feb9dafe3435e7e348076bd02
Parents: 8ea34ae
Author: stack <stack@apache.org>
Authored: Tue Sep 29 15:01:10 2015 -0700
Committer: stack <stack@apache.org>
Committed: Tue Sep 29 15:37:09 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/ae1c011a/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 b79610f..a1ee201 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
@@ -1267,7 +1267,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/ae1c011a/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 a8f5437..4aa715f 100644
--- a/hbase-shell/src/main/ruby/hbase/admin.rb
+++ b/hbase-shell/src/main/ruby/hbase/admin.rb
@@ -577,7 +577,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