Merge branches 'ignite-692' and 'ignite-sprint-3'
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/2ba7b502 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/2ba7b502 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/2ba7b502 Branch: refs/heads/ignite-692 Commit: 2ba7b5024bdb042b6b4fb0862215fee2d5fdfed7 Parents: 9fb5651 3e6da9c Author: AKuznetsov <akuznet...@gridgain.com> Authored: Thu Apr 9 14:38:09 2015 +0700 Committer: AKuznetsov <akuznet...@gridgain.com> Committed: Thu Apr 9 14:38:09 2015 +0700 ---------------------------------------------------------------------- .../src/main/java/org/apache/ignite/Ignite.java | 26 + .../java/org/apache/ignite/IgniteCluster.java | 9 +- .../ignite/cluster/ClusterStartNodeResult.java | 46 + .../ignite/internal/ClusterMetricsSnapshot.java | 384 +++------ .../apache/ignite/internal/IgniteKernal.java | 72 +- .../org/apache/ignite/internal/IgnitionEx.java | 171 ++-- .../cluster/ClusterStartNodeResultImpl.java | 87 ++ .../cluster/IgniteClusterAsyncImpl.java | 5 +- .../internal/cluster/IgniteClusterImpl.java | 37 +- .../internal/managers/GridManagerAdapter.java | 34 +- .../cache/DynamicCacheChangeRequest.java | 19 +- .../cache/DynamicCacheDescriptor.java | 17 +- .../processors/cache/GridCacheProcessor.java | 376 ++++++-- .../GridDhtPartitionsExchangeFuture.java | 1 + .../cache/transactions/IgniteTxManager.java | 6 +- .../ignite/internal/util/lang/GridFunc.java | 33 + .../util/nodestart/IgniteNodeCallable.java | 30 - .../util/nodestart/IgniteSshHelper.java | 2 +- .../util/nodestart/StartNodeCallable.java | 30 + .../ignite/internal/visor/cache/VisorCache.java | 2 +- .../cache/VisorCacheAggregatedMetrics.java | 38 +- .../visor/cache/VisorCacheConfiguration.java | 17 +- .../internal/visor/cache/VisorCacheMetrics.java | 53 +- .../cache/VisorCacheMetricsCollectorTask.java | 59 +- .../visor/cache/VisorCacheStopTask.java | 69 ++ .../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 +++ .../IgniteCacheConfigurationTemplateTest.java | 448 ++++++++++ .../ignite/testframework/junits/IgniteMock.java | 15 + .../ignite/testsuites/IgniteCacheTestSuite.java | 2 + .../processors/query/h2/sql/GridSqlElement.java | 8 - .../processors/query/h2/sql/GridSqlQuery.java | 183 ++++ .../query/h2/sql/GridSqlQueryParser.java | 97 ++- .../query/h2/sql/GridSqlQuerySplitter.java | 111 ++- .../processors/query/h2/sql/GridSqlSelect.java | 209 ++--- .../query/h2/sql/GridSqlSubquery.java | 8 +- .../processors/query/h2/sql/GridSqlUnion.java | 134 +++ .../h2/twostep/GridReduceQueryExecutor.java | 2 +- .../h2/sql/AbstractH2CompareQueryTest.java | 341 ++++++++ .../query/h2/sql/BaseH2CompareQueryTest.java | 823 ++++++++++++++++++ .../query/h2/sql/GridQueryParsingTest.java | 26 +- .../query/h2/sql/H2CompareBigQueryTest.java | 707 +++++++++++++++ .../query/h2/sql/IgniteVsH2QueryTest.java | 860 ------------------- .../IgniteCacheQuerySelfTestSuite.java | 5 +- .../processors/query/h2/sql/bigQuery.sql | 55 ++ .../org/apache/ignite/IgniteSpringBean.java | 21 + .../util/nodestart/IgniteNodeCallableImpl.java | 308 ------- .../util/nodestart/IgniteSshHelperImpl.java | 4 +- .../util/nodestart/StartNodeCallableImpl.java | 309 +++++++ ...gniteProjectionStartStopRestartSelfTest.java | 261 +++--- .../IgniteStartStopRestartTestSuite.java | 1 + .../commands/cache/VisorCacheCommand.scala | 423 +++++---- .../commands/cache/VisorCacheStopCommand.scala | 145 ++++ .../commands/start/VisorStartCommand.scala | 4 +- 72 files changed, 5039 insertions(+), 2698 deletions(-) ----------------------------------------------------------------------
