Updated M/R code due to changes in Accumulo
diff --git a/src/main/java/org/apache/accumulo/testing/continuous/ContinuousMoru.java b/src/main/java/org/apache/accumulo/testing/continuous/ContinuousMoru.java
index 6497067..67adc0b 100644
--- a/src/main/java/org/apache/accumulo/testing/continuous/ContinuousMoru.java
+++ b/src/main/java/org/apache/accumulo/testing/continuous/ContinuousMoru.java
@@ -24,7 +24,6 @@
import java.util.UUID;
import org.apache.accumulo.core.client.AccumuloSecurityException;
-import org.apache.accumulo.core.client.ClientInfo;
import org.apache.accumulo.core.client.mapreduce.AccumuloInputFormat;
import org.apache.accumulo.core.client.mapreduce.AccumuloOutputFormat;
import org.apache.accumulo.core.data.Key;
@@ -124,7 +123,7 @@
job.setInputFormatClass(AccumuloInputFormat.class);
- AccumuloInputFormat.setClientInfo(job, ClientInfo.from(env.getClientProps()));
+ AccumuloInputFormat.setClientProperties(job, env.getClientProps());
AccumuloInputFormat.setInputTableName(job, env.getAccumuloTableName());
int maxMaps = Integer.parseInt(env.getTestProperty(TestProps.CI_VERIFY_MAX_MAPS));
@@ -141,7 +140,7 @@
job.setMapperClass(CMapper.class);
job.setNumReduceTasks(0);
job.setOutputFormatClass(AccumuloOutputFormat.class);
- AccumuloOutputFormat.setClientInfo(job, ClientInfo.from(env.getClientProps()));
+ AccumuloOutputFormat.setClientProperties(job, env.getClientProps());
AccumuloOutputFormat.setCreateTables(job, true);
AccumuloOutputFormat.setDefaultTableName(job, env.getAccumuloTableName());
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 94d0fbd..def4198 100644
--- a/src/main/java/org/apache/accumulo/testing/continuous/ContinuousVerify.java
+++ b/src/main/java/org/apache/accumulo/testing/continuous/ContinuousVerify.java
@@ -26,7 +26,6 @@
import java.util.Set;
import org.apache.accumulo.core.client.AccumuloClient;
-import org.apache.accumulo.core.client.ClientInfo;
import org.apache.accumulo.core.client.mapreduce.AccumuloInputFormat;
import org.apache.accumulo.core.data.Key;
import org.apache.accumulo.core.data.Range;
@@ -175,7 +174,7 @@
AccumuloInputFormat.setRanges(job, ranges);
AccumuloInputFormat.setAutoAdjustRanges(job, false);
- AccumuloInputFormat.setClientInfo(job, ClientInfo.from(env.getClientProps()));
+ AccumuloInputFormat.setClientProperties(job, env.getClientProps());
job.setMapperClass(CMapper.class);
job.setMapOutputKeyClass(LongWritable.class);
diff --git a/src/main/java/org/apache/accumulo/testing/randomwalk/multitable/CopyTool.java b/src/main/java/org/apache/accumulo/testing/randomwalk/multitable/CopyTool.java
index 747ec08..53b54e6 100644
--- a/src/main/java/org/apache/accumulo/testing/randomwalk/multitable/CopyTool.java
+++ b/src/main/java/org/apache/accumulo/testing/randomwalk/multitable/CopyTool.java
@@ -20,7 +20,6 @@
import java.util.Properties;
import org.apache.accumulo.core.client.Accumulo;
-import org.apache.accumulo.core.client.ClientInfo;
import org.apache.accumulo.core.client.mapreduce.AccumuloInputFormat;
import org.apache.accumulo.core.client.mapreduce.AccumuloOutputFormat;
import org.apache.accumulo.core.data.Key;
@@ -58,9 +57,8 @@
}
Properties props = Accumulo.newClientProperties().from(args[0]).build();
- ClientInfo info = ClientInfo.from(props);
job.setInputFormatClass(AccumuloInputFormat.class);
- AccumuloInputFormat.setClientInfo(job, info);
+ AccumuloInputFormat.setClientProperties(job, props);
AccumuloInputFormat.setInputTableName(job, args[1]);
AccumuloInputFormat.setScanAuthorizations(job, Authorizations.EMPTY);
@@ -70,7 +68,7 @@
job.setNumReduceTasks(0);
job.setOutputFormatClass(AccumuloOutputFormat.class);
- AccumuloOutputFormat.setClientInfo(job, info);
+ AccumuloOutputFormat.setClientProperties(job, props);
AccumuloOutputFormat.setCreateTables(job, true);
AccumuloOutputFormat.setDefaultTableName(job, args[2]);
diff --git a/src/main/java/org/apache/accumulo/testing/randomwalk/sequential/MapRedVerifyTool.java b/src/main/java/org/apache/accumulo/testing/randomwalk/sequential/MapRedVerifyTool.java
index 2f98bc2..7dde8e6 100644
--- a/src/main/java/org/apache/accumulo/testing/randomwalk/sequential/MapRedVerifyTool.java
+++ b/src/main/java/org/apache/accumulo/testing/randomwalk/sequential/MapRedVerifyTool.java
@@ -21,7 +21,6 @@
import java.util.Properties;
import org.apache.accumulo.core.client.Accumulo;
-import org.apache.accumulo.core.client.ClientInfo;
import org.apache.accumulo.core.client.mapreduce.AccumuloInputFormat;
import org.apache.accumulo.core.client.mapreduce.AccumuloOutputFormat;
import org.apache.accumulo.core.data.Key;
@@ -89,10 +88,10 @@
}
Properties props = Accumulo.newClientProperties().from(args[0]).build();
- AccumuloInputFormat.setClientInfo(job, ClientInfo.from(props));
+ AccumuloInputFormat.setClientProperties(job, props);
AccumuloInputFormat.setInputTableName(job, args[1]);
- AccumuloOutputFormat.setClientInfo(job, ClientInfo.from(props));
+ AccumuloOutputFormat.setClientProperties(job, props);
AccumuloOutputFormat.setDefaultTableName(job, args[2]);
job.setInputFormatClass(AccumuloInputFormat.class);
