(accumulo) branch main updated (f129a587f7 -> 7f7cf05c92)

[kt...@apache.org]

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

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


    from f129a587f7 fixes AmpleConditionalWriterIT (#5325)
     add 5657bc8cf2 fixes creating same table name in different namespaces (#5323)
     add 3b5d9cf68c Merge branch '2.1' into 3.1
     new 7f7cf05c92 Merge branch '3.1'

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../apache/accumulo/manager/tableOps/Utils.java    | 45 +++----------
 .../manager/tableOps/clone/CloneZookeeper.java     |  2 +-
 .../manager/tableOps/create/PopulateZookeeper.java |  5 +-
 .../manager/tableOps/rename/RenameTable.java       |  2 +-
 .../tableImport/ImportPopulateZookeeper.java       |  4 +-
 .../apache/accumulo/test/TableOperationsIT.java    | 74 ++++++++++++++++++++++
 6 files changed, 92 insertions(+), 40 deletions(-)

(accumulo) 01/01: Merge branch '3.1'

[kt...@apache.org]

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

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

commit 7f7cf05c92c908f5ed9755d6de497dcfea636d20
Merge: f129a587f7 3b5d9cf68c
Author: Keith Turner <kt...@apache.org>
AuthorDate: Wed Feb 12 00:41:30 2025 +0000

    Merge branch '3.1'

 .../apache/accumulo/manager/tableOps/Utils.java    | 45 +++----------
 .../manager/tableOps/clone/CloneZookeeper.java     |  2 +-
 .../manager/tableOps/create/PopulateZookeeper.java |  5 +-
 .../manager/tableOps/rename/RenameTable.java       |  2 +-
 .../tableImport/ImportPopulateZookeeper.java       |  4 +-
 .../apache/accumulo/test/TableOperationsIT.java    | 74 ++++++++++++++++++++++
 6 files changed, 92 insertions(+), 40 deletions(-)

diff --cc server/manager/src/main/java/org/apache/accumulo/manager/tableOps/Utils.java
index a8089dbb13,4af608e75f..63cc2f3353
--- a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/Utils.java
+++ b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/Utils.java
@@@ -23,23 -23,14 +23,18 @@@ import static java.nio.charset.Standard
  import java.io.IOException;
  import java.math.BigInteger;
  import java.util.Base64;
- import java.util.HashMap;
- import java.util.Map;
 +import java.util.SortedMap;
  import java.util.SortedSet;
 +import java.util.TreeMap;
  import java.util.TreeSet;
  import java.util.concurrent.locks.Lock;
  import java.util.concurrent.locks.ReentrantLock;
  import java.util.function.Function;
  
  import org.apache.accumulo.core.Constants;
- import org.apache.accumulo.core.client.NamespaceNotFoundException;
 +import org.apache.accumulo.core.client.admin.TabletMergeability;
  import org.apache.accumulo.core.clientImpl.AcceptableThriftTableOperationException;
- import org.apache.accumulo.core.clientImpl.Namespace;
- import org.apache.accumulo.core.clientImpl.Namespaces;
 +import org.apache.accumulo.core.clientImpl.TabletMergeabilityUtil;
  import org.apache.accumulo.core.clientImpl.thrift.TableOperation;
  import org.apache.accumulo.core.clientImpl.thrift.TableOperationExceptionType;
  import org.apache.accumulo.core.data.AbstractId;