Repository: incubator-ignite Updated Branches: refs/heads/ignite-646 cf6e4352b -> eb20e01a6
Merge branches 'ignite-gg-9830' and 'ignite-sprint-4' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-gg-9830 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/2116b887 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/2116b887 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/2116b887 Branch: refs/heads/ignite-646 Commit: 2116b887f16bfc9d7eb3aa503204c6b841b3bd20 Parents: 8b5a31b cde25ab Author: Andrey <anovi...@gridgain.com> Authored: Mon Apr 27 09:26:05 2015 +0700 Committer: Andrey <anovi...@gridgain.com> Committed: Mon Apr 27 09:26:05 2015 +0700 ---------------------------------------------------------------------- .../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 - .../top/GridTopologyCommandHandler.java | 3 +- .../ignite/internal/util/IgniteUtils.java | 20 +- .../visor/node/VisorNodeDataCollectorJob.java | 15 +- .../cache/IgniteExcangeFutureHistoryTest.java | 74 - .../cache/IgniteExchangeFutureHistoryTest.java | 77 ++ .../CacheNoValueClassOnServerNodeTest.java | 129 ++ .../DataStreamerMultiThreadedSelfTest.java | 101 ++ .../ignite/testsuites/IgniteCacheTestSuite.java | 7 +- .../CacheNoValueClassOnServerTestClient.java | 88 ++ .../apache/ignite/tests/p2p/cache/Person.java | 42 + .../CacheConfigurationP2PTestClient.java | 1 - .../GridCacheAbstractFieldsQuerySelfTest.java | 1284 ------------------ .../IgniteCacheAbstractFieldsQuerySelfTest.java | 235 +++- ...artitionedFieldsQueryP2PEnabledSelfTest.java | 34 - ...GridCachePartitionedFieldsQuerySelfTest.java | 115 -- ...rtitionedFieldsQueryP2PDisabledSelfTest.java | 34 - ...artitionedFieldsQueryP2PEnabledSelfTest.java | 34 + ...eReplicatedFieldsQueryP2PEnableSelfTest.java | 34 - .../GridCacheReplicatedFieldsQuerySelfTest.java | 157 --- ...eplicatedFieldsQueryP2PDisabledSelfTest.java | 34 - ...ReplicatedFieldsQueryP2PEnabledSelfTest.java | 34 + .../IgniteCacheQuerySelfTestSuite.java | 4 +- 40 files changed, 929 insertions(+), 1911 deletions(-) ----------------------------------------------------------------------
