Merge branch '3.1'

Author: ctubbsii

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

@@ -105,7 +105,6 @@
 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;

core/src/main/java/org/apache/accumulo/core/data/LoadPlan.java

@@ -249,6 +249,7 @@ private static class JsonDestination {
     String endRow;
     RangeType rangeType;
 
+    @SuppressWarnings("unused")
     JsonDestination() {}
 
     JsonDestination(Destination destination) {
@@ -270,6 +271,7 @@ Destination toDestination() {
   private static final class JsonAll {
     List<JsonDestination> destinations;
 
+    @SuppressWarnings("unused")
     JsonAll() {}
 
     JsonAll(List<Destination> destinations) {

core/src/main/java/org/apache/accumulo/core/fate/user/FateMutator.java

@@ -23,7 +23,6 @@
 import org.apache.accumulo.core.fate.FateStore;
 import org.apache.accumulo.core.fate.ReadOnlyFateStore.TStatus;
 import org.apache.accumulo.core.fate.Repo;
-import org.apache.accumulo.core.fate.user.schema.FateSchema;
 
 public interface FateMutator<T> {
 
@@ -57,17 +56,19 @@ public interface FateMutator<T> {
   FateMutator<T> requireAbsentKey();
 
   /**
-   * Add a conditional mutation to {@link FateSchema.TxColumnFamily#RESERVATION_COLUMN} that will
-   * put the reservation if there is not already a reservation present
+   * Add a conditional mutation to
+   * {@link org.apache.accumulo.core.fate.user.schema.FateSchema.TxColumnFamily#RESERVATION_COLUMN}
+   * that will put the reservation if there is not already a reservation present
    *
    * @param reservation the reservation to attempt to put
    * @return the FateMutator with this added mutation
    */
   FateMutator<T> putReservedTx(FateStore.FateReservation reservation);
 
   /**
-   * Add a conditional mutation to {@link FateSchema.TxColumnFamily#RESERVATION_COLUMN} that will
-   * delete the column if the column value matches the given reservation
+   * Add a conditional mutation to
+   * {@link org.apache.accumulo.core.fate.user.schema.FateSchema.TxColumnFamily#RESERVATION_COLUMN}
+   * that will delete the column if the column value matches the given reservation
    *
    * @param reservation the reservation to attempt to remove
    * @return the FateMutator with this added mutation

core/src/main/java/org/apache/accumulo/core/fate/user/UserFateStore.java

@@ -79,8 +79,9 @@ public class UserFateStore<T> extends AbstractFateStore<T> {
    *
    * @param context the {@link ClientContext}
    * @param tableName the name of the table which will store the Fate data
-   * @param lockID the {@link ZooUtil.LockID} held by the process creating this store. Should be
-   *        null if this store will be used as read-only (will not be used to reserve transactions)
+   * @param lockID the {@link org.apache.accumulo.core.fate.zookeeper.ZooUtil.LockID} held by the
+   *        process creating this store. Should be null if this store will be used as read-only
+   *        (will not be used to reserve transactions)
    * @param isLockHeld the {@link Predicate} used to determine if the lockID is held or not at the
    *        time of invocation. If the store is used for a {@link Fate} which runs a dead
    *        reservation cleaner, this should be non-null, otherwise null is fine

core/src/main/java/org/apache/accumulo/core/metadata/schema/Ample.java

@@ -259,10 +259,11 @@ public interface TabletsMutator extends AutoCloseable {
   interface ConditionalResult {
 
     /**
-     * This enum was created instead of using {@link ConditionalWriter.Status} because Ample has
-     * automated handling for most of the statuses of the conditional writer and therefore only a
-     * subset are expected to be passed out of Ample. This enum represents the subset that Ample
-     * will actually return.
+     * This enum was created instead of using
+     * {@link org.apache.accumulo.core.client.ConditionalWriter.Status} because Ample has automated
+     * handling for most of the statuses of the conditional writer and therefore only a subset are
+     * expected to be passed out of Ample. This enum represents the subset that Ample will actually
+     * return.
      */
     enum Status {
       ACCEPTED, REJECTED

core/src/main/java/org/apache/accumulo/core/util/compaction/CompactionPlanImpl.java

@@ -55,14 +55,11 @@ public static class BuilderImpl implements CompactionPlan.Builder {
 
     private final CompactionKind kind;
     private final ArrayList<CompactionJob> jobs = new ArrayList<>();
-    private final Set<CompactableFile> allFiles;
     private final Set<CompactableFile> seenFiles = new HashSet<>();
     private final Set<CompactableFile> candidates;
 
-    public BuilderImpl(CompactionKind kind, Set<CompactableFile> allFiles,
-        Set<CompactableFile> candidates) {
+    public BuilderImpl(CompactionKind kind, Set<CompactableFile> candidates) {
       this.kind = kind;
-      this.allFiles = allFiles;
       this.candidates = candidates;
     }
 

core/src/main/java/org/apache/accumulo/core/zookeeper/ZooCache.java

@@ -266,21 +266,12 @@ private abstract class ZooRunnable<T> {
      * Runs an operation against ZooKeeper. Retries are performed by the retry method when
      * KeeperExceptions occur.
      *
-     * Changes were made in ACCUMULO-4388 so that the run method no longer accepts Zookeeper as an
-     * argument, and instead relies on the ZooRunnable implementation to call
-     * {@link #getZooKeeper()}. Performing the call to retrieving a ZooKeeper Session after caches
-     * are checked has the benefit of limiting ZK connections and blocking as a result of obtaining
-     * these sessions.
-     *
      * @return T the result of the runnable
      */
     abstract T run() throws KeeperException, InterruptedException;
 
     /**
-     * Retry will attempt to call the run method. Run should make a call to {@link #getZooKeeper()}
-     * after checks to cached information are made. This change, per ACCUMULO-4388 ensures that we
-     * don't create a ZooKeeper session when information is cached, and access to ZooKeeper is
-     * unnecessary.
+     * Retry will attempt to call the run method.
      *
      * @return result of the runnable access success ( i.e. no exceptions ).
      */

core/src/test/java/org/apache/accumulo/core/spi/compaction/RatioBasedCompactionPlannerTest.java

@@ -667,7 +667,7 @@ public void testMaxTableFilesFallback() {
 
   private CompactionJob createJob(CompactionKind kind, Set<CompactableFile> all,
       Set<CompactableFile> files) {
-    return new CompactionPlanImpl.BuilderImpl(kind, all, all)
+    return new CompactionPlanImpl.BuilderImpl(kind, all)
         .addJob((short) all.size(), CompactorGroupId.of("small"), files).build().getJobs()
         .iterator().next();
   }
@@ -817,7 +817,7 @@ public Collection<CompactableFile> getAll() {
 
       @Override
       public Builder createPlanBuilder() {
-        return new CompactionPlanImpl.BuilderImpl(kind, all, candidates);
+        return new CompactionPlanImpl.BuilderImpl(kind, candidates);
       }
     };
   }

server/base/src/main/java/org/apache/accumulo/server/compaction/CompactionJobGenerator.java

@@ -296,7 +296,7 @@ public Map<String,String> getExecutionHints() {
 
       @Override
       public CompactionPlan.Builder createPlanBuilder() {
-        return new CompactionPlanImpl.BuilderImpl(kind, allFiles, candidates);
+        return new CompactionPlanImpl.BuilderImpl(kind, candidates);
       }
     };
     return planCompactions(planner, params, serviceId);

server/base/src/main/java/org/apache/accumulo/server/util/ServiceStatusCmd.java

@@ -237,7 +237,6 @@ Result<Set<String>> readAllNodesData(final ZooReader zooReader, final String pat
    * Provides explicit method names instead of generic getFirst to get the error count and getSecond
    * hosts information
    *
-   * @param <A> errorCount
    * @param <B> hosts
    */
   private static class Result<B> extends Pair<Integer,B> {

server/base/src/main/java/org/apache/accumulo/server/util/checkCommand/CheckRunner.java

@@ -34,7 +34,8 @@ public interface CheckRunner {
    * @param opts server util opts. Only applicable for the checks on the root and metadata tables
    * @param fixFiles remove dangling file pointers. Only applicable for the checks on the system and
    *        user files
-   * @return the {@link Admin.CheckCommand.CheckStatus} resulting from running the check
+   * @return the {@link org.apache.accumulo.server.util.Admin.CheckCommand.CheckStatus} resulting
+   *         from running the check
    */
   Admin.CheckCommand.CheckStatus runCheck(ServerContext context, ServerUtilOpts opts,
       boolean fixFiles) throws Exception;

test/src/main/java/org/apache/accumulo/test/functional/GracefulShutdownIT.java

@@ -270,6 +270,7 @@ public void testGracefulShutdown() throws Exception {
         scanner.setBatchSize(1);
         int count = 0;
         for (Entry<Key,Value> e : scanner) {
+          assertNotNull(e);
           count++;
           if (count == 2) {
             Admin.signalGracefulShutdown(ctx, sserver.toString());

test/src/main/java/org/apache/accumulo/test/functional/MemoryStarvedScanIT.java

@@ -25,6 +25,7 @@
 import static org.apache.accumulo.core.metrics.Metric.SCAN_RETURN_FOR_MEM;
 import static org.apache.accumulo.test.util.Wait.waitFor;
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.util.Collections;
@@ -187,7 +188,7 @@ static void freeServerMemory(AccumuloClient client) throws Exception {
     try (Scanner scanner = client.createScanner(AccumuloTable.METADATA.tableName())) {
       IteratorSetting is = new IteratorSetting(11, MemoryFreeingIterator.class, Map.of());
       scanner.addScanIterator(is);
-      var unused = Iterables.size(scanner); // consume the key/values
+      assertNotEquals(0, Iterables.size(scanner)); // consume the key/values
     }
   }