Repository: parquet-mr Updated Branches: refs/heads/master e9928c94c -> d40214875
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 <[email protected]> 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/d4021487 Tree: http://git-wip-us.apache.org/repos/asf/parquet-mr/tree/d4021487 Diff: http://git-wip-us.apache.org/repos/asf/parquet-mr/diff/d4021487 Branch: refs/heads/master Commit: d4021487539b0f7758ec644f2e0d83df95c66bba Parents: e9928c9 Author: Michael Allman <[email protected]> Authored: Sat Apr 16 17:23:59 2016 -0700 Committer: Ryan Blue <[email protected]> Committed: Sat Apr 16 17:23:59 2016 -0700 ---------------------------------------------------------------------- .../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/d4021487/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 6accce1..6cfa8e9 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 @@ -252,7 +252,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) { @@ -383,7 +383,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(
