# ignite-185 Merge sprint-2 into ignite-185
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/1ff1c8e6 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/1ff1c8e6 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/1ff1c8e6 Branch: refs/heads/ignite-185 Commit: 1ff1c8e6cf91a77bfe19802787c33eb4fd6cc150 Parents: 775d499 2bf1bde Author: anovikov <anovi...@gridgain.com> Authored: Tue Feb 24 13:51:21 2015 +0700 Committer: anovikov <anovi...@gridgain.com> Committed: Tue Feb 24 13:51:21 2015 +0700 ---------------------------------------------------------------------- README.md | 2 - bin/setup-hadoop.sh | 2 +- examples/pom-standalone.xml | 2 +- .../examples/datagrid/CacheApiExample.java | 4 +- .../examples/datagrid/CacheQueryExample.java | 2 +- .../ClientAbstractMultiNodeSelfTest.java | 8 +- .../rest/AbstractRestProcessorSelfTest.java | 2 +- .../ignite/codegen/MessageCodeGenerator.java | 133 +-- .../java/org/apache/ignite/cache/GridCache.java | 48 - .../ignite/internal/ClusterGroupAdapter.java | 889 ------------------- .../apache/ignite/internal/ClusterGroupEx.java | 44 - .../internal/ClusterNodeLocalMapImpl.java | 103 --- .../ignite/internal/GridJobCancelRequest.java | 26 +- .../ignite/internal/GridJobExecuteRequest.java | 70 +- .../ignite/internal/GridJobExecuteResponse.java | 34 +- .../ignite/internal/GridJobSiblingsRequest.java | 24 +- .../internal/GridJobSiblingsResponse.java | 22 +- .../apache/ignite/internal/GridKillTask.java | 103 --- .../ignite/internal/GridTaskCancelRequest.java | 22 +- .../ignite/internal/GridTaskSessionRequest.java | 26 +- .../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 + .../org/apache/ignite/internal/IgnitionEx.java | 4 +- .../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/direct/DirectByteBufferStream.java | 44 +- .../internal/direct/DirectMessageReader.java | 33 +- .../internal/direct/DirectMessageWriter.java | 23 +- .../direct/DirectMessageWriterState.java | 13 +- .../internal/executor/GridExecutorService.java | 1 + .../internal/managers/GridManagerAdapter.java | 4 +- .../checkpoint/GridCheckpointRequest.java | 26 +- .../managers/communication/GridIoManager.java | 30 +- .../managers/communication/GridIoMessage.java | 38 +- .../communication/GridIoMessageFactory.java | 33 +- .../communication/GridIoUserMessage.java | 38 +- .../deployment/GridDeploymentCommunication.java | 4 +- .../deployment/GridDeploymentInfoBean.java | 35 +- .../deployment/GridDeploymentRequest.java | 34 +- .../deployment/GridDeploymentResponse.java | 26 +- .../eventstorage/GridEventStorageMessage.java | 42 +- .../processors/cache/GridCacheAdapter.java | 49 +- .../processors/cache/GridCacheContext.java | 5 + .../cache/GridCacheEvictionRequest.java | 26 +- .../cache/GridCacheEvictionResponse.java | 30 +- .../processors/cache/GridCacheMapEntry.java | 60 +- .../processors/cache/GridCacheMessage.java | 21 +- .../processors/cache/GridCacheProcessor.java | 4 + .../processors/cache/GridCacheProjectionEx.java | 47 + .../cache/GridCacheProjectionImpl.java | 11 + .../processors/cache/GridCacheProxyImpl.java | 8 +- .../processors/cache/GridCacheUtils.java | 46 +- .../processors/cache/GridCacheValueBytes.java | 24 +- .../processors/cache/IgniteCacheProxy.java | 14 +- ...idCacheOptimisticCheckPreparedTxRequest.java | 30 +- ...dCacheOptimisticCheckPreparedTxResponse.java | 26 +- .../distributed/GridCacheTtlUpdateRequest.java | 58 +- .../distributed/GridDistributedBaseMessage.java | 33 +- .../GridDistributedCacheAdapter.java | 4 +- .../distributed/GridDistributedLockRequest.java | 52 +- .../GridDistributedLockResponse.java | 30 +- .../GridDistributedTxFinishRequest.java | 42 +- .../GridDistributedTxFinishResponse.java | 24 +- .../GridDistributedTxPrepareRequest.java | 58 +- .../GridDistributedTxPrepareResponse.java | 24 +- .../GridDistributedTxRemoteAdapter.java | 11 +- .../GridDistributedUnlockRequest.java | 26 +- .../dht/GridDhtAffinityAssignmentRequest.java | 22 +- .../dht/GridDhtAffinityAssignmentResponse.java | 24 +- .../distributed/dht/GridDhtCacheAdapter.java | 16 +- .../distributed/dht/GridDhtLockRequest.java | 42 +- .../distributed/dht/GridDhtLockResponse.java | 40 +- .../distributed/dht/GridDhtTxFinishRequest.java | 42 +- .../dht/GridDhtTxFinishResponse.java | 22 +- .../dht/GridDhtTxPrepareRequest.java | 48 +- .../dht/GridDhtTxPrepareResponse.java | 42 +- .../distributed/dht/GridDhtUnlockRequest.java | 26 +- .../GridDhtAtomicDeferredUpdateResponse.java | 26 +- .../dht/atomic/GridDhtAtomicUpdateRequest.java | 92 +- .../dht/atomic/GridDhtAtomicUpdateResponse.java | 32 +- .../dht/atomic/GridNearAtomicUpdateFuture.java | 44 +- .../dht/atomic/GridNearAtomicUpdateRequest.java | 78 +- .../atomic/GridNearAtomicUpdateResponse.java | 54 +- .../dht/preloader/GridDhtForceKeysRequest.java | 32 +- .../dht/preloader/GridDhtForceKeysResponse.java | 32 +- .../GridDhtPartitionDemandMessage.java | 36 +- .../preloader/GridDhtPartitionExchangeId.java | 27 +- .../GridDhtPartitionSupplyMessage.java | 40 +- .../GridDhtPartitionsAbstractMessage.java | 19 +- .../preloader/GridDhtPartitionsFullMessage.java | 24 +- .../GridDhtPartitionsSingleMessage.java | 22 +- .../GridDhtPartitionsSingleRequest.java | 18 +- .../distributed/near/GridNearAtomicCache.java | 4 +- .../distributed/near/GridNearCacheAdapter.java | 8 +- .../distributed/near/GridNearGetRequest.java | 47 +- .../distributed/near/GridNearGetResponse.java | 38 +- .../distributed/near/GridNearLockRequest.java | 52 +- .../distributed/near/GridNearLockResponse.java | 42 +- .../near/GridNearTxFinishRequest.java | 32 +- .../near/GridNearTxFinishResponse.java | 26 +- .../near/GridNearTxPrepareRequest.java | 44 +- .../near/GridNearTxPrepareResponse.java | 48 +- .../distributed/near/GridNearUnlockRequest.java | 18 +- .../cache/query/GridCacheQueryManager.java | 2 +- .../cache/query/GridCacheQueryRequest.java | 58 +- .../cache/query/GridCacheQueryResponse.java | 40 +- .../continuous/CacheContinuousQueryManager.java | 4 +- .../cache/version/GridCacheVersion.java | 29 +- .../clock/GridClockDeltaSnapshotMessage.java | 28 +- .../processors/clock/GridClockDeltaVersion.java | 24 +- .../closure/GridClosureProcessor.java | 82 +- .../continuous/GridContinuousMessage.java | 28 +- .../dataload/GridDataLoadRequest.java | 50 +- .../dataload/GridDataLoadResponse.java | 26 +- .../dataload/IgniteDataLoaderImpl.java | 4 +- .../datastructures/GridCacheSetImpl.java | 4 +- .../processors/igfs/IgfsAckMessage.java | 26 +- .../internal/processors/igfs/IgfsBlockKey.java | 28 +- .../processors/igfs/IgfsBlocksMessage.java | 30 +- .../igfs/IgfsCommunicationMessage.java | 18 +- .../processors/igfs/IgfsDeleteMessage.java | 24 +- .../processors/igfs/IgfsFileAffinityRange.java | 30 +- .../igfs/IgfsFragmentizerRequest.java | 28 +- .../igfs/IgfsFragmentizerResponse.java | 22 +- .../processors/igfs/IgfsSyncMessage.java | 24 +- .../plugin/IgnitePluginProcessor.java | 2 +- .../processors/query/GridQueryProcessor.java | 4 +- .../handlers/cache/GridCacheCommandHandler.java | 4 +- .../cache/GridCacheQueryCommandHandler.java | 4 +- .../handlers/task/GridTaskCommandHandler.java | 4 +- .../handlers/task/GridTaskResultRequest.java | 24 +- .../handlers/task/GridTaskResultResponse.java | 28 +- .../top/GridTopologyCommandHandler.java | 2 +- .../streamer/GridStreamerCancelRequest.java | 22 +- .../streamer/GridStreamerContextImpl.java | 2 +- .../streamer/GridStreamerExecutionRequest.java | 38 +- .../streamer/GridStreamerResponse.java | 24 +- .../processors/streamer/IgniteStreamerImpl.java | 4 +- .../ignite/internal/util/GridByteArrayList.java | 24 +- .../ignite/internal/util/GridLongList.java | 24 +- .../ignite/internal/util/IgniteUtils.java | 32 +- .../internal/util/future/GridFutureAdapter.java | 8 +- .../util/future/GridFutureAdapterEx.java | 3 +- .../internal/util/ipc/IpcToNioAdapter.java | 4 +- .../util/nio/GridCommunicationClient.java | 2 +- .../internal/util/nio/GridDirectParser.java | 33 +- .../internal/util/nio/GridNioMessageReader.java | 2 +- .../internal/util/nio/GridNioMessageWriter.java | 4 +- .../ignite/internal/util/nio/GridNioServer.java | 59 +- .../util/nio/GridShmemCommunicationClient.java | 2 +- .../util/nio/GridTcpCommunicationClient.java | 2 +- .../util/nio/GridTcpNioCommunicationClient.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 +- .../extensions/communication/Message.java | 58 ++ .../communication/MessageAdapter.java | 143 --- .../MessageCollectionItemType.java | 101 +++ .../communication/MessageFactory.java | 4 +- .../communication/MessageFormatter.java | 3 +- .../extensions/communication/MessageReader.java | 24 +- .../extensions/communication/MessageWriter.java | 26 +- .../jobstealing/JobStealingRequest.java | 22 +- .../communication/tcp/TcpCommunicationSpi.java | 80 +- .../core/src/main/resources/ignite.properties | 3 +- .../ignite/IgniteCacheAffinitySelfTest.java | 8 +- .../IgniteCacheExpiryStoreLoadSelfTest.java | 81 +- .../ignite/internal/ClusterMetricsSelfTest.java | 2 +- .../GridJobMasterLeaveAwareSelfTest.java | 12 +- .../internal/GridMultipleJobsSelfTest.java | 2 +- .../internal/GridProjectionAbstractTest.java | 2 +- .../ignite/internal/GridProjectionSelfTest.java | 2 +- .../apache/ignite/internal/GridSelfTest.java | 15 +- .../GridCommunicationSendMessageSelfTest.java | 13 +- .../communication/GridIoManagerSelfTest.java | 18 +- .../GridDeploymentMessageCountSelfTest.java | 2 +- .../GridAffinityProcessorAbstractSelfTest.java | 7 +- .../cache/GridCacheAbstractFullApiSelfTest.java | 28 +- .../cache/GridCacheAffinityApiSelfTest.java | 18 +- .../GridCacheAtomicMessageCountSelfTest.java | 2 +- .../cache/GridCacheEntryMemorySizeSelfTest.java | 4 +- ...GridCacheMixedPartitionExchangeSelfTest.java | 2 +- ...ridCacheReplicatedSynchronousCommitTest.java | 2 +- .../cache/GridCacheVersionMultinodeTest.java | 65 +- .../IgniteCacheAbstractStopBusySelfTest.java | 5 +- .../cache/IgniteTxReentryAbstractSelfTest.java | 2 +- ...ridCacheQueueJoinedNodeSelfAbstractTest.java | 4 +- ...GridCacheQueueMultiNodeAbstractSelfTest.java | 4 +- ...dCacheSequenceMultiNodeAbstractSelfTest.java | 4 +- ...dCachePartitionedQueueEntryMoveSelfTest.java | 2 +- .../GridCacheAbstractJobExecutionTest.java | 13 +- .../GridCacheAtomicTimeoutSelfTest.java | 3 +- ...xOriginatingNodeFailureAbstractSelfTest.java | 2 +- ...cOriginatingNodeFailureAbstractSelfTest.java | 2 +- .../dht/GridCacheDhtEntrySelfTest.java | 2 +- ...GridCacheDhtEvictionNearReadersSelfTest.java | 4 +- .../dht/GridCacheDhtEvictionSelfTest.java | 2 +- .../dht/GridCacheDhtInternalEntrySelfTest.java | 2 +- .../GridCacheDhtPreloadMessageCountTest.java | 2 +- ...eAtomicInvalidPartitionHandlingSelfTest.java | 2 +- .../near/GridCacheNearMultiNodeSelfTest.java | 4 +- .../near/GridCacheNearReadersSelfTest.java | 18 +- ...ePartitionedBasicStoreMultiNodeSelfTest.java | 12 +- ...titionedExplicitLockNodeFailureSelfTest.java | 4 +- ...achePartitionedMultiNodeFullApiSelfTest.java | 2 +- ...hePartitionedQueryMultiThreadedSelfTest.java | 2 +- .../GridCacheReplicatedInvalidateSelfTest.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 +- .../communication/GridIoManagerBenchmark0.java | 6 +- .../communication/GridTestMessage.java | 9 +- .../marshaller/GridMarshallerAbstractTest.java | 14 +- .../ignite/messaging/GridMessagingSelfTest.java | 3 +- .../spi/GridTcpSpiForwardingSelfTest.java | 4 +- .../GridAbstractCommunicationSelfTest.java | 22 +- .../spi/communication/GridTestMessage.java | 25 +- .../tcp/GridCacheDhtLockBackupSelfTest.java | 4 +- .../GridTcpCommunicationSpiAbstractTest.java | 2 +- ...mmunicationSpiConcurrentConnectSelfTest.java | 16 +- .../tcp/GridTcpCommunicationSpiLanTest.java | 4 +- ...cpCommunicationSpiMultithreadedSelfTest.java | 22 +- ...dTcpCommunicationSpiRecoveryAckSelfTest.java | 10 +- ...GridTcpCommunicationSpiRecoverySelfTest.java | 10 +- .../tcp/TcpDiscoverySpiWildcardSelfTest.java | 2 +- .../testframework/GridSpiTestContext.java | 6 +- .../testframework/junits/GridAbstractTest.java | 4 +- modules/hadoop/pom.xml | 6 - .../IgfsHadoop20FileSystemAbstractSelfTest.java | 2 +- ...idHadoopDefaultMapReducePlannerSelfTest.java | 227 +---- .../GridCacheAbstractFieldsQuerySelfTest.java | 7 +- .../cache/GridCacheQueryMetricsSelfTest.java | 4 +- .../near/GridCachePartitionedQuerySelfTest.java | 4 +- .../GridCacheReplicatedFieldsQuerySelfTest.java | 2 +- .../tcp/GridOrderedMessageCancelSelfTest.java | 6 +- .../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 +- pom.xml | 2 +- readme.md | 2 - 281 files changed, 5218 insertions(+), 4165 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1ff1c8e6/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/ack/VisorAckCommand.scala ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1ff1c8e6/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/gc/VisorGcCommand.scala ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1ff1c8e6/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/ping/VisorPingCommand.scala ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1ff1c8e6/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/tasks/VisorTasksCommand.scala ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1ff1c8e6/modules/visor-console/src/main/scala/org/apache/ignite/visor/visor.scala ----------------------------------------------------------------------
