Merge branch 'ignite-sprint-4' into ignite-800
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/bf27a793 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/bf27a793 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/bf27a793 Branch: refs/heads/ignite-800 Commit: bf27a793a15af65418be41cf25af00252d653527 Parents: 182db43 cf55393 Author: Artem Shutak <ashu...@gridgain.com> Authored: Mon Apr 27 14:10:54 2015 +0300 Committer: Artem Shutak <ashu...@gridgain.com> Committed: Mon Apr 27 14:10:54 2015 +0300 ---------------------------------------------------------------------- .../cache/CacheServerNotFoundException.java | 12 +- .../ClusterTopologyServerNotFoundException.java | 12 +- .../affinity/GridAffinityAssignmentCache.java | 4 +- .../processors/cache/GridCacheAdapter.java | 9 +- .../processors/cache/GridCacheEntryEx.java | 4 + .../processors/cache/GridCacheMapEntry.java | 20 +- .../GridCachePartitionExchangeManager.java | 2 +- .../processors/cache/GridCacheUtils.java | 53 +- .../GridDistributedCacheAdapter.java | 20 +- .../distributed/GridDistributedLockRequest.java | 99 +- .../distributed/dht/GridDhtCacheAdapter.java | 4 +- .../cache/distributed/dht/GridDhtGetFuture.java | 9 +- .../distributed/dht/GridDhtLockFuture.java | 20 +- .../distributed/dht/GridDhtLockRequest.java | 7 +- .../dht/GridDhtTransactionalCacheAdapter.java | 21 +- .../distributed/dht/GridDhtTxLocalAdapter.java | 26 +- .../distributed/dht/GridDhtTxPrepareFuture.java | 6 +- .../cache/distributed/dht/GridDhtTxRemote.java | 7 +- .../dht/GridPartitionedGetFuture.java | 7 + .../dht/atomic/GridDhtAtomicCache.java | 41 +- .../dht/atomic/GridNearAtomicUpdateFuture.java | 38 +- .../dht/atomic/GridNearAtomicUpdateRequest.java | 49 +- .../dht/colocated/GridDhtColocatedCache.java | 56 +- .../colocated/GridDhtColocatedLockFuture.java | 18 +- .../distributed/near/GridNearAtomicCache.java | 5 +- .../distributed/near/GridNearCacheAdapter.java | 10 +- .../distributed/near/GridNearCacheEntry.java | 10 +- .../distributed/near/GridNearGetFuture.java | 17 +- .../distributed/near/GridNearLockFuture.java | 15 +- .../distributed/near/GridNearLockRequest.java | 7 +- .../near/GridNearTransactionalCache.java | 43 +- .../cache/distributed/near/GridNearTxLocal.java | 7 +- .../distributed/near/GridNearTxRemote.java | 7 +- .../local/atomic/GridLocalAtomicCache.java | 59 +- .../cache/query/GridCacheQueryManager.java | 11 +- .../cache/transactions/IgniteTxEntry.java | 74 +- .../transactions/IgniteTxLocalAdapter.java | 94 +- .../cache/transactions/IgniteTxLocalEx.java | 4 +- .../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/GridCacheAbstractFullApiSelfTest.java | 514 ++++++- .../processors/cache/GridCacheTestEntryEx.java | 2 + .../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 + .../query/h2/sql/BaseH2CompareQueryTest.java | 32 +- .../IgniteCacheQuerySelfTestSuite.java | 4 +- 67 files changed, 1977 insertions(+), 2129 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bf27a793/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bf27a793/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bf27a793/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bf27a793/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/atomic/GridLocalAtomicCache.java ----------------------------------------------------------------------
