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

[dlmarion]

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

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

commit e4d83cca90c57a3b1a27938c5aa966df1dcf1ae8
Merge: fbe236d4c9 c817c976f9
Author: Dave Marion <dlmar...@apache.org>
AuthorDate: Wed Feb 26 13:33:35 2025 +0000

    Merge branch '2.1' into 3.1

 .../core/metadata/schema/TabletMetadata.java       |   2 +-
 .../core/metadata/schema/TabletsMetadata.java      |   3 +-
 .../manager/tableOps/bulkVer2/LoadFiles.java       |  91 ++++--
 .../manager/tableOps/bulkVer2/LoadFilesTest.java   | 304 +++++++++++++++++++++
 .../tableOps/bulkVer2/PrepBulkImportTest.java      |   4 +-
 5 files changed, 380 insertions(+), 24 deletions(-)

diff --cc 
core/src/main/java/org/apache/accumulo/core/metadata/schema/TabletMetadata.java
index 68d63cfac3,c3c5f27485..bed6b00c41
--- 
a/core/src/main/java/org/apache/accumulo/core/metadata/schema/TabletMetadata.java
+++ 
b/core/src/main/java/org/apache/accumulo/core/metadata/schema/TabletMetadata.java
@@@ -518,13 -520,14 +518,13 @@@ public class TabletMetadata 
    }
  
    @VisibleForTesting
-   static TabletMetadata create(String id, String prevEndRow, String endRow) {
+   public static TabletMetadata create(String id, String prevEndRow, String 
endRow) {
 -    TabletMetadata te = new TabletMetadata();
 -    te.tableId = TableId.of(id);
 -    te.sawPrevEndRow = true;
 -    te.prevEndRow = prevEndRow == null ? null : new Text(prevEndRow);
 -    te.endRow = endRow == null ? null : new Text(endRow);
 -    te.fetchedCols = EnumSet.of(ColumnType.PREV_ROW);
 -    return te;
 +    final var tmBuilder = new Builder();
 +    tmBuilder.table(TableId.of(id));
 +    tmBuilder.sawPrevEndRow(true);
 +    tmBuilder.prevEndRow(prevEndRow == null ? null : new Text(prevEndRow));
 +    tmBuilder.endRow(endRow == null ? null : new Text(endRow));
 +    return tmBuilder.build(EnumSet.of(ColumnType.PREV_ROW));
    }
  
    /**
diff --cc 
server/manager/src/main/java/org/apache/accumulo/manager/tableOps/bulkVer2/LoadFiles.java
index 41041691f5,dfa4b98278..ba879d6ebd
--- 
a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/bulkVer2/LoadFiles.java
+++ 
b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/bulkVer2/LoadFiles.java
@@@ -41,8 -41,8 +42,7 @@@ import org.apache.accumulo.core.clientI
  import org.apache.accumulo.core.clientImpl.bulk.LoadMappingIterator;
  import org.apache.accumulo.core.conf.Property;
  import org.apache.accumulo.core.data.Mutation;
- import org.apache.accumulo.core.data.TableId;
  import org.apache.accumulo.core.dataImpl.KeyExtent;
 -import org.apache.accumulo.core.dataImpl.thrift.MapFileInfo;
  import org.apache.accumulo.core.dataImpl.thrift.TKeyExtent;
  import org.apache.accumulo.core.fate.FateTxId;
  import org.apache.accumulo.core.fate.Repo;