Merge remote-tracking branch 'remotes/origin/sprint-1' into ignite-42
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/5f6156e3 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/5f6156e3 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/5f6156e3 Branch: refs/heads/ignite-107 Commit: 5f6156e38a1de3ef192920554776364007285055 Parents: 738c67f 2860388 Author: sboikov <sboi...@gridgain.com> Authored: Tue Jan 20 14:22:31 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Tue Jan 20 14:22:31 2015 +0300 ---------------------------------------------------------------------- .../main/java/org/apache/ignite/CacheLock.java | 61 +++++++ .../java/org/apache/ignite/IgniteCache.java | 23 ++- .../processors/cache/CacheLockAsyncImpl.java | 141 +++++++++++++++ .../processors/cache/CacheLockImpl.java | 176 +++++++++++++++++++ .../processors/cache/IgniteCacheProxy.java | 75 +------- .../processors/cache/GridCacheAdapter.java | 20 ++- .../cache/GridCacheAbstractFullApiSelfTest.java | 55 +++--- .../cache/GridCacheBasicApiAbstractTest.java | 80 +++++++++ .../GridCacheMultiNodeLockAbstractTest.java | 58 +++--- .../dht/GridCacheColocatedDebugTest.java | 16 +- .../near/GridCachePartitionedLockSelfTest.java | 15 +- .../GridCacheLocalMultithreadedSelfTest.java | 47 +++-- 12 files changed, 607 insertions(+), 160 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5f6156e3/modules/core/src/main/java/org/apache/ignite/IgniteCache.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5f6156e3/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5f6156e3/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheAdapter.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5f6156e3/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractFullApiSelfTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5f6156e3/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCacheColocatedDebugTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5f6156e3/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCachePartitionedLockSelfTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5f6156e3/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/local/GridCacheLocalMultithreadedSelfTest.java ---------------------------------------------------------------------- diff --cc modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/local/GridCacheLocalMultithreadedSelfTest.java index 1b5672f,452dc48..5e03028 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/local/GridCacheLocalMultithreadedSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/local/GridCacheLocalMultithreadedSelfTest.java @@@ -17,8 -17,8 +17,9 @@@ package org.gridgain.grid.kernal.processors.cache.local; + import com.google.common.collect.*; import org.apache.ignite.*; +import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; import org.apache.ignite.lang.*; import org.gridgain.grid.cache.*;
