Merge remote-tracking branch 'remotes/origin/ignite-sprint-7' into ignite-965
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/6d3218c3 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/6d3218c3 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/6d3218c3 Branch: refs/heads/ignite-965 Commit: 6d3218c3824b7055a11ca29669abd92af0618fbc Parents: 4a1db95 5d8e404 Author: ivasilinets <ivasilin...@gridgain.com> Authored: Mon Jun 22 17:22:59 2015 +0300 Committer: ivasilinets <ivasilin...@gridgain.com> Committed: Mon Jun 22 17:22:59 2015 +0300 ---------------------------------------------------------------------- .../apache/ignite/IgniteSystemProperties.java | 3 + .../ignite/internal/MarshallerContextImpl.java | 12 +- .../internal/managers/GridManagerAdapter.java | 8 +- .../discovery/GridDiscoveryManager.java | 30 ++- .../GridCachePartitionExchangeManager.java | 1 + .../processors/cache/GridCacheSwapManager.java | 12 +- .../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 | 92 ++++++++- .../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 ++++++++++++++++++ .../cache/GridCacheDaemonNodeStopSelfTest.java | 119 +++++++++++ .../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 +- 32 files changed, 915 insertions(+), 107 deletions(-) ----------------------------------------------------------------------
