Merge branches 'ignite-100' and 'sprint-1' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-100
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/09c52dd7 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/09c52dd7 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/09c52dd7 Branch: refs/heads/ignite-54 Commit: 09c52dd7d297de4fdf24fa57e7fe26f97417e4ee Parents: 2af57da 2888b99 Author: S.Vladykin <svlady...@gridgain.com> Authored: Wed Jan 21 14:20:19 2015 +0300 Committer: S.Vladykin <svlady...@gridgain.com> Committed: Wed Jan 21 14:20:19 2015 +0300 ---------------------------------------------------------------------- LICENSE.txt | 202 ++++ apache-2.0.txt | 202 ---- assembly/release-base.xml | 2 +- docs/core-site.gridgain.xml | 21 + .../examples/datagrid/CacheApiExample.java | 63 +- .../datagrid/CachePopularNumbersExample.java | 17 +- .../ScalarCachePopularNumbersExample.scala | 17 +- .../services/javax.cache.spi.CachingProvider | 1 + .../java/org/apache/ignite/IgniteCache.java | 235 +++- .../org/apache/ignite/IgniteCacheMXBean.java | 72 ++ .../org/apache/ignite/IgniteCacheManager.java | 372 +++++++ .../apache/ignite/IgniteCachingProvider.java | 189 ++++ .../apache/ignite/cache/CacheEntryEvent.java | 53 +- .../java/org/apache/ignite/cache/CacheLock.java | 62 ++ .../cache/CachePartialUpdateException.java | 44 + .../dataload/IgniteDataLoadCacheUpdater.java | 7 +- .../processors/cache/CacheLockAsyncImpl.java | 141 +++ .../processors/cache/CacheLockImpl.java | 177 +++ .../processors/cache/IgniteCacheProxy.java | 693 ++++++++++-- .../communication/tcp/TcpCommunicationSpi.java | 2 +- .../grid/cache/GridCacheConfiguration.java | 44 +- .../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 ---- .../cache/query/GridCacheContinuousQuery.java | 10 +- .../grid/kernal/GridEventConsumeHandler.java | 2 +- .../org/gridgain/grid/kernal/GridGainEx.java | 2 +- .../kernal/managers/GridManagerAdapter.java | 26 +- .../processors/cache/CacheInvokeEntry.java | 97 ++ .../processors/cache/CacheInvokeResult.java | 104 ++ .../processors/cache/GridCacheAdapter.java | 553 +++++++--- .../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 | 534 ++++++---- .../processors/cache/GridCacheMessage.java | 71 +- .../processors/cache/GridCacheProcessor.java | 25 +- .../processors/cache/GridCacheProjectionEx.java | 86 +- .../cache/GridCacheProjectionImpl.java | 171 +-- .../processors/cache/GridCacheProxyImpl.java | 147 +-- .../processors/cache/GridCacheReturn.java | 57 +- .../processors/cache/GridCacheStoreManager.java | 7 +- .../cache/GridCacheTransformComputeClosure.java | 76 -- .../cache/GridCacheUpdateAtomicResult.java | 20 +- .../kernal/processors/cache/GridCacheUtils.java | 25 +- .../cache/IgniteCacheExpiryPolicy.java | 73 ++ .../GridAtomicCacheQueueImpl.java | 44 +- .../GridCacheDataStructuresManager.java | 13 +- .../datastructures/GridCacheQueueAdapter.java | 229 ++-- .../GridTransactionalCacheQueueImpl.java | 112 +- .../distributed/GridCacheTtlUpdateRequest.java | 500 +++++++++ .../GridDistributedCacheAdapter.java | 18 +- .../GridDistributedLockResponse.java | 19 +- .../GridDistributedTxRemoteAdapter.java | 52 +- .../IgniteExternalizableExpiryPolicy.java | 174 +++ .../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 +- .../GridCacheContinuousQueryAdapter.java | 42 +- .../GridCacheContinuousQueryEntry.java | 81 +- .../GridCacheContinuousQueryHandler.java | 96 +- .../GridCacheContinuousQueryHandlerV2.java | 83 -- .../GridCacheContinuousQueryHandlerV3.java | 61 -- .../GridCacheContinuousQueryHandlerV4.java | 61 -- .../GridCacheContinuousQueryManager.java | 513 ++++++++- .../cache/transactions/IgniteTxAdapter.java | 37 +- .../cache/transactions/IgniteTxEntry.java | 129 ++- .../cache/transactions/IgniteTxHandler.java | 28 +- .../transactions/IgniteTxLocalAdapter.java | 653 +++++++++--- .../cache/transactions/IgniteTxLocalEx.java | 20 +- .../continuous/GridContinuousMessage.java | 52 +- .../continuous/GridContinuousMessageType.java | 5 +- .../continuous/GridContinuousProcessor.java | 181 +++- .../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 + .../service/GridServiceProcessor.java | 4 +- .../grid/kernal/tck/TCKMBeanServerBuilder.java | 118 ++ .../visor/cache/VisorCacheConfiguration.java | 18 - .../GridTcpCommunicationMessageFactory.java | 9 +- .../cache/IgniteCacheAbstractTest.java | 222 ++++ .../cache/IgniteCacheAtomicInvokeTest.java | 55 + .../cache/IgniteCacheAtomicLocalInvokeTest.java | 49 + ...niteCacheAtomicLocalWithStoreInvokeTest.java | 30 + .../IgniteCacheAtomicNearEnabledInvokeTest.java | 32 + ...eCacheAtomicPrimaryWriteOrderInvokeTest.java | 55 + ...micPrimaryWriteOrderWithStoreInvokeTest.java | 31 + .../IgniteCacheEntryListenerAbstractTest.java | 1005 ++++++++++++++++++ ...IgniteCacheEntryListenerAtomicLocalTest.java | 49 + ...eCacheEntryListenerAtomicReplicatedTest.java | 32 + .../IgniteCacheEntryListenerAtomicTest.java | 55 + ...eCacheEntryListenerEagerTtlDisabledTest.java | 30 + .../IgniteCacheEntryListenerTxLocalTest.java | 49 + ...gniteCacheEntryListenerTxReplicatedTest.java | 32 + .../cache/IgniteCacheEntryListenerTxTest.java | 49 + .../cache/IgniteCacheInvokeAbstractTest.java | 655 ++++++++++++ .../processors/cache/IgniteCacheTest.java | 121 --- .../cache/IgniteCacheTxInvokeTest.java | 49 + .../cache/IgniteCacheTxLocalInvokeTest.java | 49 + .../IgniteCacheTxNearEnabledInvokeTest.java | 32 + .../cache/IgniteCachingProviderSelfTest.java | 131 +++ .../IgniteCacheAtomicExpiryPolicyTest.java | 55 + .../IgniteCacheAtomicLocalExpiryPolicyTest.java | 49 + ...AtomicPrimaryWriteOrderExpiryPolicyTest.java | 32 + ...maryWriteOrderWithStoreExpiryPolicyTest.java | 31 + ...teCacheAtomicReplicatedExpiryPolicyTest.java | 32 + ...iteCacheAtomicWithStoreExpiryPolicyTest.java | 30 + .../IgniteCacheExpiryPolicyAbstractTest.java | 959 +++++++++++++++++ .../IgniteCacheExpiryPolicyTestSuite.java | 47 + .../expiry/IgniteCacheTxExpiryPolicyTest.java | 49 + .../IgniteCacheTxLocalExpiryPolicyTest.java | 49 + ...IgniteCacheTxReplicatedExpiryPolicyTest.java | 34 + .../IgniteCacheTxWithStoreExpiryPolicyTest.java | 30 + .../tcp/GridCacheDhtLockBackupSelfTest.java | 18 +- .../GridCacheLoadOnlyStoreAdapterSelfTest.java | 5 +- .../cache/GridCacheAbstractFullApiSelfTest.java | 682 +++++------- .../cache/GridCacheAbstractSelfTest.java | 17 + .../cache/GridCacheAbstractTtlSelfTest.java | 104 -- .../cache/GridCacheBasicApiAbstractTest.java | 188 +++- .../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 | 205 ++-- .../GridCacheTransformEventSelfTest.java | 68 +- .../IgniteTxPreloadAbstractTest.java | 44 +- ...heAbstractTransformWriteThroughSelfTest.java | 37 +- .../dht/GridCacheAtomicNearCacheSelfTest.java | 71 +- .../dht/GridCacheColocatedDebugTest.java | 43 +- .../GridCacheColocatedRefreshAheadSelfTest.java | 54 - .../dht/GridCacheGlobalLoadTest.java | 171 +++ ...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 | 28 +- .../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 | 66 +- .../GridCacheLocalRefreshAheadSelfTest.java | 51 - .../cache/local/GridCacheLocalTtlSelfTest.java | 33 - .../ggfs/GridGgfsMetaManagerSelfTest.java | 6 +- .../testframework/junits/GridAbstractTest.java | 8 + .../junits/common/GridCommonAbstractTest.java | 138 ++- .../GridCacheFullApiSelfTestSuite.java | 2 +- .../bamboo/GridDataGridTestSuite.java | 35 +- .../counter/GridHadoopFSCounterWriter.java | 4 +- .../counter/GridHadoopPerformanceCounter.java | 18 +- .../hadoop/jobtracker/GridHadoopJobTracker.java | 163 ++- .../v2/GridHadoopV2JobResourceManager.java | 13 +- .../grid/hadoop/GridHadoopTestUtils.java | 20 +- .../hadoop/GridHadoopCommandLineTest.java | 2 +- .../hadoop/GridHadoopMapReduceTest.java | 5 +- .../cache/GridCacheAbstractQuerySelfTest.java | 14 +- ...idCachePartitionedHitsAndMissesSelfTest.java | 23 +- .../grid/cache/spring/GridSpringCache.java | 185 ++++ .../cache/spring/GridSpringCacheManager.java | 190 +--- .../spring/GridSpringDynamicCacheManager.java | 316 ++++++ .../spring/GridSpringCacheManagerSelfTest.java | 2 +- .../GridSpringDynamicCacheManagerSelfTest.java | 218 ++++ .../GridSpringDynamicCacheTestService.java | 62 ++ .../cache/spring/spring-dynamic-caching.xml | 43 + .../testsuites/bamboo/GridSpringTestSuite.java | 1 + .../commands/cache/VisorCacheCommand.scala | 1 - .../cache/websession/GridWebSessionFilter.java | 37 +- .../websession/GridWebSessionListener.java | 54 +- .../websession/GridWebSessionSelfTestSuite.java | 2 +- 238 files changed, 15989 insertions(+), 4925 deletions(-) ----------------------------------------------------------------------
