Merge remote-tracking branch 'remotes/origin/ignite-sprint-3' into ignite-30
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/c31dbd2a Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c31dbd2a Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c31dbd2a Branch: refs/heads/ignite-30 Commit: c31dbd2a20f0a2715dfa158102e1b879bfee657b Parents: cb21533 7eef373 Author: sevdokimov <sevdoki...@gridgain.com> Authored: Wed Apr 8 18:25:27 2015 +0300 Committer: sevdokimov <sevdoki...@gridgain.com> Committed: Wed Apr 8 18:25:27 2015 +0300 ---------------------------------------------------------------------- bin/ignite.bat | 2 +- bin/ignite.sh | 2 +- bin/include/service.sh | 8 +- config/hadoop/default-config.xml | 15 +- .../streaming/StreamTransformerExample.java | 3 +- .../src/main/java/org/apache/ignite/Ignite.java | 15 + .../apache/ignite/internal/IgniteKernal.java | 55 ++- .../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 | 350 +++++++++++++-- .../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 +- .../ipc/shmem/IpcSharedMemoryNativeLoader.java | 48 ++- .../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 +++ .../org/apache/ignite/spi/IgniteSpiAdapter.java | 24 +- .../communication/tcp/TcpCommunicationSpi.java | 14 +- .../discovery/tcp/TcpClientDiscoverySpi.java | 47 +-- .../spi/discovery/tcp/TcpDiscoverySpi.java | 78 ++-- .../discovery/tcp/TcpDiscoverySpiAdapter.java | 8 +- .../spi/swapspace/file/FileSwapSpaceSpi.java | 4 +- .../resources/META-INF/classnames.properties | 19 +- ...eCacheConfigurationTemplateNotFoundTest.java | 114 +++++ .../IgniteCacheConfigurationTemplateTest.java | 364 ++++++++++++++++ .../cache/IgniteDynamicCacheStartSelfTest.java | 23 + ...ePartitionedBasicStoreMultiNodeSelfTest.java | 110 +---- ...ridCacheFifoBatchEvictionPolicySelfTest.java | 3 +- .../GridAbstractCommunicationSelfTest.java | 3 +- .../GridTcpCommunicationSpiAbstractTest.java | 5 +- ...mmunicationSpiConcurrentConnectSelfTest.java | 3 +- ...cpCommunicationSpiMultithreadedSelfTest.java | 3 +- ...dTcpCommunicationSpiRecoveryAckSelfTest.java | 3 +- ...GridTcpCommunicationSpiRecoverySelfTest.java | 2 +- .../ignite/testframework/junits/IgniteMock.java | 10 + .../IgniteCacheEvictionSelfTestSuite.java | 1 + .../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 +- parent/pom.xml | 2 +- pom.xml | 2 + 66 files changed, 2474 insertions(+), 865 deletions(-) ----------------------------------------------------------------------
