You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@orc.apache.org by om...@apache.org on 2018/10/01 17:20:55 UTC
orc git commit: ORC-409: Changes for extending MemoryManagerImpl
Repository: orc
Updated Branches:
refs/heads/master 4dba1f1d9 -> 1b0829339
ORC-409: Changes for extending MemoryManagerImpl
Fixes #313
Signed-off-by: Owen O'Malley <om...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/orc/repo
Commit: http://git-wip-us.apache.org/repos/asf/orc/commit/1b082933
Tree: http://git-wip-us.apache.org/repos/asf/orc/tree/1b082933
Diff: http://git-wip-us.apache.org/repos/asf/orc/diff/1b082933
Branch: refs/heads/master
Commit: 1b0829339ee56b63258f7ef394943eec0939484f
Parents: 4dba1f1
Author: Prasanth Jayachandran <pr...@apache.org>
Authored: Thu Sep 27 17:51:57 2018 -0700
Committer: Owen O'Malley <om...@apache.org>
Committed: Mon Oct 1 10:20:33 2018 -0700
----------------------------------------------------------------------
java/core/src/java/org/apache/orc/impl/MemoryManagerImpl.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/orc/blob/1b082933/java/core/src/java/org/apache/orc/impl/MemoryManagerImpl.java
----------------------------------------------------------------------
diff --git a/java/core/src/java/org/apache/orc/impl/MemoryManagerImpl.java b/java/core/src/java/org/apache/orc/impl/MemoryManagerImpl.java
index 7f03ea9..ac589a0 100644
--- a/java/core/src/java/org/apache/orc/impl/MemoryManagerImpl.java
+++ b/java/core/src/java/org/apache/orc/impl/MemoryManagerImpl.java
@@ -201,10 +201,10 @@ public class MemoryManagerImpl implements MemoryManager {
* @param isAllocate is this an allocation?
*/
private void updateScale(boolean isAllocate) throws IOException {
- if (totalAllocation <= totalMemoryPool) {
+ if (totalAllocation <= getTotalMemoryPool()) {
currentScale = 1;
} else {
- currentScale = (double) totalMemoryPool / totalAllocation;
+ currentScale = (double) getTotalMemoryPool() / totalAllocation;
}
}
}