You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by st...@apache.org on 2015/09/30 00:35:25 UTC
hbase git commit: HBASE-14510 Fix coprocessor handling of duplicate
classes (Yerui Sun)
Repository: hbase
Updated Branches:
refs/heads/master 4cb3e029b -> e0929bbc5
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/e0929bbc
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/e0929bbc
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/e0929bbc
Branch: refs/heads/master
Commit: e0929bbc5a4326f3f10ba67e78a58e3e119ad6b4
Parents: 4cb3e02
Author: stack <st...@apache.org>
Authored: Tue Sep 29 15:01:10 2015 -0700
Committer: stack <st...@apache.org>
Committed: Tue Sep 29 15:01:10 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/e0929bbc/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 19bc2e7..c3fc4bc 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
@@ -1265,7 +1265,6 @@ public class HTableDescriptor implements Comparable<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/e0929bbc/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 7c0172a..8f78de0 100644
--- a/hbase-shell/src/main/ruby/hbase/admin.rb
+++ b/hbase-shell/src/main/ruby/hbase/admin.rb
@@ -610,7 +610,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