Merge remote-tracking branch 'remotes/origin/ignite-sprint-6' into ignite-950
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/42ec7d0e Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/42ec7d0e Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/42ec7d0e Branch: refs/heads/ignite-950 Commit: 42ec7d0efdb6f4549520dd4726d08b93784c91bd Parents: 9fb9679 285d790 Author: Denis Magda <dma...@gridgain.com> Authored: Tue Jun 23 08:30:39 2015 +0300 Committer: Denis Magda <dma...@gridgain.com> Committed: Tue Jun 23 08:30:39 2015 +0300 ---------------------------------------------------------------------- .../apache/ignite/IgniteSystemProperties.java | 3 + .../ignite/internal/MarshallerContextImpl.java | 12 +- .../internal/managers/GridManagerAdapter.java | 8 +- .../discovery/GridDiscoveryManager.java | 30 ++- .../processors/cache/GridCacheIoManager.java | 64 ++++-- .../GridCachePartitionExchangeManager.java | 71 ++++--- .../processors/cache/GridCacheSwapManager.java | 12 +- .../GridDhtPartitionsExchangeFuture.java | 49 +++-- .../continuous/CacheContinuousQueryHandler.java | 8 + .../offheap/GridOffHeapProcessor.java | 19 +- .../apache/ignite/internal/util/GridDebug.java | 37 ++-- .../ignite/internal/util/nio/GridNioServer.java | 64 +++++- .../org/apache/ignite/spi/IgniteSpiAdapter.java | 7 +- .../org/apache/ignite/spi/IgniteSpiContext.java | 9 +- .../communication/tcp/TcpCommunicationSpi.java | 104 +++++++++- .../tcp/TcpCommunicationSpiMBean.java | 19 ++ .../ignite/spi/discovery/DiscoverySpi.java | 3 +- .../ignite/spi/discovery/tcp/ClientImpl.java | 80 +++++--- .../ignite/spi/discovery/tcp/ServerImpl.java | 17 +- .../spi/discovery/tcp/TcpDiscoveryImpl.java | 3 +- .../spi/discovery/tcp/TcpDiscoverySpi.java | 6 +- .../messages/TcpDiscoveryNodeFailedMessage.java | 18 ++ ...ridFailFastNodeFailureDetectionSelfTest.java | 17 +- .../IgniteSlowClientDetectionSelfTest.java | 187 ++++++++++++++++++ .../GridCacheAbstractFailoverSelfTest.java | 6 +- .../cache/GridCacheDaemonNodeStopSelfTest.java | 119 +++++++++++ .../GridTcpCommunicationSpiConfigSelfTest.java | 1 - .../testframework/GridSpiTestContext.java | 7 +- .../ignite/testsuites/IgniteBasicTestSuite.java | 1 + .../testsuites/IgniteCacheTestSuite3.java | 1 + .../processors/query/h2/IgniteH2Indexing.java | 2 + .../query/h2/twostep/GridMapQueryExecutor.java | 23 ++- .../cache/IgniteCacheOffheapEvictQueryTest.java | 196 +++++++++++++++++++ .../IgniteCacheQuerySelfTestSuite.java | 1 + .../cache/jta/GridCacheXAResource.java | 18 +- .../processors/cache/GridCacheJtaSelfTest.java | 2 +- 36 files changed, 1043 insertions(+), 181 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/42ec7d0e/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite.java ----------------------------------------------------------------------