Merge branch 'ignite-1.4'
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/0a41ae57 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/0a41ae57 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/0a41ae57 Branch: refs/heads/ignite-843 Commit: 0a41ae57215e9d2d208d33f7a46653c4be43de9c Parents: 88acd31 1942d75 Author: vozerov-gridgain <voze...@gridgain.com> Authored: Tue Sep 22 17:53:41 2015 +0300 Committer: vozerov-gridgain <voze...@gridgain.com> Committed: Tue Sep 22 17:53:41 2015 +0300 ---------------------------------------------------------------------- .../apache/ignite/cache/CacheAtomicityMode.java | 17 +-- .../configuration/CacheConfiguration.java | 15 +++ .../processors/cache/GridCacheAdapter.java | 8 +- .../processors/cache/GridCacheMapEntry.java | 51 ++++---- .../processors/cache/GridCacheProcessor.java | 10 +- .../cache/GridCacheSwapEntryImpl.java | 31 ++++- .../processors/cache/GridCacheSwapManager.java | 80 ++++++++----- .../datastreamer/DataStreamerImpl.java | 2 - .../IgniteCacheEntryListenerAbstractTest.java | 65 +++++++++- .../IgniteCachePutRetryAbstractSelfTest.java | 33 ++++++ ...lientDiscoverySpiFailureTimeoutSelfTest.java | 118 ++++++++++++++++++- .../tcp/TcpClientDiscoverySpiSelfTest.java | 13 +- .../processors/query/h2/IgniteH2Indexing.java | 19 +-- .../query/h2/opt/GridH2AbstractKeyValueRow.java | 54 ++++++--- .../query/h2/opt/GridH2KeyValueRowOffheap.java | 11 +- .../query/h2/opt/GridH2RowDescriptor.java | 5 + .../processors/query/h2/opt/GridH2Table.java | 10 +- .../cache/CacheIndexStreamerTest.java | 37 ++++-- .../processors/cache/GridCacheSwapSelfTest.java | 4 +- .../IgniteCacheWithIndexingTestSuite.java | 2 + 20 files changed, 448 insertions(+), 137 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/0a41ae57/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSwapManager.java ----------------------------------------------------------------------
