[parquet-mr] branch master updated: PARQUET-1414: Simplify next row count check calculation (#537)

[blue]

This is an automated email from the ASF dual-hosted git repository.

blue pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/parquet-mr.git


The following commit(s) were added to refs/heads/master by this push:
     new 7f561b6  PARQUET-1414: Simplify next row count check calculation (#537)
7f561b6 is described below

commit 7f561b6053e6808b5b2c2482d1aa61c22c7a90cc
Author: Gabor Szadovszky <ga...@apache.org>
AuthorDate: Thu Nov 8 18:23:32 2018 +0100

    PARQUET-1414: Simplify next row count check calculation (#537)
---
 .../main/java/org/apache/parquet/column/impl/ColumnWriteStoreBase.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/parquet-column/src/main/java/org/apache/parquet/column/impl/ColumnWriteStoreBase.java
 
b/parquet-column/src/main/java/org/apache/parquet/column/impl/ColumnWriteStoreBase.java
index f79c09d..ac9aaca 100644
--- 
a/parquet-column/src/main/java/org/apache/parquet/column/impl/ColumnWriteStoreBase.java
+++ 
b/parquet-column/src/main/java/org/apache/parquet/column/impl/ColumnWriteStoreBase.java
@@ -200,7 +200,7 @@ abstract class ColumnWriteStoreBase implements 
ColumnWriteStore {
         writer.writePage();
         remainingMem = props.getPageSizeThreshold();
       } else {
-        rowCountForNextRowCountCheck = min(rowCountForNextRowCountCheck, 
rowCount + (pageRowCountLimit - rows));
+        rowCountForNextRowCountCheck = min(rowCountForNextRowCountCheck, 
writer.getRowsWrittenSoFar() + pageRowCountLimit);
       }
       long rowsToFillPage =
           usedMem == 0 ?