[accumulo] branch main updated (56d49f15a0 -> afe5654613)

[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 56d49f15a0 improves fetching mulitple extents in ample (#3349)
     add e776715d87 fixes #473 avoids scanning entire table metadata for bulk import (#3336)
     new afe5654613 Merge remote-tracking branch 'upstream/2.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:
 .../accumulo/core/metadata/schema/Ample.java       |  4 ++-
 .../accumulo/server/metadata/ServerAmpleImpl.java  |  4 +--
 .../manager/tableOps/bulkVer2/BulkInfo.java        |  4 +++
 .../tableOps/bulkVer2/CleanUpBulkImport.java       | 16 +++++++++---
 .../manager/tableOps/bulkVer2/PrepBulkImport.java  | 30 +++++++++++++++++++---
 .../tableOps/bulkVer2/PrepBulkImportTest.java      | 12 ++++++++-
 6 files changed, 58 insertions(+), 12 deletions(-)

[accumulo] 01/01: Merge remote-tracking branch 'upstream/2.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 afe56546131e0c8392d825d96410eb0677a81fe2
Merge: 56d49f15a0 e776715d87
Author: Keith Turner <kt...@apache.org>
AuthorDate: Tue May 9 15:56:46 2023 -0400

    Merge remote-tracking branch 'upstream/2.1'

 .../accumulo/core/metadata/schema/Ample.java       |  4 ++-
 .../accumulo/server/metadata/ServerAmpleImpl.java  |  4 +--
 .../manager/tableOps/bulkVer2/BulkInfo.java        |  4 +++
 .../tableOps/bulkVer2/CleanUpBulkImport.java       | 16 +++++++++---
 .../manager/tableOps/bulkVer2/PrepBulkImport.java  | 30 +++++++++++++++++++---
 .../tableOps/bulkVer2/PrepBulkImportTest.java      | 12 ++++++++-
 6 files changed, 58 insertions(+), 12 deletions(-)

diff --cc server/manager/src/main/java/org/apache/accumulo/manager/tableOps/bulkVer2/PrepBulkImport.java
index 4fa7d09b12,56116365b4..4514b98c1a
--- a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/bulkVer2/PrepBulkImport.java
+++ b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/bulkVer2/PrepBulkImport.java
@@@ -41,8 -42,8 +42,9 @@@ import org.apache.accumulo.core.clientI
  import org.apache.accumulo.core.conf.Property;
  import org.apache.accumulo.core.data.TableId;
  import org.apache.accumulo.core.dataImpl.KeyExtent;
+ import org.apache.accumulo.core.fate.FateTxId;
  import org.apache.accumulo.core.fate.Repo;
 +import org.apache.accumulo.core.file.FilePrefix;
  import org.apache.accumulo.core.metadata.schema.TabletMetadata;
  import org.apache.accumulo.core.metadata.schema.TabletsMetadata;
  import org.apache.accumulo.manager.Manager;