You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mnemonic.apache.org by ga...@apache.org on 2019/03/03 18:08:19 UTC
[mnemonic] branch master updated: MNEMONIC-520: Fix formatting for
Hadoop module
This is an automated email from the ASF dual-hosted git repository.
garyw pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mnemonic.git
The following commit(s) were added to refs/heads/master by this push:
new d11afe6 MNEMONIC-520: Fix formatting for Hadoop module
d11afe6 is described below
commit d11afe6efe0fa21bc1abfe53b3478fdf7f044f66
Author: Kevin Ratnasekera <dj...@yahoo.com>
AuthorDate: Mon Feb 25 20:56:32 2019 +0530
MNEMONIC-520: Fix formatting for Hadoop module
---
.../mnemonic/hadoop/mapred/MneInputFormat.java | 21 +++---
.../hadoop/mapred/MneMapredRecordReader.java | 88 +++++++++++-----------
.../hadoop/mapred/MneMapredRecordWriter.java | 20 +++--
.../mnemonic/hadoop/mapred/MneOutputFormat.java | 20 +++--
.../mnemonic/hadoop/mapreduce/MneInputFormat.java | 9 +--
.../hadoop/mapreduce/MneMapreduceRecordReader.java | 9 +--
.../hadoop/mapreduce/MneMapreduceRecordWriter.java | 6 +-
.../mnemonic/hadoop/mapreduce/MneOutputFormat.java | 3 +-
8 files changed, 82 insertions(+), 94 deletions(-)
diff --git a/mnemonic-hadoop/mnemonic-hadoop-mapreduce/src/main/java/org/apache/mnemonic/hadoop/mapred/MneInputFormat.java b/mnemonic-hadoop/mnemonic-hadoop-mapreduce/src/main/java/org/apache/mnemonic/hadoop/mapred/MneInputFormat.java
index 61ed385..0432cc7 100644
--- a/mnemonic-hadoop/mnemonic-hadoop-mapreduce/src/main/java/org/apache/mnemonic/hadoop/mapred/MneInputFormat.java
+++ b/mnemonic-hadoop/mnemonic-hadoop-mapreduce/src/main/java/org/apache/mnemonic/hadoop/mapred/MneInputFormat.java
@@ -32,19 +32,16 @@ import org.apache.mnemonic.hadoop.MneDurableInputValue;
/**
* A Mnemonic input format that satisfies the org.apache.hadoop.mapred API.
*/
+public class MneInputFormat<MV extends MneDurableInputValue<V>, V> extends FileInputFormat<NullWritable, MV> {
-public class MneInputFormat<MV extends MneDurableInputValue<V>, V>
- extends FileInputFormat<NullWritable, MV> {
-
- @Override
- public RecordReader<NullWritable, MV>
- getRecordReader(InputSplit inputSpilt,
- JobConf jobConf,
- Reporter reporter
- ) throws IOException {
- MneMapredRecordReader<MV, V> reader =
+ @Override
+ public RecordReader<NullWritable, MV>
+ getRecordReader(InputSplit inputSpilt,
+ JobConf jobConf,
+ Reporter reporter) throws IOException {
+ MneMapredRecordReader<MV, V> reader =
new MneMapredRecordReader<MV, V>((FileSplit) inputSpilt, jobConf);
- return reader;
- }
+ return reader;
+ }
}
diff --git a/mnemonic-hadoop/mnemonic-hadoop-mapreduce/src/main/java/org/apache/mnemonic/hadoop/mapred/MneMapredRecordReader.java b/mnemonic-hadoop/mnemonic-hadoop-mapreduce/src/main/java/org/apache/mnemonic/hadoop/mapred/MneMapredRecordReader.java
index 27d8044..c623cfc 100644
--- a/mnemonic-hadoop/mnemonic-hadoop-mapreduce/src/main/java/org/apache/mnemonic/hadoop/mapred/MneMapredRecordReader.java
+++ b/mnemonic-hadoop/mnemonic-hadoop-mapreduce/src/main/java/org/apache/mnemonic/hadoop/mapred/MneMapredRecordReader.java
@@ -32,61 +32,59 @@ import org.apache.mnemonic.hadoop.MneDurableInputValue;
/**
* This record reader implements the org.apache.hadoop.mapred API.
*
- * @param <V>
- * the type of the data item
+ * @param <V> the type of the data item
*/
-
public class MneMapredRecordReader<MV extends MneDurableInputValue<V>, V>
- implements org.apache.hadoop.mapred.RecordReader<NullWritable, MV> {
-
- protected CloseableIterator<V> m_iter;
- protected MneDurableInputSession<V> m_session;
- protected FileSplit m_fileSplit;
+ implements org.apache.hadoop.mapred.RecordReader<NullWritable, MV> {
+
+ protected CloseableIterator<V> m_iter;
+ protected MneDurableInputSession<V> m_session;
+ protected FileSplit m_fileSplit;
+
-
- public MneMapredRecordReader(FileSplit fileSplit, JobConf conf) throws IOException {
- m_fileSplit = fileSplit;
- m_session = new MneDurableInputSession<V>(null, conf,
+ public MneMapredRecordReader(FileSplit fileSplit, JobConf conf) throws IOException {
+ m_fileSplit = fileSplit;
+ m_session = new MneDurableInputSession<V>(null, conf,
new Path[]{m_fileSplit.getPath()}, MneConfigHelper.DEFAULT_INPUT_CONFIG_PREFIX);
- m_iter = m_session.iterator();
- }
-
- @Override
- public boolean next(NullWritable key, MV value) throws IOException {
- boolean ret = false;
- if (m_iter.hasNext()) {
- value.of(m_iter.next());
- ret = true;
- }
- return ret;
- }
+ m_iter = m_session.iterator();
+ }
- @Override
- public NullWritable createKey() {
- return NullWritable.get();
+ @Override
+ public boolean next(NullWritable key, MV value) throws IOException {
+ boolean ret = false;
+ if (m_iter.hasNext()) {
+ value.of(m_iter.next());
+ ret = true;
}
+ return ret;
+ }
- @SuppressWarnings("unchecked")
- @Override
- public MV createValue() {
- return (MV) new MneDurableInputValue<V>(m_session);
- }
+ @Override
+ public NullWritable createKey() {
+ return NullWritable.get();
+ }
- @Override
- public long getPos() throws IOException {
- return m_fileSplit.getLength();
- }
+ @SuppressWarnings("unchecked")
+ @Override
+ public MV createValue() {
+ return (MV) new MneDurableInputValue<V>(m_session);
+ }
- @Override
- public void close() throws IOException {
- if (null != m_iter) {
- m_iter.close();
- }
- }
+ @Override
+ public long getPos() throws IOException {
+ return m_fileSplit.getLength();
+ }
- @Override
- public float getProgress() throws IOException {
- return 0.5f; /* TBD */
+ @Override
+ public void close() throws IOException {
+ if (null != m_iter) {
+ m_iter.close();
}
+ }
+
+ @Override
+ public float getProgress() throws IOException {
+ return 0.5f; /* TBD */
+ }
}
diff --git a/mnemonic-hadoop/mnemonic-hadoop-mapreduce/src/main/java/org/apache/mnemonic/hadoop/mapred/MneMapredRecordWriter.java b/mnemonic-hadoop/mnemonic-hadoop-mapreduce/src/main/java/org/apache/mnemonic/hadoop/mapred/MneMapredRecordWriter.java
index d5fd721..d01116f 100644
--- a/mnemonic-hadoop/mnemonic-hadoop-mapreduce/src/main/java/org/apache/mnemonic/hadoop/mapred/MneMapredRecordWriter.java
+++ b/mnemonic-hadoop/mnemonic-hadoop-mapreduce/src/main/java/org/apache/mnemonic/hadoop/mapred/MneMapredRecordWriter.java
@@ -28,21 +28,19 @@ import org.apache.mnemonic.hadoop.MneDurableOutputValue;
/**
* This record writer implements the org.apache.hadoop.mapred API.
*
- * @param <MV>
- * the type of the item of value
+ * @param <MV> the type of the item of value
*/
public class MneMapredRecordWriter<MV extends MneDurableOutputValue<?>>
- implements RecordWriter<NullWritable, MV> {
-
+ implements RecordWriter<NullWritable, MV> {
- @Override
- public void write(NullWritable key, MV value) throws IOException {
- value.post();
- }
+ @Override
+ public void write(NullWritable key, MV value) throws IOException {
+ value.post();
+ }
- @Override
- public void close(Reporter reporter) throws IOException {
- }
+ @Override
+ public void close(Reporter reporter) throws IOException {
+ }
}
diff --git a/mnemonic-hadoop/mnemonic-hadoop-mapreduce/src/main/java/org/apache/mnemonic/hadoop/mapred/MneOutputFormat.java b/mnemonic-hadoop/mnemonic-hadoop-mapreduce/src/main/java/org/apache/mnemonic/hadoop/mapred/MneOutputFormat.java
index be0b997..3d1606a 100644
--- a/mnemonic-hadoop/mnemonic-hadoop-mapreduce/src/main/java/org/apache/mnemonic/hadoop/mapred/MneOutputFormat.java
+++ b/mnemonic-hadoop/mnemonic-hadoop-mapreduce/src/main/java/org/apache/mnemonic/hadoop/mapred/MneOutputFormat.java
@@ -30,16 +30,14 @@ import org.apache.mnemonic.hadoop.MneDurableOutputValue;
/**
* A Mnemonic output format that satisfies the org.apache.hadoop.mapred API.
+ *
*/
-
-public class MneOutputFormat<MV extends MneDurableOutputValue<?>> extends FileOutputFormat<NullWritable, MV> {
-
- @Override
- public RecordWriter<NullWritable, MV> getRecordWriter(FileSystem ignored, JobConf job, String name,
- Progressable progress) throws IOException {
- return new MneMapredRecordWriter<MV>();
- }
-
-
-
+public class MneOutputFormat<MV extends MneDurableOutputValue<?>>
+ extends FileOutputFormat<NullWritable, MV> {
+
+ @Override
+ public RecordWriter<NullWritable, MV> getRecordWriter(FileSystem ignored, JobConf job, String name,
+ Progressable progress) throws IOException {
+ return new MneMapredRecordWriter<MV>();
+ }
}
diff --git a/mnemonic-hadoop/mnemonic-hadoop-mapreduce/src/main/java/org/apache/mnemonic/hadoop/mapreduce/MneInputFormat.java b/mnemonic-hadoop/mnemonic-hadoop-mapreduce/src/main/java/org/apache/mnemonic/hadoop/mapreduce/MneInputFormat.java
index ebfa44a..3a9fe8d 100644
--- a/mnemonic-hadoop/mnemonic-hadoop-mapreduce/src/main/java/org/apache/mnemonic/hadoop/mapreduce/MneInputFormat.java
+++ b/mnemonic-hadoop/mnemonic-hadoop-mapreduce/src/main/java/org/apache/mnemonic/hadoop/mapreduce/MneInputFormat.java
@@ -33,8 +33,7 @@ import org.apache.hadoop.io.NullWritable;
/**
* A Mnemonic input format that satisfies the org.apache.hadoop.mapreduce API.
*/
-public class MneInputFormat<MV extends MneDurableInputValue<V>, V>
- extends FileInputFormat<NullWritable, MV> {
+public class MneInputFormat<MV extends MneDurableInputValue<V>, V> extends FileInputFormat<NullWritable, MV> {
@Override
protected boolean isSplitable(JobContext context, Path filename) {
@@ -42,10 +41,8 @@ public class MneInputFormat<MV extends MneDurableInputValue<V>, V>
}
@Override
- public RecordReader<NullWritable, MV>
- createRecordReader(InputSplit inputSplit,
- TaskAttemptContext taskAttemptContext
- ) throws IOException, InterruptedException {
+ public RecordReader<NullWritable, MV> createRecordReader(InputSplit inputSplit,
+ TaskAttemptContext taskAttemptContext) throws IOException, InterruptedException {
MneMapreduceRecordReader<MV, V> reader = new MneMapreduceRecordReader<MV, V>();
reader.initialize(inputSplit, taskAttemptContext);
return reader;
diff --git a/mnemonic-hadoop/mnemonic-hadoop-mapreduce/src/main/java/org/apache/mnemonic/hadoop/mapreduce/MneMapreduceRecordReader.java b/mnemonic-hadoop/mnemonic-hadoop-mapreduce/src/main/java/org/apache/mnemonic/hadoop/mapreduce/MneMapreduceRecordReader.java
index dc0a76d..4db789b 100644
--- a/mnemonic-hadoop/mnemonic-hadoop-mapreduce/src/main/java/org/apache/mnemonic/hadoop/mapreduce/MneMapreduceRecordReader.java
+++ b/mnemonic-hadoop/mnemonic-hadoop-mapreduce/src/main/java/org/apache/mnemonic/hadoop/mapreduce/MneMapreduceRecordReader.java
@@ -32,11 +32,10 @@ import org.apache.mnemonic.hadoop.MneDurableInputValue;
/**
* This record reader implements the org.apache.hadoop.mapreduce API.
*
- * @param <V>
- * the type of the data item
+ * @param <V> the type of the data item
*/
public class MneMapreduceRecordReader<MV extends MneDurableInputValue<V>, V>
- extends org.apache.hadoop.mapreduce.RecordReader<NullWritable, MV> {
+ extends org.apache.hadoop.mapreduce.RecordReader<NullWritable, MV> {
protected CloseableIterator<V> m_iter;
protected MneDurableInputSession<V> m_session;
@@ -51,8 +50,8 @@ public class MneMapreduceRecordReader<MV extends MneDurableInputValue<V>, V>
@Override
public void initialize(InputSplit inputSplit, TaskAttemptContext context) {
FileSplit split = (FileSplit) inputSplit;
- m_session = new MneDurableInputSession<V>(context, null,
- new Path[]{split.getPath()}, MneConfigHelper.DEFAULT_INPUT_CONFIG_PREFIX);
+ m_session = new MneDurableInputSession<V>(context, null, new Path[]{split.getPath()},
+ MneConfigHelper.DEFAULT_INPUT_CONFIG_PREFIX);
m_iter = m_session.iterator();
}
diff --git a/mnemonic-hadoop/mnemonic-hadoop-mapreduce/src/main/java/org/apache/mnemonic/hadoop/mapreduce/MneMapreduceRecordWriter.java b/mnemonic-hadoop/mnemonic-hadoop-mapreduce/src/main/java/org/apache/mnemonic/hadoop/mapreduce/MneMapreduceRecordWriter.java
index 00202a2..1226083 100644
--- a/mnemonic-hadoop/mnemonic-hadoop-mapreduce/src/main/java/org/apache/mnemonic/hadoop/mapreduce/MneMapreduceRecordWriter.java
+++ b/mnemonic-hadoop/mnemonic-hadoop-mapreduce/src/main/java/org/apache/mnemonic/hadoop/mapreduce/MneMapreduceRecordWriter.java
@@ -28,10 +28,10 @@ import org.apache.mnemonic.hadoop.MneDurableOutputValue;
/**
* This record writer implements the org.apache.hadoop.mapreduce API.
*
- * @param <MV>
- * the type of the item of value
+ * @param <MV> the type of the item of value
*/
-public class MneMapreduceRecordWriter<MV extends MneDurableOutputValue<?>> extends RecordWriter<NullWritable, MV> {
+public class MneMapreduceRecordWriter<MV extends MneDurableOutputValue<?>>
+ extends RecordWriter<NullWritable, MV> {
@Override
public void write(NullWritable nullWritable, MV mdvalue) throws IOException {
diff --git a/mnemonic-hadoop/mnemonic-hadoop-mapreduce/src/main/java/org/apache/mnemonic/hadoop/mapreduce/MneOutputFormat.java b/mnemonic-hadoop/mnemonic-hadoop-mapreduce/src/main/java/org/apache/mnemonic/hadoop/mapreduce/MneOutputFormat.java
index 34decbe..28dc6cb 100644
--- a/mnemonic-hadoop/mnemonic-hadoop-mapreduce/src/main/java/org/apache/mnemonic/hadoop/mapreduce/MneOutputFormat.java
+++ b/mnemonic-hadoop/mnemonic-hadoop-mapreduce/src/main/java/org/apache/mnemonic/hadoop/mapreduce/MneOutputFormat.java
@@ -29,7 +29,8 @@ import org.apache.mnemonic.hadoop.MneDurableOutputValue;
/**
* A Mnemonic output format that satisfies the org.apache.hadoop.mapreduce API.
*/
-public class MneOutputFormat<MV extends MneDurableOutputValue<?>> extends FileOutputFormat<NullWritable, MV> {
+public class MneOutputFormat<MV extends MneDurableOutputValue<?>>
+ extends FileOutputFormat<NullWritable, MV> {
@Override
public RecordWriter<NullWritable, MV> getRecordWriter(TaskAttemptContext taskAttemptContext) throws IOException {