accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From e..@apache.org
Subject [5/6] git commit: ACCUMULO-2905 fix [~kturner]'s issue using a simple MultiMap
Date Thu, 07 Aug 2014 18:38:07 GMT
ACCUMULO-2905 fix [~kturner]'s issue using a simple MultiMap


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/c479e5f5
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/c479e5f5
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/c479e5f5

Branch: refs/heads/master
Commit: c479e5f55140c9e97b69614052cad85362cc8ac0
Parents: faa3fc2 e856ea6
Author: Eric C. Newton <eric.newton@gmail.com>
Authored: Thu Aug 7 14:16:02 2014 -0400
Committer: Eric C. Newton <eric.newton@gmail.com>
Committed: Thu Aug 7 14:16:02 2014 -0400

----------------------------------------------------------------------
 .../tabletserver/LargestFirstMemoryManager.java | 73 ++++++++++++++------
 1 file changed, 50 insertions(+), 23 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/c479e5f5/server/base/src/main/java/org/apache/accumulo/server/tabletserver/LargestFirstMemoryManager.java
----------------------------------------------------------------------
diff --cc server/base/src/main/java/org/apache/accumulo/server/tabletserver/LargestFirstMemoryManager.java
index d06d61e,4554afd..41a1edb
--- a/server/base/src/main/java/org/apache/accumulo/server/tabletserver/LargestFirstMemoryManager.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/tabletserver/LargestFirstMemoryManager.java
@@@ -130,9 -153,9 +154,9 @@@ public class LargestFirstMemoryManager 
      final MemoryManagementActions result = new MemoryManagementActions();
      result.tabletsToMinorCompact = new ArrayList<KeyExtent>();
      
-     TreeMap<Long,TabletInfo> largestMemTablets = new LargestMap(maxMinCs);
-     final TreeMap<Long,TabletInfo> largestIdleMemTablets = new LargestMap(maxConcurrentMincs);
+     LargestMap largestMemTablets = new LargestMap(maxMinCs);
+     final LargestMap largestIdleMemTablets = new LargestMap(maxConcurrentMincs);
 -    final long now = System.currentTimeMillis();
 +    final long now = currentTimeMillis();
      
      long ingestMemory = 0;
      long compactionMemory = 0;


Mime
View raw message