Merge branch 'main' into elasticity

apache · Aug 6, 2024 · 34909bc · 34909bc
2 parents af58350 + 3e78ef7
commit 34909bc
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 2 deletions.
diff --git a/src/main/java/org/apache/accumulo/testing/continuous/ContinuousInputFormat.java b/src/main/java/org/apache/accumulo/testing/continuous/ContinuousInputFormat.java
@@ -143,6 +143,7 @@ private Key genKey(CRC32 cksum) {
 
         byte[] fam = genCol(random.nextInt(maxFam));
         byte[] qual = genCol(random.nextInt(maxQual));
+        @SuppressWarnings("deprecation")
         byte[] cv = visibilities.get(random.nextInt(visibilities.size())).flatten();
 
         if (cksum != null) {

diff --git a/src/main/java/org/apache/accumulo/testing/continuous/ContinuousVerify.java b/src/main/java/org/apache/accumulo/testing/continuous/ContinuousVerify.java
@@ -190,7 +190,7 @@ public int run(String[] args) throws Exception {
 
       job.setOutputFormatClass(TextOutputFormat.class);
 
-      job.getConfiguration().setBoolean("mapred.map.tasks.speculative.execution", scanOffline);
+      job.getConfiguration().setBoolean("mapred.map.speculative", scanOffline);
       job.getConfiguration().set("mapreduce.job.classloader", "true");
 
       Path outputPath = new Path(outputDir + "/" + job.getJobName());

diff --git a/src/main/java/org/apache/accumulo/testing/performance/tests/YieldingScanExecutorPT.java b/src/main/java/org/apache/accumulo/testing/performance/tests/YieldingScanExecutorPT.java
@@ -220,7 +220,8 @@ private TestExecutor<Long> startLongScans(Environment env, String tableName, Ato
     TestExecutor<Long> longScans = new TestExecutor<>(NUM_LONG_SCANS);
 
     for (int i = 0; i < NUM_LONG_SCANS; i++) {
-      longScans.submit(() -> scan(tableName, env.getClient(), stop, fpi.next()));
+      final var client = env.getClient();
+      longScans.submit(() -> scan(tableName, client, stop, fpi.next()));
     }
     return longScans;
   }

diff --git a/src/main/java/org/apache/accumulo/testing/randomwalk/shard/ExportIndex.java b/src/main/java/org/apache/accumulo/testing/randomwalk/shard/ExportIndex.java
@@ -123,6 +123,8 @@ public void visit(State state, RandWalkEnv env, Properties props) throws Excepti
   private static HashMap<String,String> getPropsFromTable(String tableName, RandWalkEnv env)
       throws AccumuloException, TableNotFoundException {
     return new HashMap<>() {
+      private static final long serialVersionUID = 1L;
+
       {
         for (var entry : env.getAccumuloClient().tableOperations().getProperties(tableName))
           put(entry.getKey(), entry.getValue());