parquet-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jul...@apache.org
Subject git commit: PARQUET-66: Upcast blockSize to long to prevent integer overflow.
Date Wed, 20 Aug 2014 21:10:06 GMT
Repository: incubator-parquet-mr
Updated Branches:
  refs/heads/master 792b1490d -> 84ebe4c82


PARQUET-66: Upcast blockSize to long to prevent integer overflow.

Author: Eric Snyder <snyderep@gmail.com>

Closes #33 from snyderep/master and squashes the following commits:

c99802e [Eric Snyder] PARQUET-66: Upcast blockSize to long to prevent integer overflow.


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

Branch: refs/heads/master
Commit: 84ebe4c82405895706552ccf1becf6647886663f
Parents: 792b149
Author: Eric Snyder <snyderep@gmail.com>
Authored: Wed Aug 20 14:09:38 2014 -0700
Committer: julien <julien@twitter.com>
Committed: Wed Aug 20 14:09:38 2014 -0700

----------------------------------------------------------------------
 .../src/main/java/parquet/hadoop/InternalParquetRecordWriter.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-parquet-mr/blob/84ebe4c8/parquet-hadoop/src/main/java/parquet/hadoop/InternalParquetRecordWriter.java
----------------------------------------------------------------------
diff --git a/parquet-hadoop/src/main/java/parquet/hadoop/InternalParquetRecordWriter.java
b/parquet-hadoop/src/main/java/parquet/hadoop/InternalParquetRecordWriter.java
index 2c8da81..727d21d 100644
--- a/parquet-hadoop/src/main/java/parquet/hadoop/InternalParquetRecordWriter.java
+++ b/parquet-hadoop/src/main/java/parquet/hadoop/InternalParquetRecordWriter.java
@@ -144,7 +144,7 @@ class InternalParquetRecordWriter<T> {
   private void flushStore()
       throws IOException {
     LOG.info(format("Flushing mem store to file. allocated memory: %,d", store.allocatedSize()));
-    if (store.allocatedSize() > 3 * blockSize) {
+    if (store.allocatedSize() > 3 * (long) blockSize) {
       LOG.warn("Too much memory used: " + store.memUsageString());
     }
     w.startBlock(recordCount);


Mime
View raw message