Merge remote-tracking branch 'remotes/origin/ignite-sprint-4' into ignite-286
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/ca80a9b3 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ca80a9b3 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ca80a9b3 Branch: refs/heads/ignite-286 Commit: ca80a9b339164dc5c841c1457682e7bf275f02c0 Parents: 924bc9f 381fd1a Author: ivasilinets <ivasilin...@gridgain.com> Authored: Fri Apr 24 10:55:57 2015 +0300 Committer: ivasilinets <ivasilin...@gridgain.com> Committed: Fri Apr 24 10:55:57 2015 +0300 ---------------------------------------------------------------------- .../cache/CacheServerNotFoundException.java | 12 +-- .../ClusterTopologyServerNotFoundException.java | 12 +-- .../affinity/GridAffinityAssignmentCache.java | 4 +- .../GridCachePartitionExchangeManager.java | 2 +- .../processors/cache/GridCacheUtils.java | 47 +-------- .../dht/GridPartitionedGetFuture.java | 7 ++ .../dht/atomic/GridNearAtomicUpdateFuture.java | 24 ++++- .../dht/colocated/GridDhtColocatedCache.java | 20 +++- .../colocated/GridDhtColocatedLockFuture.java | 4 + .../distributed/near/GridNearCacheEntry.java | 7 +- .../distributed/near/GridNearGetFuture.java | 17 +++- .../distributed/near/GridNearLockFuture.java | 4 + .../near/GridNearTransactionalCache.java | 18 +++- .../cache/query/GridCacheQueryManager.java | 11 +- .../datastreamer/DataStreamProcessor.java | 28 ++++- .../datastreamer/DataStreamerImpl.java | 3 +- .../datastreamer/DataStreamerRequest.java | 38 ++++++- .../portable/GridPortableInputStream.java | 26 ----- .../visor/node/VisorNodeDataCollectorJob.java | 15 +-- .../DataStreamerMultiThreadedSelfTest.java | 101 +++++++++++++++++++ .../ignite/testsuites/IgniteCacheTestSuite.java | 1 + 21 files changed, 282 insertions(+), 119 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ca80a9b3/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java ----------------------------------------------------------------------
