Merge branch 'sprint-2' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into gg-9791
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/a0766464 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/a0766464 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/a0766464 Branch: refs/heads/ignite-312 Commit: a0766464f6ef2b7e903a3cfb40cf5073a72cf451 Parents: e2f2bc0 62de5af Author: Valentin Kulichenko <vkuliche...@gridgain.com> Authored: Thu Feb 19 11:12:41 2015 -0800 Committer: Valentin Kulichenko <vkuliche...@gridgain.com> Committed: Thu Feb 19 11:12:41 2015 -0800 ---------------------------------------------------------------------- .../ClientAbstractMultiNodeSelfTest.java | 6 +- .../rest/AbstractRestProcessorSelfTest.java | 2 +- .../java/org/apache/ignite/cache/GridCache.java | 48 - .../ignite/internal/ClusterGroupAdapter.java | 889 ------------------- .../apache/ignite/internal/ClusterGroupEx.java | 44 - .../internal/ClusterNodeLocalMapImpl.java | 103 --- .../apache/ignite/internal/GridKillTask.java | 103 --- .../ignite/internal/IgniteClusterAsyncImpl.java | 261 ------ .../ignite/internal/IgniteComputeImpl.java | 1 + .../ignite/internal/IgniteEventsImpl.java | 1 + .../org/apache/ignite/internal/IgniteEx.java | 14 +- .../apache/ignite/internal/IgniteKernal.java | 613 +++---------- .../ignite/internal/IgniteMessagingImpl.java | 1 + .../ignite/internal/IgniteServicesImpl.java | 1 + .../internal/cluster/ClusterGroupAdapter.java | 866 ++++++++++++++++++ .../ignite/internal/cluster/ClusterGroupEx.java | 44 + .../cluster/ClusterNodeLocalMapImpl.java | 104 +++ .../cluster/IgniteClusterAsyncImpl.java | 292 ++++++ .../internal/cluster/IgniteClusterEx.java | 27 + .../internal/cluster/IgniteClusterImpl.java | 527 +++++++++++ .../ignite/internal/cluster/IgniteKillTask.java | 103 +++ .../internal/executor/GridExecutorService.java | 1 + .../processors/cache/CacheProjection.java | 5 + .../processors/cache/GridCacheAdapter.java | 72 +- .../processors/cache/GridCacheContext.java | 5 + .../processors/cache/GridCacheMapEntry.java | 48 +- .../processors/cache/GridCacheProcessor.java | 4 + .../processors/cache/GridCacheProjectionEx.java | 47 + .../cache/GridCacheProjectionImpl.java | 16 + .../processors/cache/GridCacheProxyImpl.java | 20 +- .../processors/cache/GridCacheUtils.java | 26 + .../processors/cache/IgniteCacheProxy.java | 12 +- .../GridDistributedCacheAdapter.java | 4 +- .../GridDistributedTxRemoteAdapter.java | 11 +- .../distributed/dht/GridDhtCacheAdapter.java | 16 +- .../dht/atomic/GridDhtAtomicCache.java | 10 + .../dht/atomic/GridNearAtomicUpdateFuture.java | 44 +- .../distributed/near/GridNearAtomicCache.java | 14 +- .../distributed/near/GridNearCacheAdapter.java | 8 +- .../cache/query/GridCacheQueryManager.java | 2 +- .../continuous/CacheContinuousQueryManager.java | 4 +- .../dataload/IgniteDataLoaderImpl.java | 4 +- .../datastructures/GridCacheSetImpl.java | 4 +- .../handlers/cache/GridCacheCommandHandler.java | 4 +- .../cache/GridCacheQueryCommandHandler.java | 4 +- .../handlers/task/GridTaskCommandHandler.java | 4 +- .../top/GridTopologyCommandHandler.java | 2 +- .../streamer/GridStreamerContextImpl.java | 2 +- .../internal/util/future/GridFutureAdapter.java | 8 +- .../util/future/GridFutureAdapterEx.java | 3 +- .../ignite/internal/visor/cache/VisorCache.java | 2 +- .../visor/cache/VisorCacheClearTask.java | 3 +- .../visor/cache/VisorCacheCompactTask.java | 2 +- .../visor/cache/VisorCacheConfiguration.java | 40 +- .../visor/cache/VisorCacheLoadTask.java | 18 +- .../visor/cache/VisorCacheMetadataTask.java | 2 +- .../internal/visor/cache/VisorCacheMetrics.java | 3 +- .../visor/cache/VisorCachePreloadTask.java | 4 +- .../visor/cache/VisorCacheSwapBackupsTask.java | 2 +- .../cache/VisorCacheTypeFieldMetadata.java | 1 - .../visor/cache/VisorCacheTypeMetadata.java | 12 +- .../compute/VisorComputeCancelSessionsTask.java | 2 +- .../compute/VisorComputeMonitoringHolder.java | 6 +- .../compute/VisorComputeResetMetricsTask.java | 2 +- .../VisorComputeToggleMonitoringTask.java | 4 +- .../internal/visor/debug/VisorThreadInfo.java | 14 +- .../event/VisorGridAuthenticationEvent.java | 106 --- .../event/VisorGridAuthorizationEvent.java | 89 -- .../visor/event/VisorGridEventsLost.java | 2 +- .../event/VisorGridSecuritySessionEvent.java | 2 +- .../internal/visor/igfs/VisorIgfsEndpoint.java | 5 +- .../visor/igfs/VisorIgfsProfilerEntry.java | 6 +- .../visor/igfs/VisorIgfsProfilerTask.java | 34 +- .../VisorIgfsProfilerUniformityCounters.java | 15 +- .../visor/igfs/VisorIgfsResetMetricsTask.java | 2 +- .../visor/igfs/VisorIgfsSamplingStateTask.java | 2 +- .../internal/visor/log/VisorLogSearchTask.java | 18 +- .../visor/misc/VisorResolveHostNameTask.java | 6 +- .../node/VisorCacheQueryConfiguration.java | 141 +++ .../node/VisorExecutorServiceConfiguration.java | 1 - .../visor/node/VisorGridConfiguration.java | 18 + .../visor/node/VisorNodeDataCollectorJob.java | 6 +- .../node/VisorNodeEventsCollectorTask.java | 6 +- .../internal/visor/node/VisorNodeGcTask.java | 2 +- .../internal/visor/node/VisorNodePingTask.java | 2 +- .../visor/node/VisorQueryConfiguration.java | 183 ++++ .../visor/node/VisorSpisConfiguration.java | 2 +- .../visor/query/VisorQueryCleanupTask.java | 3 +- .../visor/query/VisorQueryNextPageTask.java | 8 +- .../visor/query/VisorQueryResultEx.java | 2 +- .../internal/visor/query/VisorQueryTask.java | 10 +- .../internal/visor/query/VisorQueryUtils.java | 18 +- .../internal/visor/util/VisorEventMapper.java | 3 + .../internal/visor/util/VisorTaskUtils.java | 23 +- .../optimized/optimized-classnames.properties | 70 +- .../ignite/IgniteCacheAffinitySelfTest.java | 8 +- .../IgniteCacheExpiryStoreLoadSelfTest.java | 81 +- .../ignite/internal/ClusterMetricsSelfTest.java | 2 +- .../GridJobMasterLeaveAwareSelfTest.java | 8 +- .../internal/GridMultipleJobsSelfTest.java | 2 +- .../internal/GridProjectionAbstractTest.java | 2 +- .../ignite/internal/GridProjectionSelfTest.java | 2 +- .../apache/ignite/internal/GridSelfTest.java | 15 +- .../GridAffinityProcessorAbstractSelfTest.java | 7 +- .../cache/GridCacheAbstractFullApiSelfTest.java | 28 +- .../cache/GridCacheAffinityApiSelfTest.java | 18 +- .../cache/GridCacheEntryMemorySizeSelfTest.java | 4 +- ...GridCacheMixedPartitionExchangeSelfTest.java | 2 +- .../cache/GridCacheVersionMultinodeTest.java | 65 +- ...ridCacheQueueJoinedNodeSelfAbstractTest.java | 4 +- ...GridCacheQueueMultiNodeAbstractSelfTest.java | 4 +- ...dCacheSequenceMultiNodeAbstractSelfTest.java | 4 +- ...dCachePartitionedQueueEntryMoveSelfTest.java | 2 +- .../dht/GridCacheDhtEntrySelfTest.java | 2 +- ...GridCacheDhtEvictionNearReadersSelfTest.java | 4 +- .../dht/GridCacheDhtEvictionSelfTest.java | 2 +- .../dht/GridCacheDhtInternalEntrySelfTest.java | 2 +- .../near/GridCacheNearMultiNodeSelfTest.java | 4 +- .../near/GridCacheNearReadersSelfTest.java | 18 +- ...ePartitionedBasicStoreMultiNodeSelfTest.java | 12 +- ...titionedExplicitLockNodeFailureSelfTest.java | 4 +- ...achePartitionedMultiNodeFullApiSelfTest.java | 2 +- ...hePartitionedQueryMultiThreadedSelfTest.java | 2 +- ...CacheReplicatedPreloadLifecycleSelfTest.java | 2 +- ...ridCacheContinuousQueryAbstractSelfTest.java | 14 +- .../closure/GridClosureProcessorRemoteTest.java | 2 +- .../closure/GridClosureProcessorSelfTest.java | 14 +- .../continuous/GridEventConsumeSelfTest.java | 18 +- .../continuous/GridMessageListenSelfTest.java | 14 +- .../processors/igfs/IgfsSizeSelfTest.java | 7 +- .../processors/igfs/IgfsStreamsSelfTest.java | 2 +- .../GridServiceReassignmentSelfTest.java | 2 +- .../marshaller/GridMarshallerAbstractTest.java | 14 +- .../ignite/messaging/GridMessagingSelfTest.java | 3 +- .../spi/GridTcpSpiForwardingSelfTest.java | 4 +- .../tcp/TcpDiscoverySpiWildcardSelfTest.java | 2 +- .../testframework/junits/GridAbstractTest.java | 4 +- .../ignite/testsuites/IgniteIgfsTestSuite.java | 2 +- .../IgfsHadoop20FileSystemAbstractSelfTest.java | 2 +- ...idHadoopDefaultMapReducePlannerSelfTest.java | 227 +---- .../GridCacheAbstractFieldsQuerySelfTest.java | 7 +- .../cache/GridCacheQueryMetricsSelfTest.java | 4 +- .../near/GridCachePartitionedQuerySelfTest.java | 4 +- .../GridCacheReplicatedFieldsQuerySelfTest.java | 2 +- .../tcp/GridOrderedMessageCancelSelfTest.java | 4 +- .../apache/ignite/cache/spring/SpringCache.java | 2 +- .../resource/GridServiceInjectionSelfTest.java | 4 +- .../visor/commands/ack/VisorAckCommand.scala | 4 +- .../commands/alert/VisorAlertCommand.scala | 11 +- .../commands/cache/VisorCacheClearCommand.scala | 4 +- .../commands/cache/VisorCacheCommand.scala | 6 +- .../cache/VisorCacheCompactCommand.scala | 4 +- .../commands/cache/VisorCacheScanCommand.scala | 4 +- .../commands/cache/VisorCacheSwapCommand.scala | 4 +- .../config/VisorConfigurationCommand.scala | 4 +- .../commands/disco/VisorDiscoveryCommand.scala | 6 +- .../commands/events/VisorEventsCommand.scala | 4 +- .../visor/commands/gc/VisorGcCommand.scala | 4 +- .../visor/commands/kill/VisorKillCommand.scala | 12 +- .../visor/commands/node/VisorNodeCommand.scala | 2 +- .../visor/commands/ping/VisorPingCommand.scala | 4 +- .../commands/start/VisorStartCommand.scala | 4 +- .../commands/tasks/VisorTasksCommand.scala | 12 +- .../commands/top/VisorTopologyCommand.scala | 4 +- .../visor/commands/vvm/VisorVvmCommand.scala | 6 +- .../scala/org/apache/ignite/visor/visor.scala | 32 +- 166 files changed, 3287 insertions(+), 2870 deletions(-) ----------------------------------------------------------------------
