You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by vo...@apache.org on 2015/04/01 08:19:59 UTC
[03/11] incubator-ignite git commit: Merge branches 'ignite-644' and
'ignite-sprint-3' of https://git-wip-us.apache.org/repos/asf/incubator-ignite
into ignite-644
Merge branches 'ignite-644' and 'ignite-sprint-3' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-644
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/f1f873bf
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/f1f873bf
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/f1f873bf
Branch: refs/heads/ignite-598
Commit: f1f873bf5eb1d5d8c024f68ab9aaa90bd0cc9122
Parents: 5ee3767 c6b3380
Author: Valentin Kulichenko <vk...@gridgain.com>
Authored: Tue Mar 31 14:08:23 2015 -0700
Committer: Valentin Kulichenko <vk...@gridgain.com>
Committed: Tue Mar 31 14:08:23 2015 -0700
----------------------------------------------------------------------
DEVNOTES.txt | 6 +
.../client/impl/ClientCacheFlagsCodecTest.java | 18 +-
.../ignite/internal/GridKernalContextImpl.java | 9 +-
.../org/apache/ignite/internal/IgniteEx.java | 4 +-
.../apache/ignite/internal/IgniteKernal.java | 12 +-
.../internal/client/GridClientCacheFlag.java | 13 -
.../impl/connection/GridClientConnection.java | 9 -
.../internal/managers/GridManagerAdapter.java | 4 +
.../cache/CacheConflictResolutionManager.java | 30 ++
.../internal/processors/cache/CacheFlag.java | 108 ------
.../processors/cache/CacheFlagException.java | 67 ----
.../cache/CacheOsConflictResolutionManager.java | 58 +++
.../processors/cache/CacheProjection.java | 233 +-----------
.../internal/processors/cache/GridCache.java | 3 -
.../processors/cache/GridCacheAdapter.java | 271 +++-----------
.../cache/GridCacheConcurrentMap.java | 44 +--
.../processors/cache/GridCacheContext.java | 241 ++-----------
.../processors/cache/GridCacheEntryEx.java | 3 +-
.../processors/cache/GridCacheMapEntry.java | 27 +-
.../processors/cache/GridCacheProcessor.java | 20 +-
.../processors/cache/GridCacheProjectionEx.java | 29 --
.../cache/GridCacheProjectionImpl.java | 357 +++----------------
.../processors/cache/GridCacheProxyImpl.java | 55 +--
.../cache/GridCacheSharedContext.java | 21 --
.../processors/cache/IgniteCacheProxy.java | 31 +-
.../CacheDataStructuresManager.java | 4 +-
.../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 +-
.../processors/cache/dr/GridCacheDrManager.java | 5 -
.../cache/dr/GridOsCacheDrManager.java | 106 ++++++
.../cache/dr/os/GridOsCacheDrManager.java | 111 ------
.../local/atomic/GridLocalAtomicCache.java | 74 +---
.../cache/query/GridCacheQueriesImpl.java | 23 +-
.../continuous/CacheContinuousQueryHandler.java | 5 -
.../transactions/IgniteTransactionsImpl.java | 1 -
.../transactions/IgniteTxLocalAdapter.java | 19 +-
.../cache/transactions/IgniteTxManager.java | 2 -
.../version/CacheVersionConflictResolver.java | 40 +++
...ridCacheVersionAbstractConflictResolver.java | 56 ---
.../GridCacheVersionConflictResolver.java | 59 ---
.../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/VisorCacheStoreConfiguration.java | 18 +-
.../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 +-
.../GridProjectionForCachesSelfTest.java | 12 +-
.../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 ---
...achePartitionedMultiNodeFullApiSelfTest.java | 2 +
.../GridCacheReplicatedFlagsTest.java | 28 --
.../cache/GridCacheCommandHandlerSelfTest.java | 2 +-
.../GridServiceReassignmentSelfTest.java | 5 +-
.../loadtests/hashmap/GridCacheTestContext.java | 6 +-
.../OptimizedObjectStreamSelfTest.java | 4 -
.../testframework/GridSpiTestContext.java | 18 +-
.../IgniteCacheFailoverTestSuite.java | 8 +-
.../ignite/testsuites/IgniteCacheTestSuite.java | 1 -
.../hadoop/jobtracker/HadoopJobTracker.java | 7 +-
.../HadoopDefaultMapReducePlannerSelfTest.java | 3 +-
.../processors/cache/jta/CacheJtaManager.java | 1 -
.../ignite/scalar/pimps/ScalarCachePimp.scala | 36 --
parent/pom.xml | 38 +-
96 files changed, 723 insertions(+), 2362 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f1f873bf/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearAtomicCache.java
----------------------------------------------------------------------