From commits-return-1209-archive-asf-public=cust-asf.ponee.io@parquet.apache.org Wed Jan 10 14:54:53 2018 Return-Path: X-Original-To: archive-asf-public@eu.ponee.io Delivered-To: archive-asf-public@eu.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by mx-eu-01.ponee.io (Postfix) with ESMTP id 4149E18072F for ; Wed, 10 Jan 2018 14:54:53 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 319E8160C2E; Wed, 10 Jan 2018 13:54:53 +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 7494A160C23 for ; Wed, 10 Jan 2018 14:54:52 +0100 (CET) Received: (qmail 30804 invoked by uid 500); 10 Jan 2018 13:54:51 -0000 Mailing-List: contact commits-help@parquet.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@parquet.apache.org Delivered-To: mailing list commits@parquet.apache.org Received: (qmail 30795 invoked by uid 99); 10 Jan 2018 13:54:51 -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; Wed, 10 Jan 2018 13:54:51 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 8F4BBDFCFA; Wed, 10 Jan 2018 13:54:51 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: zivanfi@apache.org To: commits@parquet.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: parquet-mr git commit: PARQUET-1185: TestBinary#testBinary unit test fails after PARQUET-1141 Date: Wed, 10 Jan 2018 13:54:51 +0000 (UTC) Repository: parquet-mr Updated Branches: refs/heads/master 2adb657ae -> 3783ca447 PARQUET-1185: TestBinary#testBinary unit test fails after PARQUET-1141 Author: Nandor Kollar Closes #444 from nandorKollar/PARQUET-1185 and squashes the following commits: 533aeb4 [Nandor Kollar] PARQUET-1185: TestBinary#testBinary unit test fails after PARQUET-1141 e75adef [Nandor Kollar] PARQUET-1185: TestBinary#testBinary unit test fails after PARQUET-1141 5e919cb [Nandor Kollar] PARQUET-1185: TestBinary#testBinary unit test fails after PARQUET-1141 Project: http://git-wip-us.apache.org/repos/asf/parquet-mr/repo Commit: http://git-wip-us.apache.org/repos/asf/parquet-mr/commit/3783ca44 Tree: http://git-wip-us.apache.org/repos/asf/parquet-mr/tree/3783ca44 Diff: http://git-wip-us.apache.org/repos/asf/parquet-mr/diff/3783ca44 Branch: refs/heads/master Commit: 3783ca4476fec8186c867e4e57084e649c318c6b Parents: 2adb657 Author: Nandor Kollar Authored: Wed Jan 10 14:54:01 2018 +0100 Committer: Zoltan Ivanfi Committed: Wed Jan 10 14:54:01 2018 +0100 ---------------------------------------------------------------------- .../test/java/org/apache/parquet/hadoop/thrift/TestBinary.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/parquet-mr/blob/3783ca44/parquet-thrift/src/test/java/org/apache/parquet/hadoop/thrift/TestBinary.java ---------------------------------------------------------------------- diff --git a/parquet-thrift/src/test/java/org/apache/parquet/hadoop/thrift/TestBinary.java b/parquet-thrift/src/test/java/org/apache/parquet/hadoop/thrift/TestBinary.java index b0d4feb..a152bba 100644 --- a/parquet-thrift/src/test/java/org/apache/parquet/hadoop/thrift/TestBinary.java +++ b/parquet-thrift/src/test/java/org/apache/parquet/hadoop/thrift/TestBinary.java @@ -81,9 +81,9 @@ public class TestBinary { private void assertSchema(ParquetMetadata parquetMetadata) { List fields = parquetMetadata.getFileMetaData().getSchema().getFields(); assertEquals(2, fields.size()); - assertEquals(Types.required(PrimitiveType.PrimitiveTypeName.BINARY).named("s"), fields.get(0)); + assertEquals(Types.required(PrimitiveType.PrimitiveTypeName.BINARY).id(1).named("s"), fields.get(0)); assertEquals(OriginalType.UTF8, fields.get(0).getOriginalType()); - assertEquals(Types.required(PrimitiveType.PrimitiveTypeName.BINARY).named("b"), fields.get(1)); + assertEquals(Types.required(PrimitiveType.PrimitiveTypeName.BINARY).id(2).named("b"), fields.get(1)); assertNull(fields.get(1).getOriginalType()); } }