Repository: orc Updated Branches: refs/heads/branch-1.5 ade4c5bd7 -> fe34f7209
ORC-409: Changes for extending MemoryManagerImpl Fixes #313 Signed-off-by: Owen O'Malley <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/orc/repo Commit: http://git-wip-us.apache.org/repos/asf/orc/commit/fe34f720 Tree: http://git-wip-us.apache.org/repos/asf/orc/tree/fe34f720 Diff: http://git-wip-us.apache.org/repos/asf/orc/diff/fe34f720 Branch: refs/heads/branch-1.5 Commit: fe34f72092768202b68c8e05c08507af872f1787 Parents: ade4c5b Author: Prasanth Jayachandran <[email protected]> Authored: Thu Sep 27 17:51:57 2018 -0700 Committer: Owen O'Malley <[email protected]> Committed: Mon Oct 1 10:21:20 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/fe34f720/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; } } }
