Merge branch 'HDFS-7285' of https://git-wip-us.apache.org/repos/asf/hadoop into HDFS-7285
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/c61c9c85 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/c61c9c85 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/c61c9c85 Branch: refs/heads/HDFS-7285 Commit: c61c9c855e7cd1d20f654c061ff16341ce2d9936 Parents: 10bfa92 2a89e1d Author: Uma Maheswara Rao G <[email protected]> Authored: Thu May 7 16:29:38 2015 +0530 Committer: Uma Maheswara Rao G <[email protected]> Committed: Thu May 7 16:29:38 2015 +0530 ---------------------------------------------------------------------- .../hadoop-common/CHANGES-HDFS-EC-7285.txt | 2 + .../hadoop/fs/CommonConfigurationKeys.java | 4 -- .../apache/hadoop/io/erasurecode/ECChunk.java | 2 +- .../erasurecode/coder/AbstractErasureCoder.java | 6 +- .../io/erasurecode/coder/RSErasureDecoder.java | 40 +------------ .../rawcoder/AbstractRawErasureCoder.java | 62 +++++++++++++++++++- .../rawcoder/AbstractRawErasureDecoder.java | 54 ++++++++++------- .../rawcoder/AbstractRawErasureEncoder.java | 52 ++++++++-------- .../erasurecode/rawcoder/RawErasureCoder.java | 8 +-- .../erasurecode/rawcoder/RawErasureDecoder.java | 24 +++++--- .../io/erasurecode/rawcoder/XORRawDecoder.java | 24 ++------ .../io/erasurecode/rawcoder/XORRawEncoder.java | 6 +- .../hadoop/io/erasurecode/TestCoderBase.java | 4 +- .../erasurecode/coder/TestRSErasureCoder.java | 6 +- 14 files changed, 155 insertions(+), 139 deletions(-) ----------------------------------------------------------------------
