Merge branches 'ignite-757' and 'ignite-sprint-4' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-757
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/59ec2f9c Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/59ec2f9c Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/59ec2f9c Branch: refs/heads/ignite-286 Commit: 59ec2f9ccda40487975d6ad17134279934b023f3 Parents: aefb065 2dfc187 Author: S.Vladykin <svlady...@gridgain.com> Authored: Sat Apr 25 18:02:27 2015 +0300 Committer: S.Vladykin <svlady...@gridgain.com> Committed: Sat Apr 25 18:02:27 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 - .../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 +- 39 files changed, 927 insertions(+), 1910 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/59ec2f9c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java ----------------------------------------------------------------------
