Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-gg-10509
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/0bb0cd82 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/0bb0cd82 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/0bb0cd82 Branch: refs/heads/ignite-gg-10509 Commit: 0bb0cd82cd821ff321394fa22fc67302cfdfca37 Parents: 52ddebd b19ed0c Author: iveselovskiy <iveselovs...@gridgain.com> Authored: Tue Jul 14 15:56:57 2015 +0300 Committer: iveselovskiy <iveselovs...@gridgain.com> Committed: Tue Jul 14 15:56:57 2015 +0300 ---------------------------------------------------------------------- examples/pom.xml | 2 +- .../examples/ScalarCacheAffinityExample.scala | 2 +- .../scalar/examples/ScalarCacheExample.scala | 2 +- .../ScalarCachePopularNumbersExample.scala | 2 +- .../examples/ScalarCacheQueryExample.scala | 2 +- .../examples/ScalarSnowflakeSchemaExample.scala | 4 +- modules/aop/pom.xml | 2 +- modules/aws/pom.xml | 2 +- modules/clients/pom.xml | 2 +- modules/cloud/pom.xml | 2 +- modules/codegen/pom.xml | 2 +- modules/core/pom.xml | 9 +- .../java/org/apache/ignite/IgniteCache.java | 14 +- .../org/apache/ignite/cache/CacheManager.java | 13 +- .../affinity/fair/FairAffinityFunction.java | 5 +- .../configuration/CacheConfiguration.java | 2 +- .../apache/ignite/internal/IgniteKernal.java | 2 +- .../discovery/GridDiscoveryManager.java | 23 +- .../cache/DynamicCacheChangeRequest.java | 39 +- .../processors/cache/GridCacheContext.java | 14 +- .../processors/cache/GridCacheGateway.java | 4 +- .../GridCachePartitionExchangeManager.java | 6 +- .../processors/cache/GridCacheProcessor.java | 102 ++- .../processors/cache/IgniteCacheProxy.java | 448 +++++++--- .../distributed/dht/GridDhtCacheEntry.java | 4 +- .../dht/atomic/GridDhtAtomicCache.java | 4 +- .../dht/atomic/GridNearAtomicUpdateFuture.java | 20 +- .../GridDhtPartitionsExchangeFuture.java | 30 +- .../datastreamer/DataStreamProcessor.java | 3 + .../ignite/internal/util/IgniteUtils.java | 6 +- .../visor/cache/VisorCacheStopTask.java | 2 +- .../tcp/internal/TcpDiscoveryNode.java | 8 +- .../META-INF/classnames-jdk.properties | 3 + .../core/src/main/resources/ignite.properties | 2 +- .../affinity/IgniteClientNodeAffinityTest.java | 14 +- .../IgniteFairAffinityDynamicCacheSelfTest.java | 3 +- ...cheStoreSessionListenerAbstractSelfTest.java | 111 ++- .../GridCacheTxLoadFromStoreOnLockSelfTest.java | 34 +- .../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 +- .../cache/IgniteDynamicCacheStartSelfTest.java | 140 +-- ...teCacheClientNodePartitionsExchangeTest.java | 29 +- ...eAtomicInvalidPartitionHandlingSelfTest.java | 2 +- ...eAtomicNearOnlyMultiNodeFullApiSelfTest.java | 3 + ...idCacheNearOnlyMultiNodeFullApiSelfTest.java | 5 +- .../near/GridCacheNearTxMultiNodeSelfTest.java | 10 +- ...achePartitionedMultiNodeFullApiSelfTest.java | 48 +- ...acheAtomicReplicatedNodeRestartSelfTest.java | 15 - ...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 +- .../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 + modules/extdata/p2p/pom.xml | 2 +- .../CacheConfigurationP2PTestClient.java | 4 +- .../extdata/uri/modules/uri-dependency/pom.xml | 6 +- modules/extdata/uri/pom.xml | 26 +- modules/gce/pom.xml | 2 +- modules/geospatial/pom.xml | 2 +- modules/hadoop/pom.xml | 2 +- modules/hibernate/pom.xml | 2 +- modules/indexing/pom.xml | 2 +- modules/jcl/pom.xml | 2 +- modules/jta/pom.xml | 2 +- modules/kafka/pom.xml | 2 +- modules/log4j/pom.xml | 2 +- modules/mesos/pom.xml | 2 +- modules/rest-http/pom.xml | 2 +- modules/scalar-2.10/pom.xml | 2 +- modules/scalar/pom.xml | 2 +- modules/schedule/pom.xml | 2 +- modules/schema-import/pom.xml | 2 +- modules/slf4j/pom.xml | 2 +- modules/spark-2.10/pom.xml | 2 +- modules/spark/pom.xml | 2 +- modules/spring/pom.xml | 2 +- modules/ssh/pom.xml | 2 +- modules/tools/pom.xml | 2 +- modules/urideploy/pom.xml | 2 +- modules/visor-console-2.10/pom.xml | 2 +- modules/visor-console/pom.xml | 2 +- modules/visor-plugins/pom.xml | 2 +- modules/web/pom.xml | 2 +- modules/yardstick/pom.xml | 2 +- parent/pom.xml | 40 + pom.xml | 3 +- 140 files changed, 5781 insertions(+), 644 deletions(-) ----------------------------------------------------------------------
