Merge branch 'ignite-51' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-51
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/a06c1504 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/a06c1504 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/a06c1504 Branch: refs/heads/ignite-user-req Commit: a06c15043876df01d89da8c3fad4d21b6b882573 Parents: e40d5f4 5d58d61 Author: ivasilinets <ivasilin...@gridgain.com> Authored: Thu Mar 5 18:10:40 2015 +0300 Committer: ivasilinets <ivasilin...@gridgain.com> Committed: Thu Mar 5 18:10:40 2015 +0300 ---------------------------------------------------------------------- .../apache/ignite/cache/CacheInterceptor.java | 34 +- .../ignite/cache/CacheInterceptorAdapter.java | 12 +- .../org/apache/ignite/cache/CacheManager.java | 1 - .../configuration/CacheConfiguration.java | 29 +- .../communication/GridIoMessageFactory.java | 10 + .../processors/cache/CacheInvokeEntry.java | 75 ++- .../processors/cache/CacheLazyEntry.java | 133 +++++ .../internal/processors/cache/CacheObject.java | 27 +- .../processors/cache/CacheObjectAdapter.java | 6 - .../processors/cache/GridCacheAdapter.java | 32 +- .../processors/cache/GridCacheAttributes.java | 13 - .../processors/cache/GridCacheContext.java | 28 +- .../processors/cache/GridCacheMapEntry.java | 267 +++++----- .../processors/cache/GridCacheProcessor.java | 3 - .../processors/cache/GridCacheProjectionEx.java | 9 +- .../cache/GridCacheProjectionImpl.java | 9 +- .../processors/cache/GridCacheProxyImpl.java | 11 +- .../cache/GridCacheSharedContext.java | 6 +- .../processors/cache/GridCacheSwapManager.java | 4 +- .../processors/cache/GridCacheTtlManager.java | 18 +- .../cache/KeyCacheObjectTransferImpl.java | 5 - .../GridDistributedTxRemoteAdapter.java | 44 +- .../distributed/dht/GridDhtTxPrepareFuture.java | 7 +- .../dht/atomic/GridDhtAtomicCache.java | 70 ++- .../dht/atomic/GridNearAtomicUpdateFuture.java | 10 +- .../distributed/near/CacheVersionedValue.java | 42 +- .../distributed/near/GridNearAtomicCache.java | 11 +- .../near/GridNearTxPrepareFuture.java | 4 +- .../near/GridNearTxPrepareResponse.java | 10 +- .../cache/dr/GridCacheDrExpirationInfo.java | 21 +- .../processors/cache/dr/GridCacheDrInfo.java | 29 +- .../processors/cache/dr/GridCacheDrManager.java | 10 +- .../cache/dr/os/GridOsCacheDrManager.java | 10 +- .../cache/jta/CacheJtaManagerAdapter.java | 2 +- .../cache/jta/CacheNoopJtaManager.java | 2 +- .../local/atomic/GridLocalAtomicCache.java | 38 +- .../cache/transactions/IgniteTxAdapter.java | 34 +- .../cache/transactions/IgniteTxEntry.java | 8 +- .../transactions/IgniteTxLocalAdapter.java | 127 ++--- .../cache/transactions/IgniteTxLocalEx.java | 8 +- .../version/GridCacheRawVersionedEntry.java | 248 +++++++--- .../cache/version/GridCacheVersionEx.java | 63 +++ .../cache/version/GridCacheVersionManager.java | 2 +- .../dataload/GridDataLoadUpdateJob.java | 1 + .../dataload/IgniteDataLoaderEntry.java | 4 +- .../dataload/IgniteDataLoaderImpl.java | 7 + .../dr/GridDrDataLoadCacheUpdater.java | 25 +- .../visor/cache/VisorCacheConfiguration.java | 11 - .../cache/GridCacheDeploymentSelfTest.java | 1 - .../GridCacheInterceptorAbstractSelfTest.java | 104 ++-- .../cache/GridCacheLifecycleAwareSelfTest.java | 10 +- .../GridCacheOnCopyFlagAbstractSelfTest.java | 483 +++++++++++++++++++ .../GridCacheOnCopyFlagAtomicSelfTest.java | 39 ++ .../cache/GridCacheOnCopyFlagLocalSelfTest.java | 39 ++ .../GridCacheOnCopyFlagReplicatedSelfTest.java | 39 ++ ...ridCacheOnCopyFlagTxPartitionedSelfTest.java | 39 ++ .../cache/GridCachePutAllFailoverSelfTest.java | 1 - .../cache/GridCacheStoreValueBytesSelfTest.java | 1 - .../cache/GridCacheTtlManagerLoadTest.java | 2 +- .../GridCacheValueBytesPreloadingSelfTest.java | 1 - .../IgniteCacheInterceptorSelfTestSuite.java | 5 + ...eAtomicInvalidPartitionHandlingSelfTest.java | 1 - .../dataload/GridDataLoaderPerformanceTest.java | 2 - .../loadtests/hashmap/GridCacheTestContext.java | 8 +- .../GridCacheStoreValueBytesNode.java | 2 - .../processors/cache/jta/CacheJtaManager.java | 2 +- .../commands/cache/VisorCacheCommand.scala | 1 - 67 files changed, 1635 insertions(+), 725 deletions(-) ----------------------------------------------------------------------
