Return-Path: <commits-return-808-archive-asf-public=cust-asf.ponee.io@parquet.apache.org>
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 D8B77200C0F
	for <archive-asf-public-internal@cust-asf2.ponee.io>; Thu, 19 Jan 2017 02:27:15 +0100 (CET)
Received: by cust-asf.ponee.io (Postfix)
	id D75DE160B56; Thu, 19 Jan 2017 01:27: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 D1F75160B43
	for <archive-asf-public@cust-asf.ponee.io>; Thu, 19 Jan 2017 02:27:14 +0100 (CET)
Received: (qmail 53378 invoked by uid 500); 19 Jan 2017 01:27:13 -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 52636 invoked by uid 99); 19 Jan 2017 01:27: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; Thu, 19 Jan 2017 01:27:13 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33)
	id 026ECF403D; Thu, 19 Jan 2017 01:27:13 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: blue@apache.org
To: commits@parquet.apache.org
Date: Thu, 19 Jan 2017 01:27:28 -0000
Message-Id: <652d2bfd221c4b8f9de47aa5c88b9e97@git.apache.org>
In-Reply-To: <25406da3dfe343a9a44d6bc62fd223d9@git.apache.org>
References: <25406da3dfe343a9a44d6bc62fd223d9@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [17/50] [abbrv] parquet-mr git commit: PARQUET-581: Fix two instances
 of the conflation of the min and max row
archived-at: Thu, 19 Jan 2017 01:27:16 -0000

PARQUET-581: Fix two instances of the conflation of the min and max row

count for page size check in ParquetOutputFormat.java

Author: Michael Allman <michael@videoamp.com>

Closes #340 from mallman/fix_minmax_conflation and squashes the following commits:

79331a5 [Michael Allman] PARQUET-581: Fix two instances of the conflation of the min and max row count for page size check in ParquetOutputFormat.java


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

Branch: refs/heads/parquet-1.8.x
Commit: 1c60a5666c3d82b4a4d4dfc9f0bb9ca0f7b3a194
Parents: 43d0961
Author: Michael Allman <michael@videoamp.com>
Authored: Sat Apr 16 17:23:59 2016 -0700
Committer: Ryan Blue <blue@apache.org>
Committed: Mon Jan 9 16:54:53 2017 -0800

----------------------------------------------------------------------
 .../main/java/org/apache/parquet/hadoop/ParquetOutputFormat.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/parquet-mr/blob/1c60a566/parquet-hadoop/src/main/java/org/apache/parquet/hadoop/ParquetOutputFormat.java
----------------------------------------------------------------------
diff --git a/parquet-hadoop/src/main/java/org/apache/parquet/hadoop/ParquetOutputFormat.java b/parquet-hadoop/src/main/java/org/apache/parquet/hadoop/ParquetOutputFormat.java
index 6cd4c90..e95a508 100644
--- a/parquet-hadoop/src/main/java/org/apache/parquet/hadoop/ParquetOutputFormat.java
+++ b/parquet-hadoop/src/main/java/org/apache/parquet/hadoop/ParquetOutputFormat.java
@@ -203,7 +203,7 @@ public class ParquetOutputFormat<T> extends FileOutputFormat<Void, T> {
 
   public static int getMaxRowCountForPageSizeCheck(Configuration configuration) {
     return configuration.getInt(MAX_ROW_COUNT_FOR_PAGE_SIZE_CHECK,
-        ParquetProperties.DEFAULT_MINIMUM_RECORD_COUNT_FOR_CHECK);
+        ParquetProperties.DEFAULT_MAXIMUM_RECORD_COUNT_FOR_CHECK);
   }
 
   public static boolean getEstimatePageSizeCheck(Configuration configuration) {
@@ -334,7 +334,7 @@ public class ParquetOutputFormat<T> extends FileOutputFormat<Void, T> {
     if (INFO) LOG.info("Maximum row group padding size is " + maxPaddingSize + " bytes");
     if (INFO) LOG.info("Page size checking is: " + (props.estimateNextSizeCheck() ? "estimated" : "constant"));
     if (INFO) LOG.info("Min row count for page size check is: " + props.getMinRowCountForPageSizeCheck());
-    if (INFO) LOG.info("Min row count for page size check is: " + props.getMaxRowCountForPageSizeCheck());
+    if (INFO) LOG.info("Max row count for page size check is: " + props.getMaxRowCountForPageSizeCheck());
 
     WriteContext init = writeSupport.init(conf);
     ParquetFileWriter w = new ParquetFileWriter(