Merge remote-tracking branch 'remotes/origin/ignite-58' into sprint-1
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/d58414cf Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/d58414cf Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/d58414cf Branch: refs/heads/ignite-sql-tests Commit: d58414cf493832ad4f7064d8dfe4a59de10fdd6f Parents: fc248df 625087d Author: sboikov <sboi...@gridgain.com> Authored: Thu Feb 5 12:51:34 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Thu Feb 5 12:51:34 2015 +0300 ---------------------------------------------------------------------- .../java/org/apache/ignite/IgniteCache.java | 16 +- .../org/apache/ignite/cache/CacheEntry.java | 1 + .../org/apache/ignite/cache/CachePeekMode.java | 12 +- .../apache/ignite/cache/CacheProjection.java | 7 + .../apache/ignite/cache/GridCachePeekMode.java | 85 ----- .../eviction/fifo/CacheFifoEvictionPolicy.java | 1 + .../random/CacheRandomEvictionPolicy.java | 1 + .../internal/managers/GridManagerAdapter.java | 2 +- .../processors/cache/GridCacheAdapter.java | 226 ++++++++++++- .../processors/cache/GridCacheEntryEx.java | 14 + .../processors/cache/GridCacheEntryImpl.java | 2 +- .../cache/GridCacheEvictionEntry.java | 2 +- .../cache/GridCacheFilterEvaluationEntry.java | 2 +- .../processors/cache/GridCacheMapEntry.java | 36 +- .../processors/cache/GridCachePeekMode.java | 85 +++++ .../cache/GridCacheProjectionImpl.java | 5 + .../processors/cache/GridCacheProxyImpl.java | 12 + .../processors/cache/GridCacheSwapManager.java | 48 ++- .../processors/cache/GridCacheUtils.java | 2 +- .../processors/cache/IgniteCacheProxy.java | 9 +- .../GridPartitionedCacheEntryImpl.java | 2 +- .../distributed/dht/GridDhtCacheEntryImpl.java | 2 +- .../dht/atomic/GridDhtAtomicCache.java | 3 +- .../dht/colocated/GridDhtColocatedCache.java | 2 +- .../distributed/near/GridNearCacheAdapter.java | 2 +- .../distributed/near/GridNearTxRemote.java | 2 +- .../cache/GridCacheAbstractFullApiSelfTest.java | 2 +- .../cache/GridCacheOffHeapSelfTest.java | 2 +- .../processors/cache/GridCacheTestEntryEx.java | 6 + .../cache/IgniteCacheAtomicLocalPeekTest.java | 43 +++ .../cache/IgniteCacheAtomicPeekTest.java | 49 +++ .../IgniteCacheAtomicReplicatedPeekTest.java | 32 ++ .../cache/IgniteCachePeekAbstractTest.java | 333 +++++++++++++++++++ .../cache/IgniteCacheTxLocalPeekTest.java | 43 +++ .../processors/cache/IgniteCacheTxPeekTest.java | 49 +++ .../cache/IgniteCacheTxReplicatedPeekTest.java | 32 ++ .../dht/GridCacheDhtInternalEntrySelfTest.java | 2 +- .../near/GridCacheNearMultiNodeSelfTest.java | 2 +- ...achePartitionedMultiNodeFullApiSelfTest.java | 2 +- .../cache/eviction/GridCacheMockEntry.java | 1 + .../ignite/testsuites/IgniteCacheTestSuite.java | 7 + .../processors/query/h2/IgniteH2Indexing.java | 2 +- .../cache/GridCacheOffHeapAndSwapSelfTest.java | 2 +- .../processors/cache/GridCacheSwapSelfTest.java | 2 +- 44 files changed, 1053 insertions(+), 139 deletions(-) ----------------------------------------------------------------------
