Merge branches 'ignite-436' and 'sprint-2' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-436
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/cad3d1fa Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/cad3d1fa Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/cad3d1fa Branch: refs/heads/master Commit: cad3d1fa644be0d4867ed524ee9b160f5dd2a792 Parents: 79293ff c7e1ccc Author: AKuznetsov <akuznet...@gridgain.com> Authored: Thu Mar 12 14:22:29 2015 +0700 Committer: AKuznetsov <akuznet...@gridgain.com> Committed: Thu Mar 12 14:22:29 2015 +0700 ---------------------------------------------------------------------- DEVNOTES.txt | 13 +- LICENSE.txt | 54 ++++- NOTICE.txt | 11 + docs/hadoop_readme.md | 17 ++ examples/config/example-cache.xml | 4 +- .../MemcacheRestExampleNodeStartup.java | 5 +- ipc/shmem/compile | 4 + ipc/shmem/config.guess | 4 + ipc/shmem/config.sub | 4 + ipc/shmem/depcomp | 4 + ipc/shmem/ltmain.sh | 3 + ipc/shmem/missing | 4 + modules/clients/readme.md | 17 ++ .../clients/src/test/resources/spring-cache.xml | 8 +- .../java/org/apache/ignite/IgniteCache.java | 24 ++ .../apache/ignite/cache/CachePreloadMode.java | 67 ------ .../apache/ignite/cache/CacheRebalanceMode.java | 67 ++++++ .../java/org/apache/ignite/cache/GridCache.java | 12 +- .../configuration/CacheConfiguration.java | 231 +++++++++---------- .../ignite/events/CachePreloadingEvent.java | 172 -------------- .../ignite/events/CacheRebalancingEvent.java | 172 ++++++++++++++ .../java/org/apache/ignite/events/Event.java | 2 +- .../org/apache/ignite/events/EventType.java | 44 ++-- .../org/apache/ignite/internal/IgnitionEx.java | 8 +- .../processors/cache/GridCacheAttributes.java | 32 +-- .../processors/cache/GridCacheContext.java | 8 +- .../processors/cache/GridCacheEventManager.java | 12 +- .../cache/GridCacheEvictionManager.java | 6 +- .../GridCachePartitionExchangeManager.java | 6 +- .../processors/cache/GridCacheProcessor.java | 74 +++--- .../processors/cache/GridCacheUtils.java | 4 +- .../processors/cache/IgniteCacheProxy.java | 7 + .../distributed/dht/GridDhtLocalPartition.java | 4 +- .../distributed/dht/GridDhtLockFuture.java | 4 +- .../dht/GridDhtPartitionTopologyImpl.java | 14 +- .../distributed/dht/GridDhtTxPrepareFuture.java | 4 +- .../dht/preloader/GridDhtForceKeysFuture.java | 30 +-- .../preloader/GridDhtPartitionDemandPool.java | 78 +++---- .../preloader/GridDhtPartitionSupplyPool.java | 22 +- .../dht/preloader/GridDhtPreloader.java | 14 +- .../internal/util/GridConcurrentFactory.java | 59 ----- .../cache/VisorCachePreloadConfiguration.java | 16 +- .../core/src/test/config/discovery-stress.xml | 2 +- modules/core/src/test/config/example-cache.xml | 4 +- .../config/load/dsi-49-server-production.xml | 4 +- .../src/test/config/load/dsi-load-client.xml | 4 +- .../src/test/config/load/dsi-load-server.xml | 4 +- .../core/src/test/config/spring-cache-load.xml | 2 +- .../core/src/test/config/spring-multicache.xml | 16 +- modules/core/src/test/config/start-nodes.ini | 15 ++ .../test/config/websession/spring-cache-1.xml | 6 +- .../test/config/websession/spring-cache-2.xml | 6 +- .../test/config/websession/spring-cache-3.xml | 6 +- .../GridDiscoveryManagerAliveCacheSelfTest.java | 4 +- .../GridCacheAbstractFailoverSelfTest.java | 4 +- .../GridCacheAbstractLocalStoreSelfTest.java | 8 +- ...acheAbstractUsersAffinityMapperSelfTest.java | 4 +- .../cache/GridCacheBasicStoreAbstractTest.java | 4 +- .../GridCacheConcurrentTxMultiNodeTest.java | 4 +- ...idCacheConfigurationConsistencySelfTest.java | 6 +- ...ridCacheConfigurationValidationSelfTest.java | 8 +- .../cache/GridCacheDeploymentSelfTest.java | 4 +- ...idCacheGetAndTransformStoreAbstractTest.java | 4 +- .../cache/GridCacheIncrementTransformTest.java | 4 +- .../cache/GridCacheMultiUpdateLockSelfTest.java | 4 +- .../GridCacheOrderedPreloadingSelfTest.java | 6 +- .../cache/GridCacheP2PUndeploySelfTest.java | 8 +- .../cache/GridCachePartitionedGetSelfTest.java | 4 +- ...hePartitionedProjectionAffinitySelfTest.java | 4 +- .../GridCachePreloadingEvictionsSelfTest.java | 6 +- .../GridCacheQueryInternalKeysSelfTest.java | 4 +- .../cache/GridCacheSwapPreloadSelfTest.java | 4 +- .../GridCacheValueBytesPreloadingSelfTest.java | 2 +- ...idCacheValueConsistencyAbstractSelfTest.java | 4 +- .../IgniteCacheAbstractStopBusySelfTest.java | 2 +- ...tAllUpdateNonPreloadedPartitionSelfTest.java | 4 +- ...dCacheQueueMultiNodeConsistencySelfTest.java | 3 +- .../IgniteCollectionAbstractTest.java | 4 +- ...GridCachePartitionedNodeRestartSelfTest.java | 4 +- ...idCachePartitionedNodeRestartTxSelfTest.java | 4 +- ...PartitionedQueueCreateMultiNodeSelfTest.java | 4 +- .../GridCacheAbstractNodeRestartSelfTest.java | 6 +- .../GridCacheAbstractPrimarySyncSelfTest.java | 4 +- ...acheEntrySetIterationPreloadingSelfTest.java | 2 +- ...heExpiredEntriesPreloadAbstractSelfTest.java | 6 +- .../distributed/GridCacheLockAbstractTest.java | 4 +- ...dCacheMultithreadedFailoverAbstractTest.java | 4 +- ...dCachePartitionedAffinityFilterSelfTest.java | 4 +- .../GridCachePreloadEventsAbstractSelfTest.java | 8 +- .../GridCachePreloadLifecycleAbstractTest.java | 6 +- ...GridCachePreloadRestartAbstractSelfTest.java | 10 +- ...iteTxConsistencyRestartAbstractSelfTest.java | 4 +- .../IgniteTxPreloadAbstractTest.java | 6 +- .../dht/GridCacheAtomicNearCacheSelfTest.java | 4 +- ...dCacheColocatedTxSingleThreadedSelfTest.java | 4 +- ...GridCacheDhtEvictionNearReadersSelfTest.java | 4 +- .../dht/GridCacheDhtEvictionSelfTest.java | 4 +- .../dht/GridCacheDhtInternalEntrySelfTest.java | 4 +- .../dht/GridCacheDhtMappingSelfTest.java | 4 +- .../dht/GridCacheDhtPreloadBigDataSelfTest.java | 10 +- .../dht/GridCacheDhtPreloadDelayedSelfTest.java | 26 +-- .../GridCacheDhtPreloadDisabledSelfTest.java | 8 +- .../GridCacheDhtPreloadMessageCountTest.java | 4 +- .../dht/GridCacheDhtPreloadPutGetSelfTest.java | 6 +- .../dht/GridCacheDhtPreloadSelfTest.java | 28 +-- .../GridCacheDhtPreloadStartStopSelfTest.java | 12 +- .../dht/GridCacheDhtPreloadUnloadSelfTest.java | 10 +- ...ePartitionedNearDisabledMetricsSelfTest.java | 4 +- ...idCachePartitionedPreloadEventsSelfTest.java | 8 +- ...dCachePartitionedTopologyChangeSelfTest.java | 4 +- ...ridCachePartitionedUnloadEventsSelfTest.java | 12 +- ...eAtomicInvalidPartitionHandlingSelfTest.java | 4 +- ...unctionExcludeNeighborsAbstractSelfTest.java | 4 +- ...GridCacheAtomicMultiNodeFullApiSelfTest.java | 4 +- ...idCacheAtomicPartitionedMetricsSelfTest.java | 4 +- .../near/GridCacheNearEvictionSelfTest.java | 7 +- .../near/GridCacheNearMultiGetSelfTest.java | 4 +- .../near/GridCacheNearOnlyTopologySelfTest.java | 4 +- .../GridCacheNearPartitionedClearSelfTest.java | 4 +- .../near/GridCacheNearReadersSelfTest.java | 4 +- .../near/GridCacheNearTxMultiNodeSelfTest.java | 4 +- ...AffinityExcludeNeighborsPerformanceTest.java | 4 +- .../GridCachePartitionedAffinitySelfTest.java | 4 +- .../GridCachePartitionedBasicOpSelfTest.java | 2 +- .../near/GridCachePartitionedEventSelfTest.java | 4 +- ...idCachePartitionedHitsAndMissesSelfTest.java | 2 +- .../GridCachePartitionedMetricsSelfTest.java | 4 +- ...achePartitionedMultiNodeCounterSelfTest.java | 4 +- ...achePartitionedMultiNodeFullApiSelfTest.java | 4 +- .../GridCachePartitionedNodeRestartTest.java | 4 +- ...ePartitionedOptimisticTxNodeRestartTest.java | 4 +- ...achePartitionedPreloadLifecycleSelfTest.java | 4 +- ...hePartitionedQueryMultiThreadedSelfTest.java | 2 +- .../GridCachePartitionedTxSalvageSelfTest.java | 2 +- ...achePartitionedTxSingleThreadedSelfTest.java | 4 +- .../GridCacheReplicatedInvalidateSelfTest.java | 4 +- .../GridCacheReplicatedNodeRestartSelfTest.java | 6 +- .../GridCacheSyncReplicatedPreloadSelfTest.java | 6 +- ...CacheReplicatedPreloadLifecycleSelfTest.java | 4 +- .../GridCacheReplicatedPreloadSelfTest.java | 16 +- ...eplicatedPreloadStartStopEventsSelfTest.java | 6 +- .../GridCacheEvictionFilterSelfTest.java | 4 +- .../GridCacheLruNearEvictionPolicySelfTest.java | 4 +- ...heNearOnlyLruNearEvictionPolicySelfTest.java | 4 +- ...ridCacheContinuousQueryAbstractSelfTest.java | 4 +- ...dCacheAbstractReduceFieldsQuerySelfTest.java | 4 +- .../processors/igfs/IgfsSizeSelfTest.java | 7 +- .../ignite/jvmtest/ConcurrentMapTest.java | 5 +- .../loadtests/GridCacheMultiNodeLoadTest.java | 4 +- .../capacity/spring-capacity-cache.xml | 4 +- .../loadtests/colocation/spring-colocation.xml | 4 +- .../GridCachePartitionedAtomicLongLoadTest.java | 2 +- .../GridP2PContinuousDeploymentSelfTest.java | 4 +- .../tcp/GridCacheDhtLockBackupSelfTest.java | 4 +- .../junits/common/GridCommonAbstractTest.java | 4 +- .../webapp/META-INF/ignite-webapp-config.xml | 12 +- .../GridCacheAbstractFieldsQuerySelfTest.java | 4 +- .../cache/GridCacheAbstractQuerySelfTest.java | 4 +- .../cache/GridCacheCrossCacheQuerySelfTest.java | 4 +- .../GridCacheCrossCacheQuerySelfTestNewApi.java | 4 +- .../cache/GridIndexingWithNoopSwapSelfTest.java | 4 +- .../near/GridCacheQueryNodeRestartSelfTest.java | 6 +- .../query/h2/sql/GridQueryParsingTest.java | 5 +- .../tcp/GridOrderedMessageCancelSelfTest.java | 4 +- .../commands/events/VisorEventsCommand.scala | 4 +- .../scala/org/apache/ignite/visor/visor.scala | 4 +- modules/winservice/README.md | 17 ++ modules/yardstick/README.md | 17 ++ pom.xml | 21 +- 169 files changed, 1101 insertions(+), 959 deletions(-) ----------------------------------------------------------------------
