More clean up

linkedin · Feb 15, 2019 · dc3e754 · dc3e754
1 parent 4ddcc07
commit dc3e754
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 14 deletions.
diff --git a/dynamometer-infra/src/main/java/com/linkedin/dynamometer/Client.java b/dynamometer-infra/src/main/java/com/linkedin/dynamometer/Client.java
@@ -37,7 +37,6 @@
 import java.util.stream.Collectors;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;
-
 import org.apache.commons.cli.CommandLine;
 import org.apache.commons.cli.CommandLineParser;
 import org.apache.commons.cli.GnuParser;

diff --git a/...r-workload/src/main/java/com/linkedin/dynamometer/workloadgenerator/CreateFileMapper.java b/...r-workload/src/main/java/com/linkedin/dynamometer/workloadgenerator/CreateFileMapper.java
@@ -13,6 +13,7 @@
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.io.LongWritable;
 import org.apache.hadoop.io.NullWritable;
+import org.apache.hadoop.mapreduce.Job;
 import org.apache.hadoop.mapreduce.Mapper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

diff --git a/...ter-workload/src/main/java/com/linkedin/dynamometer/workloadgenerator/WorkloadDriver.java b/...ter-workload/src/main/java/com/linkedin/dynamometer/workloadgenerator/WorkloadDriver.java
@@ -9,7 +9,6 @@
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.concurrent.TimeUnit;
-
 import org.apache.commons.cli.CommandLine;
 import org.apache.commons.cli.CommandLineParser;
 import org.apache.commons.cli.HelpFormatter;
@@ -121,7 +120,6 @@ public static Job getJobForSubmission(Configuration baseConf, String nnURI, long
     Job job = Job.getInstance(conf, "Dynamometer Workload Driver");
     job.setJarByClass(mapperClass);
     job.setMapperClass(mapperClass);
-
     mapperClass.newInstance().configureJob(job);
 
     return job;

diff --git a/...ter-workload/src/main/java/com/linkedin/dynamometer/workloadgenerator/WorkloadMapper.java b/...ter-workload/src/main/java/com/linkedin/dynamometer/workloadgenerator/WorkloadMapper.java
@@ -19,14 +19,6 @@
  * should override the {@link #getInputFormat(Configuration)} method.
  */
 public abstract class WorkloadMapper<KEYIN, VALUEIN, KEYOUT, VALUEOUT> extends Mapper<KEYIN, VALUEIN, KEYOUT, VALUEOUT> {
-
-  /**
-   * Return the input class to be used by this mapper.
-   */
-  public static Class<? extends InputFormat> getInputFormat(Configuration conf) {
-    return TimedInputFormat.class;
-  }
-
   /**
    * Get the description of the behavior of this mapper.
    */
@@ -44,9 +36,11 @@ public static Class<? extends InputFormat> getInputFormat(Configuration conf) {
   public abstract boolean verifyConfigurations(Configuration conf);
 
   /**
-   * Get the associated Reducer class to run on the outputted kv pairs.
+   * Setup input and output formats and optional reducer.
    */
   public void configureJob(Job job) {
+    job.setInputFormatClass(TimedInputFormat.class);
+
     job.setNumReduceTasks(0);
     job.setOutputKeyClass(NullWritable.class);
     job.setOutputValueClass(NullWritable.class);

diff --git a/...kload/src/test/java/com/linkedin/dynamometer/workloadgenerator/TestWorkloadGenerator.java b/...kload/src/test/java/com/linkedin/dynamometer/workloadgenerator/TestWorkloadGenerator.java
@@ -4,12 +4,11 @@
  */
 package com.linkedin.dynamometer.workloadgenerator;
 
-import java.io.IOException;
-
 import com.linkedin.dynamometer.workloadgenerator.audit.AuditCommandParser;
 import com.linkedin.dynamometer.workloadgenerator.audit.AuditLogDirectParser;
 import com.linkedin.dynamometer.workloadgenerator.audit.AuditLogHiveTableParser;
 import com.linkedin.dynamometer.workloadgenerator.audit.AuditReplayMapper;
+import java.io.IOException;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.conf.Configured;
 import org.apache.hadoop.fs.CommonConfigurationKeysPublic;