This is an automated email from the ASF dual-hosted git repository.
ctubbsii pushed a commit to branch 2.1
in repository https://gitbox.apache.org/repos/asf/accumulo.git
The following commit(s) were added to refs/heads/2.1 by this push:
new a7167daa8f Clean up the 2.1 build a bit (#4743)
a7167daa8f is described below
commit a7167daa8f25f3a6089ef382548fa2a107c4cc53
Author: Christopher Tubbs <[email protected]>
AuthorDate: Thu Jul 18 15:18:49 2024 -0400
Clean up the 2.1 build a bit (#4743)
* Bump commons-logging to 1.3, so it natively supports sending logs to
slf4j or log4j without the log4j-jcl bridge
See https://github.com/apache/commons-logging/pull/177
* Fix issue described in
https://github.com/apache/accumulo/pull/4558#issuecomment-2231991529
regarding log4j-api being required for log4j-1.2-api in core/pom.xml
by making sure bnd and log4j-api are in the compile scope but marked
as provided to avoid the maven-dependency-plugin from complaining
because they appear to be required only for the test, but actually are
still needed transitively for log4j-1.2-api
* Fix some false-positive Closeable resource warnings from wrapping a
Scanner with an IsolatedScanner
* Suppress some deprecation warnings for scan server metadata schema
* Remove log4j-1.2-api from minicluster and compactor modules, where
they weren't used
* Fix some incorrect `@SuppressWarnings` comments
* Fix generics with the ServiceStatusCmd's Result class, which had a
generic `A extends Integer` parameter, but `Integer` is final and
cannot be extended
* Remove some unused variables
* Add a few comments in the POMs to explain why some log4j dependencies
exist where they do
* Add a try-with-resources block in ClientSideIteratorIT to ensure the
scanner is closed when done
* Remove an unneeded exclusion on httpclient from libthrift (it's not a
transitive dependency in the POM for the version of libthrift we are
using, and upstream they have already migrated to newer versions of
httpclient5 in the latest POM for libthrift)
---
assemble/pom.xml | 5 ----
core/pom.xml | 30 ++++++++++------------
.../core/client/mapred/AbstractInputFormat.java | 4 ++-
.../core/client/mapreduce/AbstractInputFormat.java | 4 ++-
.../core/metadata/ScanServerRefTabletFile.java | 5 ++--
.../hadoopImpl/mapred/AccumuloRecordReader.java | 4 ++-
.../hadoopImpl/mapreduce/AccumuloRecordReader.java | 4 ++-
minicluster/pom.xml | 5 ----
pom.xml | 11 ++------
.../accumulo/server/metadata/ServerAmpleImpl.java | 4 +--
.../accumulo/server/metrics/MetricsInfoImpl.java | 4 +--
.../accumulo/server/util/ServiceStatusCmd.java | 14 +++++-----
.../server/metrics/MetricsInfoImplTest.java | 4 +--
server/compaction-coordinator/pom.xml | 4 ---
server/compactor/pom.xml | 4 ---
.../accumulo/manager/metrics/ManagerMetrics.java | 4 ---
server/monitor/pom.xml | 2 +-
start/pom.xml | 1 +
.../apache/accumulo/test/ClientSideIteratorIT.java | 13 +++++-----
.../java/org/apache/accumulo/test/PrintInfoIT.java | 4 ---
.../test/ScanServerMetadataEntriesCleanIT.java | 7 ++---
21 files changed, 56 insertions(+), 81 deletions(-)
diff --git a/assemble/pom.xml b/assemble/pom.xml
index 78658c3e05..d24a608120 100644
--- a/assemble/pom.xml
+++ b/assemble/pom.xml
@@ -302,11 +302,6 @@
<artifactId>log4j-core</artifactId>
<optional>true</optional>
</dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-jcl</artifactId>
- <optional>true</optional>
- </dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-jul</artifactId>
diff --git a/core/pom.xml b/core/pom.xml
index 57c8c425b4..9822afe1b8 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -114,18 +114,13 @@
<artifactId>hadoop-client-api</artifactId>
</dependency>
<dependency>
+ <!-- used at compile scope by legacy mapreduce classes -->
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-1.2-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.thrift</groupId>
<artifactId>libthrift</artifactId>
- <exclusions>
- <exclusion>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpcore</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.apache.zookeeper</groupId>
@@ -148,24 +143,25 @@
<artifactId>snakeyaml</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-client-runtime</artifactId>
- <scope>runtime</scope>
- </dependency>
- <!-- bnd dependency added due to lint issue, see
https://github.com/apache/logging-log4j2/issues/2232 -->
- <dependency>
+ <!-- used by log4j-api; needed here for compile time linting only; we
don't actually use it -->
<groupId>biz.aQute.bnd</groupId>
<artifactId>biz.aQute.bnd.annotation</artifactId>
- <scope>test</scope>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <!-- used indirectly at compile scope by log4j-1.2-api; also needed for
tests -->
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-api</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-client-minicluster</artifactId>
- <scope>test</scope>
+ <artifactId>hadoop-client-runtime</artifactId>
+ <scope>runtime</scope>
</dependency>
<dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-api</artifactId>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-client-minicluster</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git
a/core/src/main/java/org/apache/accumulo/core/client/mapred/AbstractInputFormat.java
b/core/src/main/java/org/apache/accumulo/core/client/mapred/AbstractInputFormat.java
index 7c1bbf07cb..088a0655c4 100644
---
a/core/src/main/java/org/apache/accumulo/core/client/mapred/AbstractInputFormat.java
+++
b/core/src/main/java/org/apache/accumulo/core/client/mapred/AbstractInputFormat.java
@@ -502,7 +502,9 @@ public abstract class AbstractInputFormat<K,V> implements
InputFormat<K,V> {
}
if (isIsolated) {
log.info("Creating isolated scanner");
- scanner = new IsolatedScanner(scanner);
+ @SuppressWarnings("resource")
+ var wrapped = new IsolatedScanner(scanner);
+ scanner = wrapped;
}
if (usesLocalIterators) {
log.info("Using local iterators");
diff --git
a/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.java
b/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.java
index bfbad1198e..432471334b 100644
---
a/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.java
+++
b/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.java
@@ -517,7 +517,9 @@ public abstract class AbstractInputFormat<K,V> extends
InputFormat<K,V> {
}
if (isIsolated) {
log.info("Creating isolated scanner");
- scanner = new IsolatedScanner(scanner);
+ @SuppressWarnings("resource")
+ var wrapped = new IsolatedScanner(scanner);
+ scanner = wrapped;
}
if (usesLocalIterators) {
log.info("Using local iterators");
diff --git
a/core/src/main/java/org/apache/accumulo/core/metadata/ScanServerRefTabletFile.java
b/core/src/main/java/org/apache/accumulo/core/metadata/ScanServerRefTabletFile.java
index 1d63fbf25d..f3365c75c1 100644
---
a/core/src/main/java/org/apache/accumulo/core/metadata/ScanServerRefTabletFile.java
+++
b/core/src/main/java/org/apache/accumulo/core/metadata/ScanServerRefTabletFile.java
@@ -27,7 +27,6 @@ import org.apache.accumulo.core.data.Mutation;
import org.apache.accumulo.core.data.Range;
import org.apache.accumulo.core.data.Value;
import org.apache.accumulo.core.metadata.schema.MetadataSchema;
-import
org.apache.accumulo.core.metadata.schema.MetadataSchema.OldScanServerFileReferenceSection;
import
org.apache.accumulo.core.metadata.schema.MetadataSchema.ScanServerFileReferenceSection;
import org.apache.accumulo.core.util.UuidUtil;
import org.apache.hadoop.fs.Path;
@@ -38,7 +37,9 @@ import com.google.common.base.Preconditions;
public class ScanServerRefTabletFile extends TabletFile {
@SuppressWarnings("deprecation")
- private static final String OLD_PREFIX =
OldScanServerFileReferenceSection.getRowPrefix();
+ private static final String OLD_PREFIX =
+
org.apache.accumulo.core.metadata.schema.MetadataSchema.OldScanServerFileReferenceSection
+ .getRowPrefix();
private final String prefix;
private final Value NULL_VALUE = new Value(new byte[0]);
private final Text serverAddress;
diff --git
a/hadoop-mapreduce/src/main/java/org/apache/accumulo/hadoopImpl/mapred/AccumuloRecordReader.java
b/hadoop-mapreduce/src/main/java/org/apache/accumulo/hadoopImpl/mapred/AccumuloRecordReader.java
index b9440ee9bb..2325c086a9 100644
---
a/hadoop-mapreduce/src/main/java/org/apache/accumulo/hadoopImpl/mapred/AccumuloRecordReader.java
+++
b/hadoop-mapreduce/src/main/java/org/apache/accumulo/hadoopImpl/mapred/AccumuloRecordReader.java
@@ -195,7 +195,9 @@ public abstract class AccumuloRecordReader<K,V> implements
RecordReader<K,V> {
}
if (isIsolated) {
log.info("Creating isolated scanner");
- scanner = new IsolatedScanner(scanner);
+ @SuppressWarnings("resource")
+ var wrapped = new IsolatedScanner(scanner);
+ scanner = wrapped;
}
if (usesLocalIterators) {
log.info("Using local iterators");
diff --git
a/hadoop-mapreduce/src/main/java/org/apache/accumulo/hadoopImpl/mapreduce/AccumuloRecordReader.java
b/hadoop-mapreduce/src/main/java/org/apache/accumulo/hadoopImpl/mapreduce/AccumuloRecordReader.java
index dc614d61c4..66445e62cd 100644
---
a/hadoop-mapreduce/src/main/java/org/apache/accumulo/hadoopImpl/mapreduce/AccumuloRecordReader.java
+++
b/hadoop-mapreduce/src/main/java/org/apache/accumulo/hadoopImpl/mapreduce/AccumuloRecordReader.java
@@ -214,7 +214,9 @@ public abstract class AccumuloRecordReader<K,V> extends
RecordReader<K,V> {
}
if (isIsolated) {
log.info("Creating isolated scanner");
- scanner = new IsolatedScanner(scanner);
+ @SuppressWarnings("resource")
+ var wrapped = new IsolatedScanner(scanner);
+ scanner = wrapped;
}
if (usesLocalIterators) {
log.info("Using local iterators");
diff --git a/minicluster/pom.xml b/minicluster/pom.xml
index 6a17606475..7a013b402c 100644
--- a/minicluster/pom.xml
+++ b/minicluster/pom.xml
@@ -128,11 +128,6 @@
<artifactId>curator-test</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-1.2-api</artifactId>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j2-impl</artifactId>
diff --git a/pom.xml b/pom.xml
index 463fd2944f..16de14b163 100644
--- a/pom.xml
+++ b/pom.xml
@@ -319,7 +319,7 @@
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
- <version>1.2</version>
+ <version>1.3.3</version>
</dependency>
<dependency>
<!-- legacy junit version specified here for dependency convergence -->
@@ -531,13 +531,6 @@
<groupId>org.apache.thrift</groupId>
<artifactId>libthrift</artifactId>
<version>${version.thrift}</version>
- <!-- exclude vulnerable lib see
https://issues.apache.org/jira/browse/HTTPCLIENT-1803 -->
- <exclusions>
- <exclusion>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.apache.zookeeper</groupId>
@@ -1039,7 +1032,7 @@
<bannedDependencies>
<excludes>
<!-- we redirect logging to log4j2, so we should have
those bridges instead -->
- <!-- commons-logging is allowed because log4j-jcl uses it
as a dependency -->
+ <!-- commons-logging is allowed because it natively sends
to log4j2 or slf4j -->
<exclude>ch.qos.logback:*</exclude>
<exclude>ch.qos.reload4j:*</exclude>
<exclude>log4j:*</exclude>
diff --git
a/server/base/src/main/java/org/apache/accumulo/server/metadata/ServerAmpleImpl.java
b/server/base/src/main/java/org/apache/accumulo/server/metadata/ServerAmpleImpl.java
index ed531167ca..773ded6403 100644
---
a/server/base/src/main/java/org/apache/accumulo/server/metadata/ServerAmpleImpl.java
+++
b/server/base/src/main/java/org/apache/accumulo/server/metadata/ServerAmpleImpl.java
@@ -61,7 +61,6 @@ import
org.apache.accumulo.core.metadata.schema.MetadataSchema.BlipSection;
import org.apache.accumulo.core.metadata.schema.MetadataSchema.DeletesSection;
import
org.apache.accumulo.core.metadata.schema.MetadataSchema.DeletesSection.SkewedKeyValue;
import
org.apache.accumulo.core.metadata.schema.MetadataSchema.ExternalCompactionSection;
-import
org.apache.accumulo.core.metadata.schema.MetadataSchema.OldScanServerFileReferenceSection;
import
org.apache.accumulo.core.metadata.schema.MetadataSchema.ScanServerFileReferenceSection;
import
org.apache.accumulo.core.metadata.schema.MetadataSchema.TabletsSection.BulkFileColumnFamily;
import org.apache.accumulo.core.security.Authorizations;
@@ -363,7 +362,8 @@ public class ServerAmpleImpl extends AmpleImpl implements
Ample {
BatchScanner scanner =
context.createBatchScanner(DataLevel.USER.metaTable(),
Authorizations.EMPTY);
scanner.setRanges(Set.of(ScanServerFileReferenceSection.getRange(),
- OldScanServerFileReferenceSection.getRange()));
+
org.apache.accumulo.core.metadata.schema.MetadataSchema.OldScanServerFileReferenceSection
+ .getRange()));
return StreamSupport.stream(scanner.spliterator(), false)
.map(e -> new ScanServerRefTabletFile(e.getKey()));
} catch (TableNotFoundException e) {
diff --git
a/server/base/src/main/java/org/apache/accumulo/server/metrics/MetricsInfoImpl.java
b/server/base/src/main/java/org/apache/accumulo/server/metrics/MetricsInfoImpl.java
index 15322bc495..b1fcb8fa83 100644
---
a/server/base/src/main/java/org/apache/accumulo/server/metrics/MetricsInfoImpl.java
+++
b/server/base/src/main/java/org/apache/accumulo/server/metrics/MetricsInfoImpl.java
@@ -266,9 +266,9 @@ public class MetricsInfoImpl implements MetricsInfo {
}
}
+ // support for org.apache.accumulo.core.metrics.MeterRegistryFactory can be
removed in 3.1
@VisibleForTesting
- @SuppressWarnings({"deprecation",
- "support for org.apache.accumulo.core.metrics.MeterRegistryFactory can
be removed in 3.1"})
+ @SuppressWarnings("deprecation")
static MeterRegistry getRegistryFromFactory(final String factoryName, final
ServerContext context)
throws ClassNotFoundException, NoSuchMethodException,
InvocationTargetException,
InstantiationException, IllegalAccessException {
diff --git
a/server/base/src/main/java/org/apache/accumulo/server/util/ServiceStatusCmd.java
b/server/base/src/main/java/org/apache/accumulo/server/util/ServiceStatusCmd.java
index 204e536c93..557c789141 100644
---
a/server/base/src/main/java/org/apache/accumulo/server/util/ServiceStatusCmd.java
+++
b/server/base/src/main/java/org/apache/accumulo/server/util/ServiceStatusCmd.java
@@ -242,7 +242,7 @@ public class ServiceStatusCmd {
Map<String,Set<String>> hostsByGroups = new TreeMap<>();
// get group names
- Result<Integer,Set<String>> queueNodes = readNodeNames(zooReader,
zRootPath);
+ Result<Set<String>> queueNodes = readNodeNames(zooReader, zRootPath);
errors.addAndGet(queueNodes.getErrorCount());
Set<String> queues = new TreeSet<>(queueNodes.getHosts());
@@ -265,7 +265,7 @@ public class ServiceStatusCmd {
* @return Result with error count, Set of the node names.
*/
@VisibleForTesting
- Result<Integer,Set<String>> readNodeNames(final ZooReader zooReader, final
String path) {
+ Result<Set<String>> readNodeNames(final ZooReader zooReader, final String
path) {
Set<String> nodeNames = new TreeSet<>();
final AtomicInteger errorCount = new AtomicInteger(0);
try {
@@ -290,7 +290,7 @@ public class ServiceStatusCmd {
* @return Pair with error count, the node data as String.
*/
@VisibleForTesting
- Result<Integer,String> readNodeData(final ZooReader zooReader, final String
path) {
+ Result<String> readNodeData(final ZooReader zooReader, final String path) {
try {
byte[] data = zooReader.getData(path);
return new Result<>(0, new String(data, UTF_8));
@@ -311,7 +311,7 @@ public class ServiceStatusCmd {
* @return Pair with error count, the data from each node as a String.
*/
@VisibleForTesting
- Result<Integer,Set<String>> readAllNodesData(final ZooReader zooReader,
final String path) {
+ Result<Set<String>> readAllNodesData(final ZooReader zooReader, final String
path) {
Set<String> hosts = new TreeSet<>();
final AtomicInteger errorCount = new AtomicInteger(0);
try {
@@ -352,12 +352,12 @@ public class ServiceStatusCmd {
* @param <A> errorCount
* @param <B> hosts
*/
- private static class Result<A extends Integer,B> extends Pair<A,B> {
- public Result(A errorCount, B hosts) {
+ private static class Result<B> extends Pair<Integer,B> {
+ public Result(Integer errorCount, B hosts) {
super(errorCount, hosts);
}
- public A getErrorCount() {
+ public Integer getErrorCount() {
return getFirst();
}
diff --git
a/server/base/src/test/java/org/apache/accumulo/server/metrics/MetricsInfoImplTest.java
b/server/base/src/test/java/org/apache/accumulo/server/metrics/MetricsInfoImplTest.java
index 5ffb615685..f754b3936f 100644
---
a/server/base/src/test/java/org/apache/accumulo/server/metrics/MetricsInfoImplTest.java
+++
b/server/base/src/test/java/org/apache/accumulo/server/metrics/MetricsInfoImplTest.java
@@ -56,8 +56,8 @@ public class MetricsInfoImplTest {
verify(context, conf);
}
- @SuppressWarnings({"deprecation",
- "support for org.apache.accumulo.core.metrics.MeterRegistryFactory can
be removed in 3.1"})
+ // support for org.apache.accumulo.core.metrics.MeterRegistryFactory can be
removed in 3.1
+ @SuppressWarnings("deprecation")
static final class DeprecatedFactory
implements org.apache.accumulo.core.metrics.MeterRegistryFactory {
DeprecatedFactory() {
diff --git a/server/compaction-coordinator/pom.xml
b/server/compaction-coordinator/pom.xml
index 151cc8fdd2..497a733b8b 100644
--- a/server/compaction-coordinator/pom.xml
+++ b/server/compaction-coordinator/pom.xml
@@ -55,10 +55,6 @@
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-start</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-1.2-api</artifactId>
- </dependency>
<dependency>
<groupId>org.apache.thrift</groupId>
<artifactId>libthrift</artifactId>
diff --git a/server/compactor/pom.xml b/server/compactor/pom.xml
index e7e4263066..1866909c92 100644
--- a/server/compactor/pom.xml
+++ b/server/compactor/pom.xml
@@ -63,10 +63,6 @@
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-client-api</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-1.2-api</artifactId>
- </dependency>
<dependency>
<groupId>org.apache.thrift</groupId>
<artifactId>libthrift</artifactId>
diff --git
a/server/manager/src/main/java/org/apache/accumulo/manager/metrics/ManagerMetrics.java
b/server/manager/src/main/java/org/apache/accumulo/manager/metrics/ManagerMetrics.java
index f0502bce98..efe1e6ab01 100644
---
a/server/manager/src/main/java/org/apache/accumulo/manager/metrics/ManagerMetrics.java
+++
b/server/manager/src/main/java/org/apache/accumulo/manager/metrics/ManagerMetrics.java
@@ -26,13 +26,9 @@ import org.apache.accumulo.core.conf.Property;
import org.apache.accumulo.core.metrics.MetricsProducer;
import org.apache.accumulo.manager.Manager;
import org.apache.accumulo.manager.metrics.fate.FateMetrics;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
public class ManagerMetrics {
- private final static Logger log =
LoggerFactory.getLogger(ManagerMetrics.class);
-
public static List<MetricsProducer> getProducers(AccumuloConfiguration conf,
Manager m) {
ArrayList<MetricsProducer> producers = new ArrayList<>();
@SuppressWarnings("deprecation")
diff --git a/server/monitor/pom.xml b/server/monitor/pom.xml
index f68159233a..ccc7bceb06 100644
--- a/server/monitor/pom.xml
+++ b/server/monitor/pom.xml
@@ -145,7 +145,7 @@
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
- <!-- used by log4j; needed here for compile time linting only; we don't
actually use it -->
+ <!-- used by log4j-api; needed here for compile time linting only; we
don't actually use it -->
<groupId>biz.aQute.bnd</groupId>
<artifactId>biz.aQute.bnd.annotation</artifactId>
<scope>provided</scope>
diff --git a/start/pom.xml b/start/pom.xml
index 44efb3ba3f..85e31157e6 100644
--- a/start/pom.xml
+++ b/start/pom.xml
@@ -65,6 +65,7 @@
<scope>test</scope>
</dependency>
<dependency>
+ <!-- required to exclude log4j classes in some powermock tests -->
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-1.2-api</artifactId>
<scope>test</scope>
diff --git
a/test/src/main/java/org/apache/accumulo/test/ClientSideIteratorIT.java
b/test/src/main/java/org/apache/accumulo/test/ClientSideIteratorIT.java
index c7f56fb71f..824284ee98 100644
--- a/test/src/main/java/org/apache/accumulo/test/ClientSideIteratorIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/ClientSideIteratorIT.java
@@ -204,12 +204,13 @@ public class ClientSideIteratorIT extends
AccumuloClusterHarness {
private void runPluginEnvTest(Set<String> expected) throws Exception {
try (var scanner = client.createScanner(tableName)) {
initCalled.set(false);
- var csis = new ClientSideIteratorScanner(scanner);
- csis.addScanIterator(new IteratorSetting(100, "filter",
TestPropFilter.class));
- assertEquals(expected,
- csis.stream().map(e ->
e.getKey().getRowData().toString()).collect(Collectors.toSet()));
- // this check is here to ensure the iterator executed client side and
not server side
- assertTrue(initCalled.get());
+ try (var csis = new ClientSideIteratorScanner(scanner)) {
+ csis.addScanIterator(new IteratorSetting(100, "filter",
TestPropFilter.class));
+ assertEquals(expected,
+ csis.stream().map(e ->
e.getKey().getRowData().toString()).collect(Collectors.toSet()));
+ // this check is here to ensure the iterator executed client side and
not server side
+ assertTrue(initCalled.get());
+ }
}
// The offline scanner also runs iterators client side, so test its client
side access to
diff --git a/test/src/main/java/org/apache/accumulo/test/PrintInfoIT.java
b/test/src/main/java/org/apache/accumulo/test/PrintInfoIT.java
index 459beb9ea1..09f55d862d 100644
--- a/test/src/main/java/org/apache/accumulo/test/PrintInfoIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/PrintInfoIT.java
@@ -55,13 +55,9 @@ import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.io.TempDir;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
public class PrintInfoIT extends SharedMiniClusterBase {
- private static final Logger log = LoggerFactory.getLogger(PrintInfoIT.class);
-
@BeforeAll
public static void setup() throws Exception {
SharedMiniClusterBase.startMiniCluster();
diff --git
a/test/src/main/java/org/apache/accumulo/test/ScanServerMetadataEntriesCleanIT.java
b/test/src/main/java/org/apache/accumulo/test/ScanServerMetadataEntriesCleanIT.java
index da7e9228da..a0b1dc20ed 100644
---
a/test/src/main/java/org/apache/accumulo/test/ScanServerMetadataEntriesCleanIT.java
+++
b/test/src/main/java/org/apache/accumulo/test/ScanServerMetadataEntriesCleanIT.java
@@ -33,7 +33,6 @@ import org.apache.accumulo.core.client.TableNotFoundException;
import org.apache.accumulo.core.data.Mutation;
import org.apache.accumulo.core.metadata.ScanServerRefTabletFile;
import org.apache.accumulo.core.metadata.schema.Ample;
-import
org.apache.accumulo.core.metadata.schema.MetadataSchema.OldScanServerFileReferenceSection;
import org.apache.accumulo.core.util.HostAndPort;
import org.apache.accumulo.harness.SharedMiniClusterBase;
import org.apache.accumulo.server.ServerContext;
@@ -80,7 +79,6 @@ public class ScanServerMetadataEntriesCleanIT extends
SharedMiniClusterBase {
}
@Test
- @SuppressWarnings("deprecation")
public void testOldScanServerRefs() {
HostAndPort server = HostAndPort.fromParts("127.0.0.1", 1234);
UUID serverLockUUID = UUID.randomUUID();
@@ -97,7 +95,10 @@ public class ScanServerMetadataEntriesCleanIT extends
SharedMiniClusterBase {
// Add old scan server entries
try (BatchWriter writer =
ctx.createBatchWriter(Ample.DataLevel.USER.metaTable())) {
- String prefix = OldScanServerFileReferenceSection.getRowPrefix();
+ @SuppressWarnings("deprecation")
+ String prefix =
+
org.apache.accumulo.core.metadata.schema.MetadataSchema.OldScanServerFileReferenceSection
+ .getRowPrefix();
for (String filepath : Stream.of("F0001243.rf", "F0006512.rf")
.map(f -> "hdfs://localhost:8020/accumulo/tables/2a/test_tablet/" +
f)
.collect(Collectors.toSet())) {
