You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by vo...@apache.org on 2016/04/01 10:24:52 UTC
[07/22] ignite git commit: Removed "keySet".
Removed "keySet".
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e8f4b2ff
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e8f4b2ff
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e8f4b2ff
Branch: refs/heads/ignite-2931
Commit: e8f4b2ff0a229ea12e98c18f9b5783c5c98af006
Parents: 591868a
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Thu Mar 31 17:47:19 2016 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Thu Mar 31 17:47:19 2016 +0300
----------------------------------------------------------------------
.../processors/cache/GridCacheAdapter.java | 20 ++------------------
.../distributed/near/GridNearCacheAdapter.java | 4 ++--
2 files changed, 4 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/e8f4b2ff/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
----------------------------------------------------------------------
diff --git 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
index 43deb6c..039b575 100644
--- 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
@@ -1026,12 +1026,12 @@ public abstract class GridCacheAdapter<K, V> implements IgniteInternalCache<K, V
/** {@inheritDoc} */
@Override public Set<K> keySet() {
- return keySet((CacheEntryPredicate[])null);
+ return map.keySet();
}
/** {@inheritDoc} */
@Override public Set<K> keySetx() {
- return keySetx((CacheEntryPredicate[])null);
+ return map.keySetx();
}
/** {@inheritDoc} */
@@ -4668,22 +4668,6 @@ public abstract class GridCacheAdapter<K, V> implements IgniteInternalCache<K, V
}
/**
- * @param filter Filters to evaluate.
- * @return Key set.
- */
- public Set<K> keySet(@Nullable CacheEntryPredicate... filter) {
- return map.keySet(filter);
- }
-
- /**
- * @param filter Filters to evaluate.
- * @return Key set including internal keys.
- */
- public Set<K> keySetx(@Nullable CacheEntryPredicate... filter) {
- return map.keySetx(filter);
- }
-
- /**
* @param key Key.
* @param deserializeBinary Deserialize binary flag.
* @param needVer Need version.
http://git-wip-us.apache.org/repos/asf/ignite/blob/e8f4b2ff/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheAdapter.java
index 489e37e..8483cb1 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheAdapter.java
@@ -391,8 +391,8 @@ public abstract class GridNearCacheAdapter<K, V> extends GridDistributedCacheAda
}
/** {@inheritDoc} */
- @Override public Set<K> keySet(@Nullable CacheEntryPredicate[] filter) {
- return new GridCacheKeySet<>(ctx, entrySet(filter), null);
+ @Override public Set<K> keySet() {
+ return new GridCacheKeySet<>(ctx, entrySet(), null);
}
/** {@inheritDoc} */