Merge branches 'ignite-959-x' and 'ignite-sprint-7' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-959-x
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/8eeee9e2 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/8eeee9e2 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/8eeee9e2 Branch: refs/heads/ignite-959-x Commit: 8eeee9e29b14915fd29509fcbcf7a2aa3f8582c5 Parents: 7df4f8c a0a31e2 Author: S.Vladykin <svlady...@gridgain.com> Authored: Thu Jul 2 12:07:31 2015 -0700 Committer: S.Vladykin <svlady...@gridgain.com> Committed: Thu Jul 2 12:07:31 2015 -0700 ---------------------------------------------------------------------- .../apache/ignite/internal/IgniteKernal.java | 1 - .../managers/communication/GridIoManager.java | 124 +++++++-- .../managers/communication/GridIoMessage.java | 15 +- .../managers/communication/GridIoPolicy.java | 32 +-- .../eventstorage/GridEventStorageManager.java | 2 +- .../internal/processors/cache/CacheType.java | 8 +- .../processors/cache/GridCacheContext.java | 4 +- .../processors/cache/GridCacheIoManager.java | 12 +- .../processors/cache/GridCacheSwapManager.java | 257 ++++++++++++------- .../GridDistributedTxFinishRequest.java | 11 +- .../GridDistributedTxPrepareRequest.java | 9 +- .../GridDistributedTxRemoteAdapter.java | 3 +- .../distributed/dht/GridDhtTxFinishRequest.java | 3 +- .../cache/distributed/dht/GridDhtTxLocal.java | 3 +- .../distributed/dht/GridDhtTxLocalAdapter.java | 3 +- .../cache/distributed/dht/GridDhtTxRemote.java | 5 +- .../near/GridNearTxFinishRequest.java | 3 +- .../cache/distributed/near/GridNearTxLocal.java | 3 +- .../distributed/near/GridNearTxRemote.java | 5 +- .../cache/transactions/IgniteInternalTx.java | 3 +- .../cache/transactions/IgniteTxAdapter.java | 11 +- .../transactions/IgniteTxLocalAdapter.java | 3 +- .../internal/processors/igfs/IgfsContext.java | 5 +- .../plugin/IgnitePluginProcessor.java | 3 +- .../plugin/extensions/communication/IoPool.java | 42 +++ .../ignite/spi/discovery/tcp/ClientImpl.java | 5 +- .../ignite/spi/discovery/tcp/ServerImpl.java | 5 +- .../TcpDiscoveryMulticastIpFinder.java | 2 +- .../communication/GridIoManagerSelfTest.java | 2 +- .../cache/IgniteInternalCacheTypesTest.java | 3 +- .../GridCacheEvictionFilterSelfTest.java | 2 - .../inmemory/GridTestSwapSpaceSpi.java | 3 +- .../query/h2/opt/GridH2KeyValueRowOffheap.java | 8 +- .../processors/query/h2/opt/GridH2Table.java | 2 +- .../cache/IgniteCacheOffheapEvictQueryTest.java | 2 +- .../IgniteCacheQueryMultiThreadedSelfTest.java | 4 +- ...QueryOffheapEvictsMultiThreadedSelfTest.java | 5 - .../IgniteCacheQueryNodeRestartSelfTest2.java | 5 + modules/urideploy/pom.xml | 14 - 39 files changed, 388 insertions(+), 244 deletions(-) ----------------------------------------------------------------------
