Merge remote-tracking branch 'remotes/origin/ignite-45' into ignite-45-gridcache
Conflicts:
benchmarks/risk-analytics/src/main/java/org/gridgain/benchmarks/risk/store/GridRiskApproach1CacheStore.java
benchmarks/risk-analytics/src/test/java/org/gridgain/benchmarks/risk/store/GridRiskCacheStoreSelfTest.java
modules/compatibility/src/test/java/org/gridgain/grid/compatibility/GridCompatibilityTestsRunner.java
modules/core/src/test/java/org/gridgain/internal/processors/dr/cache/GridDrCacheFilterSelfTest.java
modules/core/src/test/java/org/gridgain/internal/processors/dr/cache/GridDrDataStreamerFailoverSelfTest.java
modules/core/src/test/java/org/gridgain/internal/processors/dr/handler/GridDrHandlerBackupQueueSelfTest.java
modules/core/src/test/java/org/gridgain/internal/processors/dr/handler/GridDrHandlerUpdateSelfTest.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/83fdf7b9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/83fdf7b9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/83fdf7b9
Branch: refs/heads/ignite-45-gridcache
Commit: 83fdf7b9919ab3f2d4b0310247cf3cba075e9c35
Parents: b478e4b
Author: ivasilinets <ivasilin...@gridgain.com>
Authored: Tue Mar 24 12:01:44 2015 +0300
Committer: ivasilinets <ivasilin...@gridgain.com>
Committed: Tue Mar 24 12:01:44 2015 +0300
----------------------------------------------------------------------
.../internal/processors/cache/CacheProjection.java | 1 -
.../datastreamer/DataStreamProcessorSelfTest.java | 8 ++++----
.../processors/cache/GridCacheSwapSelfTest.java | 14 +++++++-------
3 files changed, 11 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/83fdf7b9/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheProjection.java
----------------------------------------------------------------------
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheProjection.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheProjection.java
index 78ca980..4ffb609 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheProjection.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheProjection.java
@@ -22,7 +22,6 @@ import org.apache.ignite.cache.*;
import org.apache.ignite.cache.store.*;
import org.apache.ignite.cluster.*;
import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.processors.cache.*;
import org.apache.ignite.internal.processors.cache.query.*;
import org.apache.ignite.internal.processors.cache.transactions.*;
import org.apache.ignite.transactions.*;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/83fdf7b9/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamProcessorSelfTest.java
----------------------------------------------------------------------
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamProcessorSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamProcessorSelfTest.java
index 3e78f6b..7280592 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamProcessorSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamProcessorSelfTest.java
@@ -219,8 +219,8 @@ public class DataStreamProcessorSelfTest extends
GridCommonAbstractTest {
f1.get();
- int s2 = grid(2).jcache(null).localSize(CachePeekMode.PRIMARY);
- int s3 = grid(3).jcache(null).localSize(CachePeekMode.PRIMARY);
+ int s2 = grid(2).cache(null).localSize(CachePeekMode.PRIMARY);
+ int s3 = grid(3).cache(null).localSize(CachePeekMode.PRIMARY);
int total = threads * cnt;
assertEquals(total, s2 + s3);
@@ -256,8 +256,8 @@ public class DataStreamProcessorSelfTest extends
GridCommonAbstractTest {
f2.get();
- s2 = grid(2).jcache(null).localSize(CachePeekMode.PRIMARY);
- s3 = grid(3).jcache(null).localSize(CachePeekMode.PRIMARY);
+ s2 = grid(2).cache(null).localSize(CachePeekMode.PRIMARY);
+ s3 = grid(3).cache(null).localSize(CachePeekMode.PRIMARY);
assert s2 == 0 && s3 == 0 : "Incorrect entries count [s2=" + s2 +
", s3=" + s3 + ']';
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/83fdf7b9/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSwapSelfTest.java
----------------------------------------------------------------------
diff --git
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSwapSelfTest.java
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSwapSelfTest.java
index f4d613c..053cd6e 100644
---
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSwapSelfTest.java
+++
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSwapSelfTest.java
@@ -161,8 +161,8 @@ public class GridCacheSwapSelfTest extends
GridCommonAbstractTest {
Ignite ignite2 = startGrid(2);
- IgniteCache<Integer, Object> cache1 = ignite1.jcache(null);
- IgniteCache<Integer, Object> cache2 = ignite2.jcache(null);
+ IgniteCache<Integer, Object> cache1 = ignite1.cache(null);
+ IgniteCache<Integer, Object> cache2 = ignite2.cache(null);
Object v1 = new CacheValue(1);
@@ -288,7 +288,7 @@ public class GridCacheSwapSelfTest extends
GridCommonAbstractTest {
}
}, EVT_CACHE_OBJECT_SWAPPED, EVT_CACHE_OBJECT_UNSWAPPED,
EVT_SWAP_SPACE_DATA_EVICTED);
- IgniteCache<Integer, CacheValue> cache = grid(0).jcache(null);
+ IgniteCache<Integer, CacheValue> cache = grid(0).cache(null);
for (int i = 0; i< 20; i++) {
cache.put(i, new CacheValue(i));
@@ -346,7 +346,7 @@ public class GridCacheSwapSelfTest extends
GridCommonAbstractTest {
}
}, EVT_CACHE_OBJECT_SWAPPED, EVT_CACHE_OBJECT_UNSWAPPED);
- IgniteCache<Integer, CacheValue> cache = grid(0).jcache(null);
+ IgniteCache<Integer, CacheValue> cache = grid(0).cache(null);
populate(grid(0));
evictAll(cache);
@@ -392,7 +392,7 @@ public class GridCacheSwapSelfTest extends
GridCommonAbstractTest {
grid(0);
- IgniteCache<Integer, Integer> cache = grid(0).jcache(null);
+ IgniteCache<Integer, Integer> cache = grid(0).cache(null);
for (int i = 0; i < 100; i++) {
info("Putting: " + i);
@@ -436,9 +436,9 @@ public class GridCacheSwapSelfTest extends
GridCommonAbstractTest {
resetCounters();
for (int i = 0; i < ENTRY_CNT; i++) {
- ignite.<Integer, CacheValue>jcache(null).put(i, new CacheValue(i));
+ ignite.<Integer, CacheValue>cache(null).put(i, new CacheValue(i));
- CacheValue val = ignite.<Integer,
CacheValue>jcache(null).localPeek(i);
+ CacheValue val = ignite.<Integer,
CacheValue>cache(null).localPeek(i);
assert val != null;
assert val.value() == i;
