From 5c642ff853a2b2c59dde8c539576e5b7bbac1c7b Mon Sep 17 00:00:00 2001 From: "Dom G." Date: Tue, 23 Jul 2024 13:33:57 -0400 Subject: [PATCH 1/2] Replace map reduce prop in continous ingest verify (#277) --- .../apache/accumulo/testing/continuous/ContinuousVerify.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/apache/accumulo/testing/continuous/ContinuousVerify.java b/src/main/java/org/apache/accumulo/testing/continuous/ContinuousVerify.java index 2f65d12a..5cc5d5fd 100644 --- 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()); From 3e78ef7925fbc740f443709cebc978b8d1726d55 Mon Sep 17 00:00:00 2001 From: Christopher Tubbs Date: Tue, 23 Jul 2024 13:43:33 -0400 Subject: [PATCH 2/2] Fix trivial warnings * Fix resource closure warning in lambda by assigning to a final var outside * Fix deprecation warning by suppressing the use of the deprecated method * Add missing serialVersionUID to Serializable anonymous inner class --- .../accumulo/testing/continuous/ContinuousInputFormat.java | 1 + .../testing/performance/tests/YieldingScanExecutorPT.java | 3 ++- .../apache/accumulo/testing/randomwalk/shard/ExportIndex.java | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/apache/accumulo/testing/continuous/ContinuousInputFormat.java b/src/main/java/org/apache/accumulo/testing/continuous/ContinuousInputFormat.java index fd3443b1..a6fa97d1 100644 --- 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/performance/tests/YieldingScanExecutorPT.java b/src/main/java/org/apache/accumulo/testing/performance/tests/YieldingScanExecutorPT.java index b6cd64e7..ac5da637 100644 --- 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 startLongScans(Environment env, String tableName, Ato TestExecutor 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 index 13c39f8e..9460b638 100644 --- 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 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());