Merge branch 'ignite-sprint-3' into ignite-635
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/67b5cb68 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/67b5cb68 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/67b5cb68 Branch: refs/heads/ignite-635 Commit: 67b5cb68e5c289716e66cbd733c08ebb8e01ed79 Parents: 3be59d5 71439bc Author: Artem Shutak <ashu...@gridgain.com> Authored: Wed Apr 8 17:01:56 2015 +0300 Committer: Artem Shutak <ashu...@gridgain.com> Committed: Wed Apr 8 17:01:56 2015 +0300 ---------------------------------------------------------------------- .../src/main/java/org/apache/ignite/Ignite.java | 15 + .../apache/ignite/internal/IgniteKernal.java | 44 +- .../org/apache/ignite/internal/IgnitionEx.java | 171 +++----- .../internal/managers/GridManagerAdapter.java | 34 +- .../cache/DynamicCacheChangeRequest.java | 17 + .../cache/DynamicCacheDescriptor.java | 17 +- .../processors/cache/GridCacheIoManager.java | 2 +- .../processors/cache/GridCacheProcessor.java | 349 +++++++++++++-- .../dht/GridClientPartitionTopology.java | 6 +- .../distributed/dht/GridDhtLockFuture.java | 10 +- .../dht/GridDhtPartitionTopologyImpl.java | 6 +- .../distributed/dht/GridDhtTxLocalAdapter.java | 49 ++- .../distributed/dht/GridDhtTxPrepareFuture.java | 2 +- .../GridDhtPartitionsExchangeFuture.java | 1 + .../cache/transactions/IgniteTxManager.java | 6 +- .../ignite/internal/util/lang/GridFunc.java | 33 ++ .../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 +++ .../resources/META-INF/classnames.properties | 19 +- ...eCacheConfigurationTemplateNotFoundTest.java | 114 +++++ .../IgniteCacheConfigurationTemplateTest.java | 364 ++++++++++++++++ .../cache/IgniteDynamicCacheStartSelfTest.java | 23 + ...ePartitionedBasicStoreMultiNodeSelfTest.java | 110 +---- .../ignite/testframework/junits/IgniteMock.java | 10 + .../ignite/testsuites/IgniteCacheTestSuite.java | 5 +- .../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 +- .../query/h2/sql/GridQueryParsingTest.java | 26 +- .../query/h2/sql/IgniteVsH2QueryTest.java | 27 +- .../org/apache/ignite/IgniteSpringBean.java | 14 + .../commands/cache/VisorCacheClearCommand.scala | 3 +- .../commands/cache/VisorCacheCommand.scala | 423 +++++++++++-------- .../commands/cache/VisorCacheStopCommand.scala | 145 +++++++ .../scala/org/apache/ignite/visor/visor.scala | 12 +- 44 files changed, 2298 insertions(+), 749 deletions(-) ----------------------------------------------------------------------
