Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 62699200B52 for ; Mon, 25 Jul 2016 23:20:15 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 60E4B160A7D; Mon, 25 Jul 2016 21:20:15 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id A9A24160A67 for ; Mon, 25 Jul 2016 23:20:14 +0200 (CEST) Received: (qmail 68529 invoked by uid 500); 25 Jul 2016 21:20:13 -0000 Mailing-List: contact commits-help@hive.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: hive-dev@hive.apache.org Delivered-To: mailing list commits@hive.apache.org Received: (qmail 68518 invoked by uid 99); 25 Jul 2016 21:20:13 -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, 25 Jul 2016 21:20:13 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id B8198E00A7; Mon, 25 Jul 2016 21:20:13 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: hashutosh@apache.org To: commits@hive.apache.org Message-Id: <0a0748254a194a2b802705723c580478@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: hive git commit: HIVE-14287 : Explain output: printed nested mapvalues are dependent on map entry iteration order (Zoltan Haindrich via Ashutosh Chauhan) Date: Mon, 25 Jul 2016 21:20:13 +0000 (UTC) archived-at: Mon, 25 Jul 2016 21:20:15 -0000 Repository: hive Updated Branches: refs/heads/master d8f28f0da -> 9f40c8fb9 HIVE-14287 : Explain output: printed nested mapvalues are dependent on map entry iteration order (Zoltan Haindrich via Ashutosh Chauhan) Signed-off-by: Ashutosh Chauhan Project: http://git-wip-us.apache.org/repos/asf/hive/repo Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/9f40c8fb Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/9f40c8fb Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/9f40c8fb Branch: refs/heads/master Commit: 9f40c8fb9bcf5cce44a7b496e14ba702c7fc37f9 Parents: d8f28f0 Author: Zoltan Haindrich Authored: Mon Jul 25 14:19:31 2016 -0700 Committer: Ashutosh Chauhan Committed: Mon Jul 25 14:19:31 2016 -0700 ---------------------------------------------------------------------- ql/src/java/org/apache/hadoop/hive/ql/exec/ExplainTask.java | 5 +++-- ql/src/test/org/apache/hadoop/hive/ql/exec/TestExplainTask.java | 1 - 2 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hive/blob/9f40c8fb/ql/src/java/org/apache/hadoop/hive/ql/exec/ExplainTask.java ---------------------------------------------------------------------- diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/ExplainTask.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/ExplainTask.java index 2515b2a..ad48091 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/exec/ExplainTask.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/ExplainTask.java @@ -467,12 +467,13 @@ public class ExplainTask extends Task implements Serializable { } } else if (ent.getValue() instanceof Map) { + String stringValue = getBasictypeKeyedMap((Map)ent.getValue()).toString(); if (out != null) { - out.print(ent.getValue().toString()); + out.print(stringValue); out.println(); } if (jsonOutput) { - json.put(ent.getKey().toString(), ent.getValue().toString()); + json.put(ent.getKey().toString(), stringValue); } } else if (ent.getValue() != null) { http://git-wip-us.apache.org/repos/asf/hive/blob/9f40c8fb/ql/src/test/org/apache/hadoop/hive/ql/exec/TestExplainTask.java ---------------------------------------------------------------------- diff --git a/ql/src/test/org/apache/hadoop/hive/ql/exec/TestExplainTask.java b/ql/src/test/org/apache/hadoop/hive/ql/exec/TestExplainTask.java index 1da32fc..990d80c 100644 --- a/ql/src/test/org/apache/hadoop/hive/ql/exec/TestExplainTask.java +++ b/ql/src/test/org/apache/hadoop/hive/ql/exec/TestExplainTask.java @@ -101,7 +101,6 @@ public class TestExplainTask { assertEquals("both maps should be sorted the same way", result1, result2); } - @Ignore("HIVE-14287 will fix this later") @Test public void testExplainDoesSortMapValues() throws Exception { LinkedHashMap explainMap1Val = new LinkedHashMap<>();