Merge remote-tracking branch 'remotes/origin/ignite-629-1' into ignite-sprint-3
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/c6b3380f Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c6b3380f Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c6b3380f Branch: refs/heads/gg-9998 Commit: c6b3380f6391e92584bfeb6d3b2fe28edb0ebbe5 Parents: 7aba4ba 79c76cd Author: sboikov <sboi...@gridgain.com> Authored: Tue Mar 31 17:31:53 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Tue Mar 31 17:31:53 2015 +0300 ---------------------------------------------------------------------- .../client/impl/ClientCacheFlagsCodecTest.java | 18 +- .../internal/client/GridClientCacheFlag.java | 13 -- .../impl/connection/GridClientConnection.java | 9 - .../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/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 - .../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 +++--- .../cache/GridCacheAbstractFlagsTest.java | 97 -------- .../cache/GridCacheAbstractFullApiSelfTest.java | 61 ++++- .../GridCacheReturnValueTransferSelfTest.java | 36 +-- .../processors/cache/GridCacheTestEntryEx.java | 2 +- .../cache/IgniteCacheInvokeAbstractTest.java | 11 - ...GridCacheValueConsistencyAtomicSelfTest.java | 101 --------- .../near/GridCachePartitionedFlagsTest.java | 41 ---- .../GridCacheReplicatedFlagsTest.java | 28 --- .../cache/GridCacheCommandHandlerSelfTest.java | 2 +- .../OptimizedObjectStreamSelfTest.java | 4 - .../ignite/testsuites/IgniteCacheTestSuite.java | 1 - .../processors/cache/jta/CacheJtaManager.java | 1 - .../ignite/scalar/pimps/ScalarCachePimp.scala | 36 --- 61 files changed, 278 insertions(+), 1629 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c6b3380f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c6b3380f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java ----------------------------------------------------------------------
