Merge remote-tracking branch 'remotes/origin/ignite-sprint-3' into ignite-gg-9829
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/7335704c Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/7335704c Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/7335704c Branch: refs/heads/ignite-gg-9829 Commit: 7335704c189a14501c71a2361f7158bd43a4fa09 Parents: 2ff63c2 3e6da9c Author: ptupitsyn <ptupit...@gridgain.com> Authored: Thu Apr 9 11:02:30 2015 +0300 Committer: ptupitsyn <ptupit...@gridgain.com> Committed: Thu Apr 9 11:02:30 2015 +0300 ---------------------------------------------------------------------- .../src/main/java/org/apache/ignite/Ignite.java | 11 + .../java/org/apache/ignite/IgniteCluster.java | 9 +- .../ignite/cluster/ClusterStartNodeResult.java | 46 + .../ignite/internal/ClusterMetricsSnapshot.java | 384 +++----- .../apache/ignite/internal/IgniteKernal.java | 30 +- .../cluster/ClusterStartNodeResultImpl.java | 87 ++ .../cluster/IgniteClusterAsyncImpl.java | 5 +- .../internal/cluster/IgniteClusterImpl.java | 37 +- .../cache/DynamicCacheChangeRequest.java | 2 +- .../processors/cache/GridCacheProcessor.java | 130 +-- .../util/nodestart/IgniteNodeCallable.java | 30 - .../util/nodestart/IgniteSshHelper.java | 2 +- .../util/nodestart/StartNodeCallable.java | 30 + .../messages/TcpDiscoveryAbstractMessage.java | 24 +- .../messages/TcpDiscoveryAuthFailedMessage.java | 25 +- .../TcpDiscoveryCheckFailedMessage.java | 24 +- .../TcpDiscoveryClientReconnectMessage.java | 30 +- .../TcpDiscoveryCustomEventMessage.java | 23 +- .../messages/TcpDiscoveryDiscardMessage.java | 24 +- .../TcpDiscoveryDuplicateIdMessage.java | 24 +- .../messages/TcpDiscoveryHandshakeRequest.java | 8 - .../messages/TcpDiscoveryHandshakeResponse.java | 22 - .../messages/TcpDiscoveryHeartbeatMessage.java | 44 +- .../TcpDiscoveryJoinRequestMessage.java | 28 +- .../TcpDiscoveryLoopbackProblemMessage.java | 28 +- .../TcpDiscoveryNodeAddFinishedMessage.java | 24 +- .../messages/TcpDiscoveryNodeAddedMessage.java | 60 +- .../messages/TcpDiscoveryNodeFailedMessage.java | 28 +- .../messages/TcpDiscoveryNodeLeftMessage.java | 8 - .../tcp/messages/TcpDiscoveryPingRequest.java | 25 +- .../tcp/messages/TcpDiscoveryPingResponse.java | 14 - .../TcpDiscoveryStatusCheckMessage.java | 30 +- ...teCacheConfigurationDefaultTemplateTest.java | 111 +++ ...eCacheConfigurationTemplateNotFoundTest.java | 114 --- .../IgniteCacheConfigurationTemplateTest.java | 86 +- .../ignite/testframework/junits/IgniteMock.java | 5 + .../ignite/testsuites/IgniteCacheTestSuite.java | 2 +- .../h2/sql/AbstractH2CompareQueryTest.java | 341 ++++++++ .../query/h2/sql/BaseH2CompareQueryTest.java | 823 +++++++++++++++++ .../query/h2/sql/H2CompareBigQueryTest.java | 707 +++++++++++++++ .../query/h2/sql/IgniteVsH2QueryTest.java | 875 ------------------- .../IgniteCacheQuerySelfTestSuite.java | 5 +- .../processors/query/h2/sql/bigQuery.sql | 55 ++ .../org/apache/ignite/IgniteSpringBean.java | 7 + .../util/nodestart/IgniteNodeCallableImpl.java | 308 ------- .../util/nodestart/IgniteSshHelperImpl.java | 4 +- .../util/nodestart/StartNodeCallableImpl.java | 309 +++++++ ...gniteProjectionStartStopRestartSelfTest.java | 261 +++--- .../IgniteStartStopRestartTestSuite.java | 1 + .../commands/start/VisorStartCommand.scala | 4 +- 50 files changed, 3033 insertions(+), 2281 deletions(-) ----------------------------------------------------------------------