Merge branch 'ignite-sprint-3' into ignite-598
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/1df9ff52 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/1df9ff52 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/1df9ff52 Branch: refs/heads/ignite-598 Commit: 1df9ff52acb24ca8163ad87bc29369fac3deca1c Parents: 065cb89 c6b3380 Author: Artem Shutak <ashu...@gridgain.com> Authored: Tue Mar 31 19:18:30 2015 +0300 Committer: Artem Shutak <ashu...@gridgain.com> Committed: Tue Mar 31 19:18:30 2015 +0300 ---------------------------------------------------------------------- .../client/impl/ClientCacheFlagsCodecTest.java | 18 +- .../ignite/internal/GridKernalContextImpl.java | 6 +- .../apache/ignite/internal/IgniteKernal.java | 7 + .../internal/client/GridClientCacheFlag.java | 13 -- .../impl/connection/GridClientConnection.java | 9 - .../internal/managers/GridManagerAdapter.java | 4 + .../internal/processors/cache/CacheFlag.java | 108 --------- .../processors/cache/CacheFlagException.java | 67 ------ .../processors/cache/CacheProjection.java | 209 +---------------- .../internal/processors/cache/GridCache.java | 3 - .../processors/cache/GridCacheAdapter.java | 211 ++++-------------- .../cache/GridCacheConcurrentMap.java | 44 +--- .../processors/cache/GridCacheContext.java | 222 +------------------ .../processors/cache/GridCacheEntryEx.java | 3 +- .../processors/cache/GridCacheMapEntry.java | 27 +-- .../processors/cache/GridCacheProjectionEx.java | 20 -- .../cache/GridCacheProjectionImpl.java | 77 ++----- .../processors/cache/GridCacheProxyImpl.java | 36 +-- .../cache/GridCacheSharedContext.java | 21 -- .../processors/cache/IgniteCacheProxy.java | 29 +-- .../GridDistributedTxRemoteAdapter.java | 2 +- .../distributed/dht/GridDhtCacheAdapter.java | 2 +- .../distributed/dht/GridDhtLocalPartition.java | 2 +- .../distributed/dht/GridDhtLockFuture.java | 2 +- .../distributed/dht/GridDhtTxLocalAdapter.java | 2 +- .../distributed/dht/GridDhtTxPrepareFuture.java | 2 +- .../dht/GridPartitionedGetFuture.java | 3 +- .../dht/atomic/GridDhtAtomicCache.java | 32 --- .../dht/atomic/GridDhtAtomicUpdateFuture.java | 2 - .../dht/atomic/GridNearAtomicUpdateFuture.java | 3 - .../dht/atomic/GridNearAtomicUpdateRequest.java | 78 ++----- .../dht/colocated/GridDhtColocatedCache.java | 2 - .../colocated/GridDhtDetachedCacheEntry.java | 2 +- .../distributed/near/GridNearAtomicCache.java | 2 - .../distributed/near/GridNearCacheAdapter.java | 9 - .../distributed/near/GridNearGetFuture.java | 3 +- .../near/GridNearTransactionalCache.java | 2 - .../cache/distributed/near/GridNearTxLocal.java | 4 +- .../local/atomic/GridLocalAtomicCache.java | 74 +------ .../continuous/CacheContinuousQueryHandler.java | 5 - .../transactions/IgniteTransactionsImpl.java | 1 - .../transactions/IgniteTxLocalAdapter.java | 6 +- .../cache/transactions/IgniteTxManager.java | 2 - .../datastreamer/DataStreamerImpl.java | 2 +- .../datastructures/DataStructuresProcessor.java | 13 +- .../datastructures/GridCacheAtomicLongImpl.java | 14 +- .../GridCacheAtomicReferenceImpl.java | 2 +- .../GridCacheAtomicReferenceValue.java | 15 +- .../GridCacheAtomicSequenceImpl.java | 2 +- .../GridCacheAtomicStampedImpl.java | 2 +- .../GridCacheAtomicStampedValue.java | 15 +- .../GridCacheCountDownLatchImpl.java | 2 +- .../handlers/cache/GridCacheCommandHandler.java | 66 +++--- .../org/apache/ignite/spi/IgniteSpiAdapter.java | 16 +- .../org/apache/ignite/spi/IgniteSpiContext.java | 5 + .../communication/tcp/TcpCommunicationSpi.java | 13 +- .../spi/discovery/tcp/TcpDiscoverySpi.java | 14 +- .../GridCacheAbstractFailoverSelfTest.java | 2 +- .../cache/GridCacheAbstractFlagsTest.java | 97 -------- .../cache/GridCacheAbstractFullApiSelfTest.java | 61 ++++- .../cache/GridCachePutAllFailoverSelfTest.java | 26 ++- .../GridCacheReturnValueTransferSelfTest.java | 36 +-- .../processors/cache/GridCacheTestEntryEx.java | 2 +- .../cache/IgniteCacheInvokeAbstractTest.java | 11 - ...PartitionedQueueCreateMultiNodeSelfTest.java | 6 +- ...GridCacheValueConsistencyAtomicSelfTest.java | 101 --------- .../near/GridCachePartitionedFlagsTest.java | 41 ---- .../GridCacheReplicatedFlagsTest.java | 28 --- .../cache/GridCacheCommandHandlerSelfTest.java | 2 +- .../OptimizedObjectStreamSelfTest.java | 4 - .../testframework/GridSpiTestContext.java | 18 +- .../ignite/testsuites/IgniteCacheTestSuite.java | 1 - .../processors/cache/jta/CacheJtaManager.java | 1 - .../ignite/scalar/pimps/ScalarCachePimp.scala | 36 --- 74 files changed, 361 insertions(+), 1669 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1df9ff52/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1df9ff52/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java ----------------------------------------------------------------------
