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 7630510E99 for ; Tue, 3 Mar 2015 21:38:47 +0000 (UTC) Received: (qmail 9748 invoked by uid 500); 3 Mar 2015 21:38:47 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 9713 invoked by uid 500); 3 Mar 2015 21:38:47 -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 9704 invoked by uid 99); 3 Mar 2015 21:38:47 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 03 Mar 2015 21:38:47 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED,T_RP_MATCHES_RCVD X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO mail.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with SMTP; Tue, 03 Mar 2015 21:38:24 +0000 Received: (qmail 9376 invoked by uid 99); 3 Mar 2015 21:38:21 -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; Tue, 03 Mar 2015 21:38:21 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id AE431E1026; Tue, 3 Mar 2015 21:38:21 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sergi@apache.org To: commits@ignite.incubator.apache.org Date: Tue, 03 Mar 2015 21:38:31 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [11/50] incubator-ignite git commit: #ignite-237: return to Visor excludeNeighbors attribute. X-Virus-Checked: Checked by ClamAV on apache.org #ignite-237: return to Visor excludeNeighbors attribute. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/414410be Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/414410be Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/414410be Branch: refs/heads/ignite-sql-tests Commit: 414410bea39a7d8bdc46b1b63c5f506ec96d653e Parents: 936b879 Author: ivasilinets Authored: Fri Feb 27 18:34:08 2015 +0300 Committer: ivasilinets Committed: Fri Feb 27 18:34:08 2015 +0300 ---------------------------------------------------------------------- .../visor/cache/VisorCacheAffinityConfiguration.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/414410be/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheAffinityConfiguration.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheAffinityConfiguration.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheAffinityConfiguration.java index c43dc1c..47a2cf4 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheAffinityConfiguration.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheAffinityConfiguration.java @@ -18,6 +18,7 @@ package org.apache.ignite.internal.visor.cache; import org.apache.ignite.cache.affinity.*; +import org.apache.ignite.cache.affinity.rendezvous.*; import org.apache.ignite.configuration.*; import org.apache.ignite.internal.util.typedef.internal.*; import org.jetbrains.annotations.*; @@ -58,15 +59,19 @@ public class VisorCacheAffinityConfiguration implements Serializable { public static VisorCacheAffinityConfiguration from(CacheConfiguration ccfg) { CacheAffinityFunction aff = ccfg.getAffinity(); - Integer dfltReplicas = null; Boolean excludeNeighbors = null; + if (aff instanceof CacheRendezvousAffinityFunction) { + CacheRendezvousAffinityFunction hashAffFunc = (CacheRendezvousAffinityFunction)aff; + + excludeNeighbors = hashAffFunc.isExcludeNeighbors(); + } + VisorCacheAffinityConfiguration cfg = new VisorCacheAffinityConfiguration(); cfg.function(compactClass(aff)); cfg.mapper(compactClass(ccfg.getAffinityMapper())); cfg.partitionedBackups(ccfg.getBackups()); - cfg.defaultReplicas(dfltReplicas); cfg.excludeNeighbors(excludeNeighbors); return cfg;