Merge branch 'master' into ignite-1099
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/bc336d99 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/bc336d99 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/bc336d99 Branch: refs/heads/ignite-1099 Commit: bc336d99b296ef8acc14b4d8f0c308b120d01993 Parents: 8d96c57 8218fe6 Author: ashutak <ashu...@gridgain.com> Authored: Mon Jul 13 13:20:27 2015 +0300 Committer: ashutak <ashu...@gridgain.com> Committed: Mon Jul 13 13:20:27 2015 +0300 ---------------------------------------------------------------------- RELEASE_NOTES.txt | 12 + .../examples/ScalarCacheAffinityExample.scala | 2 +- .../scalar/examples/ScalarCacheExample.scala | 2 +- .../ScalarCachePopularNumbersExample.scala | 2 +- .../examples/ScalarCacheQueryExample.scala | 2 +- .../examples/ScalarSnowflakeSchemaExample.scala | 4 +- modules/core/pom.xml | 7 + .../src/main/java/org/apache/ignite/Ignite.java | 2 +- .../java/org/apache/ignite/IgniteCache.java | 14 +- .../org/apache/ignite/cache/CacheManager.java | 13 +- .../affinity/fair/FairAffinityFunction.java | 5 +- .../configuration/CacheConfiguration.java | 6 +- .../configuration/TransactionConfiguration.java | 23 + .../apache/ignite/internal/IgniteKernal.java | 34 +- .../discovery/GridDiscoveryManager.java | 23 +- .../cache/DynamicCacheChangeRequest.java | 39 +- .../processors/cache/GridCacheAttributes.java | 3 + .../processors/cache/GridCacheContext.java | 8 +- .../processors/cache/GridCacheGateway.java | 4 +- .../processors/cache/GridCacheIoManager.java | 8 +- .../GridCachePartitionExchangeManager.java | 6 +- .../processors/cache/GridCacheProcessor.java | 220 ++--- .../cache/GridCacheSharedContext.java | 15 +- .../processors/cache/IgniteCacheProxy.java | 448 +++++++--- .../distributed/dht/GridDhtCacheEntry.java | 4 +- .../GridDhtPartitionsExchangeFuture.java | 30 +- .../distributed/near/GridNearGetFuture.java | 4 +- .../cache/jta/CacheJtaManagerAdapter.java | 17 +- .../cache/jta/CacheNoopJtaManager.java | 2 +- .../continuous/CacheContinuousQueryHandler.java | 4 +- .../datastreamer/DataStreamProcessor.java | 3 + .../datastructures/DataStructuresProcessor.java | 39 +- .../GridCacheCountDownLatchImpl.java | 15 +- .../ignite/internal/util/IgniteUtils.java | 6 +- .../visor/cache/VisorCacheConfiguration.java | 11 - .../visor/cache/VisorCacheStopTask.java | 2 +- .../tcp/internal/TcpDiscoveryNode.java | 8 +- .../affinity/IgniteClientNodeAffinityTest.java | 14 +- .../IgniteFairAffinityDynamicCacheSelfTest.java | 3 +- ...cheStoreSessionListenerAbstractSelfTest.java | 112 ++- .../GridCacheTxLoadFromStoreOnLockSelfTest.java | 34 +- .../cache/CacheFutureExceptionSelfTest.java | 72 +- .../CacheMetricsForClusterGroupSelfTest.java | 10 +- .../cache/CacheOffheapMapEntrySelfTest.java | 7 +- .../cache/CacheStopAndDestroySelfTest.java | 859 +++++++++++++++++++ ...eUsageMultinodeDynamicStartAbstractTest.java | 2 +- .../cache/GridCacheAbstractFullApiSelfTest.java | 323 ++++--- .../cache/GridCacheAbstractSelfTest.java | 14 +- ...ProjectionForCachesOnDaemonNodeSelfTest.java | 2 +- .../IgniteCacheConfigurationTemplateTest.java | 26 +- .../cache/IgniteDynamicCacheStartSelfTest.java | 156 ++-- .../IgniteDynamicClientCacheStartSelfTest.java | 5 +- .../IgniteClientDataStructuresAbstractTest.java | 109 ++- .../IgniteCountDownLatchAbstractSelfTest.java | 12 +- ...teCacheClientNodePartitionsExchangeTest.java | 29 +- ...eAtomicNearOnlyMultiNodeFullApiSelfTest.java | 3 + ...idCacheNearOnlyMultiNodeFullApiSelfTest.java | 5 +- .../near/GridCacheNearTxMultiNodeSelfTest.java | 10 +- ...achePartitionedMultiNodeFullApiSelfTest.java | 48 +- ...CacheLocalOffHeapAndSwapMetricsSelfTest.java | 2 +- ...OnlyFairAffinityMultiJvmFullApiSelfTest.java | 31 + ...AtomicClientOnlyMultiJvmFullApiSelfTest.java | 31 + ...tOnlyMultiJvmP2PDisabledFullApiSelfTest.java | 31 + ...pyOnReadDisabledMultiJvmFullApiSelfTest.java | 31 + ...omicFairAffinityMultiJvmFullApiSelfTest.java | 31 + .../GridCacheAtomicMultiJvmFullApiSelfTest.java | 30 + ...tomicMultiJvmP2PDisabledFullApiSelfTest.java | 31 + ...bledFairAffinityMultiJvmFullApiSelfTest.java | 31 + ...tomicNearEnabledMultiJvmFullApiSelfTest.java | 31 + ...rimaryWriteOrderMultiJvmFullApiSelfTest.java | 31 + ...heAtomicNearOnlyMultiJvmFullApiSelfTest.java | 31 + ...rOnlyMultiJvmP2PDisabledFullApiSelfTest.java | 31 + ...cheAtomicOffHeapMultiJvmFullApiSelfTest.java | 31 + ...micOffHeapTieredMultiJvmFullApiSelfTest.java | 36 + ...rderFairAffinityMultiJvmFullApiSelfTest.java | 31 + ...rimaryWriteOrderMultiJvmFullApiSelfTest.java | 31 + ...OrderMultiJvmP2PDisabledFullApiSelfTest.java | 31 + ...rityOrderOffHeapMultiJvmFullApiSelfTest.java | 31 + ...derOffHeapTieredMultiJvmFullApiSelfTest.java | 36 + ...OnlyFairAffinityMultiJvmFullApiSelfTest.java | 31 + ...ridCacheNearOnlyMultiJvmFullApiSelfTest.java | 30 + ...rOnlyMultiJvmP2PDisabledFullApiSelfTest.java | 31 + ...pyOnReadDisabledMultiJvmFullApiSelfTest.java | 31 + ...onedFairAffinityMultiJvmFullApiSelfTest.java | 31 + ...CachePartitionedMultiJvmFullApiSelfTest.java | 30 + ...ionedMultiJvmP2PDisabledFullApiSelfTest.java | 31 + ...micOffHeapTieredMultiJvmFullApiSelfTest.java | 36 + ...bledFairAffinityMultiJvmFullApiSelfTest.java | 31 + ...onedNearDisabledMultiJvmFullApiSelfTest.java | 31 + ...abledMultiJvmP2PDisabledFullApiSelfTest.java | 31 + ...rDisabledOffHeapMultiJvmFullApiSelfTest.java | 31 + ...ledOffHeapTieredMultiJvmFullApiSelfTest.java | 36 + ...rtitionedOffHeapMultiJvmFullApiSelfTest.java | 31 + ...nedOffHeapTieredMultiJvmFullApiSelfTest.java | 36 + ...ReplicatedAtomicMultiJvmFullApiSelfTest.java | 31 + ...rimaryWriteOrderMultiJvmFullApiSelfTest.java | 31 + ...dCacheReplicatedMultiJvmFullApiSelfTest.java | 30 + ...catedMultiJvmP2PDisabledFullApiSelfTest.java | 31 + ...plicatedNearOnlyMultiJvmFullApiSelfTest.java | 37 + ...eplicatedOffHeapMultiJvmFullApiSelfTest.java | 31 + ...tedOffHeapTieredMultiJvmFullApiSelfTest.java | 36 + .../DataStreamerMultinodeCreateCacheTest.java | 14 +- .../loadtests/hashmap/GridCacheTestContext.java | 4 +- .../GridCommandLineTransformerSelfTest.java | 12 +- .../testframework/junits/GridAbstractTest.java | 380 +++++++- .../junits/common/GridCommonAbstractTest.java | 50 +- .../junits/multijvm/AffinityProcessProxy.java | 195 +++++ .../multijvm/IgniteCacheProcessProxy.java | 602 +++++++++++++ .../multijvm/IgniteClusterProcessProxy.java | 320 +++++++ .../multijvm/IgniteEventsProcessProxy.java | 148 ++++ .../junits/multijvm/IgniteNodeRunner.java | 184 ++++ .../junits/multijvm/IgniteProcessProxy.java | 571 ++++++++++++ ...IgniteCacheFullApiMultiJvmSelfTestSuite.java | 89 ++ .../testsuites/IgniteCacheTestSuite4.java | 2 + .../CacheConfigurationP2PTestClient.java | 4 +- .../testsuites/IgniteHadoopTestSuite.java | 2 +- .../HibernateTransactionalDataRegion.java | 12 +- .../hibernate/HibernateL2CacheSelfTest.java | 7 +- .../HibernateL2CacheTransactionalSelfTest.java | 5 - .../apache/ignite/cache/jta/CacheTmLookup.java | 3 +- .../processors/cache/jta/CacheJtaManager.java | 72 +- .../cache/jta/GridCacheXAResource.java | 16 +- .../processors/cache/GridCacheJtaSelfTest.java | 52 +- .../GridTmLookupLifecycleAwareSelfTest.java | 29 +- modules/kafka/pom.xml | 11 - .../util/spring/IgniteSpringHelperImpl.java | 10 +- .../IgniteExcludeInConfigurationTest.java | 5 +- .../org/apache/ignite/spring/sprint-exclude.xml | 19 + .../commands/cache/VisorCacheCommand.scala | 2 - .../visor/commands/open/VisorOpenCommand.scala | 2 +- parent/pom.xml | 40 + pom.xml | 1 - 132 files changed, 6216 insertions(+), 854 deletions(-) ----------------------------------------------------------------------
