Merge remote-tracking branch 'remotes/origin/sprint-1' into ignite-57
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/7a997ad9 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/7a997ad9 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/7a997ad9 Branch: refs/heads/ignite-61 Commit: 7a997ad9c690a78b0eca3f435ded01865f7876e5 Parents: 1b9c346 c789b6b Author: sboikov <sboi...@gridgain.com> Authored: Fri Feb 6 11:32:35 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Fri Feb 6 11:32:35 2015 +0300 ---------------------------------------------------------------------- .../MessagingPingPongListenActorExample.java | 4 ++-- .../java/org/apache/ignite/IgniteCache.java | 22 -------------------- .../java/org/apache/ignite/IgniteQueue.java | 4 ++-- .../main/java/org/apache/ignite/IgniteSet.java | 2 +- .../ignite/cache/eviction/EvictableEntry.java | 2 +- .../processors/cache/IgniteCacheProxy.java | 6 ------ .../ignite/messaging/MessagingListenActor.java | 18 ++++++++-------- .../internal/GridListenActorSelfTest.java | 11 ++++------ .../schema/load/AbstractSchemaLoaderTest.java | 4 ++-- .../jdbc/IgniteJdbcStoreAbstractBenchmark.java | 7 ++++++- 10 files changed, 27 insertions(+), 53 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7a997ad9/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java index dc62f19,b358f77..778d0b1 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java @@@ -305,13 -296,11 +305,7 @@@ public class IgniteCacheProxy<K, V> ext } /** {@inheritDoc} */ - @Override public boolean clear(Collection<? extends K> keys) { - // TODO IGNITE-1. - throw new UnsupportedOperationException(); - } - - /** {@inheritDoc} */ @Override public int size(CachePeekMode... peekModes) throws CacheException { - // TODO IGNITE-1. - if (peekModes.length != 0) - throw new UnsupportedOperationException(); - GridCacheProjectionImpl<K, V> prev = gate.enter(prj); try {
