Merge remote-tracking branch 'remotes/origin/ignite-1' into ignite-54
Conflicts:
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheTest.java
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/5a185707
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/5a185707
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/5a185707
Branch: refs/heads/ignite-54
Commit: 5a185707cd3786612c16596451bb8d6c7bb4626a
Parents: 3344e72 80b986f
Author: avinogradov <[email protected]>
Authored: Mon Jan 19 13:26:25 2015 +0300
Committer: avinogradov <[email protected]>
Committed: Mon Jan 19 13:26:25 2015 +0300
----------------------------------------------------------------------
.../examples/datagrid/CacheApiExample.java | 63 +-
.../datagrid/CachePopularNumbersExample.java | 17 +-
.../ScalarCachePopularNumbersExample.scala | 17 +-
.../services/javax.cache.spi.CachingProvider | 1 +
.../java/org/apache/ignite/IgniteCache.java | 215 ++++-
.../org/apache/ignite/IgniteCacheMXBean.java | 72 ++
.../org/apache/ignite/IgniteCacheManager.java | 372 ++++++++
.../apache/ignite/IgniteCachingProvider.java | 189 ++++
.../cache/CachePartialUpdateException.java | 36 +
.../dataload/IgniteDataLoadCacheUpdater.java | 7 +-
.../processors/cache/IgniteCacheProxy.java | 698 ++++++++++++--
.../communication/tcp/TcpCommunicationSpi.java | 2 +-
.../grid/cache/GridCacheConfiguration.java | 43 +-
.../org/gridgain/grid/cache/GridCacheEntry.java | 24 +-
.../org/gridgain/grid/cache/GridCacheFlag.java | 5 +-
.../grid/cache/GridCacheInterceptor.java | 8 +-
.../cache/GridCachePartialUpdateException.java | 1 +
.../grid/cache/GridCacheProjection.java | 186 ----
.../org/gridgain/grid/kernal/GridGainEx.java | 2 +-
.../kernal/managers/GridManagerAdapter.java | 26 +-
.../processors/cache/CacheInvokeEntry.java | 89 ++
.../processors/cache/CacheInvokeResult.java | 96 ++
.../processors/cache/GridCacheAdapter.java | 532 ++++++++---
.../processors/cache/GridCacheContext.java | 31 +-
.../processors/cache/GridCacheEntryEx.java | 30 +-
.../processors/cache/GridCacheEntryImpl.java | 18 +-
.../cache/GridCacheEvictionEntry.java | 18 +-
.../cache/GridCacheFilterEvaluationEntry.java | 18 +-
.../processors/cache/GridCacheMapEntry.java | 464 +++++----
.../processors/cache/GridCacheMessage.java | 71 +-
.../processors/cache/GridCacheProcessor.java | 24 +-
.../processors/cache/GridCacheProjectionEx.java | 86 +-
.../cache/GridCacheProjectionImpl.java | 171 ++--
.../processors/cache/GridCacheProxyImpl.java | 147 +--
.../processors/cache/GridCacheReturn.java | 57 +-
.../processors/cache/GridCacheStoreManager.java | 19 +-
.../cache/GridCacheTransformComputeClosure.java | 76 --
.../cache/GridCacheUpdateAtomicResult.java | 20 +-
.../kernal/processors/cache/GridCacheUtils.java | 25 +-
.../cache/IgniteCacheExpiryPolicy.java | 65 ++
.../GridAtomicCacheQueueImpl.java | 44 +-
.../GridCacheDataStructuresManager.java | 7 +-
.../datastructures/GridCacheQueueAdapter.java | 229 +++--
.../GridTransactionalCacheQueueImpl.java | 112 ++-
.../distributed/GridCacheTtlUpdateRequest.java | 492 ++++++++++
.../GridDistributedCacheAdapter.java | 18 +-
.../GridDistributedLockResponse.java | 19 +-
.../GridDistributedTxRemoteAdapter.java | 52 +-
.../IgniteExternalizableExpiryPolicy.java | 166 ++++
.../distributed/dht/GridDhtCacheAdapter.java | 238 ++++-
.../cache/distributed/dht/GridDhtGetFuture.java | 70 +-
.../distributed/dht/GridDhtLockFuture.java | 18 +-
.../distributed/dht/GridDhtLockRequest.java | 50 +-
.../dht/GridDhtTransactionalCacheAdapter.java | 57 +-
.../distributed/dht/GridDhtTxFinishFuture.java | 22 +
.../distributed/dht/GridDhtTxFinishRequest.java | 95 ++
.../cache/distributed/dht/GridDhtTxLocal.java | 9 +-
.../distributed/dht/GridDhtTxLocalAdapter.java | 64 +-
.../cache/distributed/dht/GridDhtTxRemote.java | 29 +-
.../dht/GridPartitionedGetFuture.java | 33 +-
.../dht/atomic/GridDhtAtomicCache.java | 685 ++++++++++---
.../dht/atomic/GridDhtAtomicUpdateFuture.java | 54 +-
.../dht/atomic/GridDhtAtomicUpdateRequest.java | 440 ++++++---
.../dht/atomic/GridNearAtomicUpdateFuture.java | 61 +-
.../dht/atomic/GridNearAtomicUpdateRequest.java | 210 ++--
.../atomic/GridNearAtomicUpdateResponse.java | 135 ++-
.../dht/colocated/GridDhtColocatedCache.java | 139 ++-
.../colocated/GridDhtColocatedLockFuture.java | 91 +-
.../distributed/near/GridNearAtomicCache.java | 106 ++-
.../distributed/near/GridNearCacheAdapter.java | 41 +-
.../distributed/near/GridNearCacheEntry.java | 19 +-
.../distributed/near/GridNearGetFuture.java | 47 +-
.../distributed/near/GridNearGetRequest.java | 31 +-
.../distributed/near/GridNearLockFuture.java | 11 +-
.../distributed/near/GridNearLockRequest.java | 43 +-
.../distributed/near/GridNearLockResponse.java | 1 +
.../near/GridNearTransactionalCache.java | 59 +-
.../cache/distributed/near/GridNearTxLocal.java | 116 ++-
.../near/GridNearTxPrepareRequest.java | 7 +
.../distributed/near/GridNearTxRemote.java | 8 +-
.../processors/cache/dr/GridCacheDrManager.java | 2 +-
.../cache/dr/os/GridOsCacheDrManager.java | 2 +-
.../processors/cache/local/GridLocalCache.java | 11 +-
.../processors/cache/local/GridLocalTx.java | 1 +
.../local/atomic/GridLocalAtomicCache.java | 404 +++++---
.../cache/query/GridCacheQueryManager.java | 18 +-
.../GridCacheContinuousQueryEntry.java | 20 +-
.../cache/transactions/IgniteTxAdapter.java | 37 +-
.../cache/transactions/IgniteTxEntry.java | 129 ++-
.../cache/transactions/IgniteTxHandler.java | 28 +-
.../transactions/IgniteTxLocalAdapter.java | 653 ++++++++++---
.../cache/transactions/IgniteTxLocalEx.java | 20 +-
.../dataload/GridDataLoadCacheUpdaters.java | 33 +-
.../dataload/GridDataLoadUpdateJob.java | 21 +-
.../dr/GridDrDataLoadCacheUpdater.java | 6 +-
.../processors/ggfs/GridGgfsDataManager.java | 33 +-
.../processors/ggfs/GridGgfsMetaManager.java | 67 +-
.../handlers/cache/GridCacheCommandHandler.java | 44 +-
.../top/GridTopologyCommandHandler.java | 1 +
.../grid/kernal/tck/TCKMBeanServerBuilder.java | 118 +++
.../visor/cache/VisorCacheConfiguration.java | 18 -
.../grid/kernal/visor/query/VisorQueryTask.java | 53 +-
.../GridTcpCommunicationMessageFactory.java | 9 +-
.../cache/IgniteCacheAbstractTest.java | 214 +++++
.../cache/IgniteCacheAtomicInvokeTest.java | 47 +
.../cache/IgniteCacheAtomicLocalInvokeTest.java | 41 +
...niteCacheAtomicLocalWithStoreInvokeTest.java | 22 +
.../IgniteCacheAtomicNearEnabledInvokeTest.java | 24 +
...eCacheAtomicPrimaryWriteOrderInvokeTest.java | 47 +
...micPrimaryWriteOrderWithStoreInvokeTest.java | 23 +
.../cache/IgniteCacheInvokeAbstractTest.java | 647 +++++++++++++
.../processors/cache/IgniteCacheTest.java | 141 ---
.../cache/IgniteCacheTxInvokeTest.java | 41 +
.../cache/IgniteCacheTxLocalInvokeTest.java | 41 +
.../IgniteCacheTxNearEnabledInvokeTest.java | 24 +
.../cache/IgniteCachingProviderSelfTest.java | 131 +++
.../IgniteCacheAtomicExpiryPolicyTest.java | 47 +
.../IgniteCacheAtomicLocalExpiryPolicyTest.java | 41 +
...AtomicPrimaryWriteOrderExpiryPolicyTest.java | 24 +
...maryWriteOrderWithStoreExpiryPolicyTest.java | 23 +
...teCacheAtomicReplicatedExpiryPolicyTest.java | 24 +
...iteCacheAtomicWithStoreExpiryPolicyTest.java | 22 +
.../IgniteCacheExpiryPolicyAbstractTest.java | 951 +++++++++++++++++++
.../IgniteCacheExpiryPolicyTestSuite.java | 39 +
.../expiry/IgniteCacheTxExpiryPolicyTest.java | 41 +
.../IgniteCacheTxLocalExpiryPolicyTest.java | 41 +
...IgniteCacheTxReplicatedExpiryPolicyTest.java | 26 +
.../IgniteCacheTxWithStoreExpiryPolicyTest.java | 22 +
.../tcp/GridCacheDhtLockBackupSelfTest.java | 18 +-
.../GridCacheLoadOnlyStoreAdapterSelfTest.java | 5 +-
.../cache/GridCacheAbstractFullApiSelfTest.java | 626 +++++-------
.../cache/GridCacheAbstractSelfTest.java | 17 +
.../cache/GridCacheAbstractTtlSelfTest.java | 104 --
.../cache/GridCacheBasicApiAbstractTest.java | 108 +--
.../GridCacheFinishPartitionsSelfTest.java | 22 +-
...idCacheGetAndTransformStoreAbstractTest.java | 21 +-
.../GridCacheGroupLockAbstractSelfTest.java | 24 +-
.../cache/GridCacheIncrementTransformTest.java | 19 +-
.../GridCacheInterceptorAbstractSelfTest.java | 61 +-
...ridCacheMultinodeUpdateAbstractSelfTest.java | 28 +-
.../cache/GridCacheNestedTxAbstractTest.java | 28 +-
...HeapMultiThreadedUpdateAbstractSelfTest.java | 21 +-
...CacheOffHeapMultiThreadedUpdateSelfTest.java | 9 +-
.../GridCacheOffHeapTieredAbstractSelfTest.java | 95 +-
...heOffHeapTieredEvictionAbstractSelfTest.java | 32 +-
.../GridCacheRefreshAheadAbstractSelfTest.java | 177 ----
.../GridCacheReturnValueTransferSelfTest.java | 33 +-
.../processors/cache/GridCacheTestEntryEx.java | 66 +-
.../cache/GridCacheTtlManagerLoadTest.java | 12 +-
.../cache/GridCacheTtlManagerSelfTest.java | 19 +-
.../IgniteTxExceptionAbstractSelfTest.java | 16 +-
.../IgniteTxStoreExceptionAbstractSelfTest.java | 25 +-
.../GridCacheBasicOpAbstractTest.java | 20 +-
...heExpiredEntriesPreloadAbstractSelfTest.java | 12 +-
.../distributed/GridCacheLockAbstractTest.java | 40 +-
.../GridCacheMultiNodeLockAbstractTest.java | 144 ++-
.../GridCacheTransformEventSelfTest.java | 68 +-
.../IgniteTxPreloadAbstractTest.java | 44 +-
...heAbstractTransformWriteThroughSelfTest.java | 37 +-
.../dht/GridCacheAtomicNearCacheSelfTest.java | 71 +-
.../dht/GridCacheColocatedDebugTest.java | 26 +-
.../GridCacheColocatedRefreshAheadSelfTest.java | 54 --
.../dht/GridCacheGlobalLoadTest.java | 163 ++++
...ridCachePartitionedRefreshAheadSelfTest.java | 54 --
...dCachePartitionedTopologyChangeSelfTest.java | 8 +-
...GridCacheValueConsistencyAtomicSelfTest.java | 23 +-
...tomicClientOnlyMultiNodeFullApiSelfTest.java | 22 +-
...eAtomicNearOnlyMultiNodeFullApiSelfTest.java | 14 +-
.../near/GridCacheNearMultiNodeSelfTest.java | 16 +-
.../near/GridCacheNearOneNodeSelfTest.java | 39 +-
...idCacheNearOnlyMultiNodeFullApiSelfTest.java | 42 -
.../near/GridCacheNearReadersSelfTest.java | 14 +-
.../GridCachePartitionedEvictionSelfTest.java | 22 +-
...titionedExplicitLockNodeFailureSelfTest.java | 1 +
.../GridCachePartitionedLoadCacheSelfTest.java | 20 +-
.../near/GridCachePartitionedLockSelfTest.java | 11 +-
.../near/GridCachePartitionedTtlSelfTest.java | 33 -
...GridCacheReplicatedRefreshAheadSelfTest.java | 51 -
.../GridCacheReplicatedTtlSelfTest.java | 32 -
.../GridCacheEvictionLockUnlockSelfTest.java | 7 +-
.../cache/eviction/GridCacheMockEntry.java | 19 +-
.../cache/local/GridCacheLocalLockSelfTest.java | 36 +-
.../GridCacheLocalMultithreadedSelfTest.java | 42 +-
.../GridCacheLocalRefreshAheadSelfTest.java | 51 -
.../cache/local/GridCacheLocalTtlSelfTest.java | 33 -
.../ggfs/GridGgfsMetaManagerSelfTest.java | 6 +-
.../java/org/gridgain/grid/p2p/p2p.properties | 17 -
.../testframework/junits/GridAbstractTest.java | 8 +
.../junits/common/GridCommonAbstractTest.java | 125 ++-
.../GridCacheFullApiSelfTestSuite.java | 2 +-
.../bamboo/GridDataGridTestSuite.java | 25 +-
.../hadoop/jobtracker/GridHadoopJobTracker.java | 163 +++-
.../cache/GridCacheAbstractQuerySelfTest.java | 14 +-
...idCachePartitionedHitsAndMissesSelfTest.java | 23 +-
.../commands/cache/VisorCacheCommand.scala | 1 -
.../cache/websession/GridWebSessionFilter.java | 37 +-
.../websession/GridWebSessionListener.java | 54 +-
.../websession/GridWebSessionSelfTestSuite.java | 2 +-
198 files changed, 11786 insertions(+), 4187 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5a185707/modules/core/src/main/java/org/gridgain/grid/cache/GridCacheProjection.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5a185707/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheAdapter.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5a185707/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheProjectionImpl.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5a185707/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheProxyImpl.java
----------------------------------------------------------------------
