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/b6139f86 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/b6139f86 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/b6139f86 Branch: refs/heads/ignite-1282 Commit: b6139f86f8994dbbdd8acabedcd65b89e2b5aa92 Parents: c311c3c d64fc9d Author: vozerov-gridgain <voze...@gridgain.com> Authored: Fri Sep 18 11:44:13 2015 +0300 Committer: vozerov-gridgain <voze...@gridgain.com> Committed: Fri Sep 18 11:44:13 2015 +0300 ---------------------------------------------------------------------- .../apache/ignite/internal/IgniteKernal.java | 7 - .../processors/cache/GridCacheContext.java | 6 +- .../cache/GridCacheEvictionManager.java | 6 +- .../cache/GridCacheEvictionResponse.java | 2 +- .../processors/cache/GridCacheIoManager.java | 47 ++++--- .../processors/cache/GridCacheMessage.java | 7 + .../processors/cache/GridCacheMvccManager.java | 34 ++++- .../GridCachePartitionExchangeManager.java | 41 ++++-- .../processors/cache/GridCacheProcessor.java | 28 ++-- .../GridDistributedLockResponse.java | 6 +- .../GridDistributedTxPrepareResponse.java | 6 +- .../distributed/dht/GridDhtTopologyFuture.java | 6 +- .../dht/GridDhtTransactionalCacheAdapter.java | 2 +- .../dht/atomic/GridDhtAtomicUpdateFuture.java | 2 +- .../dht/atomic/GridDhtAtomicUpdateResponse.java | 12 +- .../dht/atomic/GridNearAtomicUpdateFuture.java | 16 ++- .../dht/atomic/GridNearAtomicUpdateRequest.java | 2 + .../atomic/GridNearAtomicUpdateResponse.java | 11 +- .../colocated/GridDhtColocatedLockFuture.java | 44 ++++-- .../dht/preloader/GridDhtForceKeysFuture.java | 2 +- .../dht/preloader/GridDhtForceKeysResponse.java | 6 +- .../GridDhtPartitionsExchangeFuture.java | 19 ++- .../distributed/near/GridNearGetResponse.java | 6 +- .../distributed/near/GridNearLockFuture.java | 26 +++- .../near/GridNearOptimisticTxPrepareFuture.java | 20 ++- .../near/GridNearTxFinishResponse.java | 6 +- .../cache/query/GridCacheQueryResponse.java | 6 +- .../continuous/CacheContinuousQueryHandler.java | 12 +- .../transactions/IgniteTxLocalAdapter.java | 4 +- .../ignite/internal/util/GridSpinBusyLock.java | 10 ++ .../IgniteCacheEntryProcessorNodeJoinTest.java | 24 +++- .../loadtests/hashmap/GridCacheTestContext.java | 4 +- .../ignite/testframework/GridTestUtils.java | 14 +- .../cache/CacheIndexStreamerTest.java | 137 +++++++++++++++++++ .../IgniteCacheQueryNodeRestartSelfTest2.java | 2 - .../ignite/visor/commands/VisorConsole.scala | 8 +- 36 files changed, 450 insertions(+), 141 deletions(-) ----------------------------------------------------------------------
