Return-Path: 
 <commits-return-465-apmail-parquet-commits-archive=parquet.apache.org@parquet.apache.org>
X-Original-To: apmail-parquet-commits-archive@minotaur.apache.org
Delivered-To: apmail-parquet-commits-archive@minotaur.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 31F1918A33
	for <apmail-parquet-commits-archive@minotaur.apache.org>;
 Thu,  7 Jan 2016 16:51:37 +0000 (UTC)
Received: (qmail 98450 invoked by uid 500); 7 Jan 2016 16:51:36 -0000
Delivered-To: apmail-parquet-commits-archive@parquet.apache.org
Received: (qmail 98415 invoked by uid 500); 7 Jan 2016 16:51:36 -0000
Mailing-List: contact commits-help@parquet.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@parquet.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@parquet.apache.org>
List-Post: <mailto:commits@parquet.apache.org>
List-Id: <commits.parquet.apache.org>
Reply-To: dev@parquet.apache.org
Delivered-To: mailing list commits@parquet.apache.org
Received: (qmail 98406 invoked by uid 99); 7 Jan 2016 16:51:36 -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; Thu, 07 Jan 2016 16:51:36 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at
 git1-us-west.apache.org, from userid 33)
	id B0CEEE2C82; Thu,  7 Jan 2016 16:51:36 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: spena@apache.org
To: commits@parquet.apache.org
Message-Id: <a29d484cbdd34736b90053d8973f4d82@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: parquet-mr git commit: PARQUET-413: Fix Java 8 test failure.
Date: Thu,  7 Jan 2016 16:51:36 +0000 (UTC)

Repository: parquet-mr
Updated Branches:
  refs/heads/master fbb2c9e72 -> 368588b5c


PARQUET-413: Fix Java 8 test failure.

The footer merge tests rely the order of unmergable values. This uses a
LinkedHashSet to ensure the order doesn't change.

Author: Ryan Blue <blue@apache.org>

Closes #304 from rdblue/PARQUET-413-java-8-test-failure and squashes the following commits:

57a83a8 [Ryan Blue] PARQUET-413: Fix Java 8 test failure.


Project: http://git-wip-us.apache.org/repos/asf/parquet-mr/repo
Commit: http://git-wip-us.apache.org/repos/asf/parquet-mr/commit/368588b5
Tree: http://git-wip-us.apache.org/repos/asf/parquet-mr/tree/368588b5
Diff: http://git-wip-us.apache.org/repos/asf/parquet-mr/diff/368588b5

Branch: refs/heads/master
Commit: 368588b5c5c4140f39ea8b9a8ceb3d1af0708804
Parents: fbb2c9e
Author: Ryan Blue <blue@apache.org>
Authored: Thu Jan 7 10:48:02 2016 -0600
Committer: Sergio Pena <sergio.pena@cloudera.com>
Committed: Thu Jan 7 10:48:02 2016 -0600

----------------------------------------------------------------------
 .../main/java/org/apache/parquet/hadoop/ParquetFileWriter.java    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/parquet-mr/blob/368588b5/parquet-hadoop/src/main/java/org/apache/parquet/hadoop/ParquetFileWriter.java
----------------------------------------------------------------------
diff --git a/parquet-hadoop/src/main/java/org/apache/parquet/hadoop/ParquetFileWriter.java b/parquet-hadoop/src/main/java/org/apache/parquet/hadoop/ParquetFileWriter.java
index b17b936..442d3f2 100644
--- a/parquet-hadoop/src/main/java/org/apache/parquet/hadoop/ParquetFileWriter.java
+++ b/parquet-hadoop/src/main/java/org/apache/parquet/hadoop/ParquetFileWriter.java
@@ -29,6 +29,7 @@ import java.nio.charset.Charset;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
@@ -780,7 +781,7 @@ public class ParquetFileWriter {
     for (Entry<String, String> entry : toMerge.getKeyValueMetaData().entrySet()) {
       Set<String> values = newKeyValues.get(entry.getKey());
       if (values == null) {
-        values = new HashSet<String>();
+        values = new LinkedHashSet<String>();
         newKeyValues.put(entry.getKey(), values);
       }
       values.add(entry.getValue());