Merge branch 'ignite-537' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-537
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/49996e71 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/49996e71 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/49996e71 Branch: refs/heads/ignite-721 Commit: 49996e718443557200de54b3d655c12589258b31 Parents: e544aaa 3ca7c8a Author: ivasilinets <ivasilin...@gridgain.com> Authored: Fri Apr 10 15:16:38 2015 +0300 Committer: ivasilinets <ivasilin...@gridgain.com> Committed: Fri Apr 10 15:16:38 2015 +0300 ---------------------------------------------------------------------- assembly/release-hadoop.xml | 4 - bin/ignitevisorcmd.bat | 39 +- .../examples/MessagingExamplesSelfTest.java | 2 +- .../java8/examples/BasicExamplesSelfTest.java | 3 + .../java8/examples/CacheExamplesSelfTest.java | 4 + .../examples/CheckpointExamplesSelfTest.java | 3 + .../examples/ClusterGroupExampleSelfTest.java | 3 +- .../examples/ContinuationExamplesSelfTest.java | 3 + .../ContinuousMapperExamplesSelfTest.java | 4 +- .../DeploymentExamplesMultiNodeSelfTest.java | 2 + .../examples/DeploymentExamplesSelfTest.java | 2 + .../HibernateL2CacheExampleSelfTest.java | 3 + .../java8/examples/IgfsExamplesSelfTest.java | 3 + .../examples/LifecycleExamplesSelfTest.java | 3 + .../MemcacheRestExamplesMultiNodeSelfTest.java | 2 + .../examples/MemcacheRestExamplesSelfTest.java | 2 + .../examples/MessagingExamplesSelfTest.java | 4 +- .../examples/MonteCarloExamplesSelfTest.java | 3 + .../examples/SpringBeanExamplesSelfTest.java | 3 + .../java8/examples/TaskExamplesSelfTest.java | 2 + .../client/ClientReconnectionSelfTest.java | 67 +-- .../ignite/codegen/MessageCodeGenerator.java | 1 - modules/core/pom.xml | 2 +- .../java/org/apache/ignite/IgniteCache.java | 18 + .../java/org/apache/ignite/IgniteState.java | 2 +- .../configuration/CacheConfiguration.java | 69 ++- .../configuration/IgniteConfiguration.java | 35 +- .../internal/ComputeTaskInternalFuture.java | 2 +- .../ignite/internal/GridJobExecuteRequest.java | 10 +- .../ignite/internal/GridJobExecuteResponse.java | 4 +- .../apache/ignite/internal/GridTaskMessage.java | 30 -- .../ignite/internal/GridTaskSessionRequest.java | 6 +- .../org/apache/ignite/internal/IgnitionEx.java | 4 +- .../client/GridClientConfiguration.java | 14 +- .../GridClientConnectionManagerAdapter.java | 2 +- .../router/GridTcpRouterConfiguration.java | 6 +- .../internal/cluster/ClusterGroupAdapter.java | 150 +++++- .../internal/managers/GridManagerAdapter.java | 4 +- .../discovery/GridDiscoveryManager.java | 32 +- .../eventstorage/GridEventStorageManager.java | 4 +- .../processors/cache/CacheMetricsImpl.java | 7 +- .../processors/cache/CacheMetricsSnapshot.java | 223 +++++++- .../processors/cache/GridCacheAdapter.java | 12 +- .../processors/cache/GridCacheContext.java | 64 ++- .../cache/GridCacheEvictionManager.java | 6 +- .../cache/GridCacheExplicitLockSpan.java | 2 +- .../processors/cache/GridCacheMapEntry.java | 6 +- .../processors/cache/GridCacheMvcc.java | 2 +- .../cache/GridCacheMvccCandidate.java | 50 +- .../processors/cache/GridCacheMvccManager.java | 44 +- .../processors/cache/GridCacheProcessor.java | 52 +- .../processors/cache/IgniteCacheProxy.java | 26 + .../distributed/GridDistributedCacheEntry.java | 12 +- .../distributed/dht/GridDhtCacheEntry.java | 36 +- .../distributed/dht/GridDhtLockFuture.java | 15 +- .../dht/GridDhtTransactionalCacheAdapter.java | 14 +- .../distributed/dht/GridDhtTxFinishFuture.java | 22 +- .../cache/distributed/dht/GridDhtTxLocal.java | 2 + .../distributed/dht/GridDhtTxLocalAdapter.java | 30 +- .../distributed/dht/GridDhtTxPrepareFuture.java | 28 +- .../dht/atomic/GridDhtAtomicCache.java | 6 +- .../dht/colocated/GridDhtColocatedCache.java | 35 +- .../colocated/GridDhtColocatedLockFuture.java | 46 +- .../GridDhtPartitionsExchangeFuture.java | 39 +- .../distributed/near/GridNearAtomicCache.java | 2 +- .../distributed/near/GridNearCacheEntry.java | 10 +- .../distributed/near/GridNearLockFuture.java | 13 +- .../near/GridNearTransactionalCache.java | 2 +- .../near/GridNearTxFinishFuture.java | 8 +- .../cache/distributed/near/GridNearTxLocal.java | 7 + .../near/GridNearTxPrepareFuture.java | 122 +++-- .../near/GridNearTxPrepareRequest.java | 64 ++- .../local/atomic/GridLocalAtomicCache.java | 6 +- .../cache/query/GridCacheQueryAdapter.java | 2 +- .../continuous/CacheContinuousQueryManager.java | 2 +- .../cache/transactions/IgniteTxAdapter.java | 3 +- .../cache/transactions/IgniteTxHandler.java | 120 ++++- .../transactions/IgniteTxLocalAdapter.java | 82 +-- .../cache/transactions/IgniteTxManager.java | 7 + .../continuous/GridContinuousProcessor.java | 25 +- .../internal/processors/igfs/IgfsAsyncImpl.java | 4 +- .../ignite/internal/processors/igfs/IgfsEx.java | 4 +- .../processors/igfs/IgfsFileWorker.java | 180 ------- .../processors/igfs/IgfsFileWorkerBatch.java | 225 ++++---- .../processors/igfs/IgfsFileWorkerTask.java | 32 -- .../internal/processors/igfs/IgfsImpl.java | 150 ++++-- .../internal/processors/igfs/IgfsProcessor.java | 2 +- .../processors/rest/GridRestProcessor.java | 33 +- .../security/GridSecurityProcessor.java | 13 +- .../processors/security/SecurityContext.java | 8 +- .../security/os/GridOsSecurityProcessor.java | 11 +- .../processors/task/GridTaskProcessor.java | 9 +- .../internal/util/future/GridFutureAdapter.java | 20 +- .../ignite/internal/util/worker/GridWorker.java | 6 +- .../visor/cache/VisorCacheClearTask.java | 3 + .../cache/VisorCacheQueryConfiguration.java | 9 - .../internal/visor/log/VisorLogSearchTask.java | 12 +- .../node/VisorNodeEventsCollectorTask.java | 3 + .../node/VisorSegmentationConfiguration.java | 4 +- .../internal/visor/util/VisorTaskUtils.java | 3 + .../plugin/security/AuthenticationContext.java | 12 +- .../security/GridSecurityCredentials.java | 184 ------- .../GridSecurityCredentialsBasicProvider.java | 44 -- .../GridSecurityCredentialsProvider.java | 44 -- .../plugin/security/GridSecurityException.java | 58 -- .../plugin/security/GridSecurityPermission.java | 69 --- .../security/GridSecurityPermissionSet.java | 66 --- .../plugin/security/GridSecuritySubject.java | 62 --- .../security/GridSecuritySubjectType.java | 48 -- .../plugin/security/SecurityCredentials.java | 191 +++++++ .../SecurityCredentialsBasicProvider.java | 44 ++ .../security/SecurityCredentialsProvider.java | 44 ++ .../plugin/security/SecurityException.java | 61 +++ .../plugin/security/SecurityPermission.java | 69 +++ .../plugin/security/SecurityPermissionSet.java | 66 +++ .../ignite/plugin/security/SecuritySubject.java | 62 +++ .../plugin/security/SecuritySubjectType.java | 48 ++ .../segmentation/GridSegmentationPolicy.java | 47 -- .../segmentation/GridSegmentationResolver.java | 64 --- .../plugin/segmentation/SegmentationPolicy.java | 49 ++ .../segmentation/SegmentationResolver.java | 65 +++ .../org/apache/ignite/spi/IgniteSpiAdapter.java | 4 +- .../org/apache/ignite/spi/IgniteSpiContext.java | 4 +- .../spi/discovery/DiscoveryMetricsProvider.java | 10 + .../spi/discovery/DiscoverySpiDataExchange.java | 9 +- .../DiscoverySpiNodeAuthenticator.java | 2 +- .../discovery/tcp/TcpClientDiscoverySpi.java | 46 +- .../spi/discovery/tcp/TcpDiscoverySpi.java | 539 ++++++++++++------- .../discovery/tcp/TcpDiscoverySpiAdapter.java | 27 + .../tcp/internal/TcpDiscoveryNode.java | 76 ++- .../TcpDiscoveryCustomEventMessage.java | 14 +- .../messages/TcpDiscoveryGetClassRequest.java | 1 + .../messages/TcpDiscoveryGetClassResponse.java | 3 + .../messages/TcpDiscoveryHeartbeatMessage.java | 65 +++ .../startup/cmdline/CommandLineStartup.java | 7 +- .../internal/GridLifecycleAwareSelfTest.java | 2 +- .../ignite/internal/GridProjectionSelfTest.java | 82 +++ .../ignite/internal/GridStartStopSelfTest.java | 8 +- .../CacheMetricsForClusterGroupSelfTest.java | 236 ++++++++ .../cache/GridCacheBasicApiAbstractTest.java | 4 +- ...CacheOffHeapMultiThreadedUpdateSelfTest.java | 42 +- .../GridCacheOffHeapTieredAbstractSelfTest.java | 4 +- .../cache/GridCacheReloadSelfTest.java | 3 +- .../GridCacheReturnValueTransferSelfTest.java | 15 +- .../IgniteTxMultiThreadedAbstractTest.java | 5 +- ...GridCacheQueueMultiNodeAbstractSelfTest.java | 5 +- .../GridCacheSetAbstractSelfTest.java | 10 +- .../GridCacheSetFailoverAbstractSelfTest.java | 6 +- .../distributed/GridCacheEventAbstractTest.java | 16 +- .../GridCacheNodeFailureAbstractTest.java | 15 +- .../dht/IgniteCacheLockFailoverSelfTest.java | 156 ++++++ .../dht/IgniteCacheMultiTxLockSelfTest.java | 219 ++++++++ ...licatedNearOnlyMultiNodeFullApiSelfTest.java | 2 +- .../continuous/GridEventConsumeSelfTest.java | 5 +- .../processors/igfs/IgfsAbstractSelfTest.java | 24 +- .../tostring/GridToStringBuilderSelfTest.java | 5 +- .../GridP2PMissedResourceCacheSizeSelfTest.java | 2 +- .../discovery/AbstractDiscoverySelfTest.java | 4 +- .../tcp/TcpClientDiscoverySelfTest.java | 5 +- .../tcp/TcpDiscoverySpiStartStopSelfTest.java | 4 +- .../testframework/GridSpiTestContext.java | 4 +- .../testframework/junits/GridAbstractTest.java | 6 +- .../junits/spi/GridSpiAbstractTest.java | 76 +-- .../IgniteCacheMetricsSelfTestSuite.java | 4 + .../ignite/testsuites/IgniteCacheTestSuite.java | 3 + .../IgniteSpiDiscoverySelfTestSuite.java | 2 + ...rrentLinkedHashMapMultiThreadedSelfTest.java | 4 +- .../p2p/startcache/CacheAllNodesFilter.java | 31 ++ .../startcache/CacheConfigP2PStartClient.java | 116 ++++ .../HadoopDefaultMapReducePlannerSelfTest.java | 2 +- .../GridCacheAbstractFieldsQuerySelfTest.java | 10 +- .../processors/cache/GridCacheSwapSelfTest.java | 5 +- ...hePartitionedQueryMultiThreadedSelfTest.java | 2 +- .../cache/IgniteCacheQueryIndexSelfTest.java | 3 +- .../IgniteCachePartitionedQuerySelfTest.java | 5 +- .../IgniteCacheReplicatedQuerySelfTest.java | 18 +- .../processors/cache/GridCacheJtaSelfTest.java | 6 +- .../http/jetty/GridJettyRestHandler.java | 2 +- .../p2p/GridP2PUserVersionChangeSelfTest.java | 8 +- .../ignite/tools/classgen/ClassesGenerator.java | 2 +- .../ignite/visor/commands/VisorConsole.scala | 19 + 181 files changed, 3892 insertions(+), 2060 deletions(-) ----------------------------------------------------------------------
