Merge branches 'ignite-sql-tests' and 'sprint-1' of
https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-sql-tests
Conflicts:
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.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/1c117842
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/1c117842
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/1c117842
Branch: refs/heads/ignite-sql-tests
Commit: 1c1178423147221d582fc94adef1805e1f024c4d
Parents: b26fac9 28f3b6a
Author: S.Vladykin <svlady...@gridgain.com>
Authored: Mon Feb 9 23:44:13 2015 +0300
Committer: S.Vladykin <svlady...@gridgain.com>
Committed: Mon Feb 9 23:44:13 2015 +0300
----------------------------------------------------------------------
.../apache/ignite/cache/CacheProjection.java | 39 +
.../ignite/internal/ClusterGroupAdapter.java | 6 +
.../apache/ignite/internal/ClusterGroupEx.java | 9 +
.../swapspace/GridSwapSpaceManager.java | 17 +
.../processors/cache/CacheEntryImpl0.java | 60 +
.../cache/CacheWeakQueryIteratorsHolder.java | 4 +-
.../processors/cache/GridCacheAdapter.java | 573 +++++++--
.../cache/GridCacheProjectionImpl.java | 31 +
.../processors/cache/GridCacheProxyImpl.java | 73 ++
.../processors/cache/GridCacheSwapManager.java | 206 ++++
.../processors/cache/IgniteCacheProxy.java | 35 +-
.../GridDistributedCacheAdapter.java | 71 +-
.../distributed/dht/GridDhtCacheAdapter.java | 80 +-
.../distributed/near/GridNearAtomicCache.java | 5 +
.../distributed/near/GridNearCacheAdapter.java | 8 +
.../processors/cache/local/GridLocalCache.java | 12 +
.../local/atomic/GridLocalAtomicCache.java | 11 +
.../offheap/GridOffHeapProcessor.java | 15 +
.../ignite/internal/util/lang/GridFunc.java | 149 +++
.../internal/util/offheap/GridOffHeapMap.java | 7 +
.../util/offheap/GridOffHeapPartitionedMap.java | 11 +
.../util/offheap/unsafe/GridUnsafeMap.java | 12 +-
.../unsafe/GridUnsafePartitionedMap.java | 10 +
.../ignite/spi/swapspace/SwapSpaceSpi.java | 11 +
.../spi/swapspace/file/FileSwapSpaceSpi.java | 27 +
.../spi/swapspace/noop/NoopSwapSpaceSpi.java | 5 +
.../cache/GridCacheAbstractFullApiSelfTest.java | 83 +-
.../IgniteCacheAtomicLocalPeekModesTest.java | 43 +
.../cache/IgniteCacheAtomicLocalPeekTest.java | 43 -
.../cache/IgniteCacheAtomicPeekModesTest.java | 49 +
.../cache/IgniteCacheAtomicPeekTest.java | 49 -
...gniteCacheAtomicReplicatedPeekModesTest.java | 32 +
.../IgniteCacheAtomicReplicatedPeekTest.java | 32 -
.../cache/IgniteCachePeekAbstractTest.java | 333 ------
.../cache/IgniteCachePeekModesAbstractTest.java | 1131 ++++++++++++++++++
.../cache/IgniteCacheTxLocalPeekModesTest.java | 43 +
.../cache/IgniteCacheTxLocalPeekTest.java | 43 -
.../cache/IgniteCacheTxPeekModesTest.java | 49 +
.../processors/cache/IgniteCacheTxPeekTest.java | 49 -
.../IgniteCacheTxReplicatedPeekModesTest.java | 32 +
.../cache/IgniteCacheTxReplicatedPeekTest.java | 32 -
...eAtomicNearOnlyMultiNodeFullApiSelfTest.java | 2 +-
...idCacheNearOnlyMultiNodeFullApiSelfTest.java | 31 +-
.../offheap/GridOffHeapMapAbstractSelfTest.java | 52 +-
.../inmemory/GridTestSwapSpaceSpi.java | 41 +
.../ignite/testsuites/IgniteCacheTestSuite.java | 12 +-
46 files changed, 2923 insertions(+), 745 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1c117842/modules/core/src/main/java/org/apache/ignite/cache/CacheProjection.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1c117842/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheWeakQueryIteratorsHolder.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1c117842/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionImpl.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1c117842/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
----------------------------------------------------------------------
