You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by ap...@apache.org on 2015/01/13 04:30:53 UTC

[1/4] hbase git commit: HBASE-12801 Failed to truncate a table while maintaing binary region boundaries (Liu Shaohui)

Repository: hbase
Updated Branches:
  refs/heads/0.94 72d17265c -> eef4ad69a
  refs/heads/0.98 00a50d6b9 -> 780f6f525
  refs/heads/branch-1 6e45269f2 -> 40e9c22ea
  refs/heads/master c32a2c0b1 -> acc284eec


HBASE-12801 Failed to truncate a table while maintaing binary region boundaries (Liu Shaohui)


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

Branch: refs/heads/master
Commit: acc284eec6e708088971b495f2ad4d720ee35a40
Parents: c32a2c0
Author: Andrew Purtell <ap...@apache.org>
Authored: Mon Jan 12 19:09:02 2015 -0800
Committer: Andrew Purtell <ap...@apache.org>
Committed: Mon Jan 12 19:09:02 2015 -0800

----------------------------------------------------------------------
 .../main/java/org/apache/hadoop/hbase/util/Bytes.java   | 12 ++++++++++++
 hbase-shell/src/main/ruby/hbase/admin.rb                |  4 ++--
 2 files changed, 14 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/acc284ee/hbase-common/src/main/java/org/apache/hadoop/hbase/util/Bytes.java
----------------------------------------------------------------------
diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/util/Bytes.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/util/Bytes.java
index 97c2c36..bec35ee 100644
--- a/hbase-common/src/main/java/org/apache/hadoop/hbase/util/Bytes.java
+++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/util/Bytes.java
@@ -1994,6 +1994,18 @@ public class Bytes implements Comparable<Bytes> {
   }
 
   /**
+   * @param t operands
+   * @return Array of binary byte arrays made from passed array of binary strings
+   */
+  public static byte[][] toBinaryByteArrays(final String[] t) {
+    byte[][] result = new byte[t.length][];
+    for (int i = 0; i < t.length; i++) {
+      result[i] = Bytes.toBytesBinary(t[i]);
+    }
+    return result;
+  }
+
+  /**
    * @param column operand
    * @return A byte array of a byte array where first and only entry is
    * <code>column</code>

http://git-wip-us.apache.org/repos/asf/hbase/blob/acc284ee/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 f7bcd83..0ce1a56 100644
--- a/hbase-shell/src/main/ruby/hbase/admin.rb
+++ b/hbase-shell/src/main/ruby/hbase/admin.rb
@@ -398,8 +398,8 @@ module Hbase
     # Truncates table while maintaing region boundaries (deletes all records by recreating the table)
     def truncate_preserve(table_name, conf = @conf)
       h_table = @conn.getTable(table_name)
-      splits = h_table.getRegionLocations().keys().map{|i| Bytes.toString(i.getStartKey)}.delete_if{|k| k == ""}.to_java :String
-      splits = org.apache.hadoop.hbase.util.Bytes.toByteArrays(splits)
+      splits = h_table.getRegionLocations().keys().map{|i| Bytes.toStringBinary(i.getStartKey)}.delete_if{|k| k == ""}.to_java :String
+      splits = org.apache.hadoop.hbase.util.Bytes.toBinaryByteArrays(splits)
       table_description = h_table.getTableDescriptor()
       yield 'Disabling table...' if block_given?
       disable(table_name)


[4/4] hbase git commit: HBASE-12801 Failed to truncate a table while maintaing binary region boundaries (Liu Shaohui)

Posted by ap...@apache.org.
HBASE-12801 Failed to truncate a table while maintaing binary region boundaries (Liu Shaohui)


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

Branch: refs/heads/0.94
Commit: eef4ad69a5325cd83b3391bea5a3eb327cb24be5
Parents: 72d1726
Author: Andrew Purtell <ap...@apache.org>
Authored: Mon Jan 12 19:09:02 2015 -0800
Committer: Andrew Purtell <ap...@apache.org>
Committed: Mon Jan 12 19:24:40 2015 -0800

----------------------------------------------------------------------
 src/main/java/org/apache/hadoop/hbase/util/Bytes.java | 13 +++++++++++++
 src/main/ruby/hbase/admin.rb                          |  4 ++--
 2 files changed, 15 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/eef4ad69/src/main/java/org/apache/hadoop/hbase/util/Bytes.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/hadoop/hbase/util/Bytes.java b/src/main/java/org/apache/hadoop/hbase/util/Bytes.java
index 6a4c250..3fa1317 100644
--- a/src/main/java/org/apache/hadoop/hbase/util/Bytes.java
+++ b/src/main/java/org/apache/hadoop/hbase/util/Bytes.java
@@ -1648,6 +1648,19 @@ public class Bytes {
     return result;
   }
 
+
+  /**
+   * @param t operands
+   * @return Array of binary byte arrays made from passed array of binary strings
+   */
+  public static byte [][] toBinaryByteArrays(final String [] t) {
+    byte [][] result = new byte[t.length][];
+    for (int i = 0; i < t.length; i++) {
+      result[i] = Bytes.toBytesBinary(t[i]);
+    }
+    return result;
+  }
+
   /**
    * @param column operand
    * @return A byte array of a byte array where first and only entry is

http://git-wip-us.apache.org/repos/asf/hbase/blob/eef4ad69/src/main/ruby/hbase/admin.rb
----------------------------------------------------------------------
diff --git a/src/main/ruby/hbase/admin.rb b/src/main/ruby/hbase/admin.rb
index 266f1ff..367485b 100644
--- a/src/main/ruby/hbase/admin.rb
+++ b/src/main/ruby/hbase/admin.rb
@@ -330,8 +330,8 @@ module Hbase
     # Truncates table while maintaing region boundaries (deletes all records by recreating the table)
     def truncate_preserve(table_name, conf = @conf)
       h_table = org.apache.hadoop.hbase.client.HTable.new(conf, table_name)
-      splits = h_table.getRegionLocations().keys().map{|i| Bytes.toString(i.getStartKey)}.delete_if{|k| k == ""}.to_java :String
-      splits = org.apache.hadoop.hbase.util.Bytes.toByteArrays(splits)
+      splits = h_table.getRegionLocations().keys().map{|i| Bytes.toStringBinary(i.getStartKey)}.delete_if{|k| k == ""}.to_java :String
+      splits = org.apache.hadoop.hbase.util.Bytes.toBinaryByteArrays(splits)
       table_description = h_table.getTableDescriptor()
       yield 'Disabling table...' if block_given?
       disable(table_name)


[3/4] hbase git commit: HBASE-12801 Failed to truncate a table while maintaing binary region boundaries (Liu Shaohui)

Posted by ap...@apache.org.
HBASE-12801 Failed to truncate a table while maintaing binary region boundaries (Liu Shaohui)

Conflicts:
	hbase-shell/src/main/ruby/hbase/admin.rb


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

Branch: refs/heads/0.98
Commit: 780f6f525e34dd84cbc5490ad3c7178de9b414d6
Parents: 00a50d6
Author: Andrew Purtell <ap...@apache.org>
Authored: Mon Jan 12 19:09:02 2015 -0800
Committer: Andrew Purtell <ap...@apache.org>
Committed: Mon Jan 12 19:10:15 2015 -0800

----------------------------------------------------------------------
 .../main/java/org/apache/hadoop/hbase/util/Bytes.java   | 12 ++++++++++++
 hbase-shell/src/main/ruby/hbase/admin.rb                |  4 ++--
 2 files changed, 14 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/780f6f52/hbase-common/src/main/java/org/apache/hadoop/hbase/util/Bytes.java
----------------------------------------------------------------------
diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/util/Bytes.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/util/Bytes.java
index c69b242..c2ceb99 100644
--- a/hbase-common/src/main/java/org/apache/hadoop/hbase/util/Bytes.java
+++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/util/Bytes.java
@@ -1785,6 +1785,18 @@ public class Bytes {
   }
 
   /**
+   * @param t operands
+   * @return Array of binary byte arrays made from passed array of binary strings
+   */
+  public static byte[][] toBinaryByteArrays(final String[] t) {
+    byte[][] result = new byte[t.length][];
+    for (int i = 0; i < t.length; i++) {
+      result[i] = Bytes.toBytesBinary(t[i]);
+    }
+    return result;
+  }
+
+  /**
    * @param column operand
    * @return A byte array of a byte array where first and only entry is
    * <code>column</code>

http://git-wip-us.apache.org/repos/asf/hbase/blob/780f6f52/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 ff3770e..bbd2d97 100644
--- a/hbase-shell/src/main/ruby/hbase/admin.rb
+++ b/hbase-shell/src/main/ruby/hbase/admin.rb
@@ -382,8 +382,8 @@ module Hbase
     # Truncates table while maintaing region boundaries (deletes all records by recreating the table)
     def truncate_preserve(table_name, conf = @conf)
       h_table = org.apache.hadoop.hbase.client.HTable.new(conf, table_name)
-      splits = h_table.getRegionLocations().keys().map{|i| Bytes.toString(i.getStartKey)}.delete_if{|k| k == ""}.to_java :String
-      splits = org.apache.hadoop.hbase.util.Bytes.toByteArrays(splits)
+      splits = h_table.getRegionLocations().keys().map{|i| Bytes.toStringBinary(i.getStartKey)}.delete_if{|k| k == ""}.to_java :String
+      splits = org.apache.hadoop.hbase.util.Bytes.toBinaryByteArrays(splits)
       table_description = h_table.getTableDescriptor()
       yield 'Disabling table...' if block_given?
       disable(table_name)


[2/4] hbase git commit: HBASE-12801 Failed to truncate a table while maintaing binary region boundaries (Liu Shaohui)

Posted by ap...@apache.org.
HBASE-12801 Failed to truncate a table while maintaing binary region boundaries (Liu Shaohui)


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

Branch: refs/heads/branch-1
Commit: 40e9c22ea2800746ad324ec807b6eba136f51a92
Parents: 6e45269
Author: Andrew Purtell <ap...@apache.org>
Authored: Mon Jan 12 19:09:02 2015 -0800
Committer: Andrew Purtell <ap...@apache.org>
Committed: Mon Jan 12 19:09:08 2015 -0800

----------------------------------------------------------------------
 .../main/java/org/apache/hadoop/hbase/util/Bytes.java   | 12 ++++++++++++
 hbase-shell/src/main/ruby/hbase/admin.rb                |  4 ++--
 2 files changed, 14 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/40e9c22e/hbase-common/src/main/java/org/apache/hadoop/hbase/util/Bytes.java
----------------------------------------------------------------------
diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/util/Bytes.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/util/Bytes.java
index 9e79be3..dd666e6 100644
--- a/hbase-common/src/main/java/org/apache/hadoop/hbase/util/Bytes.java
+++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/util/Bytes.java
@@ -1786,6 +1786,18 @@ public class Bytes {
   }
 
   /**
+   * @param t operands
+   * @return Array of binary byte arrays made from passed array of binary strings
+   */
+  public static byte[][] toBinaryByteArrays(final String[] t) {
+    byte[][] result = new byte[t.length][];
+    for (int i = 0; i < t.length; i++) {
+      result[i] = Bytes.toBytesBinary(t[i]);
+    }
+    return result;
+  }
+
+  /**
    * @param column operand
    * @return A byte array of a byte array where first and only entry is
    * <code>column</code>

http://git-wip-us.apache.org/repos/asf/hbase/blob/40e9c22e/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 f7bcd83..0ce1a56 100644
--- a/hbase-shell/src/main/ruby/hbase/admin.rb
+++ b/hbase-shell/src/main/ruby/hbase/admin.rb
@@ -398,8 +398,8 @@ module Hbase
     # Truncates table while maintaing region boundaries (deletes all records by recreating the table)
     def truncate_preserve(table_name, conf = @conf)
       h_table = @conn.getTable(table_name)
-      splits = h_table.getRegionLocations().keys().map{|i| Bytes.toString(i.getStartKey)}.delete_if{|k| k == ""}.to_java :String
-      splits = org.apache.hadoop.hbase.util.Bytes.toByteArrays(splits)
+      splits = h_table.getRegionLocations().keys().map{|i| Bytes.toStringBinary(i.getStartKey)}.delete_if{|k| k == ""}.to_java :String
+      splits = org.apache.hadoop.hbase.util.Bytes.toBinaryByteArrays(splits)
       table_description = h_table.getTableDescriptor()
       yield 'Disabling table...' if block_given?
       disable(table_name)