You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by vk...@apache.org on 2015/04/10 09:46:48 UTC
[17/27] incubator-ignite git commit: # ignite-sprint-3 fixed tests
# 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-714
Commit: 9b03ae109400b0e0d0e52386b664758ff5a3af1d
Parents: 845787c
Author: sboikov <sb...@gridgain.com>
Authored: Fri Apr 10 09:26:27 2015 +0300
Committer: sboikov <sb...@gridgain.com>
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<List<?>> 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<Cache.Entry<CacheKey, CacheValue>> qry =
cache1.query(new SqlQuery<CacheKey, CacheValue>(CacheValue.class, "true"));