Merge branch 'ignite-946'
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/77608477 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/77608477 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/77608477 Branch: refs/heads/ignite-gg-9615-1 Commit: 776084772c06f6149d09726b2f6c3c7a08cef7bc Parents: 8ecddcc 51a9bd8 Author: nikolay_tikhonov <ntikho...@gridgain.com> Authored: Fri Aug 14 12:54:34 2015 +0300 Committer: nikolay_tikhonov <ntikho...@gridgain.com> Committed: Fri Aug 14 12:54:34 2015 +0300 ---------------------------------------------------------------------- .../org/apache/ignite/cache/CacheEntry.java | 94 ++++++++++ .../processors/cache/CacheEntryImpl.java | 20 +++ .../processors/cache/CacheEntryImpl0.java | 5 + .../processors/cache/CacheEntryImplEx.java | 83 +++++++++ .../processors/cache/CacheInvokeEntry.java | 27 ++- .../cache/CacheVersionedEntryImpl.java | 80 --------- .../processors/cache/GridCacheAdapter.java | 13 +- .../processors/cache/GridCacheEntryEx.java | 2 +- .../processors/cache/GridCacheMapEntry.java | 28 ++- .../processors/cache/GridCacheSwapManager.java | 82 +++++---- .../distributed/dht/GridDhtTxPrepareFuture.java | 2 +- .../dht/atomic/GridDhtAtomicCache.java | 3 +- .../local/atomic/GridLocalAtomicCache.java | 3 +- .../cache/transactions/IgniteTxAdapter.java | 16 +- .../cache/transactions/IgniteTxEntry.java | 16 +- .../transactions/IgniteTxLocalAdapter.java | 83 +++++++-- .../cache/version/GridCacheVersion.java | 2 +- .../cache/version/GridCacheVersionAware.java | 30 ++++ .../cache/version/GridCacheVersionManager.java | 5 +- .../clock/GridClockSyncProcessor.java | 2 +- .../resources/META-INF/classnames.properties | 3 +- .../processors/cache/GridCacheTestEntryEx.java | 2 +- .../CacheVersionedEntryAbstractTest.java | 170 +++++++++++++++++++ ...nedEntryLocalAtomicSwapDisabledSelfTest.java | 45 +++++ ...ersionedEntryLocalTransactionalSelfTest.java | 40 +++++ ...edEntryPartitionedAtomicOffHeapSelfTest.java | 35 ++++ ...VersionedEntryPartitionedAtomicSelfTest.java | 35 ++++ ...PartitionedTransactionalOffHeapSelfTest.java | 36 ++++ ...edEntryPartitionedTransactionalSelfTest.java | 35 ++++ ...nedEntryReplicatedAtomicOffHeapSelfTest.java | 35 ++++ ...eVersionedEntryReplicatedAtomicSelfTest.java | 35 ++++ ...yReplicatedTransactionalOffHeapSelfTest.java | 36 ++++ ...nedEntryReplicatedTransactionalSelfTest.java | 35 ++++ .../testsuites/IgniteCacheTestSuite4.java | 13 ++ 34 files changed, 1005 insertions(+), 146 deletions(-) ----------------------------------------------------------------------
