Merge remote-tracking branch 'remotes/origin/ignite-sprint-4' into ignite-157-1
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/62d80533 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/62d80533 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/62d80533 Branch: refs/heads/ignite-286 Commit: 62d80533be420edce9942fc232a019c1ebffe1d3 Parents: ceab5f3 b4b28fd Author: sboikov <sboi...@gridgain.com> Authored: Fri Apr 24 14:16:44 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Fri Apr 24 14:16:44 2015 +0300 ---------------------------------------------------------------------- .../cache/CacheServerNotFoundException.java | 12 +- .../ClusterTopologyServerNotFoundException.java | 12 +- .../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 +-- .../cache/IgniteExcangeFutureHistoryTest.java | 74 ----------- .../cache/IgniteExchangeFutureHistoryTest.java | 77 +++++++++++ .../CacheNoValueClassOnServerNodeTest.java | 129 +++++++++++++++++++ .../DataStreamerMultiThreadedSelfTest.java | 101 +++++++++++++++ .../ignite/testsuites/IgniteCacheTestSuite.java | 5 +- .../CacheNoValueClassOnServerTestClient.java | 88 +++++++++++++ .../apache/ignite/tests/p2p/cache/Person.java | 42 ++++++ .../CacheConfigurationP2PTestClient.java | 1 - 26 files changed, 619 insertions(+), 193 deletions(-) ----------------------------------------------------------------------
