Merge branches 'ignite-96' and 'sprint-1' of
https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-96
Conflicts:
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.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/9ff59707
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/9ff59707
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/9ff59707
Branch: refs/heads/ignite-96
Commit: 9ff5970715fa01fceddc1cb12722374c6703f2d7
Parents: 1f535d5 6a90e0f
Author: Yakov Zhdanov <yzhda...@gridgain.com>
Authored: Mon Feb 9 23:40:08 2015 +0300
Committer: Yakov Zhdanov <yzhda...@gridgain.com>
Committed: Mon Feb 9 23:40:08 2015 +0300
----------------------------------------------------------------------
.../datastructures/IgniteQueueExample.java | 2 +-
.../datastructures/IgniteSetExample.java | 2 +-
.../DataStructureRemovedException.java | 61 -------------
.../processors/cache/GridCacheAdapter.java | 8 +-
.../processors/cache/GridCacheUtils.java | 2 +-
.../datastructures/GridCacheAtomicLongImpl.java | 7 +-
.../GridCacheAtomicReferenceImpl.java | 7 +-
.../GridCacheAtomicSequenceImpl.java | 7 +-
.../GridCacheAtomicStampedImpl.java | 7 +-
.../datastructures/GridCacheQueueAdapter.java | 9 +-
.../datastructures/GridCacheSetImpl.java | 5 +-
.../datastructures/GridCacheSetProxy.java | 3 +-
.../org/apache/ignite/lang/IgniteBiTuple.java | 4 +-
.../store/jdbc/CacheJdbcPojoStoreTest.java | 22 ++---
...eJdbcStoreAbstractMultithreadedSelfTest.java | 36 ++++----
.../cache/GridCacheAbstractFullApiSelfTest.java | 91 +++++++++-----------
.../cache/GridCacheAbstractSelfTest.java | 10 ++-
...CacheAtomicReferenceApiSelfAbstractTest.java | 3 +-
...idCacheAtomicStampedApiSelfAbstractTest.java | 3 +-
.../GridCacheQueueApiSelfAbstractTest.java | 4 +-
...CacheQueueRotativeMultiNodeAbstractTest.java | 3 +-
.../GridCacheSequenceApiSelfAbstractTest.java | 3 +-
.../GridCacheSetAbstractSelfTest.java | 9 +-
.../IgniteAtomicLongApiAbstractSelfTest.java | 3 +-
...idCacheNearOnlyMultiNodeFullApiSelfTest.java | 5 ++
25 files changed, 129 insertions(+), 187 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9ff59707/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
----------------------------------------------------------------------
diff --cc
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
index 659ae40,cac914e..4c55180
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
@@@ -4949,7 -4938,7 +4949,11 @@@ public abstract class GridCacheAdapter<
* @param filter Filters to evaluate.
* @return Key set.
*/
++<<<<<<< HEAD
+ public Set<K> keySet(@Nullable IgnitePredicate<Cache.Entry<K, V>>...
filter) {
++=======
+ @Override public Set<K> keySet(@Nullable IgnitePredicate<CacheEntry<K,
V>>... filter) {
++>>>>>>> 6a90e0f772cd59b2e21d1788e68a6175d901cb67
return map.keySet(filter);
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9ff59707/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9ff59707/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9ff59707/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractSelfTest.java
----------------------------------------------------------------------
