Repository: hadoop Updated Branches: refs/heads/HDFS-7285 2eee19cd1 -> c41b02cc0
HADOOP-12065 Using more meaningful keys in EC schema. Contributed by Kai Zheng Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/c41b02cc Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/c41b02cc Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/c41b02cc Branch: refs/heads/HDFS-7285 Commit: c41b02cc0058239657263d45d969e71b14e6a589 Parents: 2eee19c Author: Kai Zheng <kai.zh...@intel.com> Authored: Mon Jun 8 20:24:17 2015 +0800 Committer: Kai Zheng <kai.zh...@intel.com> Committed: Mon Jun 8 20:24:17 2015 +0800 ---------------------------------------------------------------------- hadoop-common-project/hadoop-common/CHANGES-HDFS-EC-7285.txt | 4 +++- .../main/java/org/apache/hadoop/io/erasurecode/ECSchema.java | 4 ++-- .../org/apache/hadoop/io/erasurecode/TestSchemaLoader.java | 8 ++++---- 3 files changed, 9 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/c41b02cc/hadoop-common-project/hadoop-common/CHANGES-HDFS-EC-7285.txt ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/CHANGES-HDFS-EC-7285.txt b/hadoop-common-project/hadoop-common/CHANGES-HDFS-EC-7285.txt index 3559436..505eabd 100644 --- a/hadoop-common-project/hadoop-common/CHANGES-HDFS-EC-7285.txt +++ b/hadoop-common-project/hadoop-common/CHANGES-HDFS-EC-7285.txt @@ -64,4 +64,6 @@ (Kai Zheng) HADOOP-12011. Allow to dump verbose information to ease debugging in raw erasure coders - (Kai Zheng) \ No newline at end of file + (Kai Zheng) + + HADOOP-12065. Using more meaningful keys in EC schema. (Kai Zheng) \ No newline at end of file http://git-wip-us.apache.org/repos/asf/hadoop/blob/c41b02cc/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/erasurecode/ECSchema.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/erasurecode/ECSchema.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/erasurecode/ECSchema.java index fdc569e..1e07d3d 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/erasurecode/ECSchema.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/erasurecode/ECSchema.java @@ -25,8 +25,8 @@ import java.util.Map; * Erasure coding schema to housekeeper relevant information. */ public final class ECSchema { - public static final String NUM_DATA_UNITS_KEY = "k"; - public static final String NUM_PARITY_UNITS_KEY = "m"; + public static final String NUM_DATA_UNITS_KEY = "numDataUnits"; + public static final String NUM_PARITY_UNITS_KEY = "numParityUnits"; public static final String CODEC_NAME_KEY = "codec"; /** http://git-wip-us.apache.org/repos/asf/hadoop/blob/c41b02cc/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/erasurecode/TestSchemaLoader.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/erasurecode/TestSchemaLoader.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/erasurecode/TestSchemaLoader.java index 939fa9b..50d2091 100644 --- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/erasurecode/TestSchemaLoader.java +++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/erasurecode/TestSchemaLoader.java @@ -40,13 +40,13 @@ public class TestSchemaLoader { out.println("<?xml version=\"1.0\"?>"); out.println("<schemas>"); out.println(" <schema name=\"RSk6m3\">"); - out.println(" <k>6</k>"); - out.println(" <m>3</m>"); + out.println(" <numDataUnits>6</numDataUnits>"); + out.println(" <numParityUnits>3</numParityUnits>"); out.println(" <codec>RS</codec>"); out.println(" </schema>"); out.println(" <schema name=\"RSk10m4\">"); - out.println(" <k>10</k>"); - out.println(" <m>4</m>"); + out.println(" <numDataUnits>10</numDataUnits>"); + out.println(" <numParityUnits>4</numParityUnits>"); out.println(" <codec>RS</codec>"); out.println(" </schema>"); out.println("</schemas>");