wip

core/src/main/java/org/apache/accumulo/core/client/admin/TabletInformation.java

@@ -76,4 +76,10 @@ public interface TabletInformation {
    */
   TabletAvailability getTabletAvailability();
 
+  /**
+   * @return the TabletMergeability object
+   *
+   * @since 4.0.0
+   */
+  TabletMergeability getTabletMergeability();
 }

core/src/main/java/org/apache/accumulo/core/clientImpl/TableOperationsImpl.java

@@ -33,6 +33,7 @@
 import static org.apache.accumulo.core.metadata.schema.TabletMetadata.ColumnType.LAST;
 import static org.apache.accumulo.core.metadata.schema.TabletMetadata.ColumnType.LOCATION;
 import static org.apache.accumulo.core.metadata.schema.TabletMetadata.ColumnType.LOGS;
+import static org.apache.accumulo.core.metadata.schema.TabletMetadata.ColumnType.MERGEABILITY;
 import static org.apache.accumulo.core.metadata.schema.TabletMetadata.ColumnType.OPID;
 import static org.apache.accumulo.core.metadata.schema.TabletMetadata.ColumnType.PREV_ROW;
 import static org.apache.accumulo.core.metadata.schema.TabletMetadata.ColumnType.SUSPEND;
@@ -104,6 +105,7 @@
 import org.apache.accumulo.core.client.admin.NewTableConfiguration;
 import org.apache.accumulo.core.client.admin.SummaryRetriever;
 import org.apache.accumulo.core.client.admin.TableOperations;
+import org.apache.accumulo.core.client.admin.TableOperations.ImportDestinationArguments;
 import org.apache.accumulo.core.client.admin.TabletAvailability;
 import org.apache.accumulo.core.client.admin.TabletInformation;
 import org.apache.accumulo.core.client.admin.TabletMergeability;
@@ -510,11 +512,22 @@ public void putSplits(String tableName, SortedMap<Text,TabletMergeability> split
 
       tabLocator.invalidateCache();
 
+      var splitsToTablets = mapSplitsToTablets(tableName, tableId, tabLocator, splitsTodo);
       Map<KeyExtent,List<Pair<Text,TabletMergeability>>> tabletSplits =
-          mapSplitsToTablets(tableName, tableId, tabLocator, splitsTodo);
+          splitsToTablets.newSplits;
+      Map<KeyExtent,TabletMergeability> existingSplits =
+          splitsToTablets.existingSplits;
 
       List<CompletableFuture<Void>> futures = new ArrayList<>();
 
+      // TODO: Process existingSplits in a new RPC call and updating existing
+      // before continuing to the fate operations to add new. ie
+      // if (doRpcToUpdateMergability(existingSplits)) {
+      //   remove from splitsTodo
+      // } else {
+      //   handle errors, retry?
+      // }
+
       // begin the fate operation for each tablet without waiting for the operation to complete
       for (Entry<KeyExtent,List<Pair<Text,TabletMergeability>>> splitsForTablet : tabletSplits
           .entrySet()) {
@@ -606,10 +619,11 @@ public void putSplits(String tableName, SortedMap<Text,TabletMergeability> split
     waitExecutor.shutdown();
   }
 
-  private Map<KeyExtent,List<Pair<Text,TabletMergeability>>> mapSplitsToTablets(String tableName,
+  private SplitsToTablets mapSplitsToTablets(String tableName,
       TableId tableId, ClientTabletCache tabLocator, SortedMap<Text,TabletMergeability> splitsTodo)
       throws AccumuloException, AccumuloSecurityException, TableNotFoundException {
-    Map<KeyExtent,List<Pair<Text,TabletMergeability>>> tabletSplits = new HashMap<>();
+    Map<KeyExtent,List<Pair<Text,TabletMergeability>>> newSplits = new HashMap<>();
+    Map<KeyExtent,TabletMergeability> existingSplits = new HashMap<>();
 
     var iterator = splitsTodo.entrySet().iterator();
     while (iterator.hasNext()) {
@@ -633,20 +647,32 @@ private Map<KeyExtent,List<Pair<Text,TabletMergeability>>> mapSplitsToTablets(St
         }
 
         if (split.equals(tablet.getExtent().endRow())) {
+          existingSplits.put(tablet.getExtent(), splitEntry.getValue());
           // split already exists, so remove it
           iterator.remove();
           continue;
         }
 
-        tabletSplits.computeIfAbsent(tablet.getExtent(), k -> new ArrayList<>())
+        newSplits.computeIfAbsent(tablet.getExtent(), k -> new ArrayList<>())
             .add(Pair.fromEntry(splitEntry));
 
       } catch (InvalidTabletHostingRequestException e) {
         // not expected
         throw new AccumuloException(e);
       }
     }
-    return tabletSplits;
+    return new SplitsToTablets(newSplits, existingSplits);
+  }
+
+  private static class SplitsToTablets {
+    final Map<KeyExtent,List<Pair<Text,TabletMergeability>>> newSplits;
+    final Map<KeyExtent,TabletMergeability> existingSplits;
+
+    private SplitsToTablets(Map<KeyExtent,List<Pair<Text,TabletMergeability>>> newSplits,
+        Map<KeyExtent,TabletMergeability> existingSplits) {
+      this.newSplits = Objects.requireNonNull(newSplits);
+      this.existingSplits = Objects.requireNonNull(existingSplits);
+    }
   }
 
   @Override
@@ -2244,7 +2270,7 @@ public Stream<TabletInformation> getTabletInformation(final String tableName, fi
 
     TabletsMetadata tabletsMetadata =
         context.getAmple().readTablets().forTable(tableId).overlapping(scanRangeStart, true, null)
-            .fetch(AVAILABILITY, LOCATION, DIR, PREV_ROW, FILES, LAST, LOGS, SUSPEND)
+            .fetch(AVAILABILITY, LOCATION, DIR, PREV_ROW, FILES, LAST, LOGS, SUSPEND, MERGEABILITY)
             .checkConsistency().build();
 
     Set<TServerInstance> liveTserverSet = TabletMetadata.getLiveTServers(context);

core/src/main/java/org/apache/accumulo/core/clientImpl/TabletInformationImpl.java

@@ -22,6 +22,7 @@
 
 import org.apache.accumulo.core.client.admin.TabletAvailability;
 import org.apache.accumulo.core.client.admin.TabletInformation;
+import org.apache.accumulo.core.client.admin.TabletMergeability;
 import org.apache.accumulo.core.data.TabletId;
 import org.apache.accumulo.core.dataImpl.TabletIdImpl;
 import org.apache.accumulo.core.metadata.schema.DataFileValue;
@@ -93,6 +94,11 @@ public TabletAvailability getTabletAvailability() {
     return tabletMetadata.getTabletAvailability();
   }
 
+  @Override
+  public TabletMergeability getTabletMergeability() {
+    return tabletMetadata.getTabletMergeability().getTabletMergeability();
+  }
+
   @Override
   public String toString() {
     return "TabletInformationImpl{tabletMetadata=" + tabletMetadata + ", estimatedSize="

core/src/main/java/org/apache/accumulo/core/clientImpl/TabletMergeabilityUtil.java

@@ -30,6 +30,7 @@
 import java.util.function.Function;
 
 import org.apache.accumulo.core.client.admin.TabletMergeability;
+import org.apache.accumulo.core.manager.thrift.TTabletMergeability;
 import org.apache.accumulo.core.util.ByteBufferUtil;
 import org.apache.accumulo.core.util.Pair;
 import org.apache.accumulo.core.util.TextUtil;
@@ -95,6 +96,20 @@ public static Pair<Text,TabletMergeability> decode(String data) {
         : TabletMergeability.after(Duration.ofNanos(jData.delay)));
   }
 
+  public static TabletMergeability fromThrift(TTabletMergeability thriftTm) {
+    if (thriftTm.never) {
+      return TabletMergeability.never();
+    }
+    return TabletMergeability.after(Duration.ofNanos(thriftTm.delay));
+  }
+
+  public static TTabletMergeability toThrift(TabletMergeability tabletMergeability) {
+    if (tabletMergeability.isNever()) {
+      return new TTabletMergeability(true, -1L);
+    }
+    return new TTabletMergeability(false, tabletMergeability.getDelay().orElseThrow().toNanos());
+  }
+
   private static class GSonData {
     byte[] split;
     boolean never;