Return-Path: X-Original-To: apmail-hadoop-common-commits-archive@www.apache.org Delivered-To: apmail-hadoop-common-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id CC5FA1743F for ; Mon, 8 Jun 2015 04:26:59 +0000 (UTC) Received: (qmail 93239 invoked by uid 500); 8 Jun 2015 04:26:59 -0000 Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org Received: (qmail 93177 invoked by uid 500); 8 Jun 2015 04:26:59 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: common-dev@hadoop.apache.org Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 93168 invoked by uid 99); 8 Jun 2015 04:26:59 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 08 Jun 2015 04:26:59 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 2A023DFA25; Mon, 8 Jun 2015 04:26:59 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: drankye@apache.org To: common-commits@hadoop.apache.org Message-Id: <77b8bac0911e4cb38086ddce710c10d7@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: hadoop git commit: HADOOP-12065 Using more meaningful keys in EC schema. Contributed by Kai Zheng Date: Mon, 8 Jun 2015 04:26:59 +0000 (UTC) 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 Authored: Mon Jun 8 20:24:17 2015 +0800 Committer: Kai Zheng 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(""); out.println(""); out.println(" "); - out.println(" 6"); - out.println(" 3"); + out.println(" 6"); + out.println(" 3"); out.println(" RS"); out.println(" "); out.println(" "); - out.println(" 10"); - out.println(" 4"); + out.println(" 10"); + out.println(" 4"); out.println(" RS"); out.println(" "); out.println("");