From c41b02cc0058239657263d45d969e71b14e6a589 Mon Sep 17 00:00:00 2001
From: Kai Zheng <kai.zheng@intel.com>
Date: Mon, 8 Jun 2015 20:24:17 +0800
Subject: [PATCH] HADOOP-12065 Using more meaningful keys in EC schema.
 Contributed by Kai Zheng

---
 .../hadoop-common/CHANGES-HDFS-EC-7285.txt                | 4 +++-
 .../java/org/apache/hadoop/io/erasurecode/ECSchema.java   | 4 ++--
 .../apache/hadoop/io/erasurecode/TestSchemaLoader.java    | 8 ++++----
 3 files changed, 9 insertions(+), 7 deletions(-)

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 3559436a07..505eabdbcd 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
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 fdc569ee9a..1e07d3d04f 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 @@
  * 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";
 
   /**
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 939fa9b861..50d2091889 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 void testLoadSchema() throws Exception {
     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>");