rebasing with master

Author: nsivabalan

hudi-common/src/main/java/org/apache/hudi/common/table/log/HoodieLogFormatReader.java

@@ -104,13 +104,8 @@ public boolean hasNext() {
         } else {
           this.prevReadersInOpenState.add(currentReader);
         }
-        this.currentReader =
-//<<<<<<< HEAD
-  //          new HoodieLogFileReader(fs, nextLogFile, readerSchema, bufferSize, readBlocksLazily, false,
-    //            enableInlineReading, recordKeyField);
-//=======
-            new HoodieLogFileReader(fs, nextLogFile, readerSchema, bufferSize, readBlocksLazily, false, enableInlineReading, recordKeyField);
-//>>>>>>> 6035d6452 (Removing direct fs call in HoodieLogFileReader)
+        this.currentReader = new HoodieLogFileReader(fs, nextLogFile, readerSchema, bufferSize, readBlocksLazily, false,
+            enableInlineReading, recordKeyField);
       } catch (IOException io) {
         throw new HoodieIOException("unable to initialize read with log file ", io);
       }

hudi-common/src/main/java/org/apache/hudi/common/table/log/LogReaderUtils.java

@@ -44,10 +44,10 @@
  */
 public class LogReaderUtils {
 
-  private static Schema readSchemaFromLogFileInReverse(FileSystem fs, HoodieActiveTimeline activeTimeline, Pair<String, Long> logPathFilePathSizePair)
+  private static Schema readSchemaFromLogFileInReverse(FileSystem fs, HoodieActiveTimeline activeTimeline, Pair<String, Long> logFilePathSizePairs)
       throws IOException {
     // set length for the HoodieLogFile as it will be leveraged by HoodieLogFormat.Reader with reverseReading enabled
-    Reader reader = HoodieLogFormat.newReader(fs, new HoodieLogFile(new Path(logPathFilePathSizePair.getKey()), logPathFilePathSizePair.getValue()), null, true, true);
+    Reader reader = HoodieLogFormat.newReader(fs, new HoodieLogFile(new Path(logFilePathSizePairs.getKey()), logFilePathSizePairs.getValue()), null, true, true);
     Schema writerSchema = null;
     HoodieTimeline completedTimeline = activeTimeline.getCommitsTimeline().filterCompletedInstants();
     while (reader.hasPrev()) {

hudi-common/src/main/java/org/apache/hudi/metadata/HoodieMetadataFileSystemView.java

@@ -61,7 +61,7 @@ public HoodieMetadataFileSystemView(HoodieEngineContext engineContext,
    * @throws IOException
    */
   @Override
-  public FileStatus[] listPartition(Path partitionPath) throws IOException {
+  protected FileStatus[] listPartition(Path partitionPath) throws IOException {
     return tableMetadata.getAllFilesInPartition(partitionPath);
   }