Merge branch 'ignite-1.5' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-1.5
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/f89347f0 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/f89347f0 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/f89347f0 Branch: refs/heads/ignite-sql-opt Commit: f89347f0ea83a964dc3cd63cdcab3ab123fa510b Parents: c711484 ab8298a Author: Denis Magda <[email protected]> Authored: Fri Nov 20 19:29:18 2015 +0300 Committer: Denis Magda <[email protected]> Committed: Fri Nov 20 19:29:18 2015 +0300 ---------------------------------------------------------------------- .../stream/camel/IgniteCamelStreamerTest.java | 16 +- .../camel/IgniteCamelStreamerTestSuite.java | 1 - .../internal/MarshallerContextAdapter.java | 4 +- .../GridCachePartitionExchangeManager.java | 34 ++- .../dht/GridClientPartitionTopology.java | 38 +-- .../distributed/dht/GridDhtLockFuture.java | 1 - .../dht/GridDhtPartitionTopology.java | 12 +- .../dht/GridDhtPartitionTopologyImpl.java | 45 +-- .../distributed/dht/GridDhtTxPrepareFuture.java | 1 - .../dht/GridPartitionedGetFuture.java | 2 +- .../colocated/GridDhtColocatedLockFuture.java | 1 - .../dht/preloader/GridDhtPartitionFullMap.java | 41 ++- .../dht/preloader/GridDhtPartitionMap.java | 148 +-------- .../dht/preloader/GridDhtPartitionMap2.java | 306 +++++++++++++++++++ .../GridDhtPartitionsExchangeFuture.java | 24 +- .../GridDhtPartitionsSingleMessage.java | 6 +- .../distributed/near/GridNearCacheAdapter.java | 1 - .../distributed/near/GridNearGetFuture.java | 2 - .../distributed/near/GridNearLockFuture.java | 2 - ...arOptimisticSerializableTxPrepareFuture.java | 3 - .../near/GridNearOptimisticTxPrepareFuture.java | 1 - .../near/GridNearTxFinishFuture.java | 4 - .../distributed/near/GridNearTxRemote.java | 1 - .../processors/cache/local/GridLocalCache.java | 1 - .../cache/local/GridLocalLockFuture.java | 2 - .../cache/transactions/IgniteInternalTx.java | 1 - .../cache/transactions/IgniteTxAdapter.java | 1 - .../transactions/IgniteTxLocalAdapter.java | 1 - .../cache/transactions/IgniteTxManager.java | 1 - .../cache/transactions/IgniteTxStateImpl.java | 1 - .../ignite/internal/visor/cache/VisorCache.java | 6 +- .../org/apache/ignite/stream/StreamAdapter.java | 1 - .../resources/META-INF/classnames.properties | 1 + .../dht/GridCacheDhtPreloadDelayedSelfTest.java | 12 +- .../dht/GridCacheDhtPreloadSelfTest.java | 4 +- .../distributed/dht/GridCacheDhtTestUtils.java | 8 +- ...cingDelayedPartitionMapExchangeSelfTest.java | 178 +++++++++++ .../testsuites/IgniteCacheTestSuite3.java | 2 + .../h2/twostep/GridReduceQueryExecutor.java | 4 +- .../cache/WaitMapExchangeFinishCallable.java | 4 +- .../IgniteFailoverAbstractBenchmark.java | 4 +- 41 files changed, 661 insertions(+), 265 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/f89347f0/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedGetFuture.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/f89347f0/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetFuture.java ----------------------------------------------------------------------
