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
The following commit(s) were added to refs/heads/main by this push:
new 42bc7fe91f fixes a few IDE warnings
42bc7fe91f is described below
commit 42bc7fe91fb9fccf129f942604fd3e963a3fb40f
Author: Keith Turner <[email protected]>
AuthorDate: Wed Feb 11 23:29:55 2026 +0000
fixes a few IDE warnings
---
.../org/apache/accumulo/core/clientImpl/ClientTabletCache.java | 2 +-
.../org/apache/accumulo/core/clientImpl/TableOperationsImpl.java | 7 -------
.../org/apache/accumulo/core/iteratorsImpl/IteratorConfigUtil.java | 3 ---
core/src/main/java/org/apache/accumulo/core/util/Merge.java | 4 +---
.../org/apache/accumulo/test/functional/IteratorConflictsIT.java | 2 --
5 files changed, 2 insertions(+), 16 deletions(-)
diff --git
a/core/src/main/java/org/apache/accumulo/core/clientImpl/ClientTabletCache.java
b/core/src/main/java/org/apache/accumulo/core/clientImpl/ClientTabletCache.java
index 2e4571fd1c..37cd293615 100644
---
a/core/src/main/java/org/apache/accumulo/core/clientImpl/ClientTabletCache.java
+++
b/core/src/main/java/org/apache/accumulo/core/clientImpl/ClientTabletCache.java
@@ -48,7 +48,7 @@ import org.apache.hadoop.io.Text;
public abstract class ClientTabletCache {
/**
- * Flipped false on call to {@link #clearInstances}. Checked by client
classes that locally cache
+ * Flipped false on call to {@link #invalidate}. Checked by client classes
that locally cache
* Locators.
*/
private volatile boolean isValid = true;
diff --git
a/core/src/main/java/org/apache/accumulo/core/clientImpl/TableOperationsImpl.java
b/core/src/main/java/org/apache/accumulo/core/clientImpl/TableOperationsImpl.java
index ac72b0d8b4..5b7ccd1cb2 100644
---
a/core/src/main/java/org/apache/accumulo/core/clientImpl/TableOperationsImpl.java
+++
b/core/src/main/java/org/apache/accumulo/core/clientImpl/TableOperationsImpl.java
@@ -1049,13 +1049,6 @@ public class TableOperationsImpl extends
TableOperationsHelper {
final TVersionedProperties vProperties =
ThriftClientTypes.CLIENT.execute(context, client -> client
.getVersionedTableProperties(TraceUtil.traceInfo(),
context.rpcCreds(), tableName));
- final Map<String,String> configBeforeMut;
- try {
- configBeforeMut = getConfiguration(tableName);
- } catch (TableNotFoundException e) {
- throw new AccumuloException(e);
- }
-
mapMutator.accept(vProperties.getProperties());
// A reference to the map was passed to the user, maybe they still have
the reference and are
diff --git
a/core/src/main/java/org/apache/accumulo/core/iteratorsImpl/IteratorConfigUtil.java
b/core/src/main/java/org/apache/accumulo/core/iteratorsImpl/IteratorConfigUtil.java
index 94d08c4072..8ed40831dc 100644
---
a/core/src/main/java/org/apache/accumulo/core/iteratorsImpl/IteratorConfigUtil.java
+++
b/core/src/main/java/org/apache/accumulo/core/iteratorsImpl/IteratorConfigUtil.java
@@ -61,9 +61,6 @@ public class IteratorConfigUtil {
Comparator.comparingInt(IterInfo::getPriority)
.thenComparing(iterInfo -> iterInfo.getIterName() == null ? "" :
iterInfo.getIterName());
- private static final String WARNING_MSG =
- ". Iterator was set as requested, but may lead to non-deterministic
behavior.";
-
/**
* Fetch the correct configuration key prefix for the given scope. Throws an
* IllegalArgumentException if no property exists for the given scope.
diff --git a/core/src/main/java/org/apache/accumulo/core/util/Merge.java
b/core/src/main/java/org/apache/accumulo/core/util/Merge.java
index 5cc23dda2f..3a9776c1bc 100644
--- a/core/src/main/java/org/apache/accumulo/core/util/Merge.java
+++ b/core/src/main/java/org/apache/accumulo/core/util/Merge.java
@@ -239,9 +239,7 @@ public class Merge {
protected void mergeSome(AccumuloClient client, String table, List<Size>
sizes, int numToMerge)
throws MergeException {
merge(client, table, sizes, numToMerge);
- for (int i = 0; i < numToMerge; i++) {
- sizes.remove(0);
- }
+ sizes.subList(0, numToMerge).clear();
}
protected void merge(AccumuloClient client, String table, List<Size> sizes,
int numToMerge)
diff --git
a/test/src/main/java/org/apache/accumulo/test/functional/IteratorConflictsIT.java
b/test/src/main/java/org/apache/accumulo/test/functional/IteratorConflictsIT.java
index 108332b492..4b44fccfbd 100644
---
a/test/src/main/java/org/apache/accumulo/test/functional/IteratorConflictsIT.java
+++
b/test/src/main/java/org/apache/accumulo/test/functional/IteratorConflictsIT.java
@@ -332,7 +332,6 @@ public class IteratorConflictsIT extends
SharedMiniClusterBase {
String src1 = dstAndSrcNamespace1 + "." + names[15];
tops.create(src1);
String dst1 = dstAndSrcNamespace1 + "." + names[16];
- String dst2 = dstAndSrcNamespace1 + "." + names[17];
testNamespaceIterPrioConflict(dstAndSrcNamespace1, AccumuloException.class,
() -> tops.clone(src1, dst1,
CloneConfiguration.builder()
@@ -543,7 +542,6 @@ public class IteratorConflictsIT extends
SharedMiniClusterBase {
// testing CloneConfiguration.Builder.setPropertiesToSet
String dst1 = names[23];
- String dst2 = names[24];
String dst3 = names[25];
String dst4 = names[26];
String defaultsTable12 = names[27];
