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 6596C1754C for ; Fri, 10 Apr 2015 13:07:31 +0000 (UTC) Received: (qmail 17512 invoked by uid 500); 10 Apr 2015 13:07:04 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 17484 invoked by uid 500); 10 Apr 2015 13:07:04 -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 17475 invoked by uid 99); 10 Apr 2015 13:07:04 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 10 Apr 2015 13:07:04 +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; Fri, 10 Apr 2015 13:07:00 +0000 Received: (qmail 16336 invoked by uid 99); 10 Apr 2015 13:06:40 -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, 10 Apr 2015 13:06:40 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id D037BE04AC; Fri, 10 Apr 2015 13:06:40 +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, 10 Apr 2015 13:06:56 -0000 Message-Id: <3a55e53f55bd4e328a25534c63e582c3@git.apache.org> In-Reply-To: <5856deb7b05a4d5b826e34e5738e43e9@git.apache.org> References: <5856deb7b05a4d5b826e34e5738e43e9@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [17/50] incubator-ignite git commit: # ignite-sprint-3 fixed tests X-Virus-Checked: Checked by ClamAV on apache.org # ignite-sprint-3 fixed tests Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/9b03ae10 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/9b03ae10 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/9b03ae10 Branch: refs/heads/ignite-gg-9998 Commit: 9b03ae109400b0e0d0e52386b664758ff5a3af1d Parents: 845787c Author: sboikov Authored: Fri Apr 10 09:26:27 2015 +0300 Committer: sboikov Committed: Fri Apr 10 09:26:27 2015 +0300 ---------------------------------------------------------------------- .../configuration/IgniteConfiguration.java | 19 ------------------- ...chePartitionedQueryMultiThreadedSelfTest.java | 2 +- .../cache/IgniteCacheQueryIndexSelfTest.java | 3 ++- .../IgniteCachePartitionedQuerySelfTest.java | 5 +++-- .../IgniteCacheReplicatedQuerySelfTest.java | 7 ++++--- 5 files changed, 10 insertions(+), 26 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9b03ae10/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java b/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java index 5baa42c..4edda55 100644 --- a/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java +++ b/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java @@ -1564,25 +1564,6 @@ public class IgniteConfiguration { } /** - * Gets configuration (descriptors) for all near caches. - * - * @return Client cache configurations. - */ - public NearCacheConfiguration[] getNearCacheConfiguration() { - return nearCacheCfg; - } - - /** - * Sets configuration for all near caches. - * - * @param nearCacheCfg Near cache configurations. - */ - @SuppressWarnings({"ZeroLengthArrayAllocation"}) - public void setNearCacheConfiguration(NearCacheConfiguration... nearCacheCfg) { - this.nearCacheCfg = nearCacheCfg == null ? new NearCacheConfiguration[0] : nearCacheCfg; - } - - /** * Gets client mode flag. * * @return Client mode flag. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9b03ae10/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCachePartitionedQueryMultiThreadedSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCachePartitionedQueryMultiThreadedSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCachePartitionedQueryMultiThreadedSelfTest.java index b2b9e2e..c0e1b21 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCachePartitionedQueryMultiThreadedSelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCachePartitionedQueryMultiThreadedSelfTest.java @@ -138,7 +138,7 @@ public class IgniteCachePartitionedQueryMultiThreadedSelfTest extends GridCommon cache0.put(p3.id(), p3); cache0.put(p4.id(), p4); - assertEquals(4, cache0.localSize()); + assertEquals(4, cache0.localSize(CachePeekMode.ALL)); assert grid(0).cluster().nodes().size() == GRID_CNT; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9b03ae10/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheQueryIndexSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheQueryIndexSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheQueryIndexSelfTest.java index 9236de4..17dce37 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheQueryIndexSelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheQueryIndexSelfTest.java @@ -27,6 +27,7 @@ import javax.cache.*; import java.util.*; import static org.apache.ignite.cache.CacheMode.*; +import static org.apache.ignite.cache.CachePeekMode.*; /** * Tests for cache query index. @@ -94,7 +95,7 @@ public class IgniteCacheQueryIndexSelfTest extends GridCacheAbstractSelfTest { assert map.entrySet().size() == ENTRY_CNT : "Expected: " + ENTRY_CNT + ", but was: " + cache.size(); assert map.keySet().size() == ENTRY_CNT : "Expected: " + ENTRY_CNT + ", but was: " + cache.size(); assert map.values().size() == ENTRY_CNT : "Expected: " + ENTRY_CNT + ", but was: " + cache.size(); - assert cache.localSize() == ENTRY_CNT : "Expected: " + ENTRY_CNT + ", but was: " + cache.localSize(); + assert cache.localSize(ALL) == ENTRY_CNT : "Expected: " + ENTRY_CNT + ", but was: " + cache.localSize(); } /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9b03ae10/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCachePartitionedQuerySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCachePartitionedQuerySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCachePartitionedQuerySelfTest.java index 5ae191f..5ce8a59 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCachePartitionedQuerySelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCachePartitionedQuerySelfTest.java @@ -27,6 +27,7 @@ import javax.cache.Cache; import java.util.*; import static org.apache.ignite.cache.CacheMode.*; +import static org.apache.ignite.cache.CachePeekMode.*; /** * Tests for partitioned cache queries. @@ -60,7 +61,7 @@ public class IgniteCachePartitionedQuerySelfTest extends IgniteCacheAbstractQuer cache0.put(p3.id(), p3); cache0.put(p4.id(), p4); - assertEquals(4, cache0.localSize()); + assertEquals(4, cache0.localSize(ALL)); // Fields query QueryCursor> qry = cache0 @@ -99,7 +100,7 @@ public class IgniteCachePartitionedQuerySelfTest extends IgniteCacheAbstractQuer cache0.put(p3.id(), p3); cache0.put(p4.id(), p4); - assertEquals(4, cache0.localSize()); + assertEquals(4, cache0.localSize(ALL)); assert grid(0).cluster().nodes().size() == gridCount(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9b03ae10/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/IgniteCacheReplicatedQuerySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/IgniteCacheReplicatedQuerySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/IgniteCacheReplicatedQuerySelfTest.java index 4259cca..bcf9dbf 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/IgniteCacheReplicatedQuerySelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/IgniteCacheReplicatedQuerySelfTest.java @@ -42,6 +42,7 @@ import java.util.*; import java.util.concurrent.*; import static org.apache.ignite.cache.CacheMode.*; +import static org.apache.ignite.cache.CachePeekMode.*; import static org.apache.ignite.events.EventType.*; /** @@ -149,9 +150,9 @@ public class IgniteCacheReplicatedQuerySelfTest extends IgniteCacheAbstractQuery for (int i = 0; i < keyCnt; i++) cache1.put(new CacheKey(i), new CacheValue("val" + i)); - assertEquals(keyCnt, cache1.localSize()); - assertEquals(keyCnt, cache2.localSize()); - assertEquals(keyCnt, cache3.localSize()); + assertEquals(keyCnt, cache1.localSize(ALL)); + assertEquals(keyCnt, cache2.localSize(ALL)); + assertEquals(keyCnt, cache3.localSize(ALL)); QueryCursor> qry = cache1.query(new SqlQuery(CacheValue.class, "true"));