You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by el...@apache.org on 2014/03/20 16:25:27 UTC

[10/20] git commit: Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT

Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT


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

Branch: refs/heads/ACCUMULO-2061
Commit: 4d873512633be0313ab54cc06364937a00946d73
Parents: 7d32c52 205f0dc
Author: Sean Busbey <bu...@cloudera.com>
Authored: Tue Mar 18 12:45:08 2014 -0500
Committer: Sean Busbey <bu...@cloudera.com>
Committed: Tue Mar 18 12:45:08 2014 -0500

----------------------------------------------------------------------
 .../core/client/admin/TableOperations.java         | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/4d873512/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperations.java
----------------------------------------------------------------------
diff --cc core/src/main/java/org/apache/accumulo/core/client/admin/TableOperations.java
index 689c04c,2521c96..6166673
--- a/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperations.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperations.java
@@@ -132,9 -132,26 +132,26 @@@ public interface TableOperations 
     * @throws AccumuloSecurityException
     * @since 1.5.0
     */
 -  public void exportTable(String tableName, String exportDir) throws TableNotFoundException, AccumuloException, AccumuloSecurityException;
 +  void exportTable(String tableName, String exportDir) throws TableNotFoundException, AccumuloException, AccumuloSecurityException;
  
    /**
+    * Ensures that tablets are split along a set of keys.
+    * <p>
+    * Note that while the documentation for Text specifies that its bytestream should be UTF-8, the encoding is not enforced by operations that work with byte arrays.
+    * <p>
+    * For example, you can create 256 evenly-sliced splits via the following code sample even though the given byte sequences are not valid UTF-8.
+    * <pre>
+    * {@code
+    *  TableOperations tableOps = connector.tableOperations();
+    *  TreeSet<Text> splits = new TreeSet<Text>();
+    *  for (int i = 0; i < 256; i++) {
+    *    byte[] bytes = { (byte) i };
+    *    splits.add(new Text(bytes));
+    *  }
+    *  tableOps.addSplits(TABLE_NAME, splits);
+    * }
+    * </pre>
+    *
     * @param tableName
     *          the name of the table
     * @param partitionKeys