Return-Path: X-Original-To: apmail-accumulo-commits-archive@www.apache.org Delivered-To: apmail-accumulo-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id D009E1118E for ; Thu, 19 Jun 2014 02:01:49 +0000 (UTC) Received: (qmail 85770 invoked by uid 500); 19 Jun 2014 02:01:49 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 85657 invoked by uid 500); 19 Jun 2014 02:01:49 -0000 Mailing-List: contact commits-help@accumulo.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@accumulo.apache.org Delivered-To: mailing list commits@accumulo.apache.org Received: (qmail 85282 invoked by uid 99); 19 Jun 2014 02:01:49 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 19 Jun 2014 02:01:49 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 3EF9098318D; Thu, 19 Jun 2014 02:01:49 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ctubbsii@apache.org To: commits@accumulo.apache.org Date: Thu, 19 Jun 2014 02:01:54 -0000 Message-Id: In-Reply-To: <34f8832fa13d4c0b95d58bc6b9efc6c8@git.apache.org> References: <34f8832fa13d4c0b95d58bc6b9efc6c8@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [06/28] git commit: ACCUMULO-2905 Remove unused constant ACCUMULO-2905 Remove unused constant Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/b304ed7f Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/b304ed7f Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/b304ed7f Branch: refs/heads/1.5.2-SNAPSHOT Commit: b304ed7f94754b76962330c252d3a43768ab9adf Parents: 31f0fa4 Author: Christopher Tubbs Authored: Wed Jun 18 21:17:47 2014 -0400 Committer: Christopher Tubbs Committed: Wed Jun 18 21:17:47 2014 -0400 ---------------------------------------------------------------------- .../accumulo/server/tabletserver/LargestFirstMemoryManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/b304ed7f/server/src/main/java/org/apache/accumulo/server/tabletserver/LargestFirstMemoryManager.java ---------------------------------------------------------------------- diff --git a/server/src/main/java/org/apache/accumulo/server/tabletserver/LargestFirstMemoryManager.java b/server/src/main/java/org/apache/accumulo/server/tabletserver/LargestFirstMemoryManager.java index 42f10ff..89d8689 100644 --- a/server/src/main/java/org/apache/accumulo/server/tabletserver/LargestFirstMemoryManager.java +++ b/server/src/main/java/org/apache/accumulo/server/tabletserver/LargestFirstMemoryManager.java @@ -39,7 +39,6 @@ public class LargestFirstMemoryManager implements MemoryManager { private static final Logger log = Logger.getLogger(LargestFirstMemoryManager.class); private static final long ZERO_TIME = System.currentTimeMillis(); - private static final int TSERV_MINC_MAXCONCURRENT_NUMWAITING_MULTIPLIER = 2; private static final double MAX_FLUSH_AT_ONCE_PERCENT = 0.20; private long maxMemory = -1; @@ -98,6 +97,7 @@ public class LargestFirstMemoryManager implements MemoryManager { this.numWaitingMultiplier = numWaitingMultiplier; } + @Override public void init(ServerConfiguration conf) { this.config = conf; maxMemory = conf.getConfiguration().getMemoryInBytes(Property.TSERV_MAXMEM);