Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-264
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/44c4a605 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/44c4a605 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/44c4a605 Branch: refs/heads/ignite-264 Commit: 44c4a605e7828513f379745680d2c830f675d53a Parents: f9511af 7760847 Author: Alexey Goncharuk <agoncha...@gridgain.com> Authored: Fri Aug 14 10:01:36 2015 -0700 Committer: Alexey Goncharuk <agoncha...@gridgain.com> Committed: Fri Aug 14 10:01:36 2015 -0700 ---------------------------------------------------------------------- .../org/apache/ignite/cache/CacheEntry.java | 94 ++++++++++ .../org/apache/ignite/internal/IgnitionEx.java | 10 +- .../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/GridCacheGateway.java | 5 +- .../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 +- .../continuous/GridContinuousProcessor.java | 60 +++++-- .../ignite/internal/util/nio/GridNioServer.java | 4 +- .../ignite/spi/discovery/tcp/ServerImpl.java | 91 ++++++---- .../resources/META-INF/classnames.properties | 3 +- .../processors/cache/GridCacheTestEntryEx.java | 2 +- ...ridCacheContinuousQueryAbstractSelfTest.java | 2 +- .../IgniteCacheContinuousQueryClientTest.java | 137 +++++++++++++++ .../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 ++++ .../continuous/GridEventConsumeSelfTest.java | 4 +- .../testsuites/IgniteCacheTestSuite4.java | 13 ++ .../IgniteCacheQuerySelfTestSuite.java | 1 + .../java/org/apache/ignite/IgniteSpring.java | 8 +- scripts/git-format-patch.sh | 2 +- 45 files changed, 1268 insertions(+), 207 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/44c4a605/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/44c4a605/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxAdapter.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/44c4a605/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxEntry.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/44c4a605/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/44c4a605/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTestEntryEx.java ----------------------------------------------------------------------
