You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apex.apache.org by ti...@apache.org on 2015/11/17 21:06:06 UTC
[2/2] incubator-apex-malhar git commit: Merge branch 'MLHR-1910' into
devel-3
Merge branch 'MLHR-1910' into devel-3
Project: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/commit/1bfd2d15
Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/tree/1bfd2d15
Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/diff/1bfd2d15
Branch: refs/heads/devel-3
Commit: 1bfd2d15a1cde24ea5a5fc96034c45df258dbb1d
Parents: 7803359 17d0576
Author: Timothy Farkas <ti...@datatorrent.com>
Authored: Tue Nov 17 11:46:03 2015 -0800
Committer: Timothy Farkas <ti...@datatorrent.com>
Committed: Tue Nov 17 11:46:03 2015 -0800
----------------------------------------------------------------------
.../lib/io/block/AbstractBlockReader.java | 90 +++++++++++---------
.../lib/io/block/AbstractFSBlockReader.java | 22 ++---
.../datatorrent/lib/io/block/BlockMetadata.java | 7 +-
.../datatorrent/lib/io/block/FSSliceReader.java | 5 +-
.../datatorrent/lib/io/block/ReaderContext.java | 40 ++++-----
.../datatorrent/lib/io/block/package-info.java | 2 +-
.../lib/io/block/AbstractBlockReaderTest.java | 76 +++++++++--------
.../lib/io/block/FSLineReaderTest.java | 49 ++++++-----
.../lib/io/block/FSSliceReaderTest.java | 30 +++----
.../lib/io/block/ReadAheadLineReaderTest.java | 2 +-
.../lib/io/fs/FileSplitterBaseTest.java | 26 ++++--
.../datatorrent/lib/io/fs/FileSplitterTest.java | 54 ++++++------
12 files changed, 215 insertions(+), 188 deletions(-)
----------------------------------------------------------------------