MNEMONIC-229: Remove the call to initNextPool from user

MNEMONIC-231: Remove the explicit call to readConfig().

Author: Wang, Gang(Gary)

mnemonic-hadoop/mnemonic-hadoop-mapreduce/src/main/java/org/apache/mnemonic/hadoop/MneDurableInputSession.java

@@ -44,19 +44,28 @@ public class MneDurableInputSession<V>
   private Configuration configuration;
   private Iterator<String> m_fp_iter;
 
-  public MneDurableInputSession(TaskAttemptContext taskAttemptContext, Path path) {
-    this(taskAttemptContext.getConfiguration(), path);
-    setTaskAttemptContext(taskAttemptContext);
+  public MneDurableInputSession(TaskAttemptContext taskAttemptContext,
+      Configuration configuration, Path path, String prefix) {
+    if (null == taskAttemptContext && null == configuration) {
+      throw new ConfigurationException("Session is not configured properly");
+    }
+    if (null != taskAttemptContext) {
+      setTaskAttemptContext(taskAttemptContext);
+      setConfiguration(taskAttemptContext.getConfiguration());
+    } else {
+      setConfiguration(configuration);
+    }
+    initialize(path, prefix);
   }
 
-  public MneDurableInputSession(Configuration configuration, Path path) {
-    setConfiguration(configuration);
+  public void initialize(Path path, String prefix) {
     if (!Files.isRegularFile(Paths.get(path.toString()), LinkOption.NOFOLLOW_LINKS)) {
       throw new UnsupportedOperationException();
     }
     List<String> fpathlist = new ArrayList<String>();
     fpathlist.add(path.toString());
     m_fp_iter = fpathlist.iterator();
+    readConfig(prefix);
   }
 
   public void validateConfig() {

mnemonic-hadoop/mnemonic-hadoop-mapreduce/src/main/java/org/apache/mnemonic/hadoop/MneDurableOutputSession.java

@@ -42,14 +42,24 @@ public class MneDurableOutputSession<V>
   private TaskAttemptContext taskAttemptContext;
   private Configuration configuration;
 
-  public MneDurableOutputSession(TaskAttemptContext taskAttemptContext) {
-    this(taskAttemptContext.getConfiguration());
-    setTaskAttemptContext(taskAttemptContext);
+  public MneDurableOutputSession(TaskAttemptContext taskAttemptContext,
+      Configuration configuration, String prefix) {
+    if (null == taskAttemptContext && null == configuration) {
+      throw new ConfigurationException("Session is not configured properly");
+    }
+    if (null != taskAttemptContext) {
+      setTaskAttemptContext(taskAttemptContext);
+      setConfiguration(taskAttemptContext.getConfiguration());
+    } else {
+      setConfiguration(configuration);
+    }
+    initialize(prefix);
   }
-  
-  public MneDurableOutputSession(Configuration configuration) {
-    setConfiguration(configuration);
+
+  public void initialize(String prefix) {
     m_recordmap = new HashMap<V, DurableSinglyLinkedList<V>>();
+    readConfig(prefix);
+    initNextPool();
   }
 
   public void validateConfig() {
@@ -122,7 +132,7 @@ protected String getUniqueName(String name, String extension) {
   }
 
   @Override
-  public boolean initNextPool() {
+  protected boolean initNextPool() {
     boolean ret = false;
     if (m_act != null) {
       m_act.close();

mnemonic-hadoop/mnemonic-hadoop-mapreduce/src/main/java/org/apache/mnemonic/hadoop/mapred/MneMapredRecordReader.java

@@ -45,8 +45,8 @@ public class MneMapredRecordReader<MV extends MneDurableInputValue<V>, V>
 
     public MneMapredRecordReader(FileSplit fileSplit, JobConf conf) throws IOException {
         m_fileSplit = fileSplit;
-        m_session = new MneDurableInputSession<V>(conf, m_fileSplit.getPath());
-        m_session.readConfig(MneConfigHelper.DEFAULT_INPUT_CONFIG_PREFIX);
+        m_session = new MneDurableInputSession<V>(null, conf,
+            m_fileSplit.getPath(), MneConfigHelper.DEFAULT_INPUT_CONFIG_PREFIX);
         m_iter = m_session.iterator();
     }
 

mnemonic-hadoop/mnemonic-hadoop-mapreduce/src/main/java/org/apache/mnemonic/hadoop/mapreduce/MneMapreduceRecordReader.java

@@ -50,8 +50,8 @@ public void close() throws IOException {
   @Override
   public void initialize(InputSplit inputSplit, TaskAttemptContext context) {
     FileSplit split = (FileSplit) inputSplit;
-    m_session = new MneDurableInputSession<V>(context, split.getPath());
-    m_session.readConfig(MneConfigHelper.DEFAULT_INPUT_CONFIG_PREFIX);
+    m_session = new MneDurableInputSession<V>(context, null,
+        split.getPath(), MneConfigHelper.DEFAULT_INPUT_CONFIG_PREFIX);
     m_iter = m_session.iterator();
   }
 

mnemonic-hadoop/mnemonic-hadoop-mapreduce/src/test/java/org/apache/mnemonic/mapred/MneMapredBufferDataTest.java

@@ -132,9 +132,9 @@ protected DurableBuffer<?> genupdDurableBuffer(
   @Test(enabled = true)
   public void testWriteBufferData() throws Exception {
     NullWritable nada = NullWritable.get();
-    MneDurableOutputSession<DurableBuffer<?>> sess = new MneDurableOutputSession<DurableBuffer<?>>(m_conf);
-    sess.readConfig(MneConfigHelper.DEFAULT_OUTPUT_CONFIG_PREFIX);
-    sess.initNextPool();
+    MneDurableOutputSession<DurableBuffer<?>> sess =
+        new MneDurableOutputSession<DurableBuffer<?>>(null, m_conf,
+            MneConfigHelper.DEFAULT_OUTPUT_CONFIG_PREFIX);
     MneDurableOutputValue<DurableBuffer<?>> mdvalue =
         new MneDurableOutputValue<DurableBuffer<?>>(sess);
     OutputFormat<NullWritable, MneDurableOutputValue<DurableBuffer<?>>> outputFormat =

mnemonic-hadoop/mnemonic-hadoop-mapreduce/src/test/java/org/apache/mnemonic/mapreduce/MneMapreduceBufferDataTest.java

@@ -135,9 +135,9 @@ protected DurableBuffer<?> genupdDurableBuffer(
   @Test(enabled = true)
   public void testWriteBufferData() throws Exception {
     NullWritable nada = NullWritable.get();
-    MneDurableOutputSession<DurableBuffer<?>> sess = new MneDurableOutputSession<DurableBuffer<?>>(m_tacontext);
-    sess.readConfig(MneConfigHelper.DEFAULT_OUTPUT_CONFIG_PREFIX);
-    sess.initNextPool();
+    MneDurableOutputSession<DurableBuffer<?>> sess =
+        new MneDurableOutputSession<DurableBuffer<?>>(m_tacontext, null,
+            MneConfigHelper.DEFAULT_OUTPUT_CONFIG_PREFIX);
     MneDurableOutputValue<DurableBuffer<?>> mdvalue =
         new MneDurableOutputValue<DurableBuffer<?>>(sess);
     OutputFormat<NullWritable, MneDurableOutputValue<DurableBuffer<?>>> outputFormat =

mnemonic-hadoop/mnemonic-hadoop-mapreduce/src/test/java/org/apache/mnemonic/mapreduce/MneMapreduceChunkDataTest.java

@@ -140,9 +140,9 @@ protected DurableChunk<?> genupdDurableChunk(
   @Test(enabled = true)
   public void testWriteChunkData() throws Exception {
     NullWritable nada = NullWritable.get();
-    MneDurableOutputSession<DurableChunk<?>> sess = new MneDurableOutputSession<DurableChunk<?>>(m_tacontext);
-    sess.readConfig(MneConfigHelper.DEFAULT_OUTPUT_CONFIG_PREFIX);
-    sess.initNextPool();
+    MneDurableOutputSession<DurableChunk<?>> sess =
+        new MneDurableOutputSession<DurableChunk<?>>(m_tacontext, null,
+            MneConfigHelper.DEFAULT_OUTPUT_CONFIG_PREFIX);
     MneDurableOutputValue<DurableChunk<?>> mdvalue =
         new MneDurableOutputValue<DurableChunk<?>>(sess);
     OutputFormat<NullWritable, MneDurableOutputValue<DurableChunk<?>>> outputFormat =

mnemonic-hadoop/mnemonic-hadoop-mapreduce/src/test/java/org/apache/mnemonic/mapreduce/MneMapreduceLongDataTest.java

@@ -108,9 +108,9 @@ public void tearDown() {
   @Test(enabled = true)
   public void testWriteLongData() throws Exception {
     NullWritable nada = NullWritable.get();
-    MneDurableOutputSession<Long> sess = new MneDurableOutputSession<Long>(m_tacontext);
-    sess.readConfig(MneConfigHelper.DEFAULT_OUTPUT_CONFIG_PREFIX);
-    sess.initNextPool();
+    MneDurableOutputSession<Long> sess =
+        new MneDurableOutputSession<Long>(m_tacontext, null,
+            MneConfigHelper.DEFAULT_OUTPUT_CONFIG_PREFIX);
     MneDurableOutputValue<Long> mdvalue =
         new MneDurableOutputValue<Long>(sess);
     OutputFormat<NullWritable, MneDurableOutputValue<Long>> outputFormat =

mnemonic-hadoop/mnemonic-hadoop-mapreduce/src/test/java/org/apache/mnemonic/mapreduce/MneMapreducePersonDataTest.java

@@ -108,9 +108,9 @@ public void tearDown() {
   @Test(enabled = true)
   public void testWritePersonData() throws Exception {
     NullWritable nada = NullWritable.get();
-    MneDurableOutputSession<Person<Long>> sess = new MneDurableOutputSession<Person<Long>>(m_tacontext);
-    sess.readConfig(MneConfigHelper.DEFAULT_OUTPUT_CONFIG_PREFIX);
-    sess.initNextPool();
+    MneDurableOutputSession<Person<Long>> sess =
+        new MneDurableOutputSession<Person<Long>>(m_tacontext, null,
+            MneConfigHelper.DEFAULT_OUTPUT_CONFIG_PREFIX);
     MneDurableOutputValue<Person<Long>> mdvalue =
         new MneDurableOutputValue<Person<Long>>(sess);
     OutputFormat<NullWritable, MneDurableOutputValue<Person<Long>>> outputFormat =

mnemonic-sessions/src/main/java/org/apache/mnemonic/sessions/DurableOutputSession.java

@@ -46,6 +46,13 @@ public abstract class DurableOutputSession<V, A extends RestorableAllocator<A>>
   protected DurableSinglyLinkedList<V> m_listnode;
   protected A m_act;
 
+  /**
+   * Initialize the next pool, must be called before use
+   *
+   * @return true if success
+   */
+  protected abstract boolean initNextPool();
+
   @Override
   public A getAllocator() {
     return m_act;