Merge branch 'sprint-1' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into sprint-1
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/237465ed Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/237465ed Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/237465ed Branch: refs/heads/ignite-132 Commit: 237465ed5a523561dda5a5eebd43abb05ed029e0 Parents: 5e3d2fe4 74a79bb Author: ivasilinets <ivasilin...@gridgain.com> Authored: Wed Jan 28 12:48:46 2015 +0300 Committer: ivasilinets <ivasilin...@gridgain.com> Committed: Wed Jan 28 12:48:46 2015 +0300 ---------------------------------------------------------------------- .../ClientAbstractMultiNodeSelfTest.java | 1 + .../processors/cache/GridCacheAdapter.java | 1 + .../cache/GridCacheAtomicVersionComparator.java | 2 + .../cache/GridCacheBatchSwapEntry.java | 1 + .../cache/GridCacheClearAllRunnable.java | 1 + .../processors/cache/GridCacheContext.java | 1 + .../processors/cache/GridCacheEntryEx.java | 1 + .../processors/cache/GridCacheEntryInfo.java | 1 + .../cache/GridCacheEvictionManager.java | 1 + .../cache/GridCacheEvictionRequest.java | 1 + .../cache/GridCacheExplicitLockSpan.java | 1 + .../processors/cache/GridCacheFuture.java | 1 + .../cache/GridCacheLockTimeoutException.java | 2 + .../processors/cache/GridCacheMapEntry.java | 1 + .../processors/cache/GridCacheMvcc.java | 1 + .../cache/GridCacheMvccCandidate.java | 1 + .../processors/cache/GridCacheMvccManager.java | 1 + .../cache/GridCacheOffheapSwapEntry.java | 1 + .../processors/cache/GridCacheProcessor.java | 1 + .../processors/cache/GridCacheProjectionEx.java | 1 + .../cache/GridCacheProjectionImpl.java | 1 + .../processors/cache/GridCacheProxyImpl.java | 1 + .../cache/GridCacheSharedContext.java | 1 + .../processors/cache/GridCacheStoreManager.java | 1 + .../processors/cache/GridCacheSwapEntry.java | 1 + .../cache/GridCacheSwapEntryImpl.java | 1 + .../processors/cache/GridCacheSwapManager.java | 1 + .../processors/cache/GridCacheTtlManager.java | 1 + .../cache/GridCacheUpdateAtomicResult.java | 1 + .../processors/cache/GridCacheUtils.java | 1 + .../processors/cache/GridCacheVersion.java | 256 ----------------- .../processors/cache/GridCacheVersionEx.java | 104 ------- .../cache/GridCacheVersionManager.java | 281 ------------------ .../processors/cache/GridCacheVersionable.java | 28 -- .../cache/IgniteCacheExpiryPolicy.java | 1 + .../distributed/GridCacheCommittedTxInfo.java | 2 +- .../distributed/GridCacheMappedVersion.java | 2 +- ...ridCacheOptimisticCheckPreparedTxFuture.java | 1 + ...idCacheOptimisticCheckPreparedTxRequest.java | 2 +- ...dCacheOptimisticCheckPreparedTxResponse.java | 2 +- .../GridCachePerThreadTxCommitBuffer.java | 1 + ...dCachePessimisticCheckCommittedTxFuture.java | 1 + ...CachePessimisticCheckCommittedTxRequest.java | 2 +- ...achePessimisticCheckCommittedTxResponse.java | 1 + .../distributed/GridCacheTtlUpdateRequest.java | 1 + .../distributed/GridCacheTxCommitBuffer.java | 2 +- .../distributed/GridDistributedBaseMessage.java | 1 + .../GridDistributedCacheAdapter.java | 1 + .../distributed/GridDistributedCacheEntry.java | 1 + .../distributed/GridDistributedLockRequest.java | 1 + .../GridDistributedLockResponse.java | 1 + .../GridDistributedTxFinishRequest.java | 1 + .../GridDistributedTxFinishResponse.java | 1 + .../distributed/GridDistributedTxMapping.java | 1 + .../GridDistributedTxPrepareRequest.java | 1 + .../GridDistributedTxPrepareResponse.java | 1 + .../GridDistributedTxRemoteAdapter.java | 1 + .../distributed/dht/GridDhtCacheAdapter.java | 1 + .../distributed/dht/GridDhtCacheEntry.java | 1 + .../cache/distributed/dht/GridDhtGetFuture.java | 1 + .../distributed/dht/GridDhtLocalPartition.java | 1 + .../distributed/dht/GridDhtLockFuture.java | 1 + .../distributed/dht/GridDhtLockRequest.java | 1 + .../distributed/dht/GridDhtLockResponse.java | 1 + .../dht/GridDhtTransactionalCacheAdapter.java | 1 + .../distributed/dht/GridDhtTxFinishFuture.java | 1 + .../distributed/dht/GridDhtTxFinishRequest.java | 1 + .../dht/GridDhtTxFinishResponse.java | 2 +- .../cache/distributed/dht/GridDhtTxLocal.java | 1 + .../distributed/dht/GridDhtTxLocalAdapter.java | 1 + .../distributed/dht/GridDhtTxPrepareFuture.java | 1 + .../dht/GridDhtTxPrepareRequest.java | 1 + .../dht/GridDhtTxPrepareResponse.java | 1 + .../cache/distributed/dht/GridDhtTxRemote.java | 1 + .../dht/GridPartitionedGetFuture.java | 1 + .../dht/atomic/GridDhtAtomicCache.java | 1 + .../GridDhtAtomicDeferredUpdateResponse.java | 1 + .../dht/atomic/GridDhtAtomicUpdateFuture.java | 1 + .../dht/atomic/GridDhtAtomicUpdateRequest.java | 1 + .../dht/atomic/GridDhtAtomicUpdateResponse.java | 1 + .../dht/atomic/GridNearAtomicUpdateFuture.java | 1 + .../dht/atomic/GridNearAtomicUpdateRequest.java | 1 + .../atomic/GridNearAtomicUpdateResponse.java | 1 + .../dht/colocated/GridDhtColocatedCache.java | 1 + .../colocated/GridDhtColocatedLockFuture.java | 1 + .../colocated/GridDhtDetachedCacheEntry.java | 1 + .../GridDhtPartitionsAbstractMessage.java | 1 + .../GridDhtPartitionsExchangeFuture.java | 1 + .../preloader/GridDhtPartitionsFullMessage.java | 1 + .../GridDhtPartitionsSingleMessage.java | 1 + .../distributed/near/GridNearAtomicCache.java | 1 + .../distributed/near/GridNearCacheAdapter.java | 1 + .../near/GridNearCacheClearAllRunnable.java | 1 + .../distributed/near/GridNearCacheEntry.java | 1 + .../distributed/near/GridNearGetFuture.java | 1 + .../distributed/near/GridNearGetRequest.java | 1 + .../distributed/near/GridNearGetResponse.java | 1 + .../distributed/near/GridNearLockFuture.java | 1 + .../distributed/near/GridNearLockRequest.java | 1 + .../distributed/near/GridNearLockResponse.java | 1 + .../near/GridNearTransactionalCache.java | 1 + .../near/GridNearTxFinishFuture.java | 1 + .../near/GridNearTxFinishRequest.java | 2 +- .../near/GridNearTxFinishResponse.java | 1 + .../cache/distributed/near/GridNearTxLocal.java | 1 + .../near/GridNearTxPrepareFuture.java | 1 + .../near/GridNearTxPrepareResponse.java | 1 + .../distributed/near/GridNearTxRemote.java | 1 + .../cache/dr/GridCacheDrExpirationInfo.java | 2 +- .../processors/cache/dr/GridCacheDrInfo.java | 2 +- .../processors/cache/dr/GridCacheDrManager.java | 1 + .../cache/dr/os/GridOsCacheDrManager.java | 1 + .../extras/GridCacheAttributesEntryExtras.java | 1 + .../GridCacheAttributesMvccEntryExtras.java | 1 + ...dCacheAttributesMvccObsoleteEntryExtras.java | 1 + ...cheAttributesMvccObsoleteTtlEntryExtras.java | 1 + .../GridCacheAttributesMvccTtlEntryExtras.java | 1 + .../GridCacheAttributesObsoleteEntryExtras.java | 1 + ...idCacheAttributesObsoleteTtlEntryExtras.java | 1 + .../GridCacheAttributesTtlEntryExtras.java | 1 + .../cache/extras/GridCacheEntryExtras.java | 1 + .../extras/GridCacheEntryExtrasAdapter.java | 1 + .../cache/extras/GridCacheMvccEntryExtras.java | 1 + .../GridCacheMvccObsoleteEntryExtras.java | 1 + .../GridCacheMvccObsoleteTtlEntryExtras.java | 1 + .../extras/GridCacheMvccTtlEntryExtras.java | 1 + .../extras/GridCacheObsoleteEntryExtras.java | 1 + .../extras/GridCacheObsoleteTtlEntryExtras.java | 1 + .../cache/extras/GridCacheTtlEntryExtras.java | 1 + .../processors/cache/local/GridLocalCache.java | 1 + .../cache/local/GridLocalCacheEntry.java | 1 + .../cache/local/GridLocalLockFuture.java | 1 + .../cache/local/GridLocalTxFuture.java | 1 + .../local/atomic/GridLocalAtomicCache.java | 1 + .../cache/query/GridCacheQueryManager.java | 1 + .../cache/transactions/IgniteTxAdapter.java | 1 + .../cache/transactions/IgniteTxEntry.java | 1 + .../cache/transactions/IgniteTxEx.java | 1 + .../cache/transactions/IgniteTxHandler.java | 1 + .../transactions/IgniteTxLocalAdapter.java | 1 + .../cache/transactions/IgniteTxLocalEx.java | 1 + .../cache/transactions/IgniteTxManager.java | 1 + .../cache/transactions/IgniteTxRemoteEx.java | 2 +- .../cache/version/GridCacheVersion.java | 256 +++++++++++++++++ .../cache/version/GridCacheVersionEx.java | 104 +++++++ .../cache/version/GridCacheVersionManager.java | 282 +++++++++++++++++++ .../cache/version/GridCacheVersionable.java | 28 ++ .../processors/dr/GridRawVersionedEntry.java | 2 +- .../processors/dr/GridVersionedEntry.java | 2 +- .../apache/ignite/internal/util/GridUtils.java | 1 + .../GridTcpCommunicationMessageAdapter.java | 1 + .../GridTcpCommunicationMessageState.java | 3 +- .../cache/GridCacheEntryVersionSelfTest.java | 3 +- .../cache/GridCacheMvccFlagsTest.java | 1 + .../cache/GridCacheMvccPartitionedSelfTest.java | 1 + .../processors/cache/GridCacheMvccSelfTest.java | 1 + .../processors/cache/GridCacheTestEntryEx.java | 1 + .../cache/GridCacheVersionSelfTest.java | 1 + ...eAtomicInvalidPartitionHandlingSelfTest.java | 1 + .../loadtests/hashmap/GridCacheTestContext.java | 1 + .../loadtests/hashmap/GridHashMapLoadTest.java | 1 + pom.xml | 4 +- 162 files changed, 829 insertions(+), 686 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/237465ed/modules/core/src/main/java/org/apache/ignite/internal/util/GridUtils.java ----------------------------------------------------------------------
