Merge remote-tracking branch 'remotes/origin/sprint-1' into ignite-6
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/b7d585d8 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/b7d585d8 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/b7d585d8 Branch: refs/heads/ignite-6 Commit: b7d585d848ce5a483f904c357f6f737827a75e4c Parents: 349d51e b4da38a Author: sboikov <sboi...@gridgain.com> Authored: Tue Jan 27 16:33:33 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Tue Jan 27 16:33:33 2015 +0300 ---------------------------------------------------------------------- examples/config/example-cache.xml | 9 +- examples/config/example-compute.xml | 9 +- examples/config/example-streamer.xml | 9 +- examples/config/filesystem/example-ggfs.xml | 9 +- .../examples/misc/springbean/spring-bean.xml | 9 +- .../examples/ScalarCacheAffinityExample1.scala | 9 +- .../examples/ScalarCacheAffinityExample2.scala | 9 +- .../ScalarCacheAffinitySimpleExample.scala | 4 +- .../scalar/examples/ScalarCacheExample.scala | 13 +- .../ScalarCachePopularNumbersExample.scala | 14 +- .../examples/ScalarCacheQueryExample.scala | 11 +- .../scalar/examples/ScalarClosureExample.scala | 6 +- .../examples/ScalarContinuationExample.scala | 11 +- .../examples/ScalarCreditRiskExample.scala | 7 +- .../scalar/examples/ScalarJvmCloudExample.scala | 13 +- .../examples/ScalarPiCalculationExample.scala | 7 +- .../scalar/examples/ScalarPingPongExample.scala | 7 +- .../scalar/examples/ScalarPrimeExample.scala | 10 +- .../scalar/examples/ScalarScheduleExample.scala | 6 +- .../examples/ScalarSnowflakeSchemaExample.scala | 15 +- .../examples/ScalarStartStopExample.scala | 73 --- .../scalar/examples/ScalarTaskExample.scala | 12 +- .../examples/ScalarWorldShortestMapReduce.scala | 6 +- .../examples/IgniteFsExamplesSelfTest.java | 26 +- .../tests/examples/ScalarExamplesSelfTest.scala | 12 +- .../src/main/java/org/apache/ignite/Ignite.java | 2 +- .../apache/ignite/IgniteNotPeerDeployable.java | 41 -- .../org/apache/ignite/cluster/ClusterNode.java | 2 +- .../org/apache/ignite/internal/GridGainEx.java | 2 +- .../ignite/internal/GridJobExecuteRequest.java | 95 +-- .../internal/GridJobExecuteRequestV2.java | 185 ------ .../org/apache/ignite/internal/GridKernal.java | 2 +- .../ignite/internal/GridKernalContext.java | 2 +- .../ignite/internal/GridKernalContextImpl.java | 2 +- .../apache/ignite/internal/GridProductImpl.java | 6 +- .../ignite/internal/GridUpdateNotifier.java | 2 +- .../managers/communication/GridIoManager.java | 563 ++++++----------- .../managers/communication/GridIoMessage.java | 53 +- .../discovery/GridDiscoveryManager.java | 1 - .../processors/cache/GridCacheAdapter.java | 4 +- .../processors/cache/GridCacheIoManager.java | 22 +- .../processors/cache/GridCacheVersionEx.java | 9 + .../preloader/GridDhtPartitionDemandPool.java | 24 +- .../preloader/GridDhtPartitionSupplyPool.java | 10 +- .../query/GridCacheDistributedQueryManager.java | 23 - .../GridCacheContinuousQueryManager.java | 11 - .../closure/GridClosureProcessor.java | 624 ++++++++++++++----- .../GridMasterLeaveAwareComputeJobAdapter.java | 36 -- .../continuous/GridContinuousProcessor.java | 1 - .../dataload/IgniteDataLoaderImpl.java | 1 - .../processors/job/GridJobProcessor.java | 10 - .../internal/processors/job/GridJobWorker.java | 6 - .../license/GridLicenseProcessor.java | 6 +- .../license/os/GridOsLicenseProcessor.java | 2 +- .../processors/resource/GridResourceUtils.java | 4 +- .../processors/task/GridTaskProcessor.java | 15 +- .../processors/task/GridTaskWorker.java | 57 +- .../ignite/internal/product/IgniteProduct.java | 67 ++ .../internal/product/IgniteProductLicense.java | 183 ++++++ .../product/IgniteProductLicenseException.java | 70 +++ .../apache/ignite/internal/product/package.html | 23 + .../apache/ignite/internal/util/GridUtils.java | 1 - .../GridTcpCommunicationMessageFactory.java | 5 +- .../shmem/GridIpcSharedMemoryNativeLoader.java | 3 +- .../ignite/lang/IgniteNotPeerDeployable.java | 41 ++ .../ignite/lang/IgniteProductVersion.java | 291 +++++++++ .../apache/ignite/product/IgniteProduct.java | 66 -- .../ignite/product/IgniteProductLicense.java | 183 ------ .../product/IgniteProductLicenseException.java | 70 --- .../ignite/product/IgniteProductVersion.java | 291 --------- .../java/org/apache/ignite/product/package.html | 23 - .../communication/tcp/TcpCommunicationSpi.java | 1 - .../ignite/spi/discovery/DiscoverySpi.java | 2 +- .../discovery/tcp/TcpDiscoverySpiAdapter.java | 2 +- .../tcp/internal/TcpDiscoveryNode.java | 1 - .../ignite/startup/BasicWarmupClosure.java | 561 +++++++++++++++++ modules/core/src/test/config/ggfs-loopback.xml | 41 +- .../core/src/test/config/ggfs-no-endpoint.xml | 199 ------ modules/core/src/test/config/ggfs-shmem.xml | 41 +- .../ignite/internal/GridDiscoverySelfTest.java | 3 +- .../internal/GridReleaseTypeSelfTest.java | 3 +- .../GridTopologyBuildVersionSelfTest.java | 3 +- .../ignite/internal/GridVersionSelfTest.java | 2 +- .../communication/GridIoManagerSelfTest.java | 2 +- .../cache/GridCacheVersionSelfTest.java | 23 +- ...unctionExcludeNeighborsAbstractSelfTest.java | 2 +- .../GridCacheSyncReplicatedPreloadSelfTest.java | 1 - .../product/GridProductVersionSelfTest.java | 111 ++++ .../marshaller/GridMarshallerAbstractTest.java | 2 +- .../ignite/p2p/GridP2PClassLoadingSelfTest.java | 4 +- .../product/GridProductVersionSelfTest.java | 111 ---- .../ignite/session/GridSessionLoadSelfTest.java | 11 +- .../GridAbstractDiscoverySelfTest.java | 2 +- .../ignite/testframework/GridTestNode.java | 4 +- .../testframework/junits/GridTestIgnite.java | 2 +- .../junits/spi/GridSpiAbstractTest.java | 4 +- .../ignite/testsuites/IgniteBasicTestSuite.java | 2 +- modules/scalar/readme.txt | 4 +- .../ignite/scalar/ScalarConversions.scala | 19 +- .../org/apache/ignite/scalar/lang/Packet.scala | 4 +- .../ignite/scalar/lang/ScalarAbsClosure.scala | 4 +- .../scalar/lang/ScalarAbsClosureFunction.scala | 2 +- .../ignite/scalar/lang/ScalarAbsClosureX.scala | 2 +- .../scalar/lang/ScalarAbsClosureXFunction.scala | 4 +- .../ignite/scalar/lang/ScalarAbsPredicate.scala | 2 +- .../lang/ScalarAbsPredicateFunction.scala | 4 +- .../scalar/lang/ScalarAbsPredicateX.scala | 2 +- .../lang/ScalarAbsPredicateXFunction.scala | 2 +- .../ignite/scalar/lang/ScalarClosure.scala | 2 +- .../ignite/scalar/lang/ScalarClosure2.scala | 2 +- .../scalar/lang/ScalarClosure2Function.scala | 2 +- .../ignite/scalar/lang/ScalarClosure2X.scala | 2 +- .../scalar/lang/ScalarClosure2XFunction.scala | 4 +- .../ignite/scalar/lang/ScalarClosure3.scala | 2 +- .../scalar/lang/ScalarClosure3Function.scala | 4 +- .../ignite/scalar/lang/ScalarClosure3X.scala | 2 +- .../scalar/lang/ScalarClosure3XFunction.scala | 4 +- .../scalar/lang/ScalarClosureFunction.scala | 2 +- .../ignite/scalar/lang/ScalarClosureX.scala | 2 +- .../scalar/lang/ScalarClosureXFunction.scala | 2 +- .../ignite/scalar/lang/ScalarInClosure.scala | 2 +- .../ignite/scalar/lang/ScalarInClosure2.scala | 2 +- .../scalar/lang/ScalarInClosure2Function.scala | 2 +- .../ignite/scalar/lang/ScalarInClosure2X.scala | 2 +- .../scalar/lang/ScalarInClosure2XFunction.scala | 2 +- .../ignite/scalar/lang/ScalarInClosure3.scala | 2 +- .../scalar/lang/ScalarInClosure3Function.scala | 4 +- .../ignite/scalar/lang/ScalarInClosure3X.scala | 2 +- .../scalar/lang/ScalarInClosure3XFunction.scala | 4 +- .../scalar/lang/ScalarInClosureFunction.scala | 2 +- .../ignite/scalar/lang/ScalarInClosureX.scala | 2 +- .../scalar/lang/ScalarInClosureXFunction.scala | 4 +- .../apache/ignite/scalar/lang/ScalarJob.scala | 2 +- .../ignite/scalar/lang/ScalarOutClosure.scala | 7 +- .../scalar/lang/ScalarOutClosureFunction.scala | 2 +- .../ignite/scalar/lang/ScalarOutClosureX.scala | 2 +- .../scalar/lang/ScalarOutClosureXFunction.scala | 4 +- .../ignite/scalar/lang/ScalarPredicate.scala | 2 +- .../ignite/scalar/lang/ScalarPredicate2.scala | 2 +- .../scalar/lang/ScalarPredicate2Function.scala | 2 +- .../ignite/scalar/lang/ScalarPredicate2X.scala | 2 +- .../scalar/lang/ScalarPredicate2XFunction.scala | 2 +- .../ignite/scalar/lang/ScalarPredicate3.scala | 2 +- .../scalar/lang/ScalarPredicate3Function.scala | 4 +- .../ignite/scalar/lang/ScalarPredicate3X.scala | 2 +- .../scalar/lang/ScalarPredicate3XFunction.scala | 4 +- .../scalar/lang/ScalarPredicateFunction.scala | 2 +- .../ignite/scalar/lang/ScalarPredicateX.scala | 2 +- .../scalar/lang/ScalarPredicateXFunction.scala | 2 +- .../ignite/scalar/lang/ScalarReducer.scala | 4 +- .../ignite/scalar/lang/ScalarReducer2.scala | 5 +- .../scalar/lang/ScalarReducer2Function.scala | 4 +- .../ignite/scalar/lang/ScalarReducer3.scala | 5 +- .../scalar/lang/ScalarReducer3Function.scala | 4 +- .../scalar/lang/ScalarReducerFunction.scala | 2 +- .../org/apache/ignite/scalar/pimps/Packet.scala | 4 +- .../apache/ignite/scalar/pimps/PimpedType.scala | 2 +- .../ignite/scalar/pimps/ScalarCachePimp.scala | 2 +- .../pimps/ScalarCacheProjectionPimp.scala | 18 +- .../ignite/scalar/pimps/ScalarGridPimp.scala | 5 +- .../scalar/pimps/ScalarProjectionPimp.scala | 64 +- .../scalar/pimps/ScalarTaskThreadContext.scala | 5 +- .../scala/org/apache/ignite/scalar/scalar.scala | 14 +- .../test/resources/spring-ping-pong-partner.xml | 40 +- .../tests/ScalarAffinityRoutingSpec.scala | 13 +- .../tests/ScalarCacheProjectionSpec.scala | 8 +- .../scalar/tests/ScalarCacheQueriesSpec.scala | 9 +- .../ignite/scalar/tests/ScalarCacheSpec.scala | 17 +- .../scalar/tests/ScalarConversionsSpec.scala | 12 +- .../scalar/tests/ScalarProjectionSpec.scala | 14 +- .../scalar/tests/ScalarReturnableSpec.scala | 11 +- .../apache/ignite/scalar/tests/ScalarSpec.scala | 8 +- .../scalar/testsuites/ScalarSelfTestSuite.scala | 4 +- .../org/apache/ignite/IgniteSpringBean.java | 2 +- .../config/VisorConfigurationCommand.scala | 3 +- .../scala/org/apache/ignite/visor/visor.scala | 2 +- 176 files changed, 2534 insertions(+), 2497 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b7d585d8/modules/core/src/main/java/org/apache/ignite/Ignite.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b7d585d8/modules/core/src/main/java/org/apache/ignite/internal/GridGainEx.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b7d585d8/modules/core/src/main/java/org/apache/ignite/internal/GridKernal.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b7d585d8/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContext.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b7d585d8/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b7d585d8/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b7d585d8/modules/core/src/test/java/org/apache/ignite/marshaller/GridMarshallerAbstractTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b7d585d8/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridTestIgnite.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b7d585d8/modules/spring/src/main/java/org/apache/ignite/IgniteSpringBean.java ----------------------------------------------------------------------
