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 <[email protected]> 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 <[email protected]> Authored: Thu Jan 7 10:48:02 2016 -0600 Committer: Sergio Pena <[email protected]> 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());
