This is an automated email from the ASF dual-hosted git repository.

ddanielr pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/accumulo.git

commit 4b13332e58e5199f61dc6ac2f75f1b48d3a6c49d
Merge: 16a16a156b 9261f6aff6
Author: Daniel Roberts ddanielr <[email protected]>
AuthorDate: Mon Jun 8 15:38:27 2026 +0000

    Merge branch '2.1'

 .../java/org/apache/accumulo/core/client/admin/TableOperations.java | 4 +++-
 .../main/java/org/apache/accumulo/server/util/ZooKeeperMain.java    | 2 +-
 .../java/org/apache/accumulo/shell/commands/GetSplitsCommand.java   | 6 +++---
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --cc 
core/src/main/java/org/apache/accumulo/core/client/admin/TableOperations.java
index 8d0c3d5107,3b4fed9637..3b77a03f61
--- 
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
@@@ -222,9 -250,28 +222,11 @@@ public interface TableOperations 
    Collection<Text> listSplits(String tableName)
        throws TableNotFoundException, AccumuloSecurityException, 
AccumuloException;
  
 -  /**
 -   * @param tableName the name of the table
 -   * @param maxSplits specifies the maximum number of splits to return
 -   * @return the split points (end-row names) for the table's current split 
profile, grouped into
 -   *         fewer splits so as not to exceed maxSplits
 -   * @deprecated since 1.5.0; use {@link #listSplits(String, int)} instead.
 -   */
 -  @Deprecated(since = "1.5.0")
 -  default Collection<Text> getSplits(String tableName, int maxSplits)
 -      throws TableNotFoundException {
 -    try {
 -      return listSplits(tableName, maxSplits);
 -    } catch (AccumuloSecurityException | AccumuloException e) {
 -      throw new RuntimeException(e);
 -    }
 -  }
 -
    /**
     * @param tableName the name of the table
-    * @param maxSplits specifies the maximum number of splits to return
+    * @param maxSplits specifies the maximum number of selected splits to 
return. The selection of
+    *        split points is defined by the implementation and may not always 
be in immediate
+    *        sequential order.
     * @throws AccumuloException if a general error occurs
     * @throws AccumuloSecurityException if the user does not have permission
     * @return the split points (end-row names) for the table's current split 
profile, grouped into

Reply via email to