Merge remote-tracking branch 'remotes/origin/ignite-sprint-3' into ignite-683-1
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/2dc16b2f Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/2dc16b2f Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/2dc16b2f Branch: refs/heads/ignite-683 Commit: 2dc16b2f372fbbddacdb3bc80dca3be756ab297c Parents: 2cfbbd8 71439bc Author: ivasilinets <ivasilin...@gridgain.com> Authored: Wed Apr 8 16:28:25 2015 +0300 Committer: ivasilinets <ivasilin...@gridgain.com> Committed: Wed Apr 8 16:28:25 2015 +0300 ---------------------------------------------------------------------- .../apache/ignite/internal/IgniteKernal.java | 7 +- .../org/apache/ignite/internal/IgnitionEx.java | 171 +++----- .../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 +++ .../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 +- .../commands/cache/VisorCacheCommand.scala | 423 +++++++++++-------- .../commands/cache/VisorCacheStopCommand.scala | 145 +++++++ 22 files changed, 1281 insertions(+), 547 deletions(-) ----------------------------------------------------------------------
