Merge remote-tracking branch 'origin/sprint-2' into sprint-2
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/f4388063 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/f4388063 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/f4388063 Branch: refs/heads/ignite-185 Commit: f43880638200eed0afc0daba99ec7ee82a2da8ab Parents: 203da02 d591ae8 Author: Yakov Zhdanov <yzhda...@gridgain.com> Authored: Thu Feb 19 17:03:42 2015 +0300 Committer: Yakov Zhdanov <yzhda...@gridgain.com> Committed: Thu Feb 19 17:03:42 2015 +0300 ---------------------------------------------------------------------- .../ClientAbstractMultiNodeSelfTest.java | 6 +- .../rest/AbstractRestProcessorSelfTest.java | 2 +- .../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 | 536 +++++++++++ .../ignite/internal/cluster/IgniteKillTask.java | 103 +++ .../internal/executor/GridExecutorService.java | 1 + .../processors/cache/GridCacheAdapter.java | 40 +- .../processors/cache/GridCacheContext.java | 5 + .../processors/cache/GridCacheMapEntry.java | 48 +- .../processors/cache/GridCacheProcessor.java | 4 + .../processors/cache/GridCacheUtils.java | 26 + .../processors/cache/IgniteCacheProxy.java | 8 +- .../GridDistributedCacheAdapter.java | 4 +- .../GridDistributedTxRemoteAdapter.java | 11 +- .../distributed/dht/GridDhtCacheAdapter.java | 12 +- .../dht/atomic/GridNearAtomicUpdateFuture.java | 44 +- .../distributed/near/GridNearAtomicCache.java | 4 +- .../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 +- .../visor/cache/VisorCacheClearTask.java | 3 +- .../compute/VisorComputeCancelSessionsTask.java | 2 +- .../compute/VisorComputeResetMetricsTask.java | 2 +- .../VisorComputeToggleMonitoringTask.java | 2 +- .../visor/node/VisorNodeDataCollectorJob.java | 4 +- .../node/VisorNodeEventsCollectorTask.java | 2 +- .../internal/visor/node/VisorNodePingTask.java | 2 +- .../visor/query/VisorQueryCleanupTask.java | 3 +- .../visor/query/VisorQueryNextPageTask.java | 6 +- .../internal/visor/query/VisorQueryTask.java | 10 +- .../optimized/optimized-classnames.properties | 24 +- .../ignite/IgniteCacheAffinitySelfTest.java | 8 +- .../IgniteCacheExpiryStoreLoadSelfTest.java | 79 +- .../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 | 13 +- .../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 | 4 +- .../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 +- .../IgfsHadoop20FileSystemAbstractSelfTest.java | 2 +- ...idHadoopDefaultMapReducePlannerSelfTest.java | 227 +---- .../GridCacheAbstractFieldsQuerySelfTest.java | 7 +- .../cache/GridCacheQueryMetricsSelfTest.java | 4 +- .../near/GridCachePartitionedQuerySelfTest.java | 4 +- .../GridCacheReplicatedFieldsQuerySelfTest.java | 2 +- .../tcp/GridOrderedMessageCancelSelfTest.java | 4 +- .../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 +- 121 files changed, 2637 insertions(+), 2461 deletions(-) ----------------------------------------------------------------------
