Return-Path: X-Original-To: apmail-ignite-commits-archive@minotaur.apache.org Delivered-To: apmail-ignite-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 42EC318B47 for ; Fri, 5 Jun 2015 18:01:30 +0000 (UTC) Received: (qmail 97308 invoked by uid 500); 5 Jun 2015 18:01:30 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 97278 invoked by uid 500); 5 Jun 2015 18:01:30 -0000 Mailing-List: contact commits-help@ignite.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.incubator.apache.org Delivered-To: mailing list commits@ignite.incubator.apache.org Received: (qmail 97268 invoked by uid 99); 5 Jun 2015 18:01:30 -0000 Received: from Unknown (HELO spamd1-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 05 Jun 2015 18:01:30 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd1-us-west.apache.org (ASF Mail Server at spamd1-us-west.apache.org) with ESMTP id 996AACBC2F for ; Fri, 5 Jun 2015 18:01:29 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd1-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.791 X-Spam-Level: * X-Spam-Status: No, score=1.791 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, T_RP_MATCHES_RCVD=-0.01, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-us-east.apache.org ([10.40.0.8]) by localhost (spamd1-us-west.apache.org [10.40.0.7]) (amavisd-new, port 10024) with ESMTP id 5fpebyGwzqGR for ; Fri, 5 Jun 2015 18:01:22 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-us-east.apache.org (ASF Mail Server at mx1-us-east.apache.org) with SMTP id 839EE47BD3 for ; Fri, 5 Jun 2015 18:01:13 +0000 (UTC) Received: (qmail 96442 invoked by uid 99); 5 Jun 2015 18:01:12 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 05 Jun 2015 18:01:12 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 72E65E10D1; Fri, 5 Jun 2015 18:01:12 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sboikov@apache.org To: commits@ignite.incubator.apache.org Date: Fri, 05 Jun 2015 18:01:17 -0000 Message-Id: <06debab10a0c479c8a01962f3eeb7338@git.apache.org> In-Reply-To: <072bb70e18594a1a9b8ed92e22c0ae00@git.apache.org> References: <072bb70e18594a1a9b8ed92e22c0ae00@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [06/50] incubator-ignite git commit: Merge branches 'ignite-916' and 'ignite-sprint-5' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-916 Merge branches 'ignite-916' and 'ignite-sprint-5' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-916 Conflicts: modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheP2pUnmarshallingNearErrorTest.java Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/adc7b234 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/adc7b234 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/adc7b234 Branch: refs/heads/ignite-929 Commit: adc7b234708cb53a026fcf488fa2aaa03bac02fc Parents: 859f182 Author: Yakov Zhdanov Authored: Tue Jun 2 16:23:32 2015 +0300 Committer: Yakov Zhdanov Committed: Tue Jun 2 16:23:32 2015 +0300 ---------------------------------------------------------------------- .../src/main/java/org/apache/ignite/yardstick/IgniteNode.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/adc7b234/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteNode.java ---------------------------------------------------------------------- diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteNode.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteNode.java index 2027b80..8638623 100644 --- a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteNode.java +++ b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteNode.java @@ -104,11 +104,8 @@ public class IgniteNode implements BenchmarkServer { if (args.isOffheapValues()) cc.setMemoryMode(OFFHEAP_VALUES); - else { - LruEvictionPolicy plc = new LruEvictionPolicy(); - plc.setMaxSize(50000); - cc.setEvictionPolicy(plc); - } + else + cc.setEvictionPolicy(new LruEvictionPolicy(50000)); } cc.setReadThrough(args.isStoreEnabled());