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
The following commit(s) were added to refs/heads/3.1 by this push:
new f05b78ee79 Deprecate CompactionHost for replacement in future version
(#4962)
f05b78ee79 is described below
commit f05b78ee79556f6876ed6e7414a0c3114483198b
Author: Dave Marion <[email protected]>
AuthorDate: Thu Oct 17 12:39:36 2024 -0400
Deprecate CompactionHost for replacement in future version (#4962)
Related to #4954
---
.../java/org/apache/accumulo/core/client/admin/ActiveCompaction.java | 1 +
.../org/apache/accumulo/core/clientImpl/ActiveCompactionImpl.java | 4 ++--
.../org/apache/accumulo/core/clientImpl/InstanceOperationsImpl.java | 2 ++
.../org/apache/accumulo/shell/commands/ActiveCompactionHelper.java | 2 ++
.../org/apache/accumulo/test/compaction/ExternalCompaction_1_IT.java | 1 +
.../main/java/org/apache/accumulo/test/functional/CompactionIT.java | 1 +
6 files changed, 9 insertions(+), 2 deletions(-)
diff --git
a/core/src/main/java/org/apache/accumulo/core/client/admin/ActiveCompaction.java
b/core/src/main/java/org/apache/accumulo/core/client/admin/ActiveCompaction.java
index 2ca9f69fb5..bad570af0d 100644
---
a/core/src/main/java/org/apache/accumulo/core/client/admin/ActiveCompaction.java
+++
b/core/src/main/java/org/apache/accumulo/core/client/admin/ActiveCompaction.java
@@ -135,6 +135,7 @@ public abstract class ActiveCompaction {
/**
* @since 2.1.0
*/
+ @Deprecated
public interface CompactionHost {
enum Type {
TSERVER, COMPACTOR
diff --git
a/core/src/main/java/org/apache/accumulo/core/clientImpl/ActiveCompactionImpl.java
b/core/src/main/java/org/apache/accumulo/core/clientImpl/ActiveCompactionImpl.java
index d744789fe8..5dc7343ed2 100644
---
a/core/src/main/java/org/apache/accumulo/core/clientImpl/ActiveCompactionImpl.java
+++
b/core/src/main/java/org/apache/accumulo/core/clientImpl/ActiveCompactionImpl.java
@@ -25,7 +25,6 @@ import java.util.Map;
import org.apache.accumulo.core.client.IteratorSetting;
import org.apache.accumulo.core.client.TableNotFoundException;
import org.apache.accumulo.core.client.admin.ActiveCompaction;
-import
org.apache.accumulo.core.client.admin.ActiveCompaction.CompactionHost.Type;
import org.apache.accumulo.core.data.TabletId;
import org.apache.accumulo.core.dataImpl.KeyExtent;
import org.apache.accumulo.core.dataImpl.TabletIdImpl;
@@ -36,12 +35,13 @@ import com.google.common.net.HostAndPort;
/**
* @since 1.6.0
*/
+@SuppressWarnings("deprecation")
public class ActiveCompactionImpl extends ActiveCompaction {
private final org.apache.accumulo.core.tabletserver.thrift.ActiveCompaction
tac;
private final ClientContext context;
private final HostAndPort hostport;
- private final Type type;
+ private final CompactionHost.Type type;
ActiveCompactionImpl(ClientContext context,
org.apache.accumulo.core.tabletserver.thrift.ActiveCompaction tac,
HostAndPort hostport,
diff --git
a/core/src/main/java/org/apache/accumulo/core/clientImpl/InstanceOperationsImpl.java
b/core/src/main/java/org/apache/accumulo/core/clientImpl/InstanceOperationsImpl.java
index c77b272ee8..801b71f3d7 100644
---
a/core/src/main/java/org/apache/accumulo/core/clientImpl/InstanceOperationsImpl.java
+++
b/core/src/main/java/org/apache/accumulo/core/clientImpl/InstanceOperationsImpl.java
@@ -286,6 +286,7 @@ public class InstanceOperationsImpl implements
InstanceOperations {
.checkClass(TraceUtil.traceInfo(), context.rpcCreds(), className,
asTypeName));
}
+ @SuppressWarnings("deprecation")
@Override
public List<ActiveCompaction> getActiveCompactions(String server)
throws AccumuloException, AccumuloSecurityException {
@@ -340,6 +341,7 @@ public class InstanceOperationsImpl implements
InstanceOperations {
compactors.values().forEach(compactorList -> {
for (HostAndPort compactorAddr : compactorList) {
+ @SuppressWarnings("deprecation")
Callable<List<ActiveCompaction>> task =
() -> ExternalCompactionUtil.getActiveCompaction(compactorAddr,
context).stream()
.map(tac -> new ActiveCompactionImpl(context, tac,
compactorAddr,
diff --git
a/shell/src/main/java/org/apache/accumulo/shell/commands/ActiveCompactionHelper.java
b/shell/src/main/java/org/apache/accumulo/shell/commands/ActiveCompactionHelper.java
index 62dd93f269..d73a1a084a 100644
---
a/shell/src/main/java/org/apache/accumulo/shell/commands/ActiveCompactionHelper.java
+++
b/shell/src/main/java/org/apache/accumulo/shell/commands/ActiveCompactionHelper.java
@@ -62,6 +62,7 @@ class ActiveCompactionHelper {
return maxDecimal(count / 1_000_000_000.0) + "B";
}
+ @SuppressWarnings("deprecation")
private static String formatActiveCompactionLine(ActiveCompaction ac) {
String output = ac.getOutputFile();
int index = output.indexOf("tables");
@@ -123,6 +124,7 @@ class ActiveCompactionHelper {
}
public static Stream<String> activeCompactions(InstanceOperations
instanceOps) {
+ @SuppressWarnings("deprecation")
Comparator<ActiveCompaction> comparator =
Comparator.comparing((ActiveCompaction ac) ->
ac.getHost().getAddress())
.thenComparing(ac ->
ac.getHost().getPort()).thenComparing(COMPACTION_AGE_DESCENDING);
diff --git
a/test/src/main/java/org/apache/accumulo/test/compaction/ExternalCompaction_1_IT.java
b/test/src/main/java/org/apache/accumulo/test/compaction/ExternalCompaction_1_IT.java
index 1b03592d64..b1707c8862 100644
---
a/test/src/main/java/org/apache/accumulo/test/compaction/ExternalCompaction_1_IT.java
+++
b/test/src/main/java/org/apache/accumulo/test/compaction/ExternalCompaction_1_IT.java
@@ -599,6 +599,7 @@ public class ExternalCompaction_1_IT extends
SharedMiniClusterBase {
}
+ @SuppressWarnings("deprecation")
@Test
public void testGetActiveCompactions() throws Exception {
final String table1 = this.getUniqueNames(1)[0];
diff --git
a/test/src/main/java/org/apache/accumulo/test/functional/CompactionIT.java
b/test/src/main/java/org/apache/accumulo/test/functional/CompactionIT.java
index bdf04d0805..df49fcd19a 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/CompactionIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/CompactionIT.java
@@ -959,6 +959,7 @@ public class CompactionIT extends AccumuloClusterHarness {
}
}
+ @SuppressWarnings("deprecation")
@Test
public void testGetActiveCompactions() throws Exception {
final String table1 = this.getUniqueNames(1)[0];
